From a813335995f810a12baaa8d338ecedf52f8c0247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=91=E4=BA=9A=E6=9D=83?= <673583240@qq.com> Date: Thu, 14 Jul 2022 20:20:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3tabs=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E9=94=99=E8=AF=AF=EF=BC=8Cztree=E5=90=91?= =?UTF-8?q?=E4=B8=8B=E8=B5=B0=E4=B8=8D=E5=8A=A8=E7=9A=84bug=E8=A7=A3?= =?UTF-8?q?=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/compoment/@ztree/ztree_v3/js/jquery.ztree.extend.js | 2 +- .../src/fast-develop/src/js/module/editor/resource_content.js | 2 -- .../fast-develop/src/js/module/editor/resource_properties.js | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/js/jquery.ztree.extend.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/js/jquery.ztree.extend.js index 8b37ed2..33d6d78 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/js/jquery.ztree.extend.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/js/jquery.ztree.extend.js @@ -1135,7 +1135,7 @@ }, selectedNextNode(treeObj,node,setting,event){ // 选择下一个节点 // view.removeAllSelectNodes(setting.treeId) - if(node.children){ + if(node.children && node.children.length){ var nextNode = node.children[0] }else { var nextNode = node.getNextNode(); 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 ddc356c..c6703f6 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 @@ -81,8 +81,6 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener'], function(exports) resetContent(option.elem); } - - resetContent(option.elem); if(typeSchema.contentPanel){ var id = typeSchema.id; var contentPanel = 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 21e73d6..ce5ac12 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 @@ -145,7 +145,6 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'form'], function( resetContent(option.elem); - debugger if(typeSchema.propertiesPanel){ var id = typeSchema.id; var propertiesPanel = typeSchema.propertiesPanel; -- Gitee From f87e3d8a64b4d059154db5183d58987ca336af45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=91=E4=BA=9A=E6=9D=83?= <673583240@qq.com> Date: Fri, 15 Jul 2022 09:29:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E6=A0=91=20=202.=E5=8F=B3=E9=94=AE=E5=92=8C=E5=90=91=E4=B8=8B?= =?UTF-8?q?=E7=AE=AD=E5=A4=B4bug=E4=BF=AE=E5=A4=8D=203.=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ztree_v3/css/zTreeStyle/img/icon.png | Bin 0 -> 6679 bytes .../src/js/module/editor/resource_tree.js | 1 + .../src/fast-develop/src/js/module/tab.js | 24 +++++++++++++----- 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/css/zTreeStyle/img/icon.png diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/css/zTreeStyle/img/icon.png b/fast-develop-web/fast-develop-editor/src/fast-develop/src/compoment/@ztree/ztree_v3/css/zTreeStyle/img/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..053f8a8efa214130832cb604884d5dde04b19a8b GIT binary patch literal 6679 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 bZIObz+4bSc$D_8(|GKd-vnCerc8~ry99C{G literal 0 HcmV?d00001 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 766254f..68fee6b 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 @@ -407,6 +407,7 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', ' id: treeNode.id }) elem = '#dom' + sessionStorage.setItem(elem + "-pear-current-treeNode", JSON.stringify(treeNode)); } else { $('#fast-body').show() $('#content').hide() diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/tab.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/tab.js index 2a0ca23..ec2050a 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/tab.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/tab.js @@ -1,8 +1,9 @@ -layui.define(['jquery', 'element'], function(exports) { +layui.define(['jquery', 'element','resource_content'], function(exports) { "use strict"; var MOD_NAME = 'tab', $ = layui.jquery, + resource_content= layui.resource_content, element = layui.element; var pearTab = function(opt) { @@ -64,13 +65,13 @@ layui.define(['jquery', 'element'], function(exports) { closeEvent(option); // 如果有当前激活的id则激活当前id，否则激活第一个 - if(sessionStorage.getItem(option.elem + "-pear-tab-data-current")){ - option.success(sessionStorage.getItem(option.elem + "-pear-tab-data-current")); // 渲染成功执行函数 - } else { + // if(sessionStorage.getItem(option.elem + "-pear-tab-data-current")){ + // option.success(sessionStorage.getItem(option.elem + "-pear-tab-data-current")); // 渲染成功执行函数 + // } else { var id = $(".layui-tab[lay-filter='" + option.elem + "'] .layui-tab-title li[lay-id]").eq(0).attr('lay-id') console.log(id,'idididi') element.tabChange(option.elem,id); - } + // } // 渲染tab右键下拉 $("body .layui-tab[lay-filter='" + option.elem + "'] .layui-tab-title").on("contextmenu", "li", function(e) { // 获取当前元素位置 @@ -580,6 +581,11 @@ layui.define(['jquery', 'element'], function(exports) { $("#" + option.elem + "refersh").click(function() { var currentId = contextTabDOM.attr("lay-id"); + resource_content.render({ + elem:'#'+currentId, + treeNode: JSON.parse(sessionStorage.getItem('#'+currentId + "-pear-current-treeNode")), + viewMode:'tabs' + }) layer.close(index); }) } @@ -626,7 +632,13 @@ layui.define(['jquery', 'element'], function(exports) { $("body .layui-tab[lay-filter='" + option.elem + "']").on("click", "#refersh", function() { console.log('向下箭头') var currentId = $(".layui-tab[lay-filter='" + option.elem + "'] .layui-tab-title .layui-this").attr("lay-id"); - console.log('123131') + resource_content.render({ + elem:'#'+currentId, + // elem:'#dom', + treeNode: JSON.parse(sessionStorage.getItem('#'+currentId + "-pear-current-treeNode")), + // treeNode: JSON.parse(sessionStorage.getItem('#dom-pear-current-treeNode')), + viewMode:'tabs' + }) }) } -- Gitee From f82cd62c950a25be0bb3930baa07eb55df31d732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=91=E4=BA=9A=E6=9D=83?= <673583240@qq.com> Date: Fri, 15 Jul 2022 15:15:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/fast-develop/src/js/fastDevelop.js | 4 +- .../src/js/module/editor/resource_tree.js | 2 +- .../src/fast-develop/src/js/module/tab.js | 19 +++++--- .../src/fast-develop/src/js/module/utils.js | 44 +++++++++++++++++++ 4 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/utils.js 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 d3100f8..6e4a0fb 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 @@ -1,3 +1,4 @@ + window.rootPath = (function (src) { src = document.currentScript ? document.currentScript.src @@ -23,7 +24,8 @@ layui.config({ fast_config: "fast_config", // 配置 yaml: "yaml", // 配置 amis: "amis", - tab:'tab' // tabs视图 + tab:'tab', // tabs视图 + utils:'utils' }).use(['layer', 'theme'], function () { layui.theme.changeTheme(window, false); }); \ No newline at end of file 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 6e91369..68f38db 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 @@ -438,7 +438,7 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', ' id: treeNode.id }) elem = '#' + domId - sessionStorage.setItem(elem + "-pear-current-treeNode", JSON.stringify(treeNode)); + sessionStorage.setItem( "content-pear-current-treeNode", JSON.stringify(treeNode)); } else { $('#fast-body').show() $('#content').hide() diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/tab.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/tab.js index ec2050a..1b4c182 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/tab.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/tab.js @@ -1,9 +1,10 @@ -layui.define(['jquery', 'element','resource_content'], function(exports) { +layui.define(['jquery', 'element','resource_content','utils'], function(exports) { "use strict"; var MOD_NAME = 'tab', $ = layui.jquery, resource_content= layui.resource_content, + utils = layui.utils, element = layui.element; var pearTab = function(opt) { @@ -131,6 +132,7 @@ layui.define(['jquery', 'element','resource_content'], function(exports) { pearTab.prototype.click = function(callback) { //绑定点击事件 var elem = this.option.elem; var option = this.option; + console.log('0000000') element.on('tab(' + this.option.elem + ')', function(data) { var id = $("#" + elem + " .layui-tab-title .layui-this").attr("lay-id"); sessionStorage.setItem(option.elem + "-pear-tab-data-current", id); @@ -581,10 +583,12 @@ layui.define(['jquery', 'element','resource_content'], function(exports) { $("#" + option.elem + "refersh").click(function() { var currentId = contextTabDOM.attr("lay-id"); + var treeNode = JSON.parse(sessionStorage.getItem('content-pear-current-treeNode')) resource_content.render({ elem:'#'+currentId, - treeNode: JSON.parse(sessionStorage.getItem('#'+currentId + "-pear-current-treeNode")), - viewMode:'tabs' + treeNode: treeNode, + viewMode:'tabs', + amisData: utils.getGlobalEnv(treeNode.data) }) layer.close(index); }) @@ -632,12 +636,13 @@ layui.define(['jquery', 'element','resource_content'], function(exports) { $("body .layui-tab[lay-filter='" + option.elem + "']").on("click", "#refersh", function() { console.log('向下箭头') var currentId = $(".layui-tab[lay-filter='" + option.elem + "'] .layui-tab-title .layui-this").attr("lay-id"); + console.log(currentId,'currentId') + var treeNode = JSON.parse(sessionStorage.getItem("content-pear-current-treeNode")) resource_content.render({ elem:'#'+currentId, - // elem:'#dom', - treeNode: JSON.parse(sessionStorage.getItem('#'+currentId + "-pear-current-treeNode")), - // treeNode: JSON.parse(sessionStorage.getItem('#dom-pear-current-treeNode')), - viewMode:'tabs' + treeNode: treeNode, + viewMode:'tabs', + amisData: utils.getGlobalEnv(treeNode.data) }) }) } diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/utils.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/utils.js new file mode 100644 index 0000000..a249adc --- /dev/null +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/utils.js @@ -0,0 +1,44 @@ + +layui.define(['element','fast_config'], function(exports) { + "use strict"; + + /** + * Button component + * */ + var MOD_NAME = 'utils', + fast_config = layui.fast_config, + $ = layui.jquery; + + + + + var utils = { + /** + * 获取服务环境变量 + */ + getGlobalEnv:function (amisData){ + 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; + } + } + + + + exports(MOD_NAME, utils); +}); -- Gitee From 35104413ee383d4110660bfc7a96ccb12ad3876d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=91=E4=BA=9A=E6=9D=83?= <673583240@qq.com> Date: Sun, 17 Jul 2022 11:40:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=B3=E9=94=AE=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E4=B8=A4=E6=A3=B5=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/fast-develop/src/js/module/editor/resource_tree.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 c539fd9..d036123 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 @@ -468,7 +468,6 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', ' function zTreeOnClick(event, treeId, treeNode) { var treeObj = $.fn.zTree.getZTreeObj(treeId) var schemaType = treeObj.setting.view.schemaType; - console.log(schemaType,'schemaType') var metaType = treeNode.data.type.metaType; var resourceTypeSchema = schema.get(schemaType); var typeSchema = resourceTypeSchema[metaType]; @@ -497,6 +496,8 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', ' }; function zTreeOnRightClick(event, treeId, treeNode) { + var treeObj = $.fn.zTree.getZTreeObj(treeId) + schemaType = treeObj.setting.view.schemaType; // 将右击事件的节点数据绑定到以下变量中 contextmenuData = treeNode; contextData.contextmenuData = contextmenuData; -- Gitee