From 40bd2c57f8088962a968a13c891e7e5ea5b87632 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 19 Mar 2023 22:14:55 +0800 Subject: [PATCH] =?UTF-8?q?Vue3=20=E9=87=8D=E6=9E=84=EF=BC=9AReview=20?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/dict/dict.data.ts | 29 +++++--- src/api/system/dict/dict.type.ts | 24 ++++--- src/api/system/dict/types.ts | 50 -------------- src/store/modules/dict.ts | 6 +- .../codegen/components/CloumInfoForm.vue | 4 +- src/views/system/dict/data.form.vue | 25 +++---- src/views/system/dict/data.vue | 67 ++++++++++--------- src/views/system/dict/form.vue | 15 +++-- src/views/system/dict/index.vue | 55 ++++++++------- 9 files changed, 128 insertions(+), 147 deletions(-) delete mode 100644 src/api/system/dict/types.ts diff --git a/src/api/system/dict/dict.data.ts b/src/api/system/dict/dict.data.ts index fd97a2dc..6d981326 100644 --- a/src/api/system/dict/dict.data.ts +++ b/src/api/system/dict/dict.data.ts @@ -1,36 +1,49 @@ import request from '@/config/axios' -import type { DictDataVO, DictDataPageReqVO, DictDataExportReqVO } from './types' + +export type DictDataVO = { + id: number | undefined + sort: number | undefined + label: string + value: string + dictType: string + status: number + colorType: string + cssClass: string + remark: string + createTime: Date +} // 查询字典数据（精简)列表 -export const listSimpleDictDataApi = () => { +export const listSimpleDictData = () => { return request.get({ url: '/system/dict-data/list-all-simple' }) } // 查询字典数据列表 -export const getDictDataPageApi = (params: DictDataPageReqVO) => { +export const getDictDataPage = (params: PageParam) => { return request.get({ url: '/system/dict-data/page', params }) } // 查询字典数据详情 -export const getDictDataApi = (id: number) => { +export const getDictData = (id: number) => { return request.get({ url: '/system/dict-data/get?id=' + id }) } // 新增字典数据 -export const createDictDataApi = (data: DictDataVO) => { +export const createDictData = (data: DictDataVO) => { return request.post({ url: '/system/dict-data/create', data }) } // 修改字典数据 -export const updateDictDataApi = (data: DictDataVO) => { +export const updateDictData = (data: DictDataVO) => { return request.put({ url: '/system/dict-data/update', data }) } // 删除字典数据 -export const deleteDictDataApi = (id: number) => { +export const deleteDictData = (id: number) => { return request.delete({ url: '/system/dict-data/delete?id=' + id }) } + // 导出字典类型数据 -export const exportDictDataApi = (params: DictDataExportReqVO) => { +export const exportDictDataApi = (params) => { return request.get({ url: '/system/dict-data/export', params }) } diff --git a/src/api/system/dict/dict.type.ts b/src/api/system/dict/dict.type.ts index 22e6411e..0d9faeb2 100644 --- a/src/api/system/dict/dict.type.ts +++ b/src/api/system/dict/dict.type.ts @@ -1,36 +1,44 @@ import request from '@/config/axios' -import type { DictTypeVO, DictTypePageReqVO, DictTypeExportReqVO } from './types' + +export type DictTypeVO = { + id: number | undefined + name: string + type: string + status: number + remark: string + createTime: Date +} // 查询字典（精简)列表 -export const listSimpleDictTypeApi = () => { +export const listSimpleDictType = () => { return request.get({ url: '/system/dict-type/list-all-simple' }) } // 查询字典列表 -export const getDictTypePageApi = (params: DictTypePageReqVO) => { +export const getDictTypePage = (params: PageParam) => { return request.get({ url: '/system/dict-type/page', params }) } // 查询字典详情 -export const getDictTypeApi = (id: number) => { +export const getDictType = (id: number) => { return request.get({ url: '/system/dict-type/get?id=' + id }) } // 新增字典 -export const createDictTypeApi = (data: DictTypeVO) => { +export const createDictType = (data: DictTypeVO) => { return request.post({ url: '/system/dict-type/create', data }) } // 修改字典 -export const updateDictTypeApi = (data: DictTypeVO) => { +export const updateDictType = (data: DictTypeVO) => { return request.put({ url: '/system/dict-type/update', data }) } // 删除字典 -export const deleteDictTypeApi = (id: number) => { +export const deleteDictType = (id: number) => { return request.delete({ url: '/system/dict-type/delete?id=' + id }) } // 导出字典类型 -export const exportDictTypeApi = (params: DictTypeExportReqVO) => { +export const exportDictType = (params) => { return request.get({ url: '/system/dict-type/export', params }) } diff --git a/src/api/system/dict/types.ts b/src/api/system/dict/types.ts deleted file mode 100644 index 3421cd23..00000000 --- a/src/api/system/dict/types.ts +++ /dev/null @@ -1,50 +0,0 @@ -export type DictTypeVO = { - id: number | undefined - name: string - type: string - status: number | undefined - remark: string - createTime: Date -} - -export type DictTypePageReqVO = { - pageNo: number - pageSize: number - name: string - type: string - status: number | undefined - createTime: Date[] -} - -export type DictTypeExportReqVO = { - name: string - type: string - status: number - createTime: Date[] -} - -export type DictDataVO = { - id: number | undefined - sort: number | undefined - label: string - value: string - dictType: string - status: number - colorType: string - cssClass: string - remark: string - createTime: Date | undefined -} -export type DictDataPageReqVO = { - pageNo: number - pageSize: number - label: string - dictType: string - status: number | undefined -} - -export type DictDataExportReqVO = { - label: string - dictType: string - status: number -} diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index 4e9ab39c..2d393e43 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -3,7 +3,7 @@ import { store } from '../index' import { DictDataVO } from '@/api/system/dict/types' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' const { wsCache } = useCache('sessionStorage') -import { listSimpleDictDataApi } from '@/api/system/dict/dict.data' +import { listSimpleDictData } from '@/api/system/dict/dict.data' export interface DictValueType { value: any @@ -44,7 +44,7 @@ export const useDictStore = defineStore('dict', { this.dictMap = dictMap this.isSetDict = true } else { - const res = await listSimpleDictDataApi() + const res = await listSimpleDictData() // 设置数据 const dictDataMap = new Map() res.forEach((dictData: DictDataVO) => { @@ -74,7 +74,7 @@ export const useDictStore = defineStore('dict', { }, async resetDict() { wsCache.delete(CACHE_KEY.DICT_CACHE) - const res = await listSimpleDictDataApi() + const res = await listSimpleDictData() // 设置数据 const dictDataMap = new Map() res.forEach((dictData: DictDataVO) => { diff --git a/src/views/infra/codegen/components/CloumInfoForm.vue b/src/views/infra/codegen/components/CloumInfoForm.vue index 0b6ea697..5a60c546 100644 --- a/src/views/infra/codegen/components/CloumInfoForm.vue +++ b/src/views/infra/codegen/components/CloumInfoForm.vue @@ -114,7 +114,7 @@ import { PropType } from 'vue' import { DictTypeVO } from '@/api/system/dict/types' import { CodegenColumnVO } from '@/api/infra/codegen/types' -import { listSimpleDictTypeApi } from '@/api/system/dict/dict.type' +import { listSimpleDictType } from '@/api/system/dict/dict.type' const props = defineProps({ info: { @@ -125,7 +125,7 @@ const props = defineProps({ /** 查询字典下拉列表 */ const dictOptions = ref() const getDictOptions = async () => { - const res = await listSimpleDictTypeApi() + const res = await listSimpleDictType() dictOptions.value = res } onMounted(async () => { diff --git a/src/views/system/dict/data.form.vue b/src/views/system/dict/data.form.vue index 5c85b946..c0b70b8e 100644 --- a/src/views/system/dict/data.form.vue +++ b/src/views/system/dict/data.form.vue @@ -17,7 +17,6 @@ - @@ -61,9 +60,8 @@ diff --git a/src/views/system/dict/form.vue b/src/views/system/dict/form.vue index 28b42c9d..af02c597 100644 --- a/src/views/system/dict/form.vue +++ b/src/views/system/dict/form.vue @@ -43,7 +43,8 @@