From 5d1c4e73323867ccb8d3c754d2a7614225f34d55 Mon Sep 17 00:00:00 2001
From: tiansai <tian_hero@126.com>
Date: Sat, 9 Jul 2022 14:35:35 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/pom.xml                               |  8 ++--
 fast-develop-web/fast-develop-editor/pom.xml  |  8 ++--
 .../src/fast-develop/gulpfile.js              |  5 ++-
 .../fast-develop/src/config/fast.config.yml   |  3 +-
 .../src/fast-develop/src/index.html           |  2 +-
 .../src/fast-develop/src/js/module/editor.js  | 42 ++++++++++++++++---
 .../src/fast-develop/src/js/module/jqgrid.js  |  2 +-
 7 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/example/pom.xml b/example/pom.xml
index a4cdb39..8962c4b 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -72,10 +72,10 @@
                 <version>2.6</version>
                 <configuration>
                     <nonFilteredFileExtensions>
-                                       <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
-                                       <nonFilteredFileExtension>woff</nonFilteredFileExtension>
-                                       <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
-                                    </nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>woff</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
                 </configuration>
             </plugin>
 
diff --git a/fast-develop-web/fast-develop-editor/pom.xml b/fast-develop-web/fast-develop-editor/pom.xml
index 7b88ac8..1fd2b3f 100644
--- a/fast-develop-web/fast-develop-editor/pom.xml
+++ b/fast-develop-web/fast-develop-editor/pom.xml
@@ -54,10 +54,10 @@
                 <version>2.6</version>
                 <configuration>
                     <nonFilteredFileExtensions>
