update 校验重复接口调整

src/views/system/modules/RoleModal.vue

@@ -29,6 +29,7 @@
 
 <script>
 import { addRole, editRole, duplicateCheck } from '@/api/api'
+import { getConfusionCode } from '@/utils/util'
 
 export default {
   name: 'RoleModal',
@@ -113,9 +114,11 @@ export default {
       if (/[\u4E00-\u9FA5]/g.test(value)) {
         callback(new Error(this.$t('roleManage.roleCodeNotChinese')))
       } else {
+        const confusionCode = getConfusionCode('sys_role', 'role_code')
         const params = {
-          tableName: 'sys_role',
-          fieldName: 'role_code',
+          // tableName: 'sys_role',
+          // fieldName: 'role_code',
+          confusionCode,
           fieldVal: value,
           dataId: this.model.id
         }

src/views/system/modules/SysCheckRuleModal.vue

@@ -127,7 +127,7 @@ export default {
         ruleName: [{ required: true, message: '请输入规则名称!' }],
         ruleCode: [
           { required: true, message: '请输入规则Code!' },
-          { validator: (rule, value, callback) => validateDuplicateValue('sys_check_rule', 'rule_code', value, this.model.id, callback) }
+          { validator: (rule, value, callback) => validateDuplicateValue(false, 'sys_check_rule', 'rule_code', value, this.model.id, callback) }
         ]
       },
       tabs: {

src/views/system/modules/SysDataSourceModal.vue

@@ -107,7 +107,7 @@ export default {
                 if (!pattern.test(value)) {
                   callback(new Error('编码必须以字母开头，可包含数字、下划线、横杠'))
                 } else {
-                  validateDuplicateValue('sys_data_source', 'code', value, this.model.id, callback)
+                  validateDuplicateValue(false, 'sys_data_source', 'code', value, this.model.id, callback)
                 }
               }
             }

src/views/system/modules/SysFillRuleModal.vue

@@ -51,7 +51,7 @@ export default {
         ruleName: [{ required: true, message: '规则名称不能为空' }],
         ruleCode: [
           { required: true, message: '规则Code不能为空' },
-          { validator: (rule, value, callback) => validateDuplicateValue('sys_fill_rule', 'rule_code', value, this.model.id, callback) }
+          { validator: (rule, value, callback) => validateDuplicateValue(false, 'sys_fill_rule', 'rule_code', value, this.model.id, callback) }
         ],
         ruleClass: [{ required: true, message: '规则实现类不能为空' }],
         ruleParams: [{
@@ -68,7 +68,7 @@ export default {
                 info = '请输入JSON字符串'
                 callback(info)
               }
-            } catch {
+            } catch (err) {
               info = '请输入JSON字符串'
               callback(info)
             }

src/views/system/modules/UserModal.vue

@@ -175,6 +175,7 @@ import { disabledAuthFilter } from '@/utils/authFilter'
 import { getRSAPublicKey } from '@/utils/encryption.js'
 import { JSEncrypt } from 'jsencrypt'
 import JMultiSelectTag from '../../../components/dict/JMultiSelectTag'
+import { getConfusionCode } from '@/utils/util'
 
 export default {
   name: 'UserModal',
@@ -200,7 +201,7 @@ export default {
           pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
           message: this.$t('user.passwordConsists')
         },
-          { validator: this.validateToNextPassword, trigger: 'change' }],
+        { validator: this.validateToNextPassword, trigger: 'change' }],
         confirmpassword: [{ required: true, message: this.$t('user.reenterLoginPassword') },
           { validator: this.compareToFirstPassword }],
         realname: [{ required: true, message: this.$t('pleaseEnter') + this.$t('user.userName') }],
@@ -436,9 +437,11 @@ export default {
         callback()
       } else {
         if (new RegExp(/^1[345789][0-9]\d{8}$/).test(value)) {
+          const confusionCode = getConfusionCode('sys_user', 'phone')
           const params = {
-            tableName: 'sys_user',
-            fieldName: 'phone',
+            // tableName: 'sys_user',
+            // fieldName: 'phone',
+            confusionCode,
             fieldVal: value,
             dataId: this.userId
           }
@@ -459,9 +462,11 @@ export default {
         callback()
       } else {
         if (new RegExp(/^\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/).test(value)) {
+          const confusionCode = getConfusionCode('sys_user', 'email')
           const params = {
-            tableName: 'sys_user',
-            fieldName: 'email',
+            // tableName: 'sys_user',
+            // fieldName: 'email',
+            confusionCode,
             fieldVal: value,
             dataId: this.userId
           }
@@ -479,9 +484,11 @@ export default {
       }
     },
     validateUsername (rule, value, callback) {
+      const confusionCode = getConfusionCode('sys_user', 'username')
       const params = {
-        tableName: 'sys_user',
-        fieldName: 'username',
+        // tableName: 'sys_user',
+        // fieldName: 'username',
+        confusionCode,
         fieldVal: value,
         dataId: this.userId
       }

src/views/system/tags/modules/TagContentModal.vue

@@ -59,6 +59,7 @@
 import JDictSelectTag from '../../../../components/dict/JDictSelectTag'
 import { addDict, duplicateCheck, editDict } from '../../../../api/api'
 import { IsReadOnlyEnums } from '../../../../enums/commonEnums'
+import { getConfusionCode } from '@/utils/util'
 
 export default {
   name: 'TagContentModal',
@@ -168,10 +169,12 @@ export default {
       }
     },
     validateDictCode (rule, value, callback) {
+      const confusionCode = getConfusionCode('sys_dict', 'dict_code')
       // 重复校验
       const params = {
-        tableName: 'sys_dict',
-        fieldName: 'dict_code',
+        // tableName: 'sys_dict',
+        // fieldName: 'dict_code',
+        confusionCode,
         fieldVal: value,
         dataId: this.model.id
       }