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 f944ccfe72118c4fec12c25d45b615cde55cd166..bda7c6d053bb49b7ee0c0133b3dd3a3527b2b6ac 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){ 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 f4f78c11e03547c8bb8ce61e3d42966e3db8419e..b60d9a7cafa67e35f6ce25d539f8b2529e9dd7f0 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,13 @@ 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"]); + if(field["columnName"] !== "" && field["columnName"] !== undefined){ + columnNames.push(field["columnName"]); + } + var validation=[]; if(field["Keyword"]){ validation.push("Keyword"); @@ -57,15 +61,19 @@ 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 if(grid_domain_design_defaultData.length<1){ + layer.alert('请查看默认字段是否生成！'); }else{ var optionApi = { enableRootPath:true, @@ -494,7 +502,7 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain "type": "input-table", "label": "", "name": "voList", - "draggable": true, + "draggable": false, "columns": [ { "label": "模型", @@ -607,7 +615,7 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain "type": "input-table", "label": "", "name": "relation", - "draggable": true, + "draggable": false, "columns": [ { "label": "关联模型", 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 2b15a8f864186975ad5c5a88ee4ffd2843948bc8..a0357e87e53544db389e1c33c335cf44b3d22451 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); } } 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 199e294c0f9d141712abf7803451d86f33c792d9..183a0da709f3eec7582f41d814cb9d66c44bb4a9 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')) @@ -649,7 +651,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;