From 380b3b7fea29adc4bec91c526b089145afda4ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Tue, 10 May 2022 17:09:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/config/button.js | 2 +- .../modules/d2admin/modules/dictionary.js | 26 ++++++++++++++++--- web/src/views/system/areas/crud.js | 4 +-- web/src/views/system/dept/crud.js | 3 +-- web/src/views/system/dictionary/crud.js | 15 ++++++++--- .../system/dictionary/subDictionary/crud.js | 4 +-- .../system/dictionary/subDictionary/index.vue | 5 ++++ web/src/views/system/menu/crud.js | 12 ++++----- web/src/views/system/role/crud.js | 6 ++--- web/src/views/system/user/crud.js | 7 +++-- web/src/views/system/whiteList/crud.js | 3 +-- 11 files changed, 55 insertions(+), 32 deletions(-) diff --git a/web/src/config/button.js b/web/src/config/button.js index 246e91e..2cde397 100644 --- a/web/src/config/button.js +++ b/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 }]) diff --git a/web/src/store/modules/d2admin/modules/dictionary.js b/web/src/store/modules/d2admin/modules/dictionary.js index 563d816..5a979ed 100644 --- a/web/src/store/modules/d2admin/modules/dictionary.js +++ b/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] } } diff --git a/web/src/views/system/areas/crud.js b/web/src/views/system/areas/crud.js index 48f854c..7a00b91 100644 --- a/web/src/views/system/areas/crud.js +++ b/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, diff --git a/web/src/views/system/dept/crud.js b/web/src/views/system/dept/crud.js index e29b38d..9dab3fb 100644 --- a/web/src/views/system/dept/crud.js +++ b/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, diff --git a/web/src/views/system/dictionary/crud.js b/web/src/views/system/dictionary/crud.js index 963944e..4adb4f7 100644 --- a/web/src/views/system/dictionary/crud.js +++ b/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 } } } } diff --git a/web/src/views/system/dictionary/subDictionary/crud.js b/web/src/views/system/dictionary/subDictionary/crud.js index 26e0c18..65bd497 100644 --- a/web/src/views/system/dictionary/subDictionary/crud.js +++ b/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, diff --git a/web/src/views/system/dictionary/subDictionary/index.vue b/web/src/views/system/dictionary/subDictionary/index.vue index c5dbd77..8524563 100644 --- a/web/src/views/system/dictionary/subDictionary/index.vue +++ b/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 diff --git a/web/src/views/system/menu/crud.js b/web/src/views/system/menu/crud.js index a781e93..3b20de9 100644 --- a/web/src/views/system/menu/crud.js +++ b/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, diff --git a/web/src/views/system/role/crud.js b/web/src/views/system/role/crud.js index bbf1912..6e2169c 100644 --- a/web/src/views/system/role/crud.js +++ b/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, diff --git a/web/src/views/system/user/crud.js b/web/src/views/system/user/crud.js index 3444d46..dbc0486 100644 --- a/web/src/views/system/user/crud.js +++ b/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, diff --git a/web/src/views/system/whiteList/crud.js b/web/src/views/system/whiteList/crud.js index c3abac7..87cfc0b 100644 --- a/web/src/views/system/whiteList/crud.js +++ b/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,