diff --git a/README.md b/README.md index 286d882b720f393a6e32ca9e12cdfb2eeae79c23..147d492bb862b62cd17901362714222c6736d24a 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/jest.config.js b/jest.config.js deleted file mode 100644 index 29fee32be8a01f71ed444bd3038992dba60295db..0000000000000000000000000000000000000000 --- a/jest.config.js +++ /dev/null @@ -1,23 +0,0 @@ -module.exports = { - moduleFileExtensions: [ - 'js', - 'jsx', - 'json', - 'vue' - ], - transform: { - '^.+\\.vue$': 'vue-jest', - '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub', - '^.+\\.jsx?$': 'babel-jest' - }, - moduleNameMapper: { - '^@/(.*)$': '/src/$1' - }, - snapshotSerializers: [ - 'jest-serializer-vue' - ], - testMatch: [ - '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)' - ], - testURL: 'http://localhost/' -} diff --git a/package.json b/package.json index 358be046fa9a6523342cd4dd318602a0538b70ba..d57618dbb1ae9add60d5c27345cf4e4bebb784eb 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 8926fc8207309d5feb9ec5e5a7c13894384ffc5c..a03c0b238c498c8bb901b8817eb4b20648d30bf6 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 93af186292233a842172d5d6dc4cc4ecfb2afc99..2f0c3f00cbe4b413f946d520927f6c1d0ee294e1 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 d7a91f992fad59d0483de5555737beed1bb9b546..e99ac2bff5da6c350876d8c099988f61641f8a00 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 f4763d3b0e4dea82fa09c316309473f5324d40fc..7d9e47f4402a6bcc536140b05acd31263956e5e5 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 916b5354cd492ba3f8b2be8ddda2fa26d7c06fcf..ec9a8b40a8e31b63e797327e9b815373f12dd1af 100644 --- a/src/views/modules/system/dict/DictList.vue +++ b/src/views/modules/system/dict/DictList.vue @@ -30,6 +30,12 @@ {{ row.groupTag||'空' }} + + + + + +