diff --git a/example/pom.xml b/example/pom.xml
index a4cdb395ea597cd6a167dd03f5cd24ef8f919fc3..8962c4bdbdbc5c881b50a0526f0e359e7ab3ffe7 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 7b88ac8af9c25d60d7f64834d6c9dd3b50caa329..1fd2b3f4fe13ade72688f53179aa85ec222043db 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 410ade491d5902d8cb932b8a73abcfc815693e5f..bc85944e7358435d6eafa099ad85435722f17bb8 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
@@ -177,8 +177,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 dbf08fb4c0ef49d3c2b52d056753faf61eb5ed90..ffe20663d15f70e5454914d16f6fab322a2d461b 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 df332a390426008edeaf60a161bec7f7fc217bd4..520d3c3944453c4e1c4d1a6eaf461eb1c0d9b624 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
@@ -485,10 +485,10 @@
 <script>
 
 
-    var treeConst;
+    var treeConst,wkflTreeConst;
     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 f403011b6918ff64243b6a5a9b1a4609164ff239..9219ba89efdcda6e62ab2d039b10844aa6b7449d 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
@@ -7,14 +7,15 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
         var obj = arguments[0];
         var s = this;
         for(var key in obj) {
-            var value = JSON.stringify(obj[key]);
-            if(typeof obj[key] === 'object'){
-                s = s.replace(new RegExp("\"\\$\\{" + key + "\\}\"", "g"), value);
-            }else{
-                s = s.replace(new RegExp("\\$\\{" + key + "\\}", "g"), obj[key]);
+            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;
     }
 
@@ -102,7 +103,7 @@ 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;
 
                 debugger
@@ -218,7 +219,7 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
     function reloadResource(){
         api.get({
             enableRootPath: true,
-            url: "resource/tree",
+            url: "api/v1/engine/development/tree",
             success: function(data){
                 //可以重载所有基础参数
                 etree.reload('treeId', {
@@ -229,7 +230,19 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                 // var newNodes = [{name:"newNode1"}, {name:"newNode2"}, {name:"newNode3"}];
                 // treeObj.addNodes(null, newNodes);
             }
-
+        });
+        api.get({
+            enableRootPath: true,
+            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);
+            }
         })
     }
 
@@ -247,16 +260,18 @@ 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);
+            $.extend(data, execData["mid"]);
             delete data['&'];
         }
+        $.extend(data, execData["mid"]);
         return data
     }
 
     function formatUrl(url, contextData){
         //url替换
-        return url.format(data);
+        return url.format(contextData);
     }
 
     function beforeExecHandle(optionApi){
@@ -268,10 +283,13 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
 
     function execApi(apiOpt){
         var {optionApi, execData, success} = apiOpt
-        var data = contextmenuData.data.data;
+        var data = getGlobalEnv(contextmenuData.data.data);
+        // var data = contextmenuData.data.data;
         if(typeof optionApi === 'object'){
             //模版数据替换
             var apiOption = optionApi;
+            debugger
+            apiOption.data = execData;
             //url替换
             apiOption.url = formatUrl(apiOption.url, data);
             apiOption.data = formatApiOptionData(optionApi, execData);
@@ -282,16 +300,20 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
             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{
+            // var optionApiProps = optionApi.split(":");
+            // if(optionApiProps.length > 1){
+            //     method = optionApiProps[0];
+            //     apiStr = optionApiProps[1];
+            // }else{
+            //     method = 'get';
+            //     apiStr = 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 = optionApiProps[0];
+                apiUrl = optionApi;
             }
-
             var optionApi = {
                 type: method,
                 url: formatUrl(apiUrl, data),
@@ -318,7 +340,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>
@@ -394,8 +417,141 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
             }
             ,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 data = contextmenuData.data.data;
+                },
+                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: [{}]
+            }
+            ,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;
+            }
+        });
+
+        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;
@@ -409,6 +565,7 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                             listener(data)
                         }
                     }else if(obj.mode && obj.mode === 'dialog'){
+                        debugger
                         var dialog = obj.dialog;
                         if(dialog.mode === 'amis'){
                             testDialog(dialog, option);
@@ -465,6 +622,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');
@@ -496,11 +654,12 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
                             schema: amisSchema,
                             schemaApi: amisSchemaApi,
                             props:{
-                                data:obj.data.data
+                                data:amisdata
+                                // data:obj.data.data
                             }
                         })
                     }else if(contentPanel.mode === 'iframe'){
-                        var iframeUrl = contentPanel.url;
+                        var iframeUrl = contentPanel.url.format(amisdata);
                         showIframe(iframeUrl);
                     }
                 }
@@ -840,21 +999,58 @@ layui.define(['element', 'dropdown', 'layer', 'util', 'etree', 'form', 'amis', '
     function getSchema(type){
         var typeSchema = schema[type]
         if(!typeSchema){
+            var schemaData={};
             api.get({
                 enableRootPath: true,
-                url: "schemas/" + type,
+                url: "schemas/model.json",
+                // url: "schemas/" + type,
                 async: false,
                 success: function(data){
-                    schema[type] = data
-                    typeSchema = schema[type]
+                    schemaData = data
                 }
             });
+
+            api.get({
+                enableRootPath: true,
+                url: "schemas/wkflmodel.json",
+                // url: "schemas/" + type,
+                async: false,
+                success: function(data){
+                    schemaData = {...schemaData,...data}
+                }
+            });
+            schema[type] = schemaData
+            typeSchema = schema[type]
         }
 
         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(){
         api.get({
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 478cdc269cab681d41daf4c7376ac4d2034c5e98..69c1a545ac90b9e8417b21b76e9ab9e226dff394 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' );
         });