-                       <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
-                       <nonFilteredFileExtension>woff</nonFilteredFileExtension>
-                       <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
-                    </nonFilteredFileExtensions>
+        <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+        <nonFilteredFileExtension>woff</nonFilteredFileExtension>
+        <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
+          </nonFilteredFileExtensions>
                 </configuration>
             </plugin>
 
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js b/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
index e201dc3..2374a16 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
@@ -176,8 +176,9 @@ function server(){
         middleware: function (connect, opt) {
             return [
                 createProxyMiddleware(
-                  '/api',{
-                  target: 'http://localhost:8080'
+                  '/builder',{
+                  // target: 'http://localhost:8080'
+                  target: 'http://localhost:8210'
                 })
             ]
       
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.yml b/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.yml
index dbf08fb..ffe2066 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.yml
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.yml
@@ -1,2 +1,3 @@
 ## 网站配置
-api: "/api/"
+api: "/builder/"
+#api: "/api/"
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/index.html b/fast-develop-web/fast-develop-editor/src/fast-develop/src/index.html
index 434a9af..91b2ab0 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/index.html
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/index.html
@@ -490,7 +490,7 @@
     var treeConst;
     var schema = {
         formType:{
-            domain_model:domainModelForm,
+            domainmodel:domainModelForm,
             domain_model_field:domainModelFieldForm,
             domain_file_field_primary_key:domainModelFieldForm,
         }
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
index 7841d81..c371e1f 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
@@ -2,6 +2,7 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
 	"use strict";
 
 	function domainModelContentPanelListener(data) {
+	    // debugger
         amis.render({
             elem: '#fast-body',
             json: {
@@ -140,7 +141,8 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
     function reloadResource(){
         api.get({
             enableRootPath: true,
-            url: "resource/tree",
+            url: "api/v1/engine/development/tree",
+            // url: "resource/tree",
             success: function(data){
                 //可以重载所有基础参数
                 etree.reload('treeId', {
@@ -223,7 +225,6 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
             }
             ,contextmenuConfig:{
                 click: function(obj, f, e){
-
                     var data = contextmenuData.data.data;
                     if(obj.mode && obj.mode === 'listener'){
                         var id = obj.id;
@@ -280,7 +281,6 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                         }
                     }
 
-
                     if(obj.id === 'create_folder' || obj.id === 'create_domain_folder'){
                         createFolder()
                     }
@@ -327,6 +327,7 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                 data: [{}]
             }
             ,click: function(obj) {
+                debugger
                 // 点击高亮
                 $(".layui-tree-set").removeClass('layui-tree-set-active');
                 obj.elem.addClass('layui-tree-set-active');
@@ -337,6 +338,7 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                 }
 
                 var metaType = obj.data.data.type.metaType;
+
                 var resourceTypeSchema = getSchema("resource");
                 var typeSchema = resourceTypeSchema[metaType];
 
@@ -351,14 +353,17 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                             listener(obj.data)
                         }
                     }else if(contentPanel.mode === 'amis'){
+                        // debugger
                         var amisSchema = contentPanel.amisSchema;
                         var amisSchemaApi = contentPanel.amisSchemaApi;
+                        var amisData = getGlobalEnv(obj.data.data);
+                        // console.log("asdadasd",amisData);
                         amis.render({
                             elem: contentElem,
                             schema: amisSchema,
                             schemaApi: amisSchemaApi,
                             props:{
-                                data:obj.data.data
+                                data: amisData
                             }
                         })
                     }else if(contentPanel.mode === 'iframe'){
@@ -418,6 +423,7 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
     });
 
     function getFileMetaData(path, selectData) {
+        // debugger
         randerForm(schema.formType[selectData.data.type.metaType], selectData.data)
         api.get({
             enableRootPath: true,
@@ -693,11 +699,13 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
      * @param type
      */
     function getSchema(type){
+        // debugger
         var typeSchema = schema[type]
         if(!typeSchema){
             api.get({
                 enableRootPath: true,
-                url: "schemas/" + type,
+                url: "schemas/model.json",
+                // url: "schemas/" + type,
                 async: false,
                 success: function(data){
                     schema[type] = data
@@ -709,6 +717,30 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
         return typeSchema;
     }
 
+    /**
+     * 获取服务环境变量
+     */
+    function getGlobalEnv(amisData){
+        // debugger
+        var env = schema['env'];
+        if(!env){
+            api.get({
+                enableRootPath: true,
+                url: "api/v1/env/getAppEnvironment?appId="+amisData.mid.tenantId,
+                // url: "schemas/" + type,
+                async: false,
+                success: function(data){
+                    schema['env'] = data;
+                    amisData = {...amisData,...data}
+                }
+            });
+        }else{
+            amisData = {...amisData,...env}
+        }
+
+        return amisData;
+    }
+
 
 
     $("#run").click(function(){
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/jqgrid.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/jqgrid.js
index 478cdc2..69c1a54 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/jqgrid.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/jqgrid.js
@@ -269,7 +269,7 @@ layui.define(['element', 'api', 'fast_config'], function(exports) {
         $(option.elem).pqGrid( "refreshDataAndView" );
 
         $(option.elem).pqGrid( "option", "height", '100%+40' );
-        $(window).resize( function  () {
+        $(window).resize(function() {
             $(option.elem).pqGrid( "option", "height", '100%+40' );
         });
 
-- 
Gitee


From f02e5a8044aaeea3368be625b467eee8abe97226 Mon Sep 17 00:00:00 2001
From: tiansai <tian_hero@126.com>
Date: Sun, 10 Jul 2022 15:21:59 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E5=AF=B9=E8=B1=A1=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/fast-develop/src/js/module/editor.js  | 49 ++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
index c371e1f..950ca29 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
@@ -39,6 +39,7 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
     }
 
     function testDialog(dialog, option){
+        debugger
         layer.open({
             type:1,
             area:['500px','600px'],
@@ -175,6 +176,12 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
             var obj = arguments[0];
             var s = this;
             for(var key in obj) {
+                if( typeof(obj[key])=='object'){
+                    var sobj = obj[key];
+                    for(var sk in sobj){
+                        s = s.replace(new RegExp("\\$\\{" + key+"\\."+sk + "\\}", "g"), sobj[sk]);
+                    }
+                }
                 s = s.replace(new RegExp("\\$\\{" + key + "\\}", "g"), obj[key]);
             }
             return s;
@@ -226,12 +233,13 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
             ,contextmenuConfig:{
                 click: function(obj, f, e){
                     var data = contextmenuData.data.data;
+                    var amisData = getGlobalEnv(data);
                     if(obj.mode && obj.mode === 'listener'){
                         var id = obj.id;
                         var listenerName = id + '_contextMenu_listener';
                         var listener = contextMenuListeners[listenerName];
                         if(listener &&  typeof listener === 'function'){
-                            listener(data)
+                            listener(amisData)
                         }
                     }else if(obj.mode && obj.mode === 'dialog'){
                         var dialog = obj.dialog;
@@ -244,7 +252,7 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                                 schema: amisSchema,
                                 schemaApi: amisSchemaApi,
                                 props:{
-                                    data:data
+                                    data:amisData
                                 },
                                 extension:{
                                     tracker: (eventTrack, props) => {
@@ -260,20 +268,22 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                     }else if(obj.mode && obj.mode === 'ajax'){
                         var optionApiStr = obj.api;
                         if(typeof optionApiStr === 'object'){
-                            optionApiStr.url = optionApiStr.url.format(data);
+                            optionApiStr.url = optionApiStr.url.format(amisData);
                             var optionApi = optionApiStr;
                             api.exec(optionApi);
                         }else{
-                            optionApiStr = optionApiStr.format(data)
-                            var optionApiProps = optionApiStr.split(":");
-                            var method, apiStr;
-                            if(optionApiProps.length > 1){
-                                method = optionApiProps[0];
-                                apiStr = optionApiProps[1];
-                            }else{
-                                method = 'get';
-                                apiStr = optionApiProps[1];
-                            }
+                            optionApiStr = optionApiStr.format(amisData)
+                            // var optionApiProps = optionApiStr.split(":");
+                            var method = optionApiStr.slice(0,optionApiStr.indexOf(":"));
+                            var apiStr = optionApiStr.slice(optionApiStr.indexOf(":")+1);
+
+                            // if(optionApiProps.length > 1){
+                            //     method = optionApiProps[0];
+                            //     apiStr = optionApiProps[1];
+                            // }else{
+                            //     method = 'get';
+                            //     apiStr = optionApiProps[1];
+                            // }
                             api.exec({
                                 type: method,
                                 url: apiStr
@@ -287,9 +297,11 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                     // else if(obj.id === 'create_domain'){
                     //     createFile('domain_model')
                     // }
-                    else if(obj.id === 'remove'){
-                        deleteResource()
-                    }else if(obj.id === 'create_domain_field'){
+                    // else if(obj.id === 'remove'){
+                        // deleteResource()
+
+                    // }
+                    else if(obj.id === 'create_domain_field'){
                         createMetaData('domain_model', contextmenuData.data.data.path)
                     }else if(obj.id === 'rename'){
                         rename(contextmenuData.data.data.name, contextmenuData.data.data.path)
@@ -680,12 +692,13 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
      * 删除
      * @param path
      */
-    function deleteResource(){
+    function deleteResource(url){
         //获取
         var path = getContextmenuFilePath();
         api.delete({
             enableRootPath: true,
-            url: "resource",
+            url: url,
+            // url: "resource",
             data: {path:path},
             async: false,
             success: function(data){
-- 
Gitee


From 8458df67e8775c76b49e2272218f553daa80aa0b Mon Sep 17 00:00:00 2001
From: tiansai <tian_hero@126.com>
Date: Mon, 11 Jul 2022 15:05:25 +0800
Subject: [PATCH 03/10] no message

---
 .../src/fast-develop/src/js/module/editor.js  | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
index bd73237..d56d8a9 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
@@ -98,11 +98,11 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
             btn: ['提交', '取消']
             ,btn1: function(index, layero){
                 var amis = option;
-                var formObject = amis.funcAmis.option.amisScoped.getComponentById("createTestForm").getValues();
+                var formObject = amis.funcAmis.option.amisScoped.getComponentById("modelForm").getValues();
                 var optionApi = amis.funcAmis.option.schema.api;
                 execApi({
                     optionApi : optionApi,
-                    formObject : formObject,
+                    execData : formObject,
                     success: function(data){
                         reloadResource()
                         layer.closeAll();
@@ -216,6 +216,10 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                     //新的参数
                     data: data
                 });
+                // etree.reload('treeIds', {
+                //     //新的参数
+                //     data: data
+                // });
                 // var treeObj = $.fn.zTree.getZTreeObj("resource");
                 // var newNodes = [{name:"newNode1"}, {name:"newNode2"}, {name:"newNode3"}];
                 // treeObj.addNodes(null, newNodes);
@@ -242,14 +246,13 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
         if(typeof optionApi === 'object'){
             optionApi.url = optionApi.url.format(data);
             var apiOption = optionApi;
+            debugger
             apiOption.data = execData;
             apiOption.success = success;
             api.exec(apiOption);
         }else{
             optionApi = optionApi.format(data)
             // var optionApiProps = optionApi.split(":");
-            var method=optionApi.slice(0,optionApi.indexOf(":"));
-            var apiStr=optionApi.slice(optionApi.indexOf(":")+1);
             // if(optionApiProps.length > 1){
             //     method = optionApiProps[0];
             //     apiStr = optionApiProps[1];
@@ -257,6 +260,12 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
             //     method = 'get';
             //     apiStr = optionApiProps[0];
             // }
+            var method=optionApi.slice(0,optionApi.indexOf(":"));
+            var apiStr=optionApi.slice(optionApi.indexOf(":")+1);
+            if(method =='http'){
+                method = 'get';
+                apiStr = optionApi;
+            }
             api.exec({
                 type: method,
                 url: apiStr,
@@ -279,7 +288,8 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                         </ul>
                         <div class="layui-tab-content">
                             <div class="layui-tab-item layui-show" id="resource"></div>
-                            <div class="layui-tab-item" id="workflowResource"></div>
+                            <div class="layui-tab-item" id="workflowResource">
+                            </div>
                           </div>
                         <!--<div class="layui-tab-content"></div>-->
                     </div>
@@ -473,6 +483,7 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                 contextData.contextmenuData = contextmenuData;
             }
         });
+
         //
         // //加载树
         reloadResource()
-- 
Gitee


From 6172534644a2e8c7558d68dd0c1f914f69a3dd2d Mon Sep 17 00:00:00 2001
From: tiansai <tian_hero@126.com>
Date: Tue, 12 Jul 2022 14:00:08 +0800
Subject: [PATCH 04/10] no message

---
 .../src/fast-develop/src/js/module/editor.js         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
index d56d8a9..46293bc 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
@@ -208,7 +208,8 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
     function reloadResource(){
         api.get({
             enableRootPath: true,
-            url: "api/v1/engine/development/tree",
+            url: "api/v1/engine/workflow/tree",
+            // url: "api/v1/engine/development/tree",
             // url: "resource/tree",
             success: function(data){
                 //可以重载所有基础参数
@@ -436,6 +437,7 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                 data: [{}]
             }
             ,click: function(obj) {
+                var amisdata = getGlobalEnv(obj.data.data);
                 // 点击高亮
                 $(".layui-tree-set").removeClass('layui-tree-set-active');
                 obj.elem.addClass('layui-tree-set-active');
@@ -462,17 +464,16 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                     }else if(contentPanel.mode === 'amis'){
                         var amisSchema = contentPanel.amisSchema;
                         var amisSchemaApi = contentPanel.amisSchemaApi;
-                        var amisData = getGlobalEnv(obj.data.data);
                         amis.render({
                             elem: contentElem,
                             schema: amisSchema,
                             schemaApi: amisSchemaApi,
                             props:{
-                                data:amisData
+                                data:amisdata
                             }
                         })
                     }else if(contentPanel.mode === 'iframe'){
-                        var iframeUrl = contentPanel.url;
+                        var iframeUrl = contentPanel.url.format(amisdata);
                         showIframe(iframeUrl);
                     }
                 }
@@ -808,7 +809,8 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
         if(!typeSchema){
             api.get({
                 enableRootPath: true,
-                url: "schemas/model.json",
+                url: "schemas/wkflmodel.json",
+                // url: "schemas/model.json",
                 // url: "schemas/" + type,
                 async: false,
                 success: function(data){
-- 
Gitee


From 426365cf7d93a5c67c60dd90c8fe402de176a72a Mon Sep 17 00:00:00 2001
From: tiansai <tian_hero@126.com>
Date: Wed, 13 Jul 2022 18:21:03 +0800
Subject: [PATCH 05/10] =?UTF-8?q?Ztree=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/fast-develop/gulpfile.js              |   4 +-
 .../src/fast-develop/src/index.html           |  67 +--
 .../src/js/module/domain_design.js            |  51 +-
 .../src/fast-develop/src/js/module/editor.js  | 531 +++++++-----------
 .../src/fast-develop/src/js/module/jqgrid.js  |   2 +-
 5 files changed, 211 insertions(+), 444 deletions(-)

diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js b/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
index bc85944..ebddd29 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
@@ -116,8 +116,8 @@ function layui(){
 
 function ztree(){
     return src([
-        './node_modules/@ztree/ztree_v3/**'
-
+        './node_modules/@ztree/ztree_v3/**',
+        '!./node_modules/@ztree/ztree_v3/css/zTreeStyle/img/zTreeStandard.png'
     ])
     .pipe(dest(distPath + 'compoment/@ztree/ztree_v3'))
 }
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/index.html b/fast-develop-web/fast-develop-editor/src/fast-develop/src/index.html
index 520d3c3..609b336 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/index.html
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/index.html
@@ -278,6 +278,10 @@
             border-color: #ede8e8;
         }
 
+        .ui-front {
+            z-index: 1000;
+        }
+
     </style>
 </head>
 <body>
@@ -485,10 +489,10 @@
 <script>
 
 
-    var treeConst,wkflTreeConst;
+    var treeConst;
     var schema = {
         formType:{
-            domainmodel:domainModelForm,
+            domain_model:domainModelForm,
             domain_model_field:domainModelFieldForm,
             domain_file_field_primary_key:domainModelFieldForm,
         }
@@ -507,65 +511,6 @@
             elem: '#editor'
         })
 
-        var setting = {
-            view: {
-				onKeyboard: true,
-				showLine: false,
-                theme:'default'
-			},
-			check: {
-				enable: true
-			},
-			data: {
-				simpleData: {
-					enable: true
-				}
-			}
-            ,callback:{
-                onLeafEnter: function(treeId,treeNode){
-                    console.log(treeId,treeNode)
-                }
-            }
-		};
-
-
-        var zNodes =[
-            { id:1, pId:0, name:"pNode 1", open:true},
-            { id:11, pId:1, name:"pNode 11"},
-            { id:111, pId:11, name:" sNode 111"},
-            { id:112, pId:11, name:"sNode 112"},
-            { id:113, pId:11, name:"sNode 113"},
-            { id:114, pId:11, name:"sNode 114"},
-            { id:12, pId:1, name:"pNode 12"},
-            { id:121, pId:12, name:"sNode 121"},
-            { id:122, pId:12, name:"sNode 122"},
-            { id:123, pId:12, name:"sNode 123"},
-            { id:124, pId:12, name:"sNode 124"},
-            { id:13, pId:1, name:"pNode 13", isParent:true},
-            { id:2, pId:0, name:"pNode 2"},
-            { id:21, pId:2, name:"pNode 21", open:true},
-            { id:211, pId:21, name:"sNode 211"},
-            { id:212, pId:21, name:"sNode 212"},
-            { id:213, pId:21, name:"sNode 213"},
-            { id:214, pId:21, name:"sNode 214"},
-            { id:22, pId:2, name:"pNode 22"},
-            { id:221, pId:22, name:"sNode 221"},
-            { id:222, pId:22, name:"sNode 222"},
-            { id:223, pId:22, name:"sNode 223"},
-            { id:224, pId:22, name:"sNode 224"},
-            { id:23, pId:2, name:"pNode 23"},
-            { id:231, pId:23, name:"sNode 231"},
-            { id:232, pId:23, name:"sNode 232"},
-            { id:233, pId:23, name:"sNode 233"},
-            { id:234, pId:23, name:"sNode 234"},
-            { id:3, pId:0, name:"pNode 3", isParent:true}
-        ];
-
-        ztree.render({
-            elem: '#ztree',
-            setting: setting,
-            zNodes : zNodes
-        })
 
         // amis.render({
         //     elem: '#fast-body',
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain_design.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain_design.js
index f019068..4ac2229 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain_design.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain_design.js
@@ -27,7 +27,7 @@ layui.define(['element', 'api', 'fast_config'], function(exports) {
 
         var grid;
         var parentContextData = window.parent.window.contextData;
-        var path = parentContextData.contextmenuData.data.data.path;
+        var path = parentContextData.contextmenuData.data.path;
         var metaName;
 
 
@@ -253,52 +253,9 @@ layui.define(['element', 'api', 'fast_config'], function(exports) {
                         }
                     ]
                 },
-                { title: "类型", dataIndx: "books", width: 90,
-                    editor: {
-                        type: "textbox",
-                        init: autoCompleteEditor
-                    },
-                    validations: [
-                        { type: 'minLen', value: 1, msg: "Required" },
-                        { type: function (ui) {
-                                var value = ui.value;
-                                if ($.inArray(ui.value, books) == -1) {
-                                    ui.msg = value + " not found in list";
-                                    return false;
-                                }
-                            }, icon: 'ui-icon-info'
-                        }
-                    ]
-                },
+
                 { title: "长度", width: 220, dataType: "integer", dataIndx: "length"},
-                {
-                    title: "非空",
-                    dataIndx: "Discontinued",
-                    maxWidth: 120,
-                    minWidth: 120,
-                    type: 'checkbox',
-                    cb: {
-                        all: false,
-                        header: true,
-                        check: "YES",
-                        uncheck: "NO"
-                    },
-                    render: function (ui) {
-                        var cb = ui.column.cb,
-                            cellData = ui.cellData,
-                            checked = cb.check === cellData ? 'checked' : '',
-                            disabled = this.isEditableCell(ui) ? "" : "disabled",
-                            text = cb.check === cellData ? 'TRUE' : (cb.uncheck === cellData ? 'FALSE' : '<i>unknown</i>');
-                        return {
-                            text: "<label><input type='checkbox' " + checked + " />" + text + "</label>",
-                            style: (disabled ? "background:lightgray" : "")
-                        };
-                    },
-                    editor: false
-                    // editable: function (ui) {
-                    //     return !ui.rowData.disabled;
-                    // }
-                },
+
                 // {
                 //     title: 'Is Available',
                 //     editable: false,
@@ -350,7 +307,7 @@ layui.define(['element', 'api', 'fast_config'], function(exports) {
         $(option.elem).pqGrid( "refreshDataAndView" );
 
         $(option.elem).pqGrid( "option", "height", '100%+40' );
-        $(window).resize( function  () {
+        $(window).resize(function() {
             $(option.elem).pqGrid( "option", "height", '100%+40' );
         });
 
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
index 9219ba8..8668113 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
@@ -1,5 +1,5 @@
-layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', 'jqgrid', 'fast_config', 'api', 'ztree', 'domain_design'], function(exports) {
-	"use strict";
+layui.define(['element', 'edropdown', 'layer', 'util', 'etree', 'form', 'amis', 'jqgrid', 'fast_config', 'api', 'ztree', 'domain_design'], function(exports) {
+    "use strict";
 
 
     String.prototype.format = function() {
@@ -15,11 +15,10 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
             }
             s = s.replace(new RegExp("\\$\\{" + key + "\\}", "g"), obj[key]);
         }
-
         return s;
     }
 
-	function domainModelContentPanelListener(data) {
+    function domainModelContentPanelListener(data) {
         amis.render({
             elem: '#fast-body',
             json: {
@@ -53,19 +52,19 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
 
     function createDomainFieldListener(data) {
 
-        createMetaData('domain_model', contextmenuData.data.data.path)
+        createMetaData('domain_model', contextmenuData.data.path)
     }
 
     function renameListener(data) {
-        rename(contextmenuData.data.data.name, contextmenuData.data.data.path)
+        rename(contextmenuData.data.name, contextmenuData.data.path)
     }
 
     function enableListener(data) {
-        enable(contextmenuData.data.data.name, contextmenuData.data.data.path)
+        enable(contextmenuData.data.name, contextmenuData.data.path)
     }
 
     function disableListener(data) {
-        disable(contextmenuData.data.data.name, contextmenuData.data.data.path)
+        disable(contextmenuData.data.name, contextmenuData.data.path)
     }
 
     function openDomainListener(data) {
@@ -127,11 +126,11 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
         });
     }
 
-	/**
-	 * Button component
-	 * */
-	var MOD_NAME = 'editor',
-		$ = layui.jquery,
+    /**
+     * Button component
+     * */
+    var MOD_NAME = 'editor',
+        $ = layui.jquery,
         element = layui.element,
         layer = layui.layer,
         form = layui.form,
@@ -147,7 +146,10 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
         contextmenuData,
         selectFileMetaData,
         ztree=layui.ztree,
-        treeObj,
+        edropdown = layui.edropdown,
+        modelTree,
+        wkflTree,
+
 
 
         //监听器
@@ -171,8 +173,8 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
         }
     ;
 
-	function resetContent(contentElem){
-	    $(contentElem).remove();
+    function resetContent(contentElem){
+        $(contentElem).remove();
         $('.layui-body.gs-body').append('<div id="'+contentElem.slice(1)+'"></div>')
     }
 
@@ -211,37 +213,29 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
         });
     }
 
-	var editor = function(opt) {
-		this.option = opt;
-	};
+    var editor = function(opt) {
+        this.option = opt;
+    };
 
 
     function reloadResource(){
         api.get({
             enableRootPath: true,
+            // url: "resource/tree",
             url: "api/v1/engine/development/tree",
             success: function(data){
-                //可以重载所有基础参数
-                etree.reload('treeId', {
-                    //新的参数
-                    data: data
-                });
-                // var treeObj = $.fn.zTree.getZTreeObj("resource");
-                // var newNodes = [{name:"newNode1"}, {name:"newNode2"}, {name:"newNode3"}];
-                // treeObj.addNodes(null, newNodes);
+                var modelTree = $.fn.zTree.getZTreeObj("resource");
+                modelTree.addNodes(null, data);
             }
-        });
+        })
+
         api.get({
             enableRootPath: true,
+            // url: "resource/tree",
             url: "api/v1/engine/workflow/tree",
             success: function(data){
-                etree.reload('wkfltreeId', {
-                    //新的参数
-                    data: data
-                });
-                // var treeObj = $.fn.zTree.getZTreeObj("resource");
-                // var newNodes = [{name:"newNode1"}, {name:"newNode2"}, {name:"newNode3"}];
-                // treeObj.addNodes(null, newNodes);
+                var wkflTree = $.fn.zTree.getZTreeObj("workflowResource");
+                wkflTree.addNodes(null, data);
             }
         })
     }
@@ -260,12 +254,11 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
 
     function formatApiOptionData(optionApi, execData){
         var data = JSON.parse(JSON.stringify(optionApi.data).format(execData));
-        debugger
         if(data['&'] === '$$'){
             $.extend(data, execData["mid"]);
             delete data['&'];
         }
-        $.extend(data, execData["mid"]);
+        $.extend(data, execData);
         return data
     }
 
@@ -283,13 +276,11 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
 
     function execApi(apiOpt){
         var {optionApi, execData, success} = apiOpt
-        var data = getGlobalEnv(contextmenuData.data.data);
-        // var data = contextmenuData.data.data;
+        // var data = contextmenuData.data;
+        var data = getGlobalEnv(contextmenuData.data);
         if(typeof optionApi === 'object'){
             //模版数据替换
             var apiOption = optionApi;
-            debugger
-            apiOption.data = execData;
             //url替换
             apiOption.url = formatUrl(apiOption.url, data);
             apiOption.data = formatApiOptionData(optionApi, execData);
@@ -301,19 +292,22 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
         }else{
             optionApi = optionApi.format(data)
             // var optionApiProps = optionApi.split(":");
+            // var method, apiUrl;
             // if(optionApiProps.length > 1){
             //     method = optionApiProps[0];
-            //     apiStr = optionApiProps[1];
+            //     apiUrl = optionApiProps[1];
             // }else{
             //     method = 'get';
-            //     apiStr = optionApiProps[0];
+            //     apiUrl = optionApiProps[0];
             // }
+
             var method=optionApi.slice(0,optionApi.indexOf(":"));
             var apiUrl=optionApi.slice(optionApi.indexOf(":")+1);
             if(method =='http' || optionApi.indexOf(":")==-1){
                 method = 'get';
                 apiUrl = optionApi;
             }
+
             var optionApi = {
                 type: method,
                 url: formatUrl(apiUrl, data),
@@ -339,8 +333,11 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                             <li>Workflow</li>
                         </ul>
                         <div class="layui-tab-content">
-                            <div class="layui-tab-item layui-show" id="resource"></div>
-                            <div class="layui-tab-item" id="workflowResource">
+                            <div class="layui-tab-item layui-show" >
+                                <ul class="ztree" id="resource"></ul>
+                            </div>
+                            <div class="layui-tab-item">
+                                <ul class="ztree" id="workflowResource"></ul>
                             </div>
                           </div>
                         <!--<div class="layui-tab-content"></div>-->
@@ -364,318 +361,187 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
         $(option.elem).append(sideBox);
     }
 
+    function zTreeOnClick(event, treeId, treeNode) {
+
+        var allData = getGlobalEnv(treeNode.data);
+        //是否是元数据，是的话请求元数据schema
+        if(treeNode.data.type.metaData){
+            getFileMetaData(treeNode.data.path, treeNode)
+        }
+
+        var metaType = treeNode.data.type.metaType;
+        var resourceTypeSchema = getSchema("resource");
+        var typeSchema = resourceTypeSchema[metaType];
+
+        resetContent(contentElem);
+        if(typeSchema.contentPanel){
+            var id = typeSchema.id;
+            var contentPanel = typeSchema.contentPanel;
+            if(contentPanel.mode === 'listener'){
+                var listenerName = id + '_contentPanel_listener';
+                var listener = contentPanelListeners[listenerName];
+                if(listener &&  typeof listener === 'function'){
+                    listener(treeNode)
+                }
+            }else if(contentPanel.mode === 'amis'){
+                var amisSchema = contentPanel.amisSchema;
+                var amisSchemaApi = contentPanel.amisSchemaApi;
+                amis.render({
+                    elem: contentElem,
+                    schema: amisSchema,
+                    schemaApi: amisSchemaApi,
+                    props:{
+                        data:allData
+                    }
+                })
+            }else if(contentPanel.mode === 'iframe'){
+                var iframeUrl = formatUrl(contentPanel.url, allData);
+                showIframe(iframeUrl);
+            }
+        }
+
+    };
+
+    function zTreeOnRightClick(event, treeId, treeNode) {
+        // 将右击事件的节点数据绑定到以下变量中
+        contextmenuData = treeNode;
+        contextData.contextmenuData = contextmenuData;
+    };
+
     /**
-	 * Button start loading
-	 * */
+     * Button start loading
+     * */
     editor.prototype.render = function(opt) {
 
 
-		var option = {
-			elem: opt.elem,
+        var option = {
+            elem: opt.elem,
             funcAmis: null,
-		}
+        }
 
         appendElem(option);
 
 
-        // var setting = {
-        //     view: {
-        //         onKeyboard: true,
-        //         showLine: false,
-        //         theme:'default'
-        //     },
-        //     check: {
-        //         enable: true
-        //     },
-        //     data: {
-        //         simpleData: {
-        //             enable: true
-        //         }
-        //     }
-        //     ,callback:{
-        //         onLeafEnter: function(treeId,treeNode){
-        //             console.log(treeId,treeNode)
-        //         }
-        //     }
-        // };
-        //
-        //
-        // treeObj = ztree.render({
-        //     elem: '#resource',
-        //     setting: setting
-        // })
-
-        //渲染
-        treeConst = etree.render({
-            elem: resource  //绑定元素
-            ,id: "treeId"
-            ,onlyIconControl: true
-            ,showLine: false
-            ,text: {
-                defaultNodeName: '未命名' //节点默认名称
-                ,none: '无数据' //数据为空时的提示文本
-            }
-            ,contextmenuConfig:{
-                click: function(obj, f, e){
-                    var data = getGlobalEnv(contextmenuData.data.data);
-                    // var data = contextmenuData.data.data;
-                    if(obj.mode && obj.mode === 'listener'){
-                        var id = obj.id;
-                        var listenerName;
-                        if(obj.listenerName){
-                            listenerName = obj.listenerName;
-                        }else{
-                            listenerName = id + '_contextMenu_listener';
-                        }
-                        var listener = contextMenuListeners[listenerName];
-                        if(listener &&  typeof listener === 'function'){
-                            listener(data)
-                        }
-                    }else if(obj.mode && obj.mode === 'dialog'){
-                        debugger
-                        var dialog = obj.dialog;
-                        if(dialog.mode === 'amis'){
-                            testDialog(dialog, option);
-                            var amisSchema = dialog.amisSchema;
-                            var amisSchemaApi = dialog.amisSchemaApi;
-                            var amisNew = amis.render({
-                                elem: '#testDialogContent',
-                                schema: amisSchema,
-                                schemaApi: amisSchemaApi,
-                                props:{
-                                    data:data
-                                },
-                                extension:{
-                                    tracker: (eventTrack, props) => {
-                                        const blob = new Blob([JSON.stringify(eventTrack)], {
-                                            type: 'application/json'
-                                        });
-                                    }
-                                }
-                            })
 
-                            option.funcAmis = amisNew;
-                        }
-                    }else if(obj.mode && obj.mode === 'ajax'){
-                        var optionApiStr = obj.api;
-                        execApi({
-                            optionApi : optionApiStr,
-                        })
-                    }
 
+        var setting = {
+            view: {
+                onKeyboard: true,
+                showLine: false,
+                theme:'default'
+            },
+            check: {
+                enable: true
+            },
+            data: {
+                simpleData: {
+                    enable: true
+                }
+            }
+            ,callback:{
+                onLeafEnter: function(treeId,treeNode){
+                    console.log(treeId,treeNode)
                 },
-                beforeRander: function(config){
-                    var data = getContextmenuData();
-                    var resourceTypeSchema = getSchema("resource");
-                    if(resourceTypeSchema){
-                        var resourceSchema = resourceTypeSchema[data.data.type.metaType];
-                        if(resourceSchema && resourceSchema.funcs){
-                            var enabled = data.data.enabled;
-                            config = $.grep(resourceSchema.funcs,
-                                function(obj, i) {
-                                    if(enabled && obj['id'] === 'enable'){
-                                        return false;
-                                    }else if(!enabled && obj['id'] === 'disable'){
-                                        return false;
-                                    }
-                                    return true;
-                                });
-                            config.resourceSchema = resourceSchema;
-                        }
-
-                    }
-                    return config;
-                },
-                data: [{}]
+                onClick: zTreeOnClick,
+                onRightClick: zTreeOnRightClick
             }
-            ,click: function(obj) {
-                var amisdata = getGlobalEnv(obj.data.data);
-                // 点击高亮
-                $(".layui-tree-set").removeClass('layui-tree-set-active');
-                obj.elem.addClass('layui-tree-set-active');
-
-                //是否是元数据，是的话请求元数据schema
-                if(obj.data.data.type.metaData){
-                    getFileMetaData(obj.data.data.path, obj.data)
-                }
+        };
 
-                var metaType = obj.data.data.type.metaType;
-                var resourceTypeSchema = getSchema("resource");
-                var typeSchema = resourceTypeSchema[metaType];
-
-                resetContent(contentElem);
-                if(typeSchema.contentPanel){
-                    var id = typeSchema.id;
-                    var contentPanel = typeSchema.contentPanel;
-                    if(contentPanel.mode === 'listener'){
-                        var listenerName = id + '_contentPanel_listener';
-                        var listener = contentPanelListeners[listenerName];
-                        if(listener &&  typeof listener === 'function'){
-                            listener(obj.data)
-                        }
-                    }else if(contentPanel.mode === 'amis'){
-                        var amisSchema = contentPanel.amisSchema;
-                        var amisSchemaApi = contentPanel.amisSchemaApi;
-                        amis.render({
-                            elem: contentElem,
-                            schema: amisSchema,
-                            schemaApi: amisSchemaApi,
-                            props:{
-                                data:amisdata
-                                // data:obj.data.data
-                            }
-                        })
-                    }else if(contentPanel.mode === 'iframe'){
-                        debugger
-                        var iframeUrl = contentPanel.url.format(amisdata);
-                        showIframe(iframeUrl);
-                    }
-                }
-            }
-            ,contextmenu: function(obj, state){
-                contextmenuData = obj
 
-                contextData.contextmenuData = contextmenuData;
-            }
-        });
+        modelTree = ztree.render({
+            elem: '#resource',
+            setting: setting
+        })
 
-        wkflTreeConst = etree.render({
-            elem: workflowResource  //绑定元素
-            ,id: "wkfltreeId"
-            ,onlyIconControl: true
-            ,showLine: false
-            ,text: {
-                defaultNodeName: '未命名' //节点默认名称
-                ,none: '无数据' //数据为空时的提示文本
-            }
-            ,contextmenuConfig:{
-                click: function(obj, f, e){
-                    var data = getGlobalEnv(contextmenuData.data.data);
-                    // var data = contextmenuData.data.data;
-                    if(obj.mode && obj.mode === 'listener'){
-                        var id = obj.id;
-                        var listenerName;
-                        if(obj.listenerName){
-                            listenerName = obj.listenerName;
-                        }else{
-                            listenerName = id + '_contextMenu_listener';
-                        }
-                        var listener = contextMenuListeners[listenerName];
-                        if(listener &&  typeof listener === 'function'){
-                            listener(data)
-                        }
-                    }else if(obj.mode && obj.mode === 'dialog'){
-                        debugger
-                        var dialog = obj.dialog;
-                        if(dialog.mode === 'amis'){
-                            testDialog(dialog, option);
-                            var amisSchema = dialog.amisSchema;
-                            var amisSchemaApi = dialog.amisSchemaApi;
-                            var amisNew = amis.render({
-                                elem: '#testDialogContent',
-                                schema: amisSchema,
-                                schemaApi: amisSchemaApi,
-                                props:{
-                                    data:data
-                                },
-                                extension:{
-                                    tracker: (eventTrack, props) => {
-                                        const blob = new Blob([JSON.stringify(eventTrack)], {
-                                            type: 'application/json'
-                                        });
-                                    }
-                                }
-                            })
+        wkflTree =ztree.render({
+            elem: '#workflowResource',
+            setting: setting
+        })
 
-                            option.funcAmis = amisNew;
-                        }
-                    }else if(obj.mode && obj.mode === 'ajax'){
-                        var optionApiStr = obj.api;
-                        execApi({
-                            optionApi : optionApiStr,
-                        })
-                    }
 
-                },
-                beforeRander: function(config){
-                    var data = getContextmenuData();
-                    var resourceTypeSchema = getSchema("resource");
-                    if(resourceTypeSchema){
-                        var resourceSchema = resourceTypeSchema[data.data.type.metaType];
-                        if(resourceSchema && resourceSchema.funcs){
-                            var enabled = data.data.enabled;
-                            config = $.grep(resourceSchema.funcs,
-                                function(obj, i) {
-                                    if(enabled && obj['id'] === 'enable'){
-                                        return false;
-                                    }else if(!enabled && obj['id'] === 'disable'){
-                                        return false;
-                                    }
-                                    return true;
-                                });
-                            config.resourceSchema = resourceSchema;
-                        }
+        //加载树
+        reloadResource()
 
-                    }
-                    return config;
-                },
-                data: [{}]
-            }
-            ,click: function(obj) {
-                var amisdata = getGlobalEnv(obj.data.data);
-                // 点击高亮
-                $(".layui-tree-set").removeClass('layui-tree-set-active');
-                obj.elem.addClass('layui-tree-set-active');
-
-                //是否是元数据，是的话请求元数据schema
-                if(obj.data.data.type.metaData){
-                    getFileMetaData(obj.data.data.path, obj.data)
-                }
 
-                var metaType = obj.data.data.type.metaType;
-                var resourceTypeSchema = getSchema("resource");
-                var typeSchema = resourceTypeSchema[metaType];
-
-                resetContent(contentElem);
-                if(typeSchema.contentPanel){
-                    var id = typeSchema.id;
-                    var contentPanel = typeSchema.contentPanel;
-                    if(contentPanel.mode === 'listener'){
-                        var listenerName = id + '_contentPanel_listener';
-                        var listener = contentPanelListeners[listenerName];
-                        if(listener &&  typeof listener === 'function'){
-                            listener(obj.data)
-                        }
-                    }else if(contentPanel.mode === 'amis'){
-                        var amisSchema = contentPanel.amisSchema;
-                        var amisSchemaApi = contentPanel.amisSchemaApi;
-                        amis.render({
-                            elem: contentElem,
+        edropdown.render({
+            elem: '#resource' //在 id="demo" 的元素中触发事件。也可以直接设置为 document，从而重置整个右键菜单
+            ,trigger: 'contextmenu' //右键事件
+            ,click: function(obj, f, e){
+
+                // var data = contextmenuData.data;
+                var data = getGlobalEnv(contextmenuData.data);
+                if(obj.mode && obj.mode === 'listener'){
+                    var id = obj.id;
+                    var listenerName;
+                    if(obj.listenerName){
+                        listenerName = obj.listenerName;
+                    }else{
+                        listenerName = id + '_contextMenu_listener';
+                    }
+                    var listener = contextMenuListeners[listenerName];
+                    if(listener &&  typeof listener === 'function'){
+                        listener(data)
+                    }
+                }else if(obj.mode && obj.mode === 'dialog'){
+                    var dialog = obj.dialog;
+                    if(dialog.mode === 'amis'){
+                        testDialog(dialog, option);
+                        var amisSchema = dialog.amisSchema;
+                        var amisSchemaApi = dialog.amisSchemaApi;
+                        var amisNew = amis.render({
+                            elem: '#testDialogContent',
                             schema: amisSchema,
                             schemaApi: amisSchemaApi,
                             props:{
-                                data:amisdata
-                                // data:obj.data.data
+                                data:data
+                            },
+                            extension:{
+                                tracker: (eventTrack, props) => {
+                                    const blob = new Blob([JSON.stringify(eventTrack)], {
+                                        type: 'application/json'
+                                    });
+                                }
                             }
                         })
-                    }else if(contentPanel.mode === 'iframe'){
-                        var iframeUrl = contentPanel.url.format(amisdata);
-                        showIframe(iframeUrl);
+
+                        option.funcAmis = amisNew;
                     }
+                }else if(obj.mode && obj.mode === 'ajax'){
+                    var optionApiStr = obj.api;
+                    execApi({
+                        optionApi : optionApiStr,
+                    })
                 }
-            }
-            ,contextmenu: function(obj, state){
-                contextmenuData = obj
 
-                contextData.contextmenuData = contextmenuData;
-            }
+            },
+            beforeRander: function(config){
+                debugger
+                var data = getContextmenuData();
+                var resourceTypeSchema = getSchema("resource");
+                if(resourceTypeSchema){
+                    var resourceSchema = resourceTypeSchema[data.data.type.metaType];
+                    if(resourceSchema && resourceSchema.funcs){
+                        var enabled = data.data.enabled;
+                        config = $.grep(resourceSchema.funcs,
+                            function(obj, i) {
+                                if(enabled && obj['id'] === 'enable'){
+                                    return false;
+                                }else if(!enabled && obj['id'] === 'disable'){
+                                    return false;
+                                }
+                                return true;
+                            });
+                        config.resourceSchema = resourceSchema;
+                    }
+
+                }
+                return config;
+            },
+            data: [{}]
         });
-        //
-        // //加载树
-        reloadResource()
 
         return new editor(option);
-	}
+    }
 
     //头部事件
     util.event('lay-header-event', {
@@ -798,20 +664,20 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
 
     function getFilePath(value){
         var path;
-        if(contextmenuData.data.data.path===null || contextmenuData.data.data.path===''){
+        if(contextmenuData.data.path===null || contextmenuData.data.path===''){
             path = value;
         }else{
-            path = contextmenuData.data.data.path + "/" + value;
+            path = contextmenuData.data.path + "/" + value;
         }
         return path;
     }
 
     function getMetaPath(value){
         var path;
-        if(contextmenuData.data.data.path===null || contextmenuData.data.data.path===''){
+        if(contextmenuData.data.path===null || contextmenuData.data.path===''){
             path = value;
         }else{
-            path = contextmenuData.data.data.path + "#/" + value;
+            path = contextmenuData.data.path + "#/" + value;
         }
         return path;
     }
@@ -820,11 +686,11 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
      * 获取右键选择数据 -> 文件路径
      */
     function getContextmenuFilePath(){
-        return contextmenuData.data.data.path;
+        return contextmenuData.data.path;
     }
 
     function getContextmenuData(){
-        return contextmenuData.data;
+        return contextmenuData;
     }
 
     /**
@@ -1051,7 +917,6 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
         return amisData;
     }
 
-
     $("#run").click(function(){
         api.get({
             enableRootPath: true,
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/jqgrid.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/jqgrid.js
index 69c1a54..d8835cd 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/jqgrid.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/jqgrid.js
@@ -27,7 +27,7 @@ layui.define(['element', 'api', 'fast_config'], function(exports) {
 
         var grid;
         var parentContextData = window.parent.window.contextData;
-        var path = parentContextData.contextmenuData.data.data.path;
+        var path = parentContextData.contextmenuData.data.path;
         var colM = [];
         var metaName;
 
-- 
Gitee


From 1a6cd4391a922907ad18341ec4a9de571d44315b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8E=AB=E5=AF=85?= <824000672@qq.com>
Date: Wed, 13 Jul 2022 20:08:07 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=EF=BC=9A=E5=B0=86?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A0=91=E6=8A=BD=E8=B1=A1=E6=88=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/fast-develop/gulpfile.js              |    2 +-
 .../src/fast-develop/src/index.html           |    2 +-
 .../src/fast-develop/src/js/fastDevelop.js    |    8 +-
 .../js/module/{ => editor}/domain_design.js   |    0
 .../src/js/module/editor/editor.js            |  130 ++
 .../src/js/module/editor/listener.js          |   60 +
 .../src/js/module/editor/resource_content.js  |  113 ++
 .../{editor.js => editor/resource_tree.js}    | 1072 ++++++-----------
 .../src/js/module/editor/schema.js            |   44 +
 9 files changed, 755 insertions(+), 676 deletions(-)
 rename fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/{ => editor}/domain_design.js (100%)
 create mode 100644 fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/editor.js
 create mode 100644 fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/listener.js
 create mode 100644 fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js
 rename fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/{editor.js => editor/resource_tree.js} (57%)
 create mode 100644 fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/schema.js

diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js b/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
index 5679b26..536c465 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
@@ -52,7 +52,7 @@ function js(){
 
 
 function module(){
-    return src('src/js/module/*')
+    return src('src/js/module/**')
         .pipe(dest(distPath + 'js/module'))
 }
 
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/index.html b/fast-develop-web/fast-develop-editor/src/fast-develop/src/index.html
index 609b336..532145d 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/index.html
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/index.html
@@ -490,7 +490,7 @@
 
 
     var treeConst;
-    var schema = {
+    var schemas = {
         formType:{
             domain_model:domainModelForm,
             domain_model_field:domainModelFieldForm,
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/fastDevelop.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/fastDevelop.js
index 9e84729..5154413 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/fastDevelop.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/fastDevelop.js
@@ -9,11 +9,15 @@ layui.config({
 	version: "0.1.0",
 	api:"api"
 }).extend({
-	editor: "editor", 	// 框架布局组件
+    editor: "editor/editor", 	// 框架布局组件
+    resource_content: "editor/resource_content", 	// 资源内容模块
+    resource_tree: "editor/resource_tree", 	// 资源功能模块
+    listener: "editor/listener", 	// 监听器模块
+    schema: "editor/schema", 	// Schema模块
 	jqgrid: "jqgrid", 	// jq表格组件
 	etree: "etree", 	// layui.etree 扩展树
 	ztree: "ztree", 	// layui.ztree
-    domain_design: "domain_design",
+    domain_design: "editor/domain_design",
 	edropdown: "edropdown", 	// layui.edropdown 扩展下拉
 	fast_config: "fast_config", 	// 配置
 	yaml: "yaml", 	// 配置
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain_design.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/domain_design.js
similarity index 100%
rename from fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain_design.js
rename to fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/domain_design.js
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/editor.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/editor.js
new file mode 100644
index 0000000..ba7f177
--- /dev/null
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/editor.js
@@ -0,0 +1,130 @@
+layui.define(['element', 'edropdown', 'layer', 'util', 'form', 'fast_config', 'api', 'schema', 'resource_tree'], function(exports) {
+	"use strict";
+
+
+
+	/**
+	 * Button component
+	 * */
+	var MOD_NAME = 'editor',
+		$ = layui.jquery,
+        element = layui.element,
+        layer = layui.layer,
+        form = layui.form,
+        util = layui.util,
+        api = layui.api,
+        contentElem = '#fast-body',
+        resource_tree = layui.resource_tree
+
+    ;
+
+
+	var editor = function(opt) {
+		this.option = opt;
+	};
+
+
+    function appendElem(option){
+
+        var sideBox = `
+        <div class="box">
+            <div class="box1">
+                <div class="layui-side-scroll">
+                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">Repository</li>
+                            <li>Workflow</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show" >
+                                <ul class="ztree" id="resource"></ul>
+                            </div>
+                            <div class="layui-tab-item" >
+                                <ul class="ztree" id="workflowResource"></ul>
+                            </div>
+                          </div>
+                        <!--<div class="layui-tab-content"></div>-->
+                    </div>
+                    <!--<div id="resource"></div>-->
+                </div>
+            </div>
+            <div class="box2" id="left">
+                <div class="" style="padding: 10px;">
+                    <div class="layui-row layui-col-space15">
+                        <div id="viewForm">
+
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+		`;
+
+        $(option.elem).append(sideBox);
+    }
+
+
+    /**
+	 * Button start loading
+	 * */
+    editor.prototype.render = function(opt) {
+
+
+		var option = {
+			elem: opt.elem,
+            funcAmis: null,
+		}
+
+        appendElem(option);
+
+        resource_tree.render({
+            elem: "#resource",
+            contentElem: contentElem
+        })
+
+
+        resource_tree.render({
+            elem: "#workflowResource",
+            contentElem: contentElem
+        })
+
+
+        return new editor(option);
+	}
+
+    //头部事件
+    util.event('lay-header-event', {
+        //左侧菜单事件
+        menuLeft: function(othis){
+            layer.msg('展开左侧菜单的操作', {icon: 0});
+        }
+        ,menuRight: function(){
+            layer.open({
+                type: 1
+                ,content: '<div style="padding: 15px;">处理右侧面板的操作</div>'
+                ,area: ['360px', '100%']
+                ,offset: 'rt' //右上角
+                ,anim: 5
+                ,shadeClose: true
+            });
+        }
+    });
+
+
+
+    $("#run").click(function(){
+        api.get({
+            enableRootPath: true,
+            url: "meta/configuration/reload",
+            async: false,
+            success: function(data){
+                layer.msg('操作成功');
+            }
+        });
+
+    });
+
+
+    exports(MOD_NAME, new editor());
+});
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/listener.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/listener.js
new file mode 100644
index 0000000..a7889a1
--- /dev/null
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/listener.js
@@ -0,0 +1,60 @@
+layui.define(['element', 'fast_config'], function(exports) {
+	"use strict";
+
+
+    function domainModelContentPanelListener(data) {
+        amis.render({
+            elem: '#fast-body',
+            json: {
+                type: 'page',
+                title: '表单页面',
+                body: {
+                    type: 'form',
+                    mode: 'horizontal',
+                    api: '/saveForm',
+                    body: [
+                        {
+                            label: 'Name',
+                            type: 'input-text',
+                            name: 'name'
+                        },
+                        {
+                            label: 'Email',
+                            type: 'input-email',
+                            name: 'email'
+                        }
+                    ]
+                }
+            }
+        })
+    }
+
+	/**
+	 * Button component
+	 * */
+	var MOD_NAME = 'listener',
+		$ = layui.jquery,
+        fast_config = layui.fast_config,
+
+        //监听器
+        contentPanelListeners = {
+            domain_model_contentPanel_listener:domainModelContentPanelListener
+        }
+    ;
+
+
+
+	var listener = {
+        registerContentPanel : function(name, listener){
+            contentPanelListeners[name] = listener;
+            return typeSchema;
+        },
+        getContentPanelListener : function(name){
+            return contentPanelListeners[name];
+        }
+    }
+
+
+
+    exports(MOD_NAME, listener);
+});
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js
new file mode 100644
index 0000000..d71315e
--- /dev/null
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js
@@ -0,0 +1,113 @@
+layui.define(['element', 'api', 'amis', 'schema', 'listener'], function(exports) {
+	"use strict";
+
+	/**
+	 * Button component
+	 * */
+	var MOD_NAME = 'resource_content',
+		$ = layui.jquery,
+		api = layui.api,
+        amis = layui.amis,
+        schema = layui.schema,
+        listener = layui.listener,
+        metaType = null
+    ;
+
+	var resource_content = function(opt) {
+		this.option = opt;
+	};
+
+
+    function resetContent(contentElem){
+        $(contentElem).remove();
+        $('.layui-body.gs-body').append('<div id="'+contentElem.slice(1)+'"></div>')
+    }
+
+
+    /**
+     弹出iframe页面(iframe后面会添加灰色蒙版)
+     **/
+    function showIframe(url,w,h){
+        var frameId = metaType + '_YuFrame1';
+
+        //添加iframe
+        var if_w = w;
+        var if_h = h;
+        //allowTransparency='true' 设置背景透明
+        $("<iframe width='100%' height='100%' id=frameId name=frameId style='position:absolute;'  frameborder='no' marginheight='0' marginwidth='0' allowTransparency='true'></iframe>").prependTo(contentElem);
+        var st=document.documentElement.scrollTop|| document.body.scrollTop;//滚动条距顶部的距离
+        var sl=document.documentElement.scrollLeft|| document.body.scrollLeft;//滚动条距左边的距离
+        var ch=document.documentElement.clientHeight;//屏幕的高度
+        var cw=document.documentElement.clientWidth;//屏幕的宽度
+        var objH=$("#" + frameId).height();//浮动对象的高度
+        var objW=$("#" + frameId).width();//浮动对象的宽度
+        var objT=Number(st)+(Number(ch)-Number(objH))/2;
+        var objL=Number(sl)+(Number(cw)-Number(objW))/2;
+        $("#" + frameId).css('left',objL);
+        $("#" + frameId).css('top',objT);
+
+        $("#" + frameId).attr("src", url)
+
+        //添加背景遮罩
+        var frameById = metaType + '_YuFrame1Bg';
+        $("<div id='YuFrame1Bg' style='display:block;z-index:3;position:absolute;left:0px;top:0px;filter:Alpha(Opacity=30);/* IE */-moz-opacity:0.4;/* Moz + FF */opacity: 0.4; '/>").prependTo(contentElem);
+        var bgWidth = Math.max($("body").width(),cw);
+        var bgHeight = Math.max($("body").height(),ch);
+        $("#" + frameById).css({width:bgWidth,height:bgHeight});
+
+        //点击背景遮罩移除iframe和背景
+        $("#" + frameById).click(function() {
+            $("#" + frameId).remove();
+            $("#" + frameById).remove();
+        });
+    }
+
+    /**
+	 * Button start loading
+	 * */
+    resource_content.prototype.render = function(opt) {
+		
+		var option = {
+			elem: opt.elem,
+            metaType: opt.metaType,
+            treeNode: opt.treeNode
+		}
+
+        metaType = opt.metaType;
+
+        var resourceTypeSchema = schema.get("resource");
+        var typeSchema = resourceTypeSchema[option.metaType];
+
+        resetContent(option.elem);
+        if(typeSchema.contentPanel){
+            var id = typeSchema.id;
+            var contentPanel = typeSchema.contentPanel;
+            if(contentPanel.mode === 'listener'){
+                var listenerName = id + '_contentPanel_listener';
+                var listener = listener.getContentPanelListener(listenerName);
+                if(listener &&  typeof listener === 'function'){
+                    listener(option.treeNode)
+                }
+            }else if(contentPanel.mode === 'amis'){
+                var amisSchema = contentPanel.amisSchema;
+                var amisSchemaApi = contentPanel.amisSchemaApi;
+                amis.render({
+                    elem: option.elem,
+                    schema: amisSchema,
+                    schemaApi: amisSchemaApi,
+                    props:{
+                        data:option.treeNode.data
+                    }
+                })
+            }else if(contentPanel.mode === 'iframe'){
+                var iframeUrl = contentPanel.url;
+                showIframe(iframeUrl);
+            }
+        }
+
+        return new resource_content(option);
+	}
+
+
+    exports(MOD_NAME, new resource_content());
+});
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
similarity index 57%
rename from fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
rename to fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
index 65e6fd2..0e4337d 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
@@ -1,4 +1,4 @@
-layui.define(['element', 'edropdown', 'layer', 'util', 'etree', 'form', 'amis', 'jqgrid', 'fast_config', 'api', 'ztree', 'domain_design'], function(exports) {
+layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', 'domain_design', 'edropdown', 'form', 'schema', 'resource_content', 'ztree'], function(exports) {
 	"use strict";
 
 
@@ -18,203 +18,133 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'etree', 'form', 'amis',
         return s;
     }
 
-	function domainModelContentPanelListener(data) {
-        amis.render({
-            elem: '#fast-body',
-            json: {
-                type: 'page',
-                title: '表单页面',
-                body: {
-                    type: 'form',
-                    mode: 'horizontal',
-                    api: '/saveForm',
-                    body: [
-                        {
-                            label: 'Name',
-                            type: 'input-text',
-                            name: 'name'
-                        },
-                        {
-                            label: 'Email',
-                            type: 'input-email',
-                            name: 'email'
-                        }
-                    ]
-                }
-            }
-        })
-    }
-
-    function createFileListener(data) {
-
-        createFile('domain_model')
-    }
-
-    function createDomainFieldListener(data) {
-
-        createMetaData('domain_model', contextmenuData.data.path)
-    }
-
-    function renameListener(data) {
-        rename(contextmenuData.data.name, contextmenuData.data.path)
-    }
-
-    function enableListener(data) {
-        enable(contextmenuData.data.name, contextmenuData.data.path)
-    }
 
-    function disableListener(data) {
-        disable(contextmenuData.data.name, contextmenuData.data.path)
+    function getMetaPath(value){
+        var path;
+        if(contextmenuData.data.path===null || contextmenuData.data.path===''){
+            path = value;
+        }else{
+            path = contextmenuData.data.path + "#/" + value;
+        }
+        return path;
     }
 
-    function openDomainListener(data) {
-        openDoamin()
-    }
+    /**
+     * 创建文件
+     * @param path
+     */
+    function createMetaData(metaType, path){
+        function send(path){
+            api.post({
+                enableRootPath: true,
+                url: "schemas/" + metaType + "/fields",
+                data: {path:path},
+                async: false,
+                success: function(data){
+                    reloadResource()
+                }
+            });
+        }
 
-    function designDomainListener(data) {
-        designDoamin()
-    }
 
-    function createFolderListener(data) {
-        createFolder()
+        layer.prompt({
+            formType: 0,
+            value: '',
+            title: '请输入文件名称',
+            area: ['200px', '20px'] //自定义文本域宽高
+        }, function(value, index, elem){
+            var path = getMetaPath("fields/" + value);
+            send(path);
+            layer.close(index);
+        });
     }
 
-    function createTest_contextMenu_listener(data) {
-        testDialog();
-    }
+    /**
+     * 启用
+     * @param path
+     */
+    function enable(metaType, path){
+        function send(){
+            api.put({
+                enableRootPath: true,
+                url: "schemas/" + metaType + "/enable",
+                data: {path:path},
+                async: false,
+                success: function(data){
+                    reloadResource()
+                }
+            });
+        }
 
-    function removeListener(data) {
-        deleteResource();
-    }
 
-    function createDomainModelListener(data) {
-        createMetaData();
+        layer.confirm('是否确认该操作？', {
+            btn: ['确认', '取消']
+        }, function(index, layero){
+            send();
+            layer.close(index);
+        }, function(index){
+            layer.close(index);
+        });
     }
 
-    function testDialog(dialog, option){
-        layer.open({
-            type:1,
-            // area:['20%','200px'],
-            title: dialog.title,
-            offset: '30%',
-            content: "<div id='testDialogContent' style='width: 500px'></div>",
-            shade: 0.3,
-            btn: ['提交', '取消']
-            ,btn1: function(index, layero){
-                var amis = option;
-                var formObject = amis.funcAmis.option.amisScoped.getComponentById("createTestForm").getValues();
-                var optionApi = amis.funcAmis.option.schema.api;
-
-                debugger
+    /**
+     * 启用
+     * @param path
+     */
+    function disable(metaType, path){
+        function send(){
+            api.put({
+                enableRootPath: true,
+                url: "schemas/" + metaType + "/disable",
+                data: {path:path},
+                async: false,
+                success: function(data){
+                    reloadResource()
+                }
+            });
+        }
 
-                execApi({
-                    optionApi : optionApi,
-                    execData : formObject,
-                    success: function(data){
-                        reloadResource()
-                        layer.closeAll();
-                        layer.msg('操作成功');
-                    }
-                })
-                // var kk=$("#username").val();
-                // alert(kk);
-            },
-            cancel: function(layero,index){
-                layer.closeAll();
-            }
 
+        layer.confirm('是否确认该操作？', {
+            btn: ['确认', '取消']
+        }, function(index, layero){
+            send();
+            layer.close(index);
+        }, function(index){
+            layer.close(index);
         });
-    }
-
-	/**
-	 * Button component
-	 * */
-	var MOD_NAME = 'editor',
-		$ = layui.jquery,
-        element = layui.element,
-        layer = layui.layer,
-        form = layui.form,
-        util = layui.util,
-        laytpl = layui.laytpl,
-        etree = layui.etree,
-        amis = layui.amis,
-        fast_config = layui.fast_config,
-        jqgrid = layui.jqgrid,
-        domain_design = layui.domain_design,
-        api = layui.api,
-        contentElem = '#fast-body',
-        contextmenuData,
-        selectFileMetaData,
-        ztree=layui.ztree,
-        edropdown = layui.edropdown,
-        treeObj,
 
+    }
 
-        //监听器
-        contentPanelListeners = {
-            domain_model_contentPanel_listener:domainModelContentPanelListener,
-        },
-        //监听器
-        contextMenuListeners = {
-            createFileListener:createFileListener,
-            createTest_contextMenu_listener:createTest_contextMenu_listener,
-            removeListener:removeListener,
-            createDomainModelListener:createDomainModelListener,
-            createDomainFieldListener:createDomainFieldListener,
-            renameListener:renameListener,
-            enableListener:enableListener,
-            disableListener:disableListener,
-            openDomainListener:openDomainListener,
-            designDomainListener:designDomainListener,
-            createFolderListener:createFolderListener
-
+    /**
+     * 创建文件
+     * @param path
+     */
+    function rename(name, path){
+        function send(name){
+            api.put({
+                enableRootPath: true,
+                url: "resource/rename/" + name,
+                data: {path:path},
+                async: false,
+                success: function(data){
+                    reloadResource()
+                }
+            });
         }
-    ;
 
-	function resetContent(contentElem){
-	    $(contentElem).remove();
-        $('.layui-body.gs-body').append('<div id="'+contentElem.slice(1)+'"></div>')
-    }
 
-    /**
-     弹出iframe页面(iframe后面会添加灰色蒙版)
-     **/
-    function showIframe(url,w,h){
-        //添加iframe
-        var if_w = w;
-        var if_h = h;
-        //allowTransparency='true' 设置背景透明
-        $("<iframe width='100%' height='100%' id='YuFrame1' name='YuFrame1' style='position:absolute;'  frameborder='no' marginheight='0' marginwidth='0' allowTransparency='true'></iframe>").prependTo(contentElem);
-        var st=document.documentElement.scrollTop|| document.body.scrollTop;//滚动条距顶部的距离
-        var sl=document.documentElement.scrollLeft|| document.body.scrollLeft;//滚动条距左边的距离
-        var ch=document.documentElement.clientHeight;//屏幕的高度
-        var cw=document.documentElement.clientWidth;//屏幕的宽度
-        var objH=$("#YuFrame1").height();//浮动对象的高度
-        var objW=$("#YuFrame1").width();//浮动对象的宽度
-        var objT=Number(st)+(Number(ch)-Number(objH))/2;
-        var objL=Number(sl)+(Number(cw)-Number(objW))/2;
-        $("#YuFrame1").css('left',objL);
-        $("#YuFrame1").css('top',objT);
-
-        $("#YuFrame1").attr("src", url)
-
-        //添加背景遮罩
-        $("<div id='YuFrame1Bg' style='display:block;z-index:3;position:absolute;left:0px;top:0px;filter:Alpha(Opacity=30);/* IE */-moz-opacity:0.4;/* Moz + FF */opacity: 0.4; '/>").prependTo(contentElem);
-        var bgWidth = Math.max($("body").width(),cw);
-        var bgHeight = Math.max($("body").height(),ch);
-        $("#YuFrame1Bg").css({width:bgWidth,height:bgHeight});
-
-        //点击背景遮罩移除iframe和背景
-        $("#YuFrame1Bg").click(function() {
-            $("#YuFrame1").remove();
-            $("#YuFrame1Bg").remove();
+        layer.prompt({
+            formType: 0,
+            value: name,
+            title: '请输入文件名称',
+            area: ['200px', '20px'] //自定义文本域宽高
+        }, function(value, index, elem){
+            send(value);
+            layer.close(index);
         });
     }
 
-	var editor = function(opt) {
-		this.option = opt;
-	};
-
 
     function reloadResource(){
         api.get({
@@ -233,154 +163,295 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'etree', 'form', 'amis',
         })
     }
 
-    function isJSON(str) {
-        if (typeof str == 'string') {
-            try {
-                JSON.parse(str);
-                return true;
-            } catch(e) {
-                console.log(e);
-                return false;
-            }
+    /**
+     * 创建文件
+     * @param path
+     */
+    function createFile(metaType){
+        function send(path){
+            api.post({
+                enableRootPath: true,
+                type: "POST",
+                url: "schemas/" + metaType,
+                data: {path:path},
+                async: false,
+                success: function(data){
+                    reloadResource()
+                }
+            });
         }
-    }
 
-    function formatApiOptionData(optionApi, execData){
-        var data = JSON.parse(JSON.stringify(optionApi.data).format(execData));
-        if(data['&'] === '$$'){
-            $.extend(data, execData);
-            delete data['&'];
-        }
-        return data
-    }
 
-    function formatUrl(url, contextData){
-        //url替换
-        return url.format(data);
+        layer.prompt({
+            formType: 0,
+            value: '',
+            title: '请输入文件名称',
+            area: ['200px', '20px'] //自定义文本域宽高
+        }, function(value, index, elem){
+            var path = getFilePath(value);
+            send(path);
+            layer.close(index);
+        });
     }
 
-    function beforeExecHandle(optionApi){
-        if(optionApi.type !== 'get'){
-            optionApi.contentType = 'application/json;charset=UTF-8';
-            optionApi.data = JSON.stringify(optionApi.data);
-        }
+
+    /**
+     * 获取右键选择数据 -> 文件路径
+     */
+    function getContextmenuFilePath(){
+        return contextmenuData.data.path;
     }
 
-    function execApi(apiOpt){
-        var {optionApi, execData, success} = apiOpt
-        var data = contextmenuData.data;
-        if(typeof optionApi === 'object'){
-            //模版数据替换
-            var apiOption = optionApi;
-            //url替换
-            apiOption.url = formatUrl(apiOption.url, data);
-            apiOption.data = formatApiOptionData(optionApi, execData);
-            apiOption.success = success;
-
-            //执行前处理
-            beforeExecHandle(optionApi);
-            api.exec(apiOption);
-        }else{
-            optionApi = optionApi.format(data)
-            var optionApiProps = optionApi.split(":");
-            var method, apiUrl;
-            if(optionApiProps.length > 1){
-                method = optionApiProps[0];
-                apiUrl = optionApiProps[1];
-            }else{
-                method = 'get';
-                apiUrl = optionApiProps[0];
+    /**
+     * 删除
+     * @param path
+     */
+    function deleteResource(){
+        //获取
+        var path = getContextmenuFilePath();
+        api.delete({
+            enableRootPath: true,
+            url: "resource",
+            data: {path:path},
+            async: false,
+            success: function(data){
+                reloadResource()
             }
+        });
+    }
 
-            var optionApi = {
-                type: method,
-                url: formatUrl(apiUrl, data),
-                data: execData,
-                success
-            };
 
-            //执行前处理
-            beforeExecHandle(optionApi);
-            api.exec(optionApi)
-        }
+    function openDoamin(script, data) {
+        resetContent(contentElem)
+        jqgrid.render({
+            elem: contentElem
+        })
     }
 
-    function appendElem(option){
-
-        var sideBox = `
-        <div class="box">
-            <div class="box1">
-                <div class="layui-side-scroll">
-                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                        <ul class="layui-tab-title">
-                            <li class="layui-this">Repository</li>
-                            <li>Workflow</li>
-                        </ul>
-                        <div class="layui-tab-content">
-                            <div class="layui-tab-item layui-show" >
-                                <ul class="ztree" id="resource"></ul>
-                            </div>
-                            <div class="layui-tab-item" id="workflowResource"></div>
-                          </div>
-                        <!--<div class="layui-tab-content"></div>-->
-                    </div>
-                    <!--<div id="resource"></div>-->
-                </div>
-            </div>
-            <div class="box2" id="left">
-                <div class="" style="padding: 10px;">
-                    <div class="layui-row layui-col-space15">
-                        <div id="viewForm">
-
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-		`;
-
-        $(option.elem).append(sideBox);
+    function designDoamin(script, data) {
+        resetContent(contentElem)
+        domain_design.render({
+            elem: contentElem
+        })
     }
 
-    function zTreeOnClick(event, treeId, treeNode) {
-
-        //是否是元数据，是的话请求元数据schema
-        if(treeNode.data.type.metaData){
-            getFileMetaData(treeNode.data.path, treeNode)
-        }
 
-        var metaType = treeNode.data.type.metaType;
-        var resourceTypeSchema = getSchema("resource");
-        var typeSchema = resourceTypeSchema[metaType];
-
-        resetContent(contentElem);
-        if(typeSchema.contentPanel){
-            var id = typeSchema.id;
-            var contentPanel = typeSchema.contentPanel;
-            if(contentPanel.mode === 'listener'){
-                var listenerName = id + '_contentPanel_listener';
-                var listener = contentPanelListeners[listenerName];
-                if(listener &&  typeof listener === 'function'){
-                    listener(treeNode)
-                }
-            }else if(contentPanel.mode === 'amis'){
-                var amisSchema = contentPanel.amisSchema;
-                var amisSchemaApi = contentPanel.amisSchemaApi;
-                amis.render({
-                    elem: contentElem,
-                    schema: amisSchema,
-                    schemaApi: amisSchemaApi,
-                    props:{
-                        data:treeNode.data
-                    }
-                })
-            }else if(contentPanel.mode === 'iframe'){
-                var iframeUrl = contentPanel.url;
-                showIframe(iframeUrl);
-            }
+    function getFilePath(value){
+        var path;
+        if(contextmenuData.data.path===null || contextmenuData.data.path===''){
+            path = value;
+        }else{
+            path = contextmenuData.data.path + "/" + value;
+        }
+        return path;
+    }
+
+
+    function reloadResource(){
+        api.get({
+            enableRootPath: true,
+            url: "resource/tree",
+            success: function(data){
+                //可以重载所有基础参数
+                // etree.reload('treeId', {
+                //     //新的参数
+                //     data: data
+                // });
+                var treeObj = $.fn.zTree.getZTreeObj(elem.replace("#", ""));
+                treeObj.addNodes(null, data);
+            }
+
+        })
+    }
+
+    /**
+     * 创建目录
+     * @param path
+     */
+    function createFolder(){
+
+        function send(path){
+            api.post({
+                enableRootPath: true,
+                type: "POST",
+                url: "resource/folder",
+                data: {path:path},
+                async: false,
+                success: function(data){
+                    reloadResource()
+                }
+            });
+        }
+
+
+        layer.prompt({
+            formType: 0,
+            value: '',
+            title: '请输入文件夹名称',
+            area: ['200px', '20px'] //自定义文本域宽高
+        }, function(value, index, elem){
+            var path = getFilePath(value);
+            send(path);
+            layer.close(index);
+        });
+    }
+
+    function resetContent(contentElem){
+        $(contentElem).remove();
+        $('.layui-body.gs-body').append('<div id="'+contentElem.slice(1)+'"></div>')
+    }
+
+
+
+    function createFileListener(data) {
+
+        createFile('domain_model')
+    }
+
+    function createDomainFieldListener(data) {
+
+        createMetaData('domain_model', contextmenuData.data.path)
+    }
+
+    function renameListener(data) {
+        rename(contextmenuData.data.name, contextmenuData.data.path)
+    }
+
+    function enableListener(data) {
+        enable(contextmenuData.data.name, contextmenuData.data.path)
+    }
+
+    function disableListener(data) {
+        disable(contextmenuData.data.name, contextmenuData.data.path)
+    }
+
+    function openDomainListener(data) {
+        openDoamin()
+    }
+
+    function designDomainListener(data) {
+        designDoamin()
+    }
+
+    function createFolderListener(data) {
+        createFolder()
+    }
+
+    function removeListener(data) {
+        deleteResource();
+    }
+
+    function createDomainModelListener(data) {
+        createMetaData();
+    }
+
+	/**
+	 * Button component
+	 * */
+	var MOD_NAME = 'resource_tree',
+		$ = layui.jquery,
+        contextmenuData,
+        contentElem,
+        elem,
+        jqgrid = layui.jqgrid,
+        domain_design = layui.domain_design,
+        edropdown = layui.edropdown,
+        selectFileMetaData,
+        form = layui.form,
+        laytpl = layui.laytpl,
+        resource_content = layui.resource_content,
+        ztree = layui.ztree,
+        api = layui.api,
+        schema = layui.schema,
+
+
+        //监听器
+        contextMenuListeners = {
+            createFileListener:createFileListener,
+            removeListener:removeListener,
+            createDomainModelListener:createDomainModelListener,
+            createDomainFieldListener:createDomainFieldListener,
+            renameListener:renameListener,
+            enableListener:enableListener,
+            disableListener:disableListener,
+            openDomainListener:openDomainListener,
+            designDomainListener:designDomainListener,
+            createFolderListener:createFolderListener
+
+        }
+
+    ;
+
+
+    form.on('submit(*)', function(data){
+        var fileData = $.extend({}, selectFileMetaData.metadata, data.field);
+
+        api.put({
+            enableRootPath: true,
+            url: "schemas/" + selectFileMetaData.selectData.data.type.metaType,
+            data: {path:selectFileMetaData.selectData.data.path, value:JSON.stringify(fileData)},
+            async: false,
+            // dataType: "json",
+            success: function(data){
+                layer.msg('保存成功');
+                reloadResource()
+            }
+        });
+
+        // schemas
+        return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
+    });
+
+
+    function resetForm(){
+        $("#form-data")[0].reset();
+        form.render();
+    }
+
+    function randerForm(script, data) {
+        var getTpl = script.innerHTML,view = document.getElementById('viewForm');
+        laytpl(getTpl).render(data, function(html){
+            view.innerHTML = html;
+        });
+    }
+
+    function getFileMetaData(path, selectData) {
+        randerForm(schemas.formType[selectData.data.type.metaType], selectData.data)
+        api.get({
+            enableRootPath: true,
+            url: "resource",
+            data: {path:path},
+            async: false,
+            dataType: "json",
+            success: function(data){
+                selectFileMetaData = {
+                    metadata: data,
+                    selectData: selectData
+                }
+
+                //重置表单
+                resetForm();
+                //给表单赋值
+                form.val('data-form',selectFileMetaData.metadata)
+
+            }
+        });
+    }
+
+    function zTreeOnClick(event, treeId, treeNode) {
+
+        //是否是元数据，是的话请求元数据schema
+        if(treeNode.data.type.metaData){
+            getFileMetaData(treeNode.data.path, treeNode)
         }
 
+        resource_content.render({
+            elem: contentElem,
+            metaType: treeNode.data.type.metaType,
+            treeNode: treeNode
+        })
+
+
     };
 
     function zTreeOnRightClick(event, treeId, treeNode) {
@@ -389,20 +460,27 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'etree', 'form', 'amis',
         contextData.contextmenuData = contextmenuData;
     };
 
+    var resource_tree = function(opt) {
+        this.option = opt;
+    };
+
+
+    function getContextmenuData(){
+        return contextmenuData;
+    }
+
     /**
 	 * Button start loading
 	 * */
-    editor.prototype.render = function(opt) {
-
-
+    resource_tree.prototype.render = function(opt) {
+		
 		var option = {
 			elem: opt.elem,
-            funcAmis: null,
+            contentElem: opt.contentElem
 		}
 
-        appendElem(option);
-
-
+        contentElem = option.contentElem;
+        elem = option.elem;
 
 
         var setting = {
@@ -429,18 +507,17 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'etree', 'form', 'amis',
         };
 
 
-        treeObj = ztree.render({
-            elem: '#resource',
-            setting: setting
+        ztree.render({
+            elem: option.elem,
+            setting: setting,
         })
 
 
         //加载树
         reloadResource()
 
-
         edropdown.render({
-            elem: '#resource' //在 id="demo" 的元素中触发事件。也可以直接设置为 document，从而重置整个右键菜单
+            elem: option.elem //在 id="demo" 的元素中触发事件。也可以直接设置为 document，从而重置整个右键菜单
             ,trigger: 'contextmenu' //右键事件
             ,click: function(obj, f, e){
 
@@ -492,7 +569,7 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'etree', 'form', 'amis',
             beforeRander: function(config){
                 debugger
                 var data = getContextmenuData();
-                var resourceTypeSchema = getSchema("resource");
+                var resourceTypeSchema = schema.get("resource");
                 if(resourceTypeSchema){
                     var resourceSchema = resourceTypeSchema[data.data.type.metaType];
                     if(resourceSchema && resourceSchema.funcs){
@@ -515,359 +592,10 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'etree', 'form', 'amis',
             data: [{}]
         });
 
-        return new editor(option);
-	}
-
-    //头部事件
-    util.event('lay-header-event', {
-        //左侧菜单事件
-        menuLeft: function(othis){
-            layer.msg('展开左侧菜单的操作', {icon: 0});
-        }
-        ,menuRight: function(){
-            layer.open({
-                type: 1
-                ,content: '<div style="padding: 15px;">处理右侧面板的操作</div>'
-                ,area: ['360px', '100%']
-                ,offset: 'rt' //右上角
-                ,anim: 5
-                ,shadeClose: true
-            });
-        }
-    });
-
-    form.on('submit(*)', function(data){
-        var fileData = $.extend({}, selectFileMetaData.metadata, data.field);
-
-        api.put({
-            enableRootPath: true,
-            url: "schemas/" + selectFileMetaData.selectData.data.type.metaType,
-            data: {path:selectFileMetaData.selectData.data.path, value:JSON.stringify(fileData)},
-            async: false,
-            // dataType: "json",
-            success: function(data){
-                layer.msg('保存成功');
-                reloadResource()
-            }
-        });
-
-        // schemas
-        return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
-    });
-
-    function getFileMetaData(path, selectData) {
-        randerForm(schema.formType[selectData.data.type.metaType], selectData.data)
-        api.get({
-            enableRootPath: true,
-            url: "resource",
-            data: {path:path},
-            async: false,
-            dataType: "json",
-            success: function(data){
-                selectFileMetaData = {
-                    metadata: data,
-                    selectData: selectData
-                }
-
-                //重置表单
-                resetForm();
-                //给表单赋值
-                form.val('data-form',selectFileMetaData.metadata)
 
-            }
-        });
-    }
-
-    function randerForm(script, data) {
-        var getTpl = script.innerHTML,view = document.getElementById('viewForm');
-        laytpl(getTpl).render(data, function(html){
-            view.innerHTML = html;
-        });
-    }
-
-    function openDoamin(script, data) {
-        resetContent(contentElem)
-        jqgrid.render({
-            elem: contentElem
-        })
-    }
-
-    function designDoamin(script, data) {
-        resetContent(contentElem)
-        domain_design.render({
-            elem: contentElem
-        })
-    }
-
-    function resetForm(){
-        $("#form-data")[0].reset();
-        form.render();
-    }
-
-
-    /**
-     * 创建目录
-     * @param path
-     */
-    function createFolder(){
-
-        function send(path){
-            api.post({
-                enableRootPath: true,
-                type: "POST",
-                url: "resource/folder",
-                data: {path:path},
-                async: false,
-                success: function(data){
-                    reloadResource()
-                }
-            });
-        }
-
-
-        layer.prompt({
-            formType: 0,
-            value: '',
-            title: '请输入文件夹名称',
-            area: ['200px', '20px'] //自定义文本域宽高
-        }, function(value, index, elem){
-            var path = getFilePath(value);
-            send(path);
-            layer.close(index);
-        });
-    }
-
-    function getFilePath(value){
-        var path;
-        if(contextmenuData.data.path===null || contextmenuData.data.path===''){
-            path = value;
-        }else{
-            path = contextmenuData.data.path + "/" + value;
-        }
-        return path;
-    }
-
-    function getMetaPath(value){
-        var path;
-        if(contextmenuData.data.path===null || contextmenuData.data.path===''){
-            path = value;
-        }else{
-            path = contextmenuData.data.path + "#/" + value;
-        }
-        return path;
-    }
-
-    /**
-     * 获取右键选择数据 -> 文件路径
-     */
-    function getContextmenuFilePath(){
-        return contextmenuData.data.path;
-    }
-
-    function getContextmenuData(){
-        return contextmenuData;
-    }
-
-    /**
-     * 创建文件
-     * @param path
-     */
-    function createMetaData(metaType, path){
-        function send(path){
-            api.post({
-                enableRootPath: true,
-                url: "schemas/" + metaType + "/fields",
-                data: {path:path},
-                async: false,
-                success: function(data){
-                    reloadResource()
-                }
-            });
-        }
-
-
-        layer.prompt({
-            formType: 0,
-            value: '',
-            title: '请输入文件名称',
-            area: ['200px', '20px'] //自定义文本域宽高
-        }, function(value, index, elem){
-            var path = getMetaPath("fields/" + value);
-            send(path);
-            layer.close(index);
-        });
-    }
-
-    /**
-     * 启用
-     * @param path
-     */
-    function enable(metaType, path){
-        function send(){
-            api.put({
-                enableRootPath: true,
-                url: "schemas/" + metaType + "/enable",
-                data: {path:path},
-                async: false,
-                success: function(data){
-                    reloadResource()
-                }
-            });
-        }
-
-
-        layer.confirm('是否确认该操作？', {
-            btn: ['确认', '取消']
-        }, function(index, layero){
-            send();
-            layer.close(index);
-        }, function(index){
-            layer.close(index);
-        });
-    }
-
-    /**
-     * 启用
-     * @param path
-     */
-    function disable(metaType, path){
-        function send(){
-            api.put({
-                enableRootPath: true,
-                url: "schemas/" + metaType + "/disable",
-                data: {path:path},
-                async: false,
-                success: function(data){
-                    reloadResource()
-                }
-            });
-        }
-
-
-        layer.confirm('是否确认该操作？', {
-            btn: ['确认', '取消']
-        }, function(index, layero){
-            send();
-            layer.close(index);
-        }, function(index){
-            layer.close(index);
-        });
-
-    }
-
-    /**
-     * 创建文件
-     * @param path
-     */
-    function rename(name, path){
-        function send(name){
-            api.put({
-                enableRootPath: true,
-                url: "resource/rename/" + name,
-                data: {path:path},
-                async: false,
-                success: function(data){
-                    reloadResource()
-                }
-            });
-        }
-
-
-        layer.prompt({
-            formType: 0,
-            value: name,
-            title: '请输入文件名称',
-            area: ['200px', '20px'] //自定义文本域宽高
-        }, function(value, index, elem){
-            send(value);
-            layer.close(index);
-        });
-    }
-
-    /**
-     * 创建文件
-     * @param path
-     */
-    function createFile(metaType){
-        function send(path){
-            api.post({
-                enableRootPath: true,
-                type: "POST",
-                url: "schemas/" + metaType,
-                data: {path:path},
-                async: false,
-                success: function(data){
-                    reloadResource()
-                }
-            });
-        }
-
-
-        layer.prompt({
-            formType: 0,
-            value: '',
-            title: '请输入文件名称',
-            area: ['200px', '20px'] //自定义文本域宽高
-        }, function(value, index, elem){
-            var path = getFilePath(value);
-            send(path);
-            layer.close(index);
-        });
-    }
-
-    /**
-     * 删除
-     * @param path
-     */
-    function deleteResource(){
-        //获取
-        var path = getContextmenuFilePath();
-        api.delete({
-            enableRootPath: true,
-            url: "resource",
-            data: {path:path},
-            async: false,
-            success: function(data){
-                reloadResource()
-            }
-        });
-    }
-
-    /**
-     * 根据schema类型获取schema
-     * @param type
-     */
-    function getSchema(type){
-        var typeSchema = schema[type]
-        if(!typeSchema){
-            api.get({
-                enableRootPath: true,
-                url: "schemas/" + type,
-                async: false,
-                success: function(data){
-                    schema[type] = data
-                    typeSchema = schema[type]
-                }
-            });
-        }
-
-        return typeSchema;
-    }
-
-
-
-    $("#run").click(function(){
-        api.get({
-            enableRootPath: true,
-            url: "meta/configuration/reload",
-            async: false,
-            success: function(data){
-                layer.msg('操作成功');
-            }
-        });
-
-    });
+        return new resource_tree(option);
+	}
 
 
-    exports(MOD_NAME, new editor());
+    exports(MOD_NAME, new resource_tree());
 });
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/schema.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/schema.js
new file mode 100644
index 0000000..29778c4
--- /dev/null
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/schema.js
@@ -0,0 +1,44 @@
+layui.define(['element', 'fast_config', 'api'], function(exports) {
+	"use strict";
+
+	/**
+	 * Button component
+	 * */
+	var MOD_NAME = 'schema',
+		$ = layui.jquery,
+        fast_config = layui.fast_config,
+        api = layui.api,
+        schemas = {
+            formType:{
+                domain_model:domainModelForm,
+                domain_model_field:domainModelFieldForm,
+                domain_file_field_primary_key:domainModelFieldForm,
+            }
+        }
+    ;
+
+
+
+	var schema = {
+        get : function(type){
+            var typeSchema = schemas[type]
+            if(!typeSchema){
+                api.get({
+                    enableRootPath: true,
+                    url: "schemas/" + type,
+                    async: false,
+                    success: function(data){
+                        schemas[type] = data
+                        typeSchema = schemas[type]
+                    }
+                });
+            }
+
+            return typeSchema;
+        }
+    }
+
+
+
+    exports(MOD_NAME, schema);
+});
-- 
Gitee


From 663a433d08d24c3722881a677c7f13ec446e23f5 Mon Sep 17 00:00:00 2001
From: tiansai <tian_hero@126.com>
Date: Wed, 13 Jul 2022 20:28:39 +0800
Subject: [PATCH 07/10] no message

---
 .../src/fast-develop/src/js/module/domain_design.js           | 3 +--
 .../src/fast-develop/src/js/module/editor.js                  | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain_design.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain_design.js
index 4ac2229..ad4b9e7 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain_design.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain_design.js
@@ -27,7 +27,7 @@ layui.define(['element', 'api', 'fast_config'], function(exports) {
 
         var grid;
         var parentContextData = window.parent.window.contextData;
-        var path = parentContextData.contextmenuData.data.path;
+        // var path = parentContextData.contextmenuData.data.path;
         var metaName;
 
 
@@ -253,7 +253,6 @@ layui.define(['element', 'api', 'fast_config'], function(exports) {
                         }
                     ]
                 },
-
                 { title: "长度", width: 220, dataType: "integer", dataIndx: "length"},
 
                 // {
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
index 8668113..1c4fc6c 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor.js
@@ -155,6 +155,7 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'etree', 'form', 'amis',
         //监听器
         contentPanelListeners = {
             domain_model_contentPanel_listener:domainModelContentPanelListener,
+            domainmodel_contentPanel_listener:openDomainListener
         },
         //监听器
         contextMenuListeners = {
@@ -166,7 +167,7 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'etree', 'form', 'amis',
             renameListener:renameListener,
             enableListener:enableListener,
             disableListener:disableListener,
-            openDomainListener:openDomainListener,
+            // openDomainListener:openDomainListener,
             designDomainListener:designDomainListener,
             createFolderListener:createFolderListener
 
@@ -378,6 +379,7 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'etree', 'form', 'amis',
             var id = typeSchema.id;
             var contentPanel = typeSchema.contentPanel;
             if(contentPanel.mode === 'listener'){
+                debugger
                 var listenerName = id + '_contentPanel_listener';
                 var listener = contentPanelListeners[listenerName];
                 if(listener &&  typeof listener === 'function'){
-- 
Gitee


From d9d548ff0eb95c7000ae778ec80c8ce5504ec746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8E=AB=E5=AF=85?= <824000672@qq.com>
Date: Thu, 14 Jul 2022 11:43:57 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E6=8A=8Adialog=E8=AF=AF=E5=88=A0=E4=BA=86=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/fast-develop/gulpfile.js              |   6 +-
 .../src/js/module/editor/resource_content.js  |   1 +
 .../js/module/editor/resource_properties.js   |  39 ++++++
 .../src/js/module/editor/resource_tree.js     | 126 +++++++++++++++++-
 4 files changed, 168 insertions(+), 4 deletions(-)
 create mode 100644 fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_properties.js

diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js b/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
index 536c465..53b916e 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/gulpfile.js
@@ -157,7 +157,7 @@ function watches(){
     watch(['src/less/*.less'], series(css,cssMinify))
     watch(['src/css/*.css'], series(cssMinify))
     watch(['src/js/*.js'], parallel(js))
-    watch(['src/js/module/*.js'], parallel(module))
+    watch(['src/js/module/**'], parallel(module))
     watch(['src/index.html'], parallel(html))
     watch(['src/image/*'], parallel(image))
     watch(['src/config/*'], parallel(fast_config))
@@ -187,11 +187,11 @@ function server(){
     watch(['src/less/*.less'], series(css,cssMinify))
     watch(['src/css/*.css'], series(cssMinify))
     watch(['src/js/*.js'], parallel(js))
-    watch(['src/js/module/*.js'], parallel(module))
+    watch(['src/js/module/**'], parallel(module))
     watch(['src/index.html'], parallel(html))
     watch(['src/image/*'], parallel(image))
     watch(['src/config/*'], parallel(fast_config))
-    watch(['src/compoment/**/*.*'], parallel(compoment))
+    watch(['src/compoment/**'], parallel(compoment))
 
 }
 
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js
index d71315e..4bb54b8 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js
@@ -84,6 +84,7 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener'], function(exports)
             var contentPanel = typeSchema.contentPanel;
             if(contentPanel.mode === 'listener'){
                 var listenerName = id + '_contentPanel_listener';
+                debugger
                 var listener = listener.getContentPanelListener(listenerName);
                 if(listener &&  typeof listener === 'function'){
                     listener(option.treeNode)
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_properties.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_properties.js
new file mode 100644
index 0000000..ae5a4c9
--- /dev/null
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_properties.js
@@ -0,0 +1,39 @@
+layui.define(['element', 'api', 'amis', 'schema', 'listener'], function(exports) {
+	"use strict";
+
+	/**
+	 * Button component
+	 * */
+	var MOD_NAME = 'resource_properties',
+		$ = layui.jquery,
+		api = layui.api,
+        amis = layui.amis,
+        schema = layui.schema,
+        listener = layui.listener,
+        metaType = null
+    ;
+
+	var resource_properties = function(opt) {
+		this.option = opt;
+	};
+
+
+
+    /**
+	 * Button start loading
+	 * */
+    resource_properties.prototype.render = function(opt) {
+		
+		var option = {
+			elem: opt.elem,
+            metaType: opt.metaType,
+            treeNode: opt.treeNode
+		}
+
+
+        return new resource_properties(option);
+	}
+
+
+    exports(MOD_NAME, new resource_properties());
+});
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
index 0e4337d..410acf4 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
@@ -363,7 +363,7 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', '
         ztree = layui.ztree,
         api = layui.api,
         schema = layui.schema,
-
+        amis = layui.amis,
 
         //监听器
         contextMenuListeners = {
@@ -413,6 +413,32 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', '
         laytpl(getTpl).render(data, function(html){
             view.innerHTML = html;
         });
+
+        // amis.render({
+        //     elem: '#viewForm',
+        //     amisSchema: {
+        //         "type": "form",
+        //         "title": "表单",
+        //         "body": [
+        //             {
+        //                 "label": "文本框",
+        //                 "type": "input-text",
+        //                 "name": "text"
+        //             }
+        //         ],
+        //         "api": {
+        //             "method": "post",
+        //             "url": "api/amis.json",
+        //             "data": {
+        //                 "&": "$$",
+        //                 "name": "${name}",
+        //                 "path": "${path}",
+        //                 "type": "${type}"
+        //             }
+        //         },
+        //         "id": "createTestForm"
+        //     }
+        // })
     }
 
     function getFileMetaData(path, selectData) {
@@ -440,6 +466,7 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', '
 
     function zTreeOnClick(event, treeId, treeNode) {
 
+        debugger
         //是否是元数据，是的话请求元数据schema
         if(treeNode.data.type.metaData){
             getFileMetaData(treeNode.data.path, treeNode)
@@ -469,6 +496,103 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', '
         return contextmenuData;
     }
 
+
+    function testDialog(dialog, option){
+        layer.open({
+            type:1,
+            // area:['20%','200px'],
+            title: dialog.title,
+            offset: '30%',
+            content: "<div id='testDialogContent' style='width: 500px'></div>",
+            shade: 0.3,
+            btn: ['提交', '取消']
+            ,btn1: function(index, layero){
+                var amis = option;
+                var formObject = amis.funcAmis.option.amisScoped.getComponentById("createTestForm").getValues();
+                var optionApi = amis.funcAmis.option.schema.api;
+
+                debugger
+
+                execApi({
+                    optionApi : optionApi,
+                    execData : formObject,
+                    success: function(data){
+                        reloadResource()
+                        layer.closeAll();
+                        layer.msg('操作成功');
+                    }
+                })
+                // var kk=$("#username").val();
+                // alert(kk);
+            },
+            cancel: function(layero,index){
+                layer.closeAll();
+            }
+
+        });
+    }
+
+
+    function formatApiOptionData(optionApi, execData){
+        var data = JSON.parse(JSON.stringify(optionApi.data).format(execData));
+        if(data['&'] === '$$'){
+            $.extend(data, execData);
+            delete data['&'];
+        }
+        return data
+    }
+
+    function formatUrl(url, contextData){
+        //url替换
+        return url.format(data);
+    }
+
+    function beforeExecHandle(optionApi){
+        if(optionApi.type !== 'get'){
+            optionApi.contentType = 'application/json;charset=UTF-8';
+            optionApi.data = JSON.stringify(optionApi.data);
+        }
+    }
+
+    function execApi(apiOpt){
+        var {optionApi, execData, success} = apiOpt
+        var data = contextmenuData.data;
+        if(typeof optionApi === 'object'){
+            //模版数据替换
+            var apiOption = optionApi;
+            //url替换
+            apiOption.url = formatUrl(apiOption.url, data);
+            apiOption.data = formatApiOptionData(optionApi, execData);
+            apiOption.success = success;
+
+            //执行前处理
+            beforeExecHandle(optionApi);
+            api.exec(apiOption);
+        }else{
+            optionApi = optionApi.format(data)
+            var optionApiProps = optionApi.split(":");
+            var method, apiUrl;
+            if(optionApiProps.length > 1){
+                method = optionApiProps[0];
+                apiUrl = optionApiProps[1];
+            }else{
+                method = 'get';
+                apiUrl = optionApiProps[0];
+            }
+
+            var optionApi = {
+                type: method,
+                url: formatUrl(apiUrl, data),
+                data: execData,
+                success
+            };
+
+            //执行前处理
+            beforeExecHandle(optionApi);
+            api.exec(optionApi)
+        }
+    }
+
     /**
 	 * Button start loading
 	 * */
-- 
Gitee


From 0b05270938003b39b7f6cfd0ddfdc114cf6720e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8E=AB=E5=AF=85?= <824000672@qq.com>
Date: Thu, 14 Jul 2022 13:39:38 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E9=9D=A2=E6=9D=BF=E6=94=AF=E6=8C=81amis=E5=92=8Cliste?=
 =?UTF-8?q?ner=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../develop/meta/resource/MetaResource.java   |   9 ++
 .../resource/loader/MetaResourceLoader.java   |   8 +
 .../.schema/resource/domain_file.json         |   6 +-
 .../.schema/resource/domain_file_field.json   |   5 +-
 .../domain_file_field_primary_key.json        |   5 +-
 .../.schema/resource/domain_folder.json       |  28 +++-
 .../src/fast-develop/src/js/fastDevelop.js    |   3 +-
 .../src/js/module/editor/editor.js            |   2 +-
 .../src/js/module/editor/resource_content.js  |   5 +-
 .../js/module/editor/resource_properties.js   | 150 +++++++++++++++++-
 .../src/js/module/editor/resource_tree.js     |  95 ++---------
 .../src/js/module/editor/schema.js            |   3 +
 12 files changed, 219 insertions(+), 100 deletions(-)

diff --git a/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/java/com/fast/develop/meta/resource/MetaResource.java b/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/java/com/fast/develop/meta/resource/MetaResource.java
index a78b6ea..aa11800 100644
--- a/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/java/com/fast/develop/meta/resource/MetaResource.java
+++ b/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/java/com/fast/develop/meta/resource/MetaResource.java
@@ -21,6 +21,7 @@ public class MetaResource extends BaseMeta {
     private Boolean isSystem;
     private List funcs;
     private Map contentPanel;
+    private Map propertiesPanel;
 
     public enum Type{
         folder, file, metadata;
@@ -82,4 +83,12 @@ public class MetaResource extends BaseMeta {
     public void setContentPanel(Map contentPanel) {
         this.contentPanel = contentPanel;
     }
+
+    public Map getPropertiesPanel() {
+        return propertiesPanel;
+    }
+
+    public void setPropertiesPanel(Map propertiesPanel) {
+        this.propertiesPanel = propertiesPanel;
+    }
 }
diff --git a/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/java/com/fast/develop/meta/resource/loader/MetaResourceLoader.java b/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/java/com/fast/develop/meta/resource/loader/MetaResourceLoader.java
index 2e9f812..2354111 100644
--- a/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/java/com/fast/develop/meta/resource/loader/MetaResourceLoader.java
+++ b/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/java/com/fast/develop/meta/resource/loader/MetaResourceLoader.java
@@ -59,6 +59,7 @@ public class MetaResourceLoader implements MetaLoader<MetaResource> {
         bindIsSystem(rawSchema, metaResource);
         bindFuncs(rawSchema, metaResource);
         bindContentPanel(rawSchema, metaResource);
+        bindpropertiesPanel(rawSchema, metaResource);
 
         return metaResource;
     }
@@ -101,6 +102,13 @@ public class MetaResourceLoader implements MetaLoader<MetaResource> {
         }
     }
 
+    private void bindpropertiesPanel(JSONObject rawSchema, MetaResource metaResource){
+        JSONObject jsonObject = rawSchema.optJSONObject("propertiesPanel");
+        if(jsonObject != null){
+            metaResource.setPropertiesPanel(jsonObject.toMap());
+        }
+    }
+
     public ObjectSchema getObjectSchema() {
         return objectSchema;
     }
diff --git a/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_file.json b/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_file.json
index 93f73dc..2e91b95 100644
--- a/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_file.json
+++ b/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_file.json
@@ -54,9 +54,8 @@
         }
       ]
     }
-
-
   ],
+
   "contentPanel":{
     "mode":"amis",
     "amisSchema":{
@@ -84,6 +83,9 @@
         ]
       }
     }
+  },
+  "propertiesPanel":{
+    "mode":"listener"
   }
 }
 
diff --git a/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_file_field.json b/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_file_field.json
index 8806db5..8b2de67 100644
--- a/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_file_field.json
+++ b/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_file_field.json
@@ -11,6 +11,9 @@
       "mode":"listener",
       "listenerName":"removeListener"
     }
-  ]
+  ],
+  "propertiesPanel":{
+    "mode":"listener"
+  }
 }
 
diff --git a/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_file_field_primary_key.json b/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_file_field_primary_key.json
index 5e48e26..49c42e5 100644
--- a/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_file_field_primary_key.json
+++ b/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_file_field_primary_key.json
@@ -8,6 +8,9 @@
     {
       "title":"主键不可操作"
     }
-  ]
+  ],
+  "propertiesPanel":{
+    "mode":"listener"
+  }
 }
 
diff --git a/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_folder.json b/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_folder.json
index dfe3388..14504e1 100644
--- a/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_folder.json
+++ b/fast-develop-server/fast-develop-meta/fast-develop-meta-resource/src/main/resources/.schema/resource/domain_folder.json
@@ -76,6 +76,32 @@
       "mode":"listener",
       "listenerName":"renameListener"
     }
-  ]
+  ],
+  "propertiesPanel":{
+    "mode":"amis",
+    "amisSchema":{
+      "title": "",
+      "type": "form",
+      "mode": "horizontal",
+      "api": "/saveForm",
+      "body": [
+        {
+          "label": "Name",
+          "type": "input-text",
+          "name": "name"
+        },
+        {
+          "label": "Email",
+          "type": "input-email",
+          "name": "email"
+        },
+        {
+          "type": "tpl",
+          "tpl": "Hello ${name}"
+        }
+      ],
+      "actions":[]
+    }
+  }
 }
 
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/fastDevelop.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/fastDevelop.js
index 5154413..9106b11 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/fastDevelop.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/fastDevelop.js
@@ -14,10 +14,11 @@ layui.config({
     resource_tree: "editor/resource_tree", 	// 资源功能模块
     listener: "editor/listener", 	// 监听器模块
     schema: "editor/schema", 	// Schema模块
+    domain_design: "editor/domain_design",
+    resource_properties: "editor/resource_properties",
 	jqgrid: "jqgrid", 	// jq表格组件
 	etree: "etree", 	// layui.etree 扩展树
 	ztree: "ztree", 	// layui.ztree
-    domain_design: "editor/domain_design",
 	edropdown: "edropdown", 	// layui.edropdown 扩展下拉
 	fast_config: "fast_config", 	// 配置
 	yaml: "yaml", 	// 配置
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/editor.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/editor.js
index ba7f177..4cdbcb5 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/editor.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/editor.js
@@ -50,7 +50,7 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'form', 'fast_config', 'a
             </div>
             <div class="box2" id="left">
                 <div class="" style="padding: 10px;">
-                    <div class="layui-row layui-col-space15">
+                    <div class="layui-row layui-col-space15" id="viewFormContainer">
                         <div id="viewForm">
 
                         </div>
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js
index 4bb54b8..3c96527 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_content.js
@@ -69,14 +69,13 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener'], function(exports)
 		
 		var option = {
 			elem: opt.elem,
-            metaType: opt.metaType,
             treeNode: opt.treeNode
 		}
 
-        metaType = opt.metaType;
+        metaType = option.treeNode.data.type.metaType;
 
         var resourceTypeSchema = schema.get("resource");
-        var typeSchema = resourceTypeSchema[option.metaType];
+        var typeSchema = resourceTypeSchema[metaType];
 
         resetContent(option.elem);
         if(typeSchema.contentPanel){
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_properties.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_properties.js
index ae5a4c9..21e73d6 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_properties.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_properties.js
@@ -1,4 +1,4 @@
-layui.define(['element', 'api', 'amis', 'schema', 'listener'], function(exports) {
+layui.define(['element', 'api', 'amis', 'schema', 'listener', 'form'], function(exports) {
 	"use strict";
 
 	/**
@@ -9,15 +9,120 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener'], function(exports)
 		api = layui.api,
         amis = layui.amis,
         schema = layui.schema,
-        listener = layui.listener,
-        metaType = null
+        form = layui.form,
+
+        laytpl = layui.laytpl,
+        metaType = null,
+        selectFileMetaData,
+        elem = null,
+        path = null,
+        treeNode = null,
+
+        propertiesPanelListeners = {
+            domain_model_propertiesPanel_listener:domain_model_propertiesPanel_listener,
+            domain_model_field_propertiesPanel_listener:domain_model_field_propertiesPanel_listener,
+            domain_file_field_primary_key_propertiesPanel_listener:domain_file_field_primary_key_propertiesPanel_listener
+        }
     ;
 
+    function domain_model_propertiesPanel_listener(data){
+        getFileMetaData(path, treeNode);
+    }
+    function domain_model_field_propertiesPanel_listener(data){
+        getFileMetaData(path, treeNode);
+    }
+    function domain_file_field_primary_key_propertiesPanel_listener(data){
+        getFileMetaData(path, treeNode);
+    }
+
 	var resource_properties = function(opt) {
 		this.option = opt;
 	};
 
 
+    function randerForm(script, data) {
+        var getTpl = script.innerHTML,view = document.getElementById(elem.replace('#', ''));
+        laytpl(getTpl).render(data, function(html){
+            view.innerHTML = html;
+        });
+    }
+
+
+    function resetForm(){
+        $("#form-data")[0].reset();
+        form.render();
+    }
+
+    function getFileMetaData(path, selectData) {
+        randerForm(schemas.formType[selectData.data.type.metaType], selectData.data)
+        api.get({
+            enableRootPath: true,
+            url: "resource",
+            data: {path:path},
+            async: false,
+            dataType: "json",
+            success: function(data){
+                selectFileMetaData = {
+                    metadata: data,
+                    selectData: selectData
+                }
+
+                //重置表单
+                resetForm();
+                //给表单赋值
+                form.val('data-form',selectFileMetaData.metadata)
+
+            }
+        });
+    }
+
+
+    /**
+     弹出iframe页面(iframe后面会添加灰色蒙版)
+     **/
+    function showIframe(url,w,h){
+        var frameId = metaType + 'proerptes_' + '_YuFrame1';
+
+        //添加iframe
+        var if_w = w;
+        var if_h = h;
+        //allowTransparency='true' 设置背景透明
+        $("<iframe width='100%' height='100%' id=frameId name=frameId style='position:absolute;'  frameborder='no' marginheight='0' marginwidth='0' allowTransparency='true'></iframe>").prependTo(contentElem);
+        var st=document.documentElement.scrollTop|| document.body.scrollTop;//滚动条距顶部的距离
+        var sl=document.documentElement.scrollLeft|| document.body.scrollLeft;//滚动条距左边的距离
+        var ch=document.documentElement.clientHeight;//屏幕的高度
+        var cw=document.documentElement.clientWidth;//屏幕的宽度
+        var objH=$("#" + frameId).height();//浮动对象的高度
+        var objW=$("#" + frameId).width();//浮动对象的宽度
+        var objT=Number(st)+(Number(ch)-Number(objH))/2;
+        var objL=Number(sl)+(Number(cw)-Number(objW))/2;
+        $("#" + frameId).css('left',objL);
+        $("#" + frameId).css('top',objT);
+
+        $("#" + frameId).attr("src", url)
+
+        //添加背景遮罩
+        var frameById = metaType + 'proerptes_'  + '_YuFrame1Bg';
+        $("<div id='YuFrame1Bg' style='display:block;z-index:3;position:absolute;left:0px;top:0px;filter:Alpha(Opacity=30);/* IE */-moz-opacity:0.4;/* Moz + FF */opacity: 0.4; '/>").prependTo(contentElem);
+        var bgWidth = Math.max($("body").width(),cw);
+        var bgHeight = Math.max($("body").height(),ch);
+        $("#" + frameById).css({width:bgWidth,height:bgHeight});
+
+        //点击背景遮罩移除iframe和背景
+        $("#" + frameById).click(function() {
+            $("#" + frameId).remove();
+            $("#" + frameById).remove();
+        });
+    }
+
+
+
+    function resetContent(contentElem){
+        $(contentElem).remove();
+        $('#viewFormContainer').append('<div id="'+contentElem.slice(1)+'"></div>')
+    }
+
+
 
     /**
 	 * Button start loading
@@ -26,10 +131,47 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener'], function(exports)
 		
 		var option = {
 			elem: opt.elem,
-            metaType: opt.metaType,
+            path: opt.path,
             treeNode: opt.treeNode
 		}
 
+        elem = option.elem;
+        metaType = option.treeNode.data.type.metaType;
+        path = option.path;
+        treeNode = option.treeNode;
+
+        var resourceTypeSchema = schema.getResource();
+        var typeSchema = resourceTypeSchema[metaType];
+
+        resetContent(option.elem);
+
+        debugger
+        if(typeSchema.propertiesPanel){
+            var id = typeSchema.id;
+            var propertiesPanel = typeSchema.propertiesPanel;
+            if(propertiesPanel.mode === 'listener'){
+                var listenerName = id + '_propertiesPanel_listener';
+                var listener = propertiesPanelListeners[listenerName];
+                if(listener &&  typeof listener === 'function'){
+                    listener(option.treeNode)
+                }
+            }else if(propertiesPanel.mode === 'amis'){
+                var amisSchema = propertiesPanel.amisSchema;
+                var amisSchemaApi = propertiesPanel.amisSchemaApi;
+                amis.render({
+                    elem: option.elem,
+                    schema: amisSchema,
+                    schemaApi: amisSchemaApi,
+                    props:{
+                        data:option.treeNode.data
+                    }
+                })
+            }else if(propertiesPanel.mode === 'iframe'){
+                var iframeUrl = propertiesPanel.url;
+                showIframe(iframeUrl);
+            }
+        }
+
 
         return new resource_properties(option);
 	}
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
index 410acf4..7938aad 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
@@ -1,4 +1,4 @@
-layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', 'domain_design', 'edropdown', 'form', 'schema', 'resource_content', 'ztree'], function(exports) {
+layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', 'domain_design', 'edropdown', 'form', 'schema', 'resource_content', 'ztree', 'resource_properties'], function(exports) {
 	"use strict";
 
 
@@ -146,22 +146,6 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', '
     }
 
 
-    function reloadResource(){
-        api.get({
-            enableRootPath: true,
-            url: "resource/tree",
-            success: function(data){
-                //可以重载所有基础参数
-                // etree.reload('treeId', {
-                //     //新的参数
-                //     data: data
-                // });
-                var treeObj = $.fn.zTree.getZTreeObj("resource");
-                treeObj.addNodes(null, data);
-            }
-
-        })
-    }
 
     /**
      * 创建文件
@@ -246,7 +230,6 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', '
         return path;
     }
 
-
     function reloadResource(){
         api.get({
             enableRootPath: true,
@@ -360,6 +343,7 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', '
         form = layui.form,
         laytpl = layui.laytpl,
         resource_content = layui.resource_content,
+        resource_properties = layui.resource_properties,
         ztree = layui.ztree,
         api = layui.api,
         schema = layui.schema,
@@ -403,78 +387,17 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', '
     });
 
 
-    function resetForm(){
-        $("#form-data")[0].reset();
-        form.render();
-    }
-
-    function randerForm(script, data) {
-        var getTpl = script.innerHTML,view = document.getElementById('viewForm');
-        laytpl(getTpl).render(data, function(html){
-            view.innerHTML = html;
-        });
-
-        // amis.render({
-        //     elem: '#viewForm',
-        //     amisSchema: {
-        //         "type": "form",
-        //         "title": "表单",
-        //         "body": [
-        //             {
-        //                 "label": "文本框",
-        //                 "type": "input-text",
-        //                 "name": "text"
-        //             }
-        //         ],
-        //         "api": {
-        //             "method": "post",
-        //             "url": "api/amis.json",
-        //             "data": {
-        //                 "&": "$$",
-        //                 "name": "${name}",
-        //                 "path": "${path}",
-        //                 "type": "${type}"
-        //             }
-        //         },
-        //         "id": "createTestForm"
-        //     }
-        // })
-    }
-
-    function getFileMetaData(path, selectData) {
-        randerForm(schemas.formType[selectData.data.type.metaType], selectData.data)
-        api.get({
-            enableRootPath: true,
-            url: "resource",
-            data: {path:path},
-            async: false,
-            dataType: "json",
-            success: function(data){
-                selectFileMetaData = {
-                    metadata: data,
-                    selectData: selectData
-                }
-
-                //重置表单
-                resetForm();
-                //给表单赋值
-                form.val('data-form',selectFileMetaData.metadata)
-
-            }
-        });
-    }
-
     function zTreeOnClick(event, treeId, treeNode) {
 
-        debugger
         //是否是元数据，是的话请求元数据schema
-        if(treeNode.data.type.metaData){
-            getFileMetaData(treeNode.data.path, treeNode)
-        }
+        resource_properties.render({
+            elem: '#viewForm',
+            path: treeNode.data.path,
+            treeNode: treeNode
+        })
 
         resource_content.render({
             elem: contentElem,
-            metaType: treeNode.data.type.metaType,
             treeNode: treeNode
         })
 
@@ -497,7 +420,7 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', '
     }
 
 
-    function testDialog(dialog, option){
+    function renderDialog(dialog, option){
         layer.open({
             type:1,
             // area:['20%','200px'],
@@ -661,7 +584,7 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', '
                 }else if(obj.mode && obj.mode === 'dialog'){
                     var dialog = obj.dialog;
                     if(dialog.mode === 'amis'){
-                        testDialog(dialog, option);
+                        renderDialog(dialog, option);
                         var amisSchema = dialog.amisSchema;
                         var amisSchemaApi = dialog.amisSchemaApi;
                         var amisNew = amis.render({
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/schema.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/schema.js
index 29778c4..7c5452a 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/schema.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/schema.js
@@ -35,6 +35,9 @@ layui.define(['element', 'fast_config', 'api'], function(exports) {
             }
 
             return typeSchema;
+        },
+        getResource: function () {
+            return this.get('resource');
         }
     }
 
-- 
Gitee


From 5012fae1f49548b2da4e5ce649e81490128a4f89 Mon Sep 17 00:00:00 2001
From: tiansai <tian_hero@126.com>
Date: Thu, 14 Jul 2022 22:11:35 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fast-develop/src/config/fast.config.yml   |  1 +
 .../src/js/module/editor/resource_tree.js     | 34 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.yml b/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.yml
index ffe2066..883d28f 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.yml
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/config/fast.config.yml
@@ -1,3 +1,4 @@
 ## 网站配置
 api: "/builder/"
 #api: "/api/"
+enableEnv: false
diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
index d8c3f8b..89f0e17 100644
--- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
+++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/resource_tree.js
@@ -1,4 +1,4 @@
-layui.define(['element', 'api', 'amis', 'schema', 'listener', 'jqgrid', 'domain_design', 'edropdown', 'form', 'schema', 'resource_content', 'ztree', 'resource_properties'], function(exports) {
+layui.define(['element', 'api', 'amis', 'schema', 'listener', 'jqgrid', 'domain_design', 'edropdown', 'form', 'schema', 'resource_content', 'ztree', 'resource_properties','fast_config'], function(exports) {
 	"use strict";
 
 
@@ -352,6 +352,7 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'jqgrid', 'domain_
         treeApi,
         treeObj,
         listener = layui.listener,
+        fast_config = layui.fast_config,
 
         //监听器
         contextMenuListeners = {
@@ -513,22 +514,23 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'jqgrid', 'domain_
      */
     function getGlobalEnv(amisData){
         // debugger
-        var env = schemas['env'];
-        if(!env){
-            api.get({
-                enableRootPath: true,
-                url: "api/v1/env/getAppEnvironment?appId="+amisData.mid.tenantId,
-                // url: "schemas/" + type,
-                async: false,
-                success: function(data){
-                    schema['env'] = data;
-                    amisData = {...amisData,...data}
-                }
-            });
-        }else{
-            amisData = {...amisData,...env}
+        if(fast_config.enableEnv){
+            var env = schemas['env'];
+            if(!env){
+                api.get({
+                    enableRootPath: true,
+                    url: "api/v1/env/getAppEnvironment?appId="+amisData.mid.tenantId,
+                    // url: "schemas/" + type,
+                    async: false,
+                    success: function(data){
+                        schema['env'] = data;
+                        amisData = {...amisData,...data}
+                    }
+                });
+            }else{
+                amisData = {...amisData,...env}
+            }
         }
-
         return amisData;
     }
 
-- 
Gitee