From e87224e989ed0e14b353e2f5ddcd0e5058d623a0 Mon Sep 17 00:00:00 2001 From: xxm Date: Fri, 9 Dec 2022 22:17:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=20=E7=94=A8=E6=88=B7=E5=92=8C=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E9=80=89=E6=8B=A9=E5=99=A8=E6=96=B0=E5=A2=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- package.json | 1 - src/api/system/dict.js | 7 + src/store/modules/dict.js | 4 +- src/views/modules/system/dict/DictEdit.vue | 11 + .../modules/system/dict/DictItemEdit.vue | 7 + .../modules/system/dict/DictItemList.vue | 6 + src/views/modules/system/dict/DictList.vue | 6 + yarn.lock | 1747 +---------------- 9 files changed, 100 insertions(+), 1691 deletions(-) diff --git a/README.md b/README.md index 286d882..147d492 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ 致力将开源版打造成超越商业版后台管理框架的项目。 ## 前端项目 -> 基于Antd Vue Pro 前端脚手架 +> 基于Antd Vue Pro 前端脚手架，Node理论上支持14+，推荐使用版本为 `v16.9.1`，`Node18`经测试无法正常启动 演示地址: [地址](http://web.platform.bootx.cn/) diff --git a/package.json b/package.json index 358be04..d57618d 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "@vue/cli-plugin-babel": "^4.5.13", "@vue/cli-plugin-eslint": "^4.5.13", "@vue/cli-plugin-router": "^4.5.13", - "@vue/cli-plugin-unit-jest": "^4.5.13", "@vue/cli-plugin-vuex": "^4.5.13", "@vue/cli-service": "^4.5.13", "@vue/eslint-config-standard": "^4.0.0", diff --git a/src/api/system/dict.js b/src/api/system/dict.js index 8926fc8..a03c0b2 100644 --- a/src/api/system/dict.js +++ b/src/api/system/dict.js @@ -7,6 +7,13 @@ export function findAllItem () { }) } +export function findAllEnableItem () { + return axios({ + url: '/dict/item/findAllByEnable', + method: 'GET' + }) +} + export function page (params) { return axios({ url: '/dict/page', diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js index 93af186..2f0c3f0 100644 --- a/src/store/modules/dict.js +++ b/src/store/modules/dict.js @@ -1,4 +1,4 @@ -import { findAllItem } from '@/api/system/dict' +import { findAllEnableItem } from '@/api/system/dict' const dict = { state: { dictList: [] @@ -14,7 +14,7 @@ const dict = { // 获取字典列表 InitDictList ({ commit }) { return new Promise((resolve, reject) => { - findAllItem().then(response => { + findAllEnableItem().then(response => { const dictList = response.data.map(response => { return { dictCode: response.dictCode, diff --git a/src/views/modules/system/dict/DictEdit.vue b/src/views/modules/system/dict/DictEdit.vue index d7a91f9..e99ac2b 100644 --- a/src/views/modules/system/dict/DictEdit.vue +++ b/src/views/modules/system/dict/DictEdit.vue @@ -25,6 +25,7 @@ + + + @@ -74,6 +84,7 @@ export default { form: { code: '', name: '', + enable: true, groupTag: '', remark: '' }, diff --git a/src/views/modules/system/dict/DictItemEdit.vue b/src/views/modules/system/dict/DictItemEdit.vue index f4763d3..7d9e47f 100644 --- a/src/views/modules/system/dict/DictItemEdit.vue +++ b/src/views/modules/system/dict/DictItemEdit.vue @@ -56,6 +56,12 @@ style="width: 200px" /> + + + + + + diff --git a/src/views/modules/system/dict/DictList.vue b/src/views/modules/system/dict/DictList.vue index 916b535..ec9a8b4 100644 --- a/src/views/modules/system/dict/DictList.vue +++ b/src/views/modules/system/dict/DictList.vue @@ -30,6 +30,12 @@ {{ row.groupTag||'空' }} + + + + + +