diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.test.yml b/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.test.yml index 8697b13959c2f9b9acd0d6b4fd18aa1e3d5221ab..9452eca75258dd28019700418a0d175080306944 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.test.yml +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.test.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/js/module/amis.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/amis.js index be5eefbe0bb60f1fcee87cacf14978e70cb2bd25..670b3f30a1964aeca0a28696dd0c572837387440 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 435f5536398035b60a414c39aba34f4527689310..b78ed24443afebc9462d875b4756d48192212a3f 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);