新增：动态配置优化修改

web/src/config/button.js

@@ -19,7 +19,7 @@ export function getButtonSettings (objectSettings) {
     }
   })
 }
-
+// v2.0.2 中已弃用，改为 vm.dictionary('button_status_bool')
 // 启用 true/ 禁用 false
 export const BUTTON_STATUS_BOOL = getButtonSettings([{ label: '启用', value: true }, { label: '禁用', value: false }])
 

web/src/store/modules/d2admin/modules/dictionary.js

@@ -1,6 +1,27 @@
 import { request } from '@/api/service'
 
 export const urlPrefix = '/api/init/dictionary/'
+export const BUTTON_VALUE_TO_COLOR_MAPPING = {
+  1: 'success',
+  true: 'success',
+  0: 'danger',
+  false: 'danger',
+  Search: 'warning', // 查询
+  Update: 'primary', // 编辑
+  Create: 'success', // 新增
+  Retrieve: 'info', // 单例
+  Delete: 'danger' // 删除
+}
+
+export function getButtonSettings (objectSettings) {
+  return objectSettings.map(item => {
+    return {
+      label: item.label,
+      value: item.value,
+      color: BUTTON_VALUE_TO_COLOR_MAPPING[item.value]
+    }
+  })
+}
 
 // 系统配置
 export default {
@@ -26,7 +47,6 @@ export default {
         if (key === 'all') {
           res.data.data.map(data => {
             data.children.map((children, index) => {
-              console.log(children.type)
               switch (children.type) {
                 case 1:
                   children.value = Number(children.value)
@@ -36,9 +56,8 @@ export default {
                   break
               }
             })
-            newData[data.value] = data.children
+            newData[data.value] = getButtonSettings(data.children)
           })
-          console.log(11, newData)
           state.data = newData
         } else {
           state.data = res.data.data[key]
@@ -69,7 +88,6 @@ export default {
      * @param {Boolean} key active
      */
     async get (state, key) {
-      console.log(1212, state.data[key])
       return state.data[key]
     }
   }

web/src/views/system/areas/crud.js

@@ -1,5 +1,3 @@
-import { BUTTON_STATUS_BOOL } from '@/config/button'
-
 import { request } from '@/api/service'
 
 export const crudOptions = (vm) => {
@@ -234,7 +232,7 @@ export const crudOptions = (vm) => {
         width: 90,
         type: 'radio',
         dict: {
-          data: BUTTON_STATUS_BOOL
+          data: vm.dictionary('button_status_bool')
         },
         form: {
           value: true,

web/src/views/system/dept/crud.js

@@ -1,5 +1,4 @@
 import { request } from '@/api/service'
-import { BUTTON_STATUS_BOOL } from '@/config/button'
 import { urlPrefix as deptPrefix } from './api'
 import XEUtils from 'xe-utils'
 export const crudOptions = (vm) => {
@@ -226,7 +225,7 @@ export const crudOptions = (vm) => {
       width: 90,
       type: 'radio',
       dict: {
-        data: BUTTON_STATUS_BOOL
+        data: vm.dictionary('button_status_bool')
       },
       form: {
         value: true,

web/src/views/system/dictionary/crud.js

@@ -155,10 +155,9 @@ export const crudOptions = (vm) => {
       search: {
         disabled: false
       },
-
       type: 'radio',
       dict: {
-        data: vm.dictionary('status_bool')
+        data: vm.dictionary('button_status_bool')
       },
       component: {
         props: {
@@ -166,8 +165,15 @@ export const crudOptions = (vm) => {
         }
       },
       form: {
-        value: 1,
+        rules: [ // 表单校验规则
+          { required: true, message: '状态必填项' }
+        ],
+        value: true,
         component: {
+          placeholder: '请选择状态'
+        },
+        itemProps: {
+          class: { yxtInput: true }
         }
       }
     },
@@ -179,6 +185,9 @@ export const crudOptions = (vm) => {
       form: {
         value: 1,
         component: {
+        },
+        itemProps: {
+          class: { yxtInput: true }
         }
       }
     }

web/src/views/system/dictionary/subDictionary/crud.js

@@ -1,5 +1,3 @@
-import { BUTTON_STATUS_BOOL } from '@/config/button'
-
 export const crudOptions = (vm) => {
   return {
 
@@ -236,7 +234,7 @@ export const crudOptions = (vm) => {
         },
         type: 'radio',
         dict: {
-          data: BUTTON_STATUS_BOOL
+          data: vm.dictionary('button_status_bool')
         },
         form: {
           value: true,

web/src/views/system/dictionary/subDictionary/index.vue

@@ -44,6 +44,11 @@ export default {
       required: true
     }
   },
+  watch: {
+    dictionaryRow () {
+      this.doRefresh({ from: 'load' })
+    }
+  },
   data () {
     return {
       drawer: false

web/src/views/system/menu/crud.js

@@ -1,5 +1,5 @@
 import { request } from '@/api/service'
-import { BUTTON_STATUS_BOOL, BUTTON_WHETHER_BOOL, BUTTON_VALUE_TO_COLOR_MAPPING } from '@/config/button'
+import { BUTTON_VALUE_TO_COLOR_MAPPING } from '@/config/button'
 import { urlPrefix as menuPrefix } from './api'
 import { urlPrefix as buttonPrefix } from '../button/api'
 import XEUtils from 'xe-utils'
@@ -223,7 +223,7 @@ export const crudOptions = (vm) => {
           disabled: true
         },
         dict: {
-          data: BUTTON_WHETHER_BOOL
+          data: vm.dictionary('button_whether_bool')
         },
         form: {
           value: false,
@@ -238,7 +238,7 @@ export const crudOptions = (vm) => {
         width: 70,
         type: 'radio',
         dict: {
-          data: BUTTON_WHETHER_BOOL
+          data: vm.dictionary('button_whether_bool')
         },
         form: {
           value: false,
@@ -396,7 +396,7 @@ export const crudOptions = (vm) => {
         width: 50,
         type: 'radio',
         dict: {
-          data: BUTTON_WHETHER_BOOL
+          data: vm.dictionary('button_whether_bool')
         },
         form: {
           value: false,
@@ -424,7 +424,7 @@ export const crudOptions = (vm) => {
         width: 75,
         type: 'radio',
         dict: {
-          data: BUTTON_WHETHER_BOOL
+          data: vm.dictionary('button_whether_bool')
         },
         form: {
           value: true,
@@ -449,7 +449,7 @@ export const crudOptions = (vm) => {
         width: 70,
         type: 'radio',
         dict: {
-          data: BUTTON_STATUS_BOOL
+          data: vm.dictionary('button_status_bool')
         },
         form: {
           value: true,

web/src/views/system/role/crud.js

@@ -1,5 +1,3 @@
-import { BUTTON_STATUS_BOOL, BUTTON_WHETHER_BOOL } from '@/config/button'
-
 export const crudOptions = (vm) => {
   return {
     pageOptions: {
@@ -161,7 +159,7 @@ export const crudOptions = (vm) => {
 
       type: 'radio',
       dict: {
-        data: BUTTON_WHETHER_BOOL
+        data: vm.dictionary('button_whether_bool')
       },
       form: {
         value: false,
@@ -180,7 +178,7 @@ export const crudOptions = (vm) => {
       },
       type: 'radio',
       dict: {
-        data: BUTTON_STATUS_BOOL
+        data: vm.dictionary('button_status_bool')
       },
       form: {
         value: true,

web/src/views/system/user/crud.js

@@ -1,5 +1,4 @@
 import { request } from '@/api/service'
-import { BUTTON_STATUS_BOOL, USER_TYPE } from '@/config/button'
 import { urlPrefix as deptPrefix } from '../dept/api'
 
 export const crudOptions = (vm) => {
@@ -227,7 +226,7 @@ export const crudOptions = (vm) => {
         type: 'radio',
         width: 70,
         dict: {
-          data: [{ label: '男', value: 1 }, { label: '女', value: 0 }]
+          data: vm.dictionary('gender')
         },
         form: {
           value: 1,
@@ -246,7 +245,7 @@ export const crudOptions = (vm) => {
         width: 140,
         type: 'select',
         dict: {
-          data: USER_TYPE
+          data: vm.dictionary('user_type')
         },
         form: {
           show: false,
@@ -264,7 +263,7 @@ export const crudOptions = (vm) => {
         width: 70,
         type: 'radio',
         dict: {
-          data: BUTTON_STATUS_BOOL
+          data: vm.dictionary('button_status_bool')
         },
         form: {
           value: true,

web/src/views/system/whiteList/crud.js

@@ -1,5 +1,4 @@
 import { request } from '@/api/service'
-import { BUTTON_STATUS_BOOL } from '@/config/button'
 
 export const crudOptions = (vm) => {
   return {
@@ -170,7 +169,7 @@ export const crudOptions = (vm) => {
         width: 150,
         type: 'radio',
         dict: {
-          data: BUTTON_STATUS_BOOL
+          data: vm.dictionary('button_status_bool')
         },
         form: {
           value: true,