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 24a72aac3354c32d37f3fcd1e776c980de952275..c588ce8a19571eeb4f5f08a7ee1c10b56125177f 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/css/style1.css b/fast-develop-web/fast-develop-editor/src/fast-develop/src/css/style1.css
index 3facd0d9304435f5e35c99c702b935f56b996e33..8eacf1be5954fb414a21614c7729e3ee6f4f26b5 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/index_gs.html b/fast-develop-web/fast-develop-editor/src/fast-develop/src/index_gs.html
index 830fe5c27c18674dde88f6d88f14a0811d79ddf6..bc9d4b025a1be4e71cf07568c95d61e1fafcd82b 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
@@ -291,6 +291,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: {
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 4142ca93846ff10ebc7eb7e4a66eac7cad243a5d..262a83bcb6d8298b0e3003698ea7062f94ade9f3 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);
}
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 870b616a7b778141c0dce1f37c70a84b54557cfc..435f5536398035b60a414c39aba34f4527689310 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;
- // ${option.userName}
- //
- //
- //