From 5cffb57c0978b674c53858071db0f29860098c4e Mon Sep 17 00:00:00 2001 From: chenwei Date: Sun, 7 Jul 2024 18:09:59 +0800 Subject: [PATCH] 组件按钮 --- frontend/manage/src/components/form/dataTemplate/DisplaySetting.vue | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------ frontend/manage/src/components/form/dataTemplate/FilterSetting.vue | 80 +++++++++++++++++++++++++++++++++++++++++++------------------------------------- frontend/manage/src/components/form/dataTemplate/ManageSetting.vue | 687 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/manage/src/components/form/dataTemplate/TemplateFilterDialog.vue | 684 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/manage/src/views/meta/DataDicManager.vue | 56 ++++++++++++++++++++++++++++---------------------------- frontend/manage/src/views/system/TenantInfoManager.vue | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------- 6 files changed, 894 insertions(+), 830 deletions(-) diff --git a/frontend/manage/src/components/form/dataTemplate/DisplaySetting.vue b/frontend/manage/src/components/form/dataTemplate/DisplaySetting.vue index 580fef4..c06494b 100644 --- a/frontend/manage/src/components/form/dataTemplate/DisplaySetting.vue +++ b/frontend/manage/src/components/form/dataTemplate/DisplaySetting.vue @@ -346,7 +346,7 @@ :indeterminate="isIndeterminate" :disabled="isDisabled" @change="handleCheckAllChange" - >全选全选 @@ -717,7 +717,7 @@ size="mini" icon="el-icon-plus" @click="handleAdd(scope.$index, scope.row)" - >增加增加 @@ -748,7 +748,7 @@ @@ -795,10 +795,10 @@ class="el-icon-plus" @click="addProSetting" style="margin: 14px 0 16px 0" - >添加添加 进度条进度条 规则设置规则设置 @@ -961,6 +961,24 @@ + + + 插槽组件默认根路径为”components/tableSlot“， 为了避免混乱请先以模块名称新建文件夹， 然后以字段名称命名（如”test/Test.vue“【产品表/产品标题插槽组件】【vue文件大写开头】）- 案例：TestTest + + + + + + + + +
组件路径 + +
+ @@ -1002,7 +1020,7 @@ ④只能查询同数据库下的表。
参考案例: ,( SELECT uc_user.account_ FROM uc_user WHERE uc_user.id_ = '1' ) AS + >,( SELECT uc_user.account_ FROM uc_user WHERE uc_user.id_ = '1' ) AS "userAccount"
⑤字段别名不能与显示列表的字段别名重复。
@@ -1013,7 +1031,7 @@ sqlConfigDialog = false sql = '' " - >取 消取 消 确定 @@ -1030,11 +1048,11 @@
编辑的脚本内容会直接填充到function(data){...}里面；data是表单数据对象，可以通过data.{显示字段列名}来获取字段的值。编辑的脚本内容会直接填充到function(data){...}里面；data是表单数据对象，可以通过data.{显示字段列名}来获取字段的值。
返回true时按此规则的文字颜色来显示。返回true时按此规则的文字颜色来显示。
@@ -1414,7 +1432,8 @@ export default { (data.urlType && data.urlType != 'noUrl') || ['2', '3'].includes(data.formatterType) || data.dataDictionary || - data.isDesensitization + data.isDesensitization || + data.componentSetting ) }, //掩码开始位置校验 @@ -1980,8 +1999,8 @@ export default { id: item.name ? item.name : item.desc - ? `${item.desc}_${index}` - : `tableHeader_${index}` + ? `${item.desc}_${index}` + : `tableHeader_${index}` } }) } @@ -2064,7 +2083,7 @@ export default { } }) existsFields.length && - this.$message.warning(`字段【${existsFields.join(',')}】已存在`) + this.$message.warning(`字段【${existsFields.join(',')}】已存在`) }, //打开设置权限 setFieldRightDialog(row) { @@ -2435,7 +2454,7 @@ export default { methodOk() { this.selectedRow.ruleSettings[ this.ruleSettingIndex - ].proRule = this.dialogRuleData + ].proRule = this.dialogRuleData this.dialogRuleData = '' this.isShowRuleSettingDialog = false }, @@ -2973,9 +2992,9 @@ export default { } /deep/ - .el-tree-node.is-drop-inner - > .el-tree-node__content - .el-tree-node__label { +.el-tree-node.is-drop-inner +> .el-tree-node__content +.el-tree-node__label { background-color: $--color-primary; color: #fff; .el-input-group__prepend { diff --git a/frontend/manage/src/components/form/dataTemplate/FilterSetting.vue b/frontend/manage/src/components/form/dataTemplate/FilterSetting.vue index 25b7427..719af8f 100644 --- a/frontend/manage/src/components/form/dataTemplate/FilterSetting.vue +++ b/frontend/manage/src/components/form/dataTemplate/FilterSetting.vue @@ -7,7 +7,7 @@ type="primary" style="margin-bottom: 10px;" @click="addFilter()" - >添加添加 @@ -860,7 +886,7 @@ size="small" icon="el-icon-edit" @click="setOutValue2(scope.row, scope.$index)" - >设置设置 @@ -887,7 +913,7 @@ 是否必填是否必填 - @@ -898,7 +924,7 @@ @click="batchUpdateData.remove(scope.row)" type="text" size="small" - >删除删除 @@ -1016,7 +1042,7 @@ resultfield: [] }) " - >添加关联查询添加关联查询
@@ -1035,7 +1061,7 @@ text-align: right; padding: 15px; " - >关联查询:关联查询: 删除删除
@@ -1075,54 +1101,54 @@ border="0" > - - {{ bind.comment }}: - -
- - + +
+ + + + + + 为空时绑定值: + + + + + @@ -1134,50 +1160,50 @@ border="0" > - - {{ bind.comment }}: - - - + + + + + + + 为空时赋值: + + + + + @@ -1188,7 +1214,7 @@
取 消 确 定确 定
@@ -1281,10 +1307,10 @@ >
注：导出模版之前请先保存配置；选择导出子表时，子表数据量太大会导致导出失败
注：导出模版之前请先保存配置；选择导出子表时，子表数据量太大会导致导出失败
使用联合导出时，当子表或孙表与关联表中的表有重复时，请注意列名是否重复，如果重复则会导出失败
使用联合导出时，当子表或孙表与关联表中的表有重复时，请注意列名是否重复，如果重复则会导出失败
{{ scope.row.isExport != 1 ? '否' : '是' }}{{ scope.row.isExport != 1 ? '否' : '是' }} @@ -1328,7 +1354,7 @@ v-if="scope.row.isExport == 1" @click="setRowValueByName(scope.row, 'defaultSort')" :type="scope.row.defaultSort != 1 ? 'info' : 'success'" - >{{ scope.row.defaultSort != 1 ? '否' : '是' }}{{ scope.row.defaultSort != 1 ? '否' : '是' }} @@ -1384,7 +1410,7 @@ {{ scope.row.isExport != 1 ? '否' : '是' }}{{ scope.row.isExport != 1 ? '否' : '是' }} @@ -1395,7 +1421,7 @@ v-if="scope.row.isExport == 1" @click="setRowValueByName(scope.row, 'defaultSort')" :type="scope.row.defaultSort != 1 ? 'info' : 'success'" - >{{ scope.row.defaultSort != 1 ? '否' : '是' }}{{ scope.row.defaultSort != 1 ? '否' : '是' }} @@ -1520,10 +1546,10 @@ 仅导入主表 导入主表与子表导入主表与子表 导入主表子表与孙表导入主表子表与孙表 @@ -1823,40 +1849,40 @@ /> - - - - - + + + + + - - - + - +
返回结果字段绑定显示的属性回填模式
返回结果字段绑定显示的属性回填模式
{{ field.comment }} - - + +
@@ -1881,12 +1907,12 @@ 当前用户当前用户 当前组织当前组织 @@ -2375,7 +2401,7 @@

