From 7f9c04273f8b4aa67f09d4434c1604398d2b21f5 Mon Sep 17 00:00:00 2001 From: tiansai Date: Thu, 25 Aug 2022 20:29:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?gs=E4=B8=BB=E9=A1=B5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=AF=B9=E8=B1=A1=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/fast-develop/package.json | 2 +- .../src/fast-develop/src/config/fast.config.gs.yml | 3 +++ .../src/fast-develop/src/index_gs.html | 13 +++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/package.json b/fast-develop-web/fast-develop-editor/src/fast-develop/package.json index 711082b..d48127e 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/package.json +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/package.json @@ -12,7 +12,7 @@ "@babel/core": "^7.18.6", "@babel/preset-env": "^7.18.6", "@ztree/ztree_v3": "3.5.48", - "amis": "2.1.0", + "amis": "2.1.1-beta.2", "browser-sync": "^2.27.10", "gulp": "^4.0.2", "gulp-babel": "^8.0.0", diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.gs.yml b/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.gs.yml index c588ce8..aeebfb9 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.gs.yml +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.gs.yml @@ -19,6 +19,9 @@ moudle: system: schemaType: system url: ${platformUrl}/api/v1/engine/development/systemTree + brms: + schemaType: brms + url: ${platformUrl}/api/v1/engine/brms/tree schemaApi: ${platformUrl}/schemas/${type} domain: diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/index_gs.html b/fast-develop-web/fast-develop-editor/src/fast-develop/src/index_gs.html index bc9d4b0..fc6a199 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/index_gs.html +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/index_gs.html @@ -304,6 +304,19 @@ onClickListener: function(event, treeId, treeNode){ $('#run').attr("disabled",true); } + }, + { + elem: "#brmsResource", + contentElem: '#fast-body', + enableRootPath:true, + api: fast_config.moudle.tree.brms.url, + viewMode:'tabs', + icon: 'brms', + title: '规则对象', + schemaType: fast_config.moudle.tree.system.schemaType, + onClickListener: function(event, treeId, treeNode){ + $('#run').attr("disabled",true); + } } ], publish_settings: { -- Gitee From e916a9dcbebd84ae99fa9a2e68061c29450b4cf7 Mon Sep 17 00:00:00 2001 From: tiansai Date: Fri, 26 Aug 2022 14:48:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E6=89=93=E5=BC=80=E5=86=85=E5=AE=B9=E9=A1=B5=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4amisApi=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/fast-develop/src/js/module/amis.js | 2 +- .../src/fast-develop/src/js/module/editor/schema_render.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/amis.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/amis.js index be5eefb..670b3f3 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/amis.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/amis.js @@ -52,7 +52,7 @@ layui.define(['element', 'api'], function(exports) { url: option.schemaApi, async: false, success: function(data){ - option.schema = data; + option.schema = JSON.parse(data); } }) } diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/schema_render.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/schema_render.js index 435f553..b78ed24 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/schema_render.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/schema_render.js @@ -245,6 +245,9 @@ layui.define(['element', 'api', 'listener', 'amis', 'utils'], function(exports) }else if(schema.mode === 'amis'){ var amisSchema = schema.amisSchema; var amisSchemaApi = schema.amisSchemaApi; + if(amisSchemaApi!=undefined){ + amisSchemaApi = utils.stringformat(amisSchemaApi,data); + } amis.render({ elem: option.elem, schema: amisSchema, @@ -256,6 +259,8 @@ layui.define(['element', 'api', 'listener', 'amis', 'utils'], function(exports) }else if(schema.mode === 'iframe'){ var iframeUrl = utils.stringformat(schema.url,data); showIframe(iframeUrl,option.elem); + }else if(schema.mode ==='winopen'){ + window.open(utils.stringformat(schema.url,data)); } return new schema_render(option); -- Gitee