From d08d504302d64a8b51be2cbd07ad2cae71ac1b54 Mon Sep 17 00:00:00 2001 From: tiansai Date: Tue, 1 Nov 2022 11:43:58 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AE=8C=E5=96=84action=20copy=20=E8=83=BD?= =?UTF-8?q?=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fast-develop/src/js/module/editor/action_executer.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/action_executer.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/action_executer.js index 2b15a8f..a0357e8 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/action_executer.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/editor/action_executer.js @@ -45,6 +45,7 @@ layui.define(['element', 'api', 'listener', 'amis', 'utils'], function(exports) } function exec(option){ + // debugger var schema = option.schema; var data = option.data; @@ -63,6 +64,13 @@ layui.define(['element', 'api', 'listener', 'amis', 'utils'], function(exports) }else{ location.href = url; } + }else if(actionType === 'copy'){ + const ele = document.createElement('input'); + document.body.appendChild(ele); + ele.setAttribute('value',args.url); + ele.select(); + document.execCommand('copy'); + document.body.removeChild(ele); } } -- Gitee From 06956c6c4f22956d01ba174ee3b9819446bf0206 Mon Sep 17 00:00:00 2001 From: tiansai Date: Tue, 1 Nov 2022 11:59:01 +0800 Subject: [PATCH 2/7] no message --- .../src/fast-develop/src/js/module/editor/resource_tree.js | 2 +- 1 file changed, 1 insertion(+), 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 199e294..cb4a976 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 @@ -649,7 +649,7 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', ' config = $.grep(resourceSchema.funcs, function(obj, i) { if(obj.disabledOn){ - return utils.evalExpression(obj.disabledOn, getContextmenuData().data) + return utils.evalExpression(obj.disabledOn, utils.getGlobalEnv(getContextmenuData().data)) } if(enabled && obj['id'] === 'enable'){ return false; -- Gitee From cd33a631faac7604220279c734446981c50a8fbe Mon Sep 17 00:00:00 2001 From: tiansai Date: Wed, 2 Nov 2022 17:16:38 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=A2=86=E5=9F=9F=E6=A8=A1=E5=9E=8B=20?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E3=80=82=E4=BC=98=E5=8C=96=E9=80=89=E4=B8=AD=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/js/module/domain/domain_design.js | 11 +++++++---- .../src/js/module/editor/resource_tree.js | 8 +++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js index f4f78c1..3f4a413 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js @@ -31,9 +31,10 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain // var formObject = option.amisObj.option.amisScoped.getComponentById(getAmisId(option)).getValues(); var formObject = option.amisObj.option.amisScoped.getComponentByName(getAmisId(option)).getValues(); - let fieldNames=[]; + let fieldNames=[],columnNames=[]; for(var field of grid_domain_design_businessData){ fieldNames.push(field["fieldName"]); + columnNames.push(field["columnName"]); var validation=[]; if(field["Keyword"]){ validation.push("Keyword"); @@ -57,13 +58,15 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain formObject["modelType"] = "domainmodel"; + const listFieldLength=fieldNames.length,newFieldListLength=new Set(fieldNames.map(item=>item)).size; + const listColumnLength=columnNames.length,newColumnListLength=new Set(columnNames.map(item=>item)).size; // const listIndexLength=fieldNames.length,newIndexListLength=new Set(indexNames.map(item=>item)).size; if(listFieldLength>newFieldListLength){ - layer.alert('字段英文名不可重复，请调整后保存。'); - // }else if(listIndexLength>newIndexListLength){ - // layer.alert('索引名称不可重复，请调整后保存。'); + layer.alert('英文名不可重复，请调整后保存。'); + }else if(listColumnLength>newColumnListLength){ + layer.alert('表字段不可重复，请调整后保存。'); }else if(grid_domain_design_businessData.length<1){ layer.alert('请先设计字段！'); }else{ 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 cb4a976..183a0da 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 @@ -316,9 +316,11 @@ layui.define(['element', 'api', 'amis', 'schema', 'listener', 'api', 'jqgrid', ' let node = selectedPath(tree, data.id); // let node = tree.getNodeByParam("id", data.id, null); //3、选择目标节点 - tree.selectNode(node); - //单击事件 - tree.setting.callback.onClick(event,getTreeId(),node); + if(node !== null){ + tree.selectNode(node); + //单击事件 + tree.setting.callback.onClick(event,getTreeId(),node); + } } // const treeNode = JSON.parse(sessionStorage.getItem('content-pear-current-treeNode')) -- Gitee From 515c4ca5db6d72ac1f3469b932b0b50562253e86 Mon Sep 17 00:00:00 2001 From: tiansai Date: Wed, 2 Nov 2022 18:00:09 +0800 Subject: [PATCH 4/7] no message --- .../src/fast-develop/src/js/module/domain/domain_design.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js index 3f4a413..7f375ac 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js @@ -34,7 +34,10 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain let fieldNames=[],columnNames=[]; for(var field of grid_domain_design_businessData){ fieldNames.push(field["fieldName"]); - columnNames.push(field["columnName"]); + if(field["columnName"] !== "" && field["columnName"] !== undefined){ + columnNames.push(field["columnName"]); + } + var validation=[]; if(field["Keyword"]){ validation.push("Keyword"); -- Gitee From 480f4b3f8b6b573c739ab677311445f77eb8f01d Mon Sep 17 00:00:00 2001 From: tiansai Date: Wed, 2 Nov 2022 20:47:41 +0800 Subject: [PATCH 5/7] no message --- .../src/fast-develop/src/js/module/domain/domain_design.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js index 7f375ac..96475c6 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js @@ -500,7 +500,7 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain "type": "input-table", "label": "", "name": "voList", - "draggable": true, + "draggable": false, "columns": [ { "label": "模型", @@ -613,7 +613,7 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain "type": "input-table", "label": "", "name": "relation", - "draggable": true, + "draggable": false, "columns": [ { "label": "关联模型", -- Gitee From 75af7197d820884ba34befa211dca0445147a93c Mon Sep 17 00:00:00 2001 From: tiansai Date: Sun, 6 Nov 2022 13:48:18 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=A7=84=E5=88=99=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/js/module/brms/brms_design.js | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/brms/brms_design.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/brms/brms_design.js index f944ccf..bda7c6d 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/brms/brms_design.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/brms/brms_design.js @@ -25,20 +25,35 @@ layui.define(['element', 'api', 'fast_config', 'fact_design', 'amis', 'utils'], formObject["fields"] = grid_domain_vo_fields; - var optionApi = { - enableRootPath:true, - type: "POST", - url: fast_config.moudle.brms.saveApi.format({nodeid:option.treeNode.id}), - data: JSON.stringify(formObject), - contentType : 'application/json;charset=UTF-8', - success: function(data){ - layer.msg('操作成功'); - if(option.callback && option.callback.reloadtree && typeof option.callback.reloadtree === 'function'){ - option.callback.reloadtree(data); + let brmsFieldNames=[],brmsColumnNames=[]; + for(var field of grid_domain_vo_fields){ + brmsFieldNames.push(field["fieldName"]); + brmsColumnNames.push(field["fieldComment"]); + } + + const brmsFieldLength=brmsFieldNames.length,newBrmsFieldListLength=new Set(brmsFieldNames.map(item=>item)).size; + const brmsColumnLength=brmsColumnNames.length,newBrmsColumnListLength=new Set(brmsColumnNames.map(item=>item)).size; + + if(brmsFieldLength>newBrmsFieldListLength){ + layer.alert('英文名不可重复，请调整后保存。'); + }else if(brmsColumnLength>newBrmsColumnListLength){ + layer.alert('名称不可重复，请调整后保存。'); + }else{ + var optionApi = { + enableRootPath:true, + type: "POST", + url: fast_config.moudle.brms.saveApi.format({nodeid:option.treeNode.id}), + data: JSON.stringify(formObject), + contentType : 'application/json;charset=UTF-8', + success: function(data){ + layer.msg('操作成功'); + if(option.callback && option.callback.reloadtree && typeof option.callback.reloadtree === 'function'){ + option.callback.reloadtree(data); + } } - } - }; - api.exec(optionApi) + }; + api.exec(optionApi) + } } function appendElem(option){ -- Gitee From abce565f5e48f3fddeccfdc7cce0ce9fc7be58d5 Mon Sep 17 00:00:00 2001 From: tiansai Date: Sun, 6 Nov 2022 14:42:15 +0800 Subject: [PATCH 7/7] no message --- .../src/fast-develop/src/js/module/domain/domain_design.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js index 96475c6..b60d9a7 100644 --- a/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js +++ b/fast-develop-web/fast-develop-editor/src/fast-develop/src/js/module/domain/domain_design.js @@ -72,6 +72,8 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain layer.alert('表字段不可重复，请调整后保存。'); }else if(grid_domain_design_businessData.length<1){ layer.alert('请先设计字段！'); + }else if(grid_domain_design_defaultData.length<1){ + layer.alert('请查看默认字段是否生成！'); }else{ var optionApi = { enableRootPath:true, -- Gitee