备注： 返回 true 显示按钮 返回 false 不显示
+ >备注： 返回 true 显示按钮 返回 false 不显示
*注意:当控制行内按钮的显示隐藏时， 可选的参数多一个_row，可以根据_row是否为空来区分顶部和行内按钮的逻辑 @@ -2622,7 +2648,8 @@ export default { key: 'batchSave', value: '批量新增', disabled: false - } + }, + {key: 'moduleButton', value: '组件按钮', disabled: false}, ], mobileBtnOptions: [ { @@ -2907,7 +2934,7 @@ export default { this.manageFields.forEach(k=>{ if ((k.name == 'add') && k.initSubData == undefined) { this.$set(k, 'initSubData', true) - } + } }) this.displayField = [] if (this.dataTemplate.displayField) { @@ -2943,7 +2970,7 @@ export default { btn.key == 'addData' || btn.key == 'searchData' || btn.key == 'batchSave' - ) + ) ) { btn.disabled = true } @@ -3363,7 +3390,7 @@ export default { return false } if (!field.buttonId) { - this.$set(field, 'buttonId', utils.uuid()) + this.$set(field, 'buttonId', utils.uuid()) } //当buttonId不存在时，判断功能按钮中，同类型的按钮是否名字有重复 // if (!field.buttonId) { @@ -3379,7 +3406,7 @@ export default { // this.$set(fieldsName, field.name, list) // } // } - + if (fields[i].name === 'switch') { if (!fields[i].bind) { this_.$message.warning('请选择开关的绑定字段') @@ -3770,8 +3797,8 @@ export default { setButtonValue(option, row) { this.currentRow = row this.dialogVisible = true - if (option === 'url') { - this.dialogTitle = '设置Url地址' + if (option === 'url' || option=='moduleButton') { + this.dialogTitle = (option == 'url'?'设置Url地址':'设置组件地址') this.url = row.url this.urlParams = [] if (row.urlParams) { @@ -3849,6 +3876,8 @@ export default { this.tokenType = 0 this.tokenApi = {} } + } else if (this.dialogTitle === '设置组件地址') { + this.dialogModel.url = this.url } if (isDislogClose) { this.dialogVisible = false @@ -3908,7 +3937,7 @@ export default { handleClick(row, index) { if (this.isAddOrEditOrDetail(row)) { this.setAuth(row) - } else if (['url', 'switch'].includes(row.name)) { + } else if (['url','moduleButton', 'switch'].includes(row.name)) { this.setButtonValue(row.name, row) } else if (row.name === 'js') { this.setButtonJs(row, index) @@ -3954,12 +3983,12 @@ export default { this.batchSaveForm = JSON.parse(Base64.decode(row.customDialogjson)) }else{ this.batchSaveForm = { - custDialog: { - alias: '', - mappingConf: [] - }, - resultField: [] - } + custDialog: { + alias: '', + mappingConf: [] + }, + resultField: [] + } } this.batchSaveVisible = true this.index = index @@ -4032,9 +4061,9 @@ export default { Base64.decode(row.relationConfig) ) }else{ - this.batchUpdateSettingForm= { - globalQueryJson: [] - } + this.batchUpdateSettingForm= { + globalQueryJson: [] + } } this.batchUpdateSettingVisible = true this.index = index @@ -4095,7 +4124,7 @@ export default { item.conditionfield.forEach((k, i) => { let oldItem = this.batchUpdateSettingForm.globalQueryJson[ index - ].conditionfield.find(sub => { + ].conditionfield.find(sub => { return sub.field === k.field }) if (oldItem) { @@ -4105,7 +4134,7 @@ export default { item.resultfield.forEach((k, i) => { let oldItem = this.batchUpdateSettingForm.globalQueryJson[ index - ].resultfield.find(sub => { + ].resultfield.find(sub => { return sub.field === k.field }) if (oldItem) { @@ -4258,50 +4287,50 @@ export default { let subFields = JSON.parse(this.dataTemplate.subField) let me_ = this subFields && - subFields.forEach(sub => { - if (sub.dsName == me_.curTemplateBoDef.boEnt.dsName) { - let tempSubFileds = [] - let subFiledPath = sub.tableName + '.' - if (!sub.isExternal) { - subFiledPath += sub.fieldPrefix - } - sub.attributeList.forEach(item => { - tempSubFileds.push({ - name: item.name, - path: subFiledPath + item.name, - desc: item.desc, - type: item.dataType, - defaultSort: '0', - isExport: '1', - sortSeq: 'asc' - }) + subFields.forEach(sub => { + if (sub.dsName == me_.curTemplateBoDef.boEnt.dsName) { + let tempSubFileds = [] + let subFiledPath = sub.tableName + '.' + if (!sub.isExternal) { + subFiledPath += sub.fieldPrefix + } + sub.attributeList.forEach(item => { + tempSubFileds.push({ + name: item.name, + path: subFiledPath + item.name, + desc: item.desc, + type: item.dataType, + defaultSort: '0', + isExport: '1', + sortSeq: 'asc' }) - sub.attributeList = tempSubFileds - if (sub.childEnts) { - sub.childEnts.forEach(sun => { - if (sun.dsName == me_.curTemplateBoDef.boEnt.dsName) { - let tempSunFileds = [] - let sunFiledPath = sun.tableName + '.' - if (!sun.isExternal) { - sunFiledPath += sun.fieldPrefix - } - sun.attributeList.forEach(item => { - tempSunFileds.push({ - name: item.name, - path: sunFiledPath + item.name, - desc: item.desc, - type: item.dataType, - defaultSort: '0', - isExport: '1', - sortSeq: 'asc' - }) - }) - sun.attributeList = tempSunFileds + }) + sub.attributeList = tempSubFileds + if (sub.childEnts) { + sub.childEnts.forEach(sun => { + if (sun.dsName == me_.curTemplateBoDef.boEnt.dsName) { + let tempSunFileds = [] + let sunFiledPath = sun.tableName + '.' + if (!sun.isExternal) { + sunFiledPath += sun.fieldPrefix } - }) - } + sun.attributeList.forEach(item => { + tempSunFileds.push({ + name: item.name, + path: sunFiledPath + item.name, + desc: item.desc, + type: item.dataType, + defaultSort: '0', + isExport: '1', + sortSeq: 'asc' + }) + }) + sun.attributeList = tempSunFileds + } + }) } - }) + } + }) this.exportSubFields = subFields } this.index = index @@ -4309,41 +4338,41 @@ export default { }, getDefaultExportSettingFieldsTemp(){ let exportSettingFieldsTemp = [] - if (this.data.displaySettingFields) { - let displayField = this.initDisplaySettingFields() - let mainFiledPath = 't.' - if (!this.curTemplateBoDef.boEnt.isExternal) { - mainFiledPath += this.curTemplateBoDef.boEnt.fieldPrefix - } - displayField.forEach(item => { - let findObj = exportSettingFieldsTemp.find( - row => item.name == row.name - ) - if ( - findObj == undefined && - item.flowField === false && - item.name != this.curTemplateBoDef.boEnt.fk && - item.name != this.curTemplateBoDef.boEnt.pkKey - ) { - let displayId = item.oldTableField + if (this.data.displaySettingFields) { + let displayField = this.initDisplaySettingFields() + let mainFiledPath = 't.' + if (!this.curTemplateBoDef.boEnt.isExternal) { + mainFiledPath += this.curTemplateBoDef.boEnt.fieldPrefix + } + displayField.forEach(item => { + let findObj = exportSettingFieldsTemp.find( + row => item.name == row.name + ) + if ( + findObj == undefined && + item.flowField === false && + item.name != this.curTemplateBoDef.boEnt.fk && + item.name != this.curTemplateBoDef.boEnt.pkKey + ) { + let displayId = item.oldTableField ? (`${item.tableName}${item.oldTableField}`).toLowerCase().replaceAll('_', '') : item.name - exportSettingFieldsTemp.push({ - name: item.name, - oldTableField: item.oldTableField, - tableName: item.tableName, - path: mainFiledPath + item.name, - desc: item.desc, - type: item.type, - defaultSort: '0', - isExport: '1', - sortSeq: 'asc', - displayId: displayId - }) - } - }) - } - return exportSettingFieldsTemp + exportSettingFieldsTemp.push({ + name: item.name, + oldTableField: item.oldTableField, + tableName: item.tableName, + path: mainFiledPath + item.name, + desc: item.desc, + type: item.type, + defaultSort: '0', + isExport: '1', + sortSeq: 'asc', + displayId: displayId + }) + } + }) + } + return exportSettingFieldsTemp }, importOk() { const this_ = this @@ -4452,15 +4481,15 @@ export default { let parentDesc = this.curTemplateBoDef.boEnt.desc let subFields = JSON.parse(this.dataTemplate.subField) subFields && - subFields.forEach(sub => { - this.importSubFields.push({ - id: sub.id, - name: sub.name, - desc: sub.desc, - type: 'sub', - parentDesc: parentDesc - }) + subFields.forEach(sub => { + this.importSubFields.push({ + id: sub.id, + name: sub.name, + desc: sub.desc, + type: 'sub', + parentDesc: parentDesc }) + }) } }, createSun() { @@ -4732,7 +4761,7 @@ export default { }) }, setCurrentCustomQuery() { - const _this = this + const _this = this _this.outConfig.customQuery.labelBind = '' _this.outConfig.customQuery.valueBind = '' _this.customQuerys.forEach(item => { diff --git a/frontend/manage/src/components/form/dataTemplate/TemplateFilterDialog.vue b/frontend/manage/src/components/form/dataTemplate/TemplateFilterDialog.vue index a0422d2..21b8161 100644 --- a/frontend/manage/src/components/form/dataTemplate/TemplateFilterDialog.vue +++ b/frontend/manage/src/components/form/dataTemplate/TemplateFilterDialog.vue @@ -48,7 +48,7 @@

查看全部查看全部 - - - - - - - - - - - - - - - + + + + +
- - -
+
+ + +
-
-
-
-
+ v-if="!filter.showAll" + > +
+ +
+
+ + + +
- -
- - - - - + - - - - + + + - - - -
-
- - -
-
- + +
+
+ - - -
-
-
- + size="mini" + style="margin-left:16px" + :class="{errorNull: !tab.value}" + > + +
- -
- - - - - - - - +
+ +
-
+
+ + + + + + + + +
+
+
-
- - -
常用变量： - -
- -
- + + + + + + + + + + + + + + + + + - - - - - + + + +
常用变量： + +
+ +
+ + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - -
权限字段数据关系权限类型
+ - 等于 - 当前登录用户的ID -
- + 等于 + 当前登录用户的ID +
+ - 等于 - 当前登录用户所属组织的ID -
- + 等于 + 当前登录用户所属组织的ID +
+ - 属于 - 当前登录用户所属组织及下属组织的ID -
- + 属于 + 当前登录用户所属组织及下属组织的ID +
+ - 属于 - {{ ' ' + selectOrg.name }} - 选择组织 -
-
- - - - - - - - - - - + + + - - - -
类型是否启用
我相关的 - -
属于 + {{ ' ' + selectOrg.name }} + 选择组织 - {{ item.label }} - -
-
+
+ + + + + + + + + + + + + + + +
类型是否启用
我相关的 + +
{{ item.label }} + +
+
@@ -481,8 +481,11 @@ export default { sqlOption: [], filterTypeList: [ {key: 1, value: '条件脚本'}, - {key: 3, value: '追加SQL'}, - {key: 4, value: '数据权限'} + + {key: 3, value: '追加SQL(or)'}, + {key: 4, value: '数据权限(or)'}, + {key: 8, value: '追加SQL(and)'}, + {key: 9, value: '数据权限(and)'} ], //添加类型时，请不要添加key为5的元素，该类型是流程权限，动态新增的 dialogVisible: false, varList: [], @@ -757,7 +760,7 @@ export default { tempFilter.key = this.editFilter.key tempFilter.filter = this.editFilter.condition tempFilter.showAll = this.editFilter.showAll - if (this.editFilter.type == 4 && tempFilter.filter) { + if ((this.editFilter.type == 4 ||this.editFilter.type == 9 ) && tempFilter.filter) { //编辑的数据权限数据 let filterJson = JSON.parse(tempFilter.filter) for (let i = 0; i < filterJson.length; i++) { @@ -781,7 +784,9 @@ export default { } else if ( this.editFilter.type == 2 || this.editFilter.type == 3 || - this.editFilter.type == 5 + this.editFilter.type == 5|| + + this.editFilter.type == 8 ) { this.$set(this.filter, 'key', this.editFilter.key) this.$set(this.filter, 'name', this.editFilter.name) @@ -794,7 +799,7 @@ export default { // this.filter.filterType = this.editFilter.type; } else { this.isEditabled = true - if (this.filter.filterType == 2 || this.filter.filterType == 3) { + if (this.filter.filterType == 2 || this.filter.filterType == 3 || this.filter.filterType == 8) { } else if (this.filter.filterType == 1) { this.conditionObj = {junction: 'and', condition: []} this.buildConditionTree(this.conditionObj) @@ -804,6 +809,7 @@ export default { }, //新增、编辑弹窗打开 showDialog(conf) { + console.log("confconfconf",conf) this.orgSelectedArray = [] if (conf.editFilter) { this.editFilter = conf.editFilter @@ -821,7 +827,7 @@ export default { }, changeFilterType() { if ( - (this.filter.filterType == 2 || this.filter.filterType == 3) && + (this.filter.filterType == 2 || this.filter.filterType == 3 || this.filter.filterType == 8) && this.filter.filterType != this.editFilter.type ) { this.filter.filter = ' ' @@ -877,7 +883,7 @@ export default { return false } } - } else if (this.filter.filterType == 4) { + } else if (this.filter.filterType == 4||this.filter.filterType == 9) { // 处理数据权限 this.filter.filter = this.getPermissionData() } else if (this.filter.filterType == 5) { @@ -1091,7 +1097,7 @@ export default { } else if (indexArr.length == 2) { this.conditionObj.condition[indexArr[0]].condition[ indexArr[1] - ].junction = newVal + ].junction = newVal } } }, diff --git a/frontend/manage/src/views/meta/DataDicManager.vue b/frontend/manage/src/views/meta/DataDicManager.vue index 9a867b3..6f5a59b 100644 --- a/frontend/manage/src/views/meta/DataDicManager.vue +++ b/frontend/manage/src/views/meta/DataDicManager.vue @@ -28,8 +28,8 @@ {{ - node.label - }} + node.label + }} @@ -39,35 +39,35 @@ icon="el-icon-plus" v-if="data.parentId == '5'" :command="{node: node, data, action: 'dicAdd'}" - >添加添加 编辑编辑 删除删除 删除删除 导入导入 导出导出 @@ -106,7 +106,7 @@ type="primary" icon="el-icon-download" @click="downloadTemplate()" - >模板下载 + >模板下载 @@ -134,7 +134,7 @@ @click="submitImport" element-loading-text="拼命导入中" v-loading.fullscreen.lock="fullscreenLoading" - >确 定确 定 @@ -152,10 +152,10 @@ 取消 跳过重复项跳过重复项 覆盖更新覆盖更新 @@ -189,7 +189,7 @@ @click=" editI18nMessage(`dictionary.${dicData.typeId}.${dicData.key}`) " - >国际化国际化 @@ -198,7 +198,7 @@ v-model="dicData.key" v-pinyin="dicData.name" autocomplete="off" - :validate="{required: true, alpha_dash: true, max: 40}" + :validate="{required: true, max: 40}" placeholder="请输入key" :disabled="dicData.id ? true : false" :maxlength="40" @@ -206,7 +206,7 @@ /> 当前{{ + >当前{{ dicTitle == '新增字典项' ? '字典项别名' : '数据字典别名' }}必须唯一 @@ -218,7 +218,7 @@ :model="dicData" scope-name="editDic" @after-save-data="afterSaveDicData" - >{{ $t('eip.common.save') }}{{ $t('eip.common.save') }} @@ -271,7 +271,7 @@ :model="sysType" scope-name="editSysTypeForm" @after-save-data="afterSaveData" - >{{ $t('eip.common.save') }}{{ $t('eip.common.save') }} @@ -293,14 +293,14 @@ icon="el-icon-plus" @click="handleCommand({action: 'dicAdd', typesLevel: 'two'})" type="primary" - >添加添加 删除删除 @@ -342,18 +342,18 @@ type="text" @click="handleCommand({moveIndex: index, action: 'dicUp'})" :disabled="index == 0" - >上移上移 下移下移 删除删除 @@ -576,7 +576,7 @@ export default { req .get( window.context.portal + - '/sys/sysType/v1/getByParentIdOrLikeName?catId=5' + '/sys/sysType/v1/getByParentIdOrLikeName?catId=5' ) .then(res => { if (res && res.status == 200) { @@ -704,12 +704,12 @@ export default { this.dicData.typeId = this.currentNode.parentId this.dicData.parentId = this.currentNode.id } - + this.dicDialogVisible = true this.dicData.name = '' this.dicData.key = '' - this.dicData.id = '' - + this.dicData.id = '' + break case 'dicDelete': if (data.id) { @@ -858,7 +858,7 @@ export default { this.$refs.dataDicTable.load() // this.getType() - + this.addChangeTree() return } diff --git a/frontend/manage/src/views/system/TenantInfoManager.vue b/frontend/manage/src/views/system/TenantInfoManager.vue index cf84c17..aa0a8b5 100644 --- a/frontend/manage/src/views/system/TenantInfoManager.vue +++ b/frontend/manage/src/views/system/TenantInfoManager.vue @@ -188,7 +188,7 @@ :loading="savaLoading" @before-save-data="beforeSaveData" @after-response-value="afterResponseValue" - >保存保存 @@ -251,7 +251,7 @@ 保存保存 @@ -283,53 +283,57 @@ class="fullheight" > - - - -
-
-

授权基础信息

-
    -
  • -

    {{ item.title || '无限制' }}

    -

    {{ item.content || '无限制' }}

    -
    • -
-
-
- - - -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = 10) - this.tenantManage.code = val.substring(0, 10) + this.tenantManage.code = val.substring(0, 10) } } }, @@ -490,7 +494,7 @@ export default { ...mapState('login', ['currentUser']) }, created() { - // this.getAuthorizationMessag?e() + // this.getAuthorizationMessage() }, mounted() { this.$validator = this.$root.$validator @@ -597,7 +601,7 @@ export default { this.$http .get( '${uc}/api/params/v1/tenantParams/getTenantParams?tenantTypeId=' + - this.tenantManage.typeId + this.tenantManage.typeId ) .then(resp => { that.tenantParams = resp.data @@ -610,7 +614,7 @@ export default { this.$http .get( '${uc}/uc/tenantParams/v1/getParamsValue?tenantId=' + - that.tenantManage.id + that.tenantManage.id ) .then(response => { if (response.data && response.data.constructor == Array) { @@ -636,7 +640,7 @@ export default { this.$http .post( '${uc}/uc/tenantParams/v1/saveTenantParams?tenantId=' + - this.tenantManage.id, + this.tenantManage.id, data ) .then( @@ -653,7 +657,7 @@ export default { } ) } - + }, beforeSaveData() { this.savaLoading = true @@ -686,28 +690,28 @@ export default { this.savaLoading = false return } - + if (this.tenantId == 'add') { this.isSubmit = false this.$http - .get('${uc}/uc/tenantManage/v1/checkCode?code=' + this.tenantManage.code + '&tenantId=' + this.tenantId) - .then(res => { - if (res && res.data) { - this.savaLoading = false - this.$message.error('别名已存在') - } else { - this.$refs.submitButton.requestSaveData() - } - }) + .get('${uc}/uc/tenantManage/v1/checkCode?code=' + this.tenantManage.code + '&tenantId=' + this.tenantId) + .then(res => { + if (res && res.data) { + this.savaLoading = false + this.$message.error('别名已存在') + } else { + this.$refs.submitButton.requestSaveData() + } + }) } else { this.isSubmit = true } - + }, afterResponseValue(value) { this.savaLoading = false if (this.tenantId == 'add') { - this.tenantManage.id = value + this.tenantManage.id = value this.$emit('after-add-success', this.tenantManage) } else if (this.tenantId) { this.$emit('after-add-success', this.tenantManage) -- libgit2 0.21.2