Skip to content

Commit 40bd2c5

Browse files
YunaiVYunaiV
committed
Vue3 重构：Review 字典数据界面
1 parent 2b52683 commit 40bd2c5

File tree

9 files changed

+128
-147
lines changed

9 files changed

+128
-147
lines changed

‎src/api/system/dict/dict.data.ts

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,49 @@
11
import request from '@/config/axios'
2-
import type { DictDataVO, DictDataPageReqVO, DictDataExportReqVO } from './types'
2+
3+
export type DictDataVO = {
4+
id: number | undefined
5+
sort: number | undefined
6+
label: string
7+
value: string
8+
dictType: string
9+
status: number
10+
colorType: string
11+
cssClass: string
12+
remark: string
13+
createTime: Date
14+
}
315

416
// 查询字典数据（精简)列表
5-
export const listSimpleDictDataApi = () => {
17+
export const listSimpleDictData = () => {
618
return request.get({ url: '/system/dict-data/list-all-simple' })
719
}
820

921
// 查询字典数据列表
10-
export const getDictDataPageApi = (params: DictDataPageReqVO) => {
22+
export const getDictDataPage = (params: PageParam) => {
1123
return request.get({ url: '/system/dict-data/page', params })
1224
}
1325

1426
// 查询字典数据详情
15-
export const getDictDataApi = (id: number) => {
27+
export const getDictData = (id: number) => {
1628
return request.get({ url: '/system/dict-data/get?id=' + id })
1729
}
1830

1931
// 新增字典数据
20-
export const createDictDataApi = (data: DictDataVO) => {
32+
export const createDictData = (data: DictDataVO) => {
2133
return request.post({ url: '/system/dict-data/create', data })
2234
}
2335

2436
// 修改字典数据
25-
export const updateDictDataApi = (data: DictDataVO) => {
37+
export const updateDictData = (data: DictDataVO) => {
2638
return request.put({ url: '/system/dict-data/update', data })
2739
}
2840

2941
// 删除字典数据
30-
export const deleteDictDataApi = (id: number) => {
42+
export const deleteDictData = (id: number) => {
3143
return request.delete({ url: '/system/dict-data/delete?id=' + id })
3244
}
45+
3346
// 导出字典类型数据
34-
export const exportDictDataApi = (params: DictDataExportReqVO) => {
47+
export const exportDictDataApi = (params) => {
3548
return request.get({ url: '/system/dict-data/export', params })
3649
}

‎src/api/system/dict/dict.type.ts

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
11
import request from '@/config/axios'
2-
import type { DictTypeVO, DictTypePageReqVO, DictTypeExportReqVO } from './types'
2+
3+
export type DictTypeVO = {
4+
id: number | undefined
5+
name: string
6+
type: string
7+
status: number
8+
remark: string
9+
createTime: Date
10+
}
311

412
// 查询字典（精简)列表
5-
export const listSimpleDictTypeApi = () => {
13+
export const listSimpleDictType = () => {
614
return request.get({ url: '/system/dict-type/list-all-simple' })
715
}
816

917
// 查询字典列表
10-
export const getDictTypePageApi = (params: DictTypePageReqVO) => {
18+
export const getDictTypePage = (params: PageParam) => {
1119
return request.get({ url: '/system/dict-type/page', params })
1220
}
1321

1422
// 查询字典详情
15-
export const getDictTypeApi = (id: number) => {
23+
export const getDictType = (id: number) => {
1624
return request.get({ url: '/system/dict-type/get?id=' + id })
1725
}
1826

1927
// 新增字典
20-
export const createDictTypeApi = (data: DictTypeVO) => {
28+
export const createDictType = (data: DictTypeVO) => {
2129
return request.post({ url: '/system/dict-type/create', data })
2230
}
2331

2432
// 修改字典
25-
export const updateDictTypeApi = (data: DictTypeVO) => {
33+
export const updateDictType = (data: DictTypeVO) => {
2634
return request.put({ url: '/system/dict-type/update', data })
2735
}
2836

2937
// 删除字典
30-
export const deleteDictTypeApi = (id: number) => {
38+
export const deleteDictType = (id: number) => {
3139
return request.delete({ url: '/system/dict-type/delete?id=' + id })
3240
}
3341
// 导出字典类型
34-
export const exportDictTypeApi = (params: DictTypeExportReqVO) => {
42+
export const exportDictType = (params) => {
3543
return request.get({ url: '/system/dict-type/export', params })
3644
}

‎src/api/system/dict/types.ts

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎src/store/modules/dict.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { store } from '../index'
33
import { DictDataVO } from '@/api/system/dict/types'
44
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
55
const { wsCache } = useCache('sessionStorage')
6-
import { listSimpleDictDataApi } from '@/api/system/dict/dict.data'
6+
import { listSimpleDictData } from '@/api/system/dict/dict.data'
77

88
export interface DictValueType {
99
value: any
@@ -44,7 +44,7 @@ export const useDictStore = defineStore('dict', {
4444
this.dictMap = dictMap
4545
this.isSetDict = true
4646
} else {
47-
const res = await listSimpleDictDataApi()
47+
const res = await listSimpleDictData()
4848
// 设置数据
4949
const dictDataMap = new Map<string, any>()
5050
res.forEach((dictData: DictDataVO) => {
@@ -74,7 +74,7 @@ export const useDictStore = defineStore('dict', {
7474
},
7575
async resetDict() {
7676
wsCache.delete(CACHE_KEY.DICT_CACHE)
77-
const res = await listSimpleDictDataApi()
77+
const res = await listSimpleDictData()
7878
// 设置数据
7979
const dictDataMap = new Map<string, any>()
8080
res.forEach((dictData: DictDataVO) => {

‎src/views/infra/codegen/components/CloumInfoForm.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
import { PropType } from 'vue'
115115
import { DictTypeVO } from '@/api/system/dict/types'
116116
import { CodegenColumnVO } from '@/api/infra/codegen/types'
117-
import { listSimpleDictTypeApi } from '@/api/system/dict/dict.type'
117+
import { listSimpleDictType } from '@/api/system/dict/dict.type'
118118
119119
const props = defineProps({
120120
info: {
@@ -125,7 +125,7 @@ const props = defineProps({
125125
/** 查询字典下拉列表 */
126126
const dictOptions = ref<DictTypeVO[]>()
127127
const getDictOptions = async () => {
128-
const res = await listSimpleDictTypeApi()
128+
const res = await listSimpleDictType()
129129
dictOptions.value = res
130130
}
131131
onMounted(async () => {

‎src/views/system/dict/data.form.vue

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<el-form-item label="数据标签" prop="label">
1818
<el-input v-model="formData.label" placeholder="请输入数据标签" />
1919
</el-form-item>
20-
2120
<el-form-item label="数据键值" prop="value">
2221
<el-input v-model="formData.value" placeholder="请输入数据键值" />
2322
</el-form-item>
@@ -61,9 +60,8 @@
6160
</template>
6261
<script setup lang="ts">
6362
import { DICT_TYPE, getDictOptions } from '@/utils/dict'
64-
6563
import * as DictDataApi from '@/api/system/dict/dict.data'
66-
import { DictDataVO } from '@/api/system/dict/types'
64+
import { CommonStatusEnum } from '@/utils/constants'
6765
const { t } = useI18n() // 国际化
6866
const message = useMessage() // 消息弹窗
6967
@@ -73,15 +71,14 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
7371
const formType = ref('') // 表单的类型：create - 新增；update - 修改
7472
const formData = ref({
7573
id: undefined,
76-
sort: 0,
74+
sort: undefined,
7775
label: '',
7876
value: '',
7977
dictType: '',
80-
status: 0,
78+
status: CommonStatusEnum.ENABLE,
8179
colorType: '',
8280
cssClass: '',
83-
remark: '',
84-
createTime: undefined
81+
remark: ''
8582
})
8683
const formRules = reactive({
8784
label: [{ required: true, message: '数据标签不能为空', trigger: 'blur' }],
@@ -91,7 +88,6 @@ const formRules = reactive({
9188
const formRef = ref() // 表单 Ref
9289
9390
// 数据标签回显样式
94-
9591
const colorTypeOptions = readonly([
9692
{
9793
value: 'default',
@@ -129,7 +125,7 @@ const openModal = async (type: string, id?: number) => {
129125
if (id) {
130126
formLoading.value = true
131127
try {
132-
formData.value = await DictDataApi.getDictDataApi(id)
128+
formData.value = await DictDataApi.getDictData(id)
133129
} finally {
134130
formLoading.value = false
135131
}
@@ -147,12 +143,12 @@ const submitForm = async () => {
147143
// 提交请求
148144
formLoading.value = true
149145
try {
150-
const data = formData.value as DictDataVO
146+
const data = formData.value as DictDataApi.DictDataVO
151147
if (formType.value === 'create') {
152-
await DictDataApi.createDictDataApi(data)
148+
await DictDataApi.createDictData(data)
153149
message.success(t('common.createSuccess'))
154150
} else {
155-
await DictDataApi.updateDictDataApi(data)
151+
await DictDataApi.updateDictData(data)
156152
message.success(t('common.updateSuccess'))
157153
}
158154
modelVisible.value = false
@@ -171,11 +167,10 @@ const resetForm = () => {
171167
label: '',
172168
value: '',
173169
dictType: '',
174-
status: 0,
170+
status: CommonStatusEnum.ENABLE,
175171
colorType: '',
176172
cssClass: '',
177-
remark: '',
178-
createTime: undefined
173+
remark: ''
179174
}
180175
formRef.value?.resetFields()
181176
}

0 commit comments

Comments
 (0)