From 2e46d0de3c933f9c0e41a6dd1ab0e219ae561ba8 Mon Sep 17 00:00:00 2001 From: tiansai Date: Wed, 17 Aug 2022 20:09:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E9=A1=B5=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/fast-develop/src/config/fast.config.gs.yml | 3 +++ .../src/fast-develop/src/index_gs.html | 13 +++++++++++++ 2 files changed, 16 insertions(+) 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 24a72aa..c588ce8 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 @@ -16,6 +16,9 @@ moudle: second: schemaType: wkflmodel url: ${platformUrl}/api/v1/engine/workflow/tree + system: + schemaType: system + url: ${platformUrl}/api/v1/engine/development/systemTree 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 690bc29..7568f19 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 @@ -281,6 +281,19 @@ onClickListener: function(event, treeId, treeNode){ $('#run').attr("disabled",true); } + }, + { + elem: "#sysResource", + contentElem: '#fast-body', + enableRootPath:true, + api: fast_config.moudle.tree.system.url, + viewMode:'tabs', + icon: 'system', + title: '系统配置', + schemaType: fast_config.moudle.tree.system.schemaType, + onClickListener: function(event, treeId, treeNode){ + $('#run').attr("disabled",true); + } } ], publish_settings: { -- Gitee From 71be929d796b2f78b173a081a60fec5a42ebc490 Mon Sep 17 00:00:00 2001 From: tiansai Date: Thu, 18 Aug 2022 11:16:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/fast-develop/src/css/style1.css | 27 ++++++--- .../src/js/module/editor/header_right.js | 58 +++++++++---------- 2 files changed, 47 insertions(+), 38 deletions(-) diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/style1.css b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/style1.css index 3facd0d..8eacf1b 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/style1.css +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/style1.css @@ -212,7 +212,7 @@ body, } .layui-field-title { - margin: 0px 10px 10px 5px + margin: 0px 10px 10px 5px } .content .header{ @@ -386,12 +386,12 @@ div.pq-toolbar{ .header-right .layui-nav .layui-this:after { height: 0px; } -/* .header-right .layui-nav .layui-nav-item a{ +.header-right .layui-nav .layui-nav-item a{ color: #666; -} */ -/* .header-right .layui-nav .layui-nav-item a:hover{ +} +.header-right .layui-nav .layui-nav-item a:hover{ background-color: rgb(245,246,249) ; -} */ +} .header-right .layui-nav-bar { display: none; } @@ -500,6 +500,14 @@ div.pq-toolbar{ background-color: transparent !important; } +.layui-layout-right .layui-nav-item a { + display: flex; + justify-content: space-between; + align-items: center; +} +.layui-nav.layui-layout-right .layui-nav-item a{ + padding: 0 10px; +} .layui-layout-right .review{ height: 26px; width: 26px; @@ -507,6 +515,7 @@ div.pq-toolbar{ background: url(../compoment/@ztree/ztree_v3/css/zTreeStyle/img/icon.png) no-repeat scroll 0 0 transparent; background-position: -112px -131px; cursor: pointer; + margin-right: 3px; /* border-radius: 50%; */ } @@ -588,7 +597,7 @@ div.pq-toolbar{ .box1 ul.ztree>li { /* max-height: 100%; */ /* overflow-y: auto; */ -} +} .box1 .layui-tab-brief>.layui-tab-title .layui-this { background-color: var(--system-main-bgColor); color: #151a26; @@ -674,7 +683,7 @@ ul.ztree .currentNode{ top: 76px !important; } .header .layui-layout-right { - margin-top: 5px; + margin-top: 1px; width: 45%; text-align: right; padding-right: 0px; @@ -683,7 +692,7 @@ ul.ztree .currentNode{ .header .layui-layout-right li { height: 26px; display: inline-block; - line-height: 26px; + line-height: 26px; padding: 0 8px; } .header .layui-layout-right li:not(:first-child){ @@ -735,4 +744,4 @@ ul.layui-menu { margin-left: 15px; font-weight: 700; color: #666; -} \ No newline at end of file +} diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/header_right.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/header_right.js index 4142ca9..262a83b 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/header_right.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/header_right.js @@ -16,36 +16,36 @@ layui.define(['element', 'api','utils','amis'], function(exports) { }; function addDom(option){ - // var dom = ` - // - // ` var dom = ` - - ` + + ` + // var dom = ` + // + // ` $(option.elem).append(dom); } -- Gitee From 5c807917fcea39f6b0c66a325821a913436ba0d2 Mon Sep 17 00:00:00 2001 From: tiansai Date: Thu, 18 Aug 2022 15:40:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/fast-develop/src/js/module/editor/schema_render.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 870b616..435f553 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 @@ -194,9 +194,6 @@ layui.define(['element', 'api', 'listener', 'amis', 'utils'], function(exports) var data = utils.getGlobalEnv(option.contextData.data); var schema = option.schema; - data["name"] = null; - data["enName"] = null; - if(schema.mode && schema.mode === 'listener'){ var id = schema.elem; var listenerName; @@ -212,7 +209,9 @@ layui.define(['element', 'api', 'listener', 'amis', 'utils'], function(exports) }else if(schema.mode && schema.mode === 'dialog'){ var dialog = schema.dialog; - + // 置空新增表单同名数据 + data["name"] = null; + data["enName"] = null; if(dialog.mode === 'amis'){ renderDialog(dialog, option); var amisSchema = dialog.amisSchema; -- Gitee