diff --git a/apps/web-antd/src/utils/dict.ts b/apps/web-antd/src/utils/dict.ts deleted file mode 100644 index 41e9ad2ed..000000000 --- a/apps/web-antd/src/utils/dict.ts +++ /dev/null @@ -1,191 +0,0 @@ -// TODO @芋艿:后续再优化 -// TODO @芋艿:可以共享么? - -import type { DictItem } from '@vben/stores'; - -import { useDictStore } from '@vben/stores'; -import { isObject } from '@vben/utils'; - -// TODO @dhb52:top-level 调用 导致:"getActivePinia()" was called but there was no active Pinia -// 先临时移入到方法中 -// const dictStore = useDictStore(); - -/** AntD 组件的颜色类型 */ -type ColorType = 'error' | 'info' | 'success' | 'warning'; - -/** 字典值类型 */ -type DictValueType = 'boolean' | 'number' | 'string'; - -/** 基础字典数据类型 */ -export interface DictDataType { - dictType?: string; - label: string; - value: boolean | number | string; - colorType?: string; - cssClass?: string; -} - -/** 数字类型字典数据 */ -export interface NumberDictDataType extends DictDataType { - value: number; -} - -/** 字符串类型字典数据 */ -export interface StringDictDataType extends DictDataType { - value: string; -} - -/** 布尔类型字典数据 */ -export interface BooleanDictDataType extends DictDataType { - value: boolean; -} - -/** 字典缓存管理器 */ -class DictCacheManager { - private cache = new Map(); - private maxCacheSize = 100; // 最大缓存数量 - - /** 清空缓存 */ - clear(): void { - this.cache.clear(); - } - - /** 删除指定字典类型的缓存 */ - delete(dictType: string): void { - const keysToDelete = []; - for (const key of this.cache.keys()) { - if (key.startsWith(`${dictType}:`)) { - keysToDelete.push(key); - } - } - keysToDelete.forEach((key) => this.cache.delete(key)); - } - - /** 获取缓存数据 */ - get(dictType: string, valueType: DictValueType): DictDataType[] | undefined { - return this.cache.get(this.getCacheKey(dictType, valueType)); - } - - /** 设置缓存数据 */ - set(dictType: string, valueType: DictValueType, data: DictDataType[]): void { - const key = this.getCacheKey(dictType, valueType); - - // 如果缓存数量超过限制,删除最早的缓存 - if (this.cache.size >= this.maxCacheSize) { - const firstKey = this.cache.keys().next().value; - if (firstKey) { - this.cache.delete(firstKey); - } - } - - this.cache.set(key, data); - } - - /** 获取缓存键 */ - private getCacheKey(dictType: string, valueType: DictValueType): string { - return `${dictType}:${valueType}`; - } -} - -/** 字典缓存实例 */ -const dictCache = new DictCacheManager(); - -/** 值转换器映射 */ -const valueConverters: Record< - DictValueType, - (value: any) => boolean | number | string -> = { - boolean: (value: any) => `${value}` === 'true', - number: (value: any) => Number.parseInt(`${value}`, 10), - string: (value: any) => `${value}`, -}; - -/** - * 获取字典标签 - * @param dictType 字典类型 - * @param value 字典值 - * @returns 字典标签 - */ -function getDictLabel(dictType: string, value: any): string { - const dictStore = useDictStore(); - const dictObj = dictStore.getDictData(dictType, value); - return isObject(dictObj) ? dictObj.label : ''; -} - -/** - * 获取字典对象 - * @param dictType 字典类型 - * @param value 字典值 - * @returns 字典对象 - */ -function getDictObj(dictType: string, value: any): DictItem | null { - const dictStore = useDictStore(); - const dictObj = dictStore.getDictData(dictType, value); - return isObject(dictObj) ? dictObj : null; -} - -/** - * 获取字典数组 - 优化版本,支持缓存和泛型 - * @param dictType 字典类型 - * @param valueType 字典值类型,默认 string 类型 - * @returns 字典数组 - */ -function getDictOptions( - dictType: string, - valueType: T = 'string' as T, -): T extends 'number' - ? NumberDictDataType[] - : T extends 'boolean' - ? BooleanDictDataType[] - : StringDictDataType[] { - // 检查缓存 - const cachedData = dictCache.get(dictType, valueType); - if (cachedData) { - return cachedData as any; - } - - const dictStore = useDictStore(); - const dictOpts = dictStore.getDictOptions(dictType); - - if (dictOpts.length === 0) { - return [] as any; - } - - const converter = valueConverters[valueType]; - const dictOptions: DictDataType[] = dictOpts.map((d: DictItem) => ({ - value: converter(d.value), - label: d.label, - colorType: d.colorType, - cssClass: d.cssClass, - })); - - // 缓存结果 - dictCache.set(dictType, valueType, dictOptions); - - return dictOptions as any; -} - -/** - * 清空字典缓存 - */ -export const clearDictCache = (): void => { - dictCache.clear(); -}; - -/** - * 删除指定字典类型的缓存 - * @param dictType 字典类型 - */ -export const deleteDictCache = (dictType: string): void => { - dictCache.delete(dictType); -}; - -export { - type ColorType, - type DictValueType, - getDictLabel, - getDictObj, - getDictOptions, -}; - -export { DICT_TYPE } from '@vben/constants'; diff --git a/apps/web-antd/src/utils/index.ts b/apps/web-antd/src/utils/index.ts index 25ad98691..b1d2a146e 100644 --- a/apps/web-antd/src/utils/index.ts +++ b/apps/web-antd/src/utils/index.ts @@ -1,5 +1,3 @@ -export * from './dict'; export * from './formCreate'; export * from './rangePickerProps'; export * from './routerHelper'; -export { CommonStatusEnum } from '@vben/constants'; diff --git a/apps/web-antd/src/views/erp/finance/account/data.ts b/apps/web-antd/src/views/erp/finance/account/data.ts index 825b556f5..dab12441c 100644 --- a/apps/web-antd/src/views/erp/finance/account/data.ts +++ b/apps/web-antd/src/views/erp/finance/account/data.ts @@ -3,10 +3,12 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { h } from 'vue'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { Tag } from 'ant-design-vue'; import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/product/category/data.ts b/apps/web-antd/src/views/erp/product/category/data.ts index 9d95075cb..2c04efb80 100644 --- a/apps/web-antd/src/views/erp/product/category/data.ts +++ b/apps/web-antd/src/views/erp/product/category/data.ts @@ -2,11 +2,12 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { ErpProductCategoryApi } from '#/api/erp/product/category'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { handleTree } from '@vben/utils'; import { z } from '#/adapter/form'; import { getProductCategoryList } from '#/api/erp/product/category'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/product/product/data.ts b/apps/web-antd/src/views/erp/product/product/data.ts index 8b44beef8..942e2288e 100644 --- a/apps/web-antd/src/views/erp/product/product/data.ts +++ b/apps/web-antd/src/views/erp/product/product/data.ts @@ -1,12 +1,13 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { handleTree } from '@vben/utils'; import { z } from '#/adapter/form'; import { getProductCategorySimpleList } from '#/api/erp/product/category'; import { getProductUnitSimpleList } from '#/api/erp/product/unit'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/product/unit/data.ts b/apps/web-antd/src/views/erp/product/unit/data.ts index 7de094158..aee0708c4 100644 --- a/apps/web-antd/src/views/erp/product/unit/data.ts +++ b/apps/web-antd/src/views/erp/product/unit/data.ts @@ -1,8 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/purchase/in/data.ts b/apps/web-antd/src/views/erp/purchase/in/data.ts index 28b74fa7e..a53dc53b0 100644 --- a/apps/web-antd/src/views/erp/purchase/in/data.ts +++ b/apps/web-antd/src/views/erp/purchase/in/data.ts @@ -1,6 +1,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { erpPriceInputFormatter } from '@vben/utils'; import { z } from '#/adapter/form'; @@ -9,7 +11,6 @@ import { getProductSimpleList } from '#/api/erp/product/product'; import { getSupplierSimpleList } from '#/api/erp/purchase/supplier'; import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse'; import { getSimpleUserList } from '#/api/system/user'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 表单的配置项 */ export function useFormSchema(formType: string): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/purchase/order/data.ts b/apps/web-antd/src/views/erp/purchase/order/data.ts index 0aa86f65e..7da9466bc 100644 --- a/apps/web-antd/src/views/erp/purchase/order/data.ts +++ b/apps/web-antd/src/views/erp/purchase/order/data.ts @@ -1,6 +1,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { erpPriceInputFormatter } from '@vben/utils'; import { z } from '#/adapter/form'; @@ -8,7 +10,6 @@ import { getAccountSimpleList } from '#/api/erp/finance/account'; import { getProductSimpleList } from '#/api/erp/product/product'; import { getSupplierSimpleList } from '#/api/erp/purchase/supplier'; import { getSimpleUserList } from '#/api/system/user'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 表单的配置项 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/purchase/return/data.ts b/apps/web-antd/src/views/erp/purchase/return/data.ts index 9d77cd7cf..595b5187a 100644 --- a/apps/web-antd/src/views/erp/purchase/return/data.ts +++ b/apps/web-antd/src/views/erp/purchase/return/data.ts @@ -1,6 +1,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { erpNumberFormatter, erpPriceInputFormatter } from '@vben/utils'; import { z } from '#/adapter/form'; @@ -9,7 +11,6 @@ import { getProductSimpleList } from '#/api/erp/product/product'; import { getSupplierSimpleList } from '#/api/erp/purchase/supplier'; import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse'; import { getSimpleUserList } from '#/api/system/user'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 表单的配置项 */ export function useFormSchema(formType: string): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/purchase/supplier/data.ts b/apps/web-antd/src/views/erp/purchase/supplier/data.ts index daa268c24..0c66fa8e0 100644 --- a/apps/web-antd/src/views/erp/purchase/supplier/data.ts +++ b/apps/web-antd/src/views/erp/purchase/supplier/data.ts @@ -1,7 +1,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/sale/customer/data.ts b/apps/web-antd/src/views/erp/sale/customer/data.ts index c2f316866..abba18024 100644 --- a/apps/web-antd/src/views/erp/sale/customer/data.ts +++ b/apps/web-antd/src/views/erp/sale/customer/data.ts @@ -1,8 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/sale/order/data.ts b/apps/web-antd/src/views/erp/sale/order/data.ts index 64d41c627..05aaaa900 100644 --- a/apps/web-antd/src/views/erp/sale/order/data.ts +++ b/apps/web-antd/src/views/erp/sale/order/data.ts @@ -1,6 +1,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { erpPriceInputFormatter } from '@vben/utils'; import { z } from '#/adapter/form'; @@ -8,7 +10,6 @@ import { getAccountSimpleList } from '#/api/erp/finance/account'; import { getProductSimpleList } from '#/api/erp/product/product'; import { getCustomerSimpleList } from '#/api/erp/sale/customer'; import { getSimpleUserList } from '#/api/system/user'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 表单的配置项 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/sale/return/data.ts b/apps/web-antd/src/views/erp/sale/return/data.ts index 01c046728..9dc66dfa7 100644 --- a/apps/web-antd/src/views/erp/sale/return/data.ts +++ b/apps/web-antd/src/views/erp/sale/return/data.ts @@ -1,6 +1,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { erpNumberFormatter, erpPriceInputFormatter } from '@vben/utils'; import { z } from '#/adapter/form'; @@ -9,7 +11,6 @@ import { getProductSimpleList } from '#/api/erp/product/product'; import { getCustomerSimpleList } from '#/api/erp/sale/customer'; import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse'; import { getSimpleUserList } from '#/api/system/user'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 表单的配置项 */ export function useFormSchema(formType: string): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/stock/check/data.ts b/apps/web-antd/src/views/erp/stock/check/data.ts index a0d75ea7d..d8ee04d73 100644 --- a/apps/web-antd/src/views/erp/stock/check/data.ts +++ b/apps/web-antd/src/views/erp/stock/check/data.ts @@ -1,11 +1,13 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { createRequiredValidation } from '#/adapter/vxe-table'; import { getProductSimpleList } from '#/api/erp/product/product'; import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse'; import { getSimpleUserList } from '#/api/system/user'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 表单的配置项 */ export function useFormSchema(formType: string): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/stock/in/data.ts b/apps/web-antd/src/views/erp/stock/in/data.ts index 68b667fc9..4048bf68c 100644 --- a/apps/web-antd/src/views/erp/stock/in/data.ts +++ b/apps/web-antd/src/views/erp/stock/in/data.ts @@ -1,10 +1,12 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { createRequiredValidation } from '#/adapter/vxe-table'; import { getSupplierSimpleList } from '#/api/erp/purchase/supplier'; import { getSimpleUserList } from '#/api/system/user'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 表单的配置项 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/stock/move/data.ts b/apps/web-antd/src/views/erp/stock/move/data.ts index 94ab7fa0e..edd802b8b 100644 --- a/apps/web-antd/src/views/erp/stock/move/data.ts +++ b/apps/web-antd/src/views/erp/stock/move/data.ts @@ -1,11 +1,13 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { createRequiredValidation } from '#/adapter/vxe-table'; import { getProductSimpleList } from '#/api/erp/product/product'; import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse'; import { getSimpleUserList } from '#/api/system/user'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 表单的配置项 */ export function useFormSchema(formType: string): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/stock/record/data.ts b/apps/web-antd/src/views/erp/stock/record/data.ts index 4b74910fe..f4753b894 100644 --- a/apps/web-antd/src/views/erp/stock/record/data.ts +++ b/apps/web-antd/src/views/erp/stock/record/data.ts @@ -1,9 +1,11 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { getProductSimpleList } from '#/api/erp/product/product'; import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/erp/stock/warehouse/data.ts b/apps/web-antd/src/views/erp/stock/warehouse/data.ts index 8adfd1daa..308f2583b 100644 --- a/apps/web-antd/src/views/erp/stock/warehouse/data.ts +++ b/apps/web-antd/src/views/erp/stock/warehouse/data.ts @@ -2,7 +2,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { ErpWarehouseApi } from '#/api/erp/stock/warehouse'; -import { DICT_TYPE, getDictOptions } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/infra/demo/general/demo01/modules/form.vue b/apps/web-antd/src/views/infra/demo/general/demo01/modules/form.vue index 7d718438a..24e361c53 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo01/modules/form.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo01/modules/form.vue @@ -6,6 +6,8 @@ import type { Demo01ContactApi } from '#/api/infra/demo/demo01'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { DatePicker, @@ -24,7 +26,6 @@ import { import { Tinymce as RichTextarea } from '#/components/tinymce'; import { ImageUpload } from '#/components/upload'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions } from '#/utils'; const emit = defineEmits(['success']); diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/form.vue index 6bec7daca..9433f0e96 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/form.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/form.vue @@ -6,6 +6,8 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { DatePicker, @@ -23,7 +25,6 @@ import { } from '#/api/infra/demo/demo03/erp'; import { Tinymce as RichTextarea } from '#/components/tinymce'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions } from '#/utils'; const emit = defineEmits(['success']); diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/form.vue index 547d126ba..72faf6407 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/form.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/form.vue @@ -6,6 +6,8 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { DatePicker, @@ -24,7 +26,6 @@ import { } from '#/api/infra/demo/demo03/normal'; import { Tinymce as RichTextarea } from '#/components/tinymce'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions } from '#/utils'; import Demo03CourseForm from './demo03-course-form.vue'; import Demo03GradeForm from './demo03-grade-form.vue'; diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/form.vue index 84169a293..89f7cbe9d 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/form.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/form.vue @@ -6,6 +6,8 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { DatePicker, @@ -24,7 +26,6 @@ import { } from '#/api/infra/demo/demo03/normal'; import { Tinymce as RichTextarea } from '#/components/tinymce'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions } from '#/utils'; import Demo03CourseForm from './demo03-course-form.vue'; import Demo03GradeForm from './demo03-grade-form.vue'; diff --git a/apps/web-antd/src/views/infra/job/data.ts b/apps/web-antd/src/views/infra/job/data.ts index 1fa6b2d5a..83a7dfe6b 100644 --- a/apps/web-antd/src/views/infra/job/data.ts +++ b/apps/web-antd/src/views/infra/job/data.ts @@ -4,13 +4,14 @@ import type { DescriptionItemSchema } from '#/components/description'; import { h, markRaw } from 'vue'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { formatDateTime } from '@vben/utils'; import { Timeline } from 'ant-design-vue'; import { CronTab } from '#/components/cron-tab'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/infra/job/logger/data.ts b/apps/web-antd/src/views/infra/job/logger/data.ts index b58629a8b..8c1e3644c 100644 --- a/apps/web-antd/src/views/infra/job/logger/data.ts +++ b/apps/web-antd/src/views/infra/job/logger/data.ts @@ -4,12 +4,13 @@ import type { DescriptionItemSchema } from '#/components/description'; import { h } from 'vue'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { formatDateTime } from '@vben/utils'; import dayjs from 'dayjs'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/product/category/data.ts b/apps/web-antd/src/views/mall/product/category/data.ts index 5efa27c02..a35f1a7d1 100644 --- a/apps/web-antd/src/views/mall/product/category/data.ts +++ b/apps/web-antd/src/views/mall/product/category/data.ts @@ -2,11 +2,12 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MallCategoryApi } from '#/api/mall/product/category'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { handleTree } from '@vben/utils'; import { z } from '#/adapter/form'; import { getCategoryList } from '#/api/mall/product/category'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/promotion/bargain/activity/data.ts b/apps/web-antd/src/views/mall/promotion/bargain/activity/data.ts index 80285f23c..75c2a315b 100644 --- a/apps/web-antd/src/views/mall/promotion/bargain/activity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/bargain/activity/data.ts @@ -1,10 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { formatDate } from '@vben/utils'; -import { DICT_TYPE, getDictOptions } from '#/utils'; - /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { return [ diff --git a/apps/web-antd/src/views/mall/promotion/combination/activity/data.ts b/apps/web-antd/src/views/mall/promotion/combination/activity/data.ts index e08dfa662..0a0794477 100644 --- a/apps/web-antd/src/views/mall/promotion/combination/activity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/combination/activity/data.ts @@ -1,10 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { formatDate } from '@vben/utils'; -import { DICT_TYPE, getDictOptions } from '#/utils'; - /** 表单配置 */ export function useFormSchema(): VbenFormSchema[] { return [ diff --git a/apps/web-antd/src/views/mall/promotion/combination/record/data.ts b/apps/web-antd/src/views/mall/promotion/combination/record/data.ts index 3a5082170..82b63c49a 100644 --- a/apps/web-antd/src/views/mall/promotion/combination/record/data.ts +++ b/apps/web-antd/src/views/mall/promotion/combination/record/data.ts @@ -1,7 +1,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/promotion/discountActivity/data.ts b/apps/web-antd/src/views/mall/promotion/discountActivity/data.ts index dffafe32d..e449efe7a 100644 --- a/apps/web-antd/src/views/mall/promotion/discountActivity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/discountActivity/data.ts @@ -1,10 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { formatDate } from '@vben/utils'; -import { DICT_TYPE, getDictOptions } from '#/utils'; - /** 表单配置 */ export function useFormSchema(): VbenFormSchema[] { return [ diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts b/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts index c145669bf..598e0d1a4 100644 --- a/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts @@ -1,7 +1,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; /** 表单配置 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/promotion/seckill/activity/data.ts b/apps/web-antd/src/views/mall/promotion/seckill/activity/data.ts index 2d294e8e7..b27413519 100644 --- a/apps/web-antd/src/views/mall/promotion/seckill/activity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/seckill/activity/data.ts @@ -1,7 +1,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts b/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts index 845169b6a..bce62ae0d 100644 --- a/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts +++ b/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts @@ -2,7 +2,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MallSeckillConfigApi } from '#/api/mall/promotion/seckill/seckillConfig'; -import { DICT_TYPE, getDictOptions } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/trade/afterSale/index.vue b/apps/web-antd/src/views/mall/trade/afterSale/index.vue index 8b3f58d49..a9ccaf58d 100644 --- a/apps/web-antd/src/views/mall/trade/afterSale/index.vue +++ b/apps/web-antd/src/views/mall/trade/afterSale/index.vue @@ -6,12 +6,13 @@ import { onMounted, ref } from 'vue'; import { useRouter } from 'vue-router'; import { DocAlert, Page } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { Button, Tabs } from 'ant-design-vue'; import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { getAfterSalePage } from '#/api/mall/trade/afterSale'; -import { DICT_TYPE, getDictOptions } from '#/utils'; import { useGridColumns, useGridFormSchema } from './data'; diff --git a/apps/web-antd/src/views/mall/trade/config/data.ts b/apps/web-antd/src/views/mall/trade/config/data.ts index 9c35219fc..c9125673b 100644 --- a/apps/web-antd/src/views/mall/trade/config/data.ts +++ b/apps/web-antd/src/views/mall/trade/config/data.ts @@ -1,6 +1,7 @@ import type { VbenFormSchema } from '#/adapter/form'; -import { DICT_TYPE, getDictOptions } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; /** 售后表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/trade/delivery/express/data.ts b/apps/web-antd/src/views/mall/trade/delivery/express/data.ts index 908cf3e1e..28db3aaa5 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/express/data.ts +++ b/apps/web-antd/src/views/mall/trade/delivery/express/data.ts @@ -1,8 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/data.ts b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/data.ts index b243fd883..048b68aab 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/data.ts +++ b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/data.ts @@ -1,8 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/member/group/data.ts b/apps/web-antd/src/views/member/group/data.ts index e7466bd3e..938774138 100644 --- a/apps/web-antd/src/views/member/group/data.ts +++ b/apps/web-antd/src/views/member/group/data.ts @@ -1,8 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/member/level/data.ts b/apps/web-antd/src/views/member/level/data.ts index d60a180dc..594d612a9 100644 --- a/apps/web-antd/src/views/member/level/data.ts +++ b/apps/web-antd/src/views/member/level/data.ts @@ -1,8 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/member/signin/config/data.ts b/apps/web-antd/src/views/member/signin/config/data.ts index be1d8e272..c1237cdd7 100644 --- a/apps/web-antd/src/views/member/signin/config/data.ts +++ b/apps/web-antd/src/views/member/signin/config/data.ts @@ -1,8 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/pay/app/data.ts b/apps/web-antd/src/views/pay/app/data.ts index a132eea05..c5f3c51e5 100644 --- a/apps/web-antd/src/views/pay/app/data.ts +++ b/apps/web-antd/src/views/pay/app/data.ts @@ -2,7 +2,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { PayAppApi } from '#/api/pay/app'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; export function useGridFormSchema(): VbenFormSchema[] { return [ diff --git a/apps/web-antd/src/views/pay/app/modules/data.ts b/apps/web-antd/src/views/pay/app/modules/data.ts index 56188df2c..37fc4fc49 100644 --- a/apps/web-antd/src/views/pay/app/modules/data.ts +++ b/apps/web-antd/src/views/pay/app/modules/data.ts @@ -2,8 +2,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import { h } from 'vue'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { InputUpload } from '#/components/upload'; -import { DICT_TYPE, getDictOptions } from '#/utils'; export function channelSchema(formType: string): VbenFormSchema[] { if (formType.includes('alipay_')) { diff --git a/apps/web-antd/src/views/pay/order/data.ts b/apps/web-antd/src/views/pay/order/data.ts index 0e9ad03b2..1fcd6ee21 100644 --- a/apps/web-antd/src/views/pay/order/data.ts +++ b/apps/web-antd/src/views/pay/order/data.ts @@ -4,12 +4,13 @@ import type { DescriptionItemSchema } from '#/components/description'; import { h } from 'vue'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { erpPriceInputFormatter, formatDateTime } from '@vben/utils'; import { Tag } from 'ant-design-vue'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/dept/data.ts b/apps/web-antd/src/views/system/dept/data.ts index 0da23687b..b1fb3d62b 100644 --- a/apps/web-antd/src/views/system/dept/data.ts +++ b/apps/web-antd/src/views/system/dept/data.ts @@ -2,12 +2,13 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemDeptApi } from '#/api/system/dept'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { handleTree } from '@vben/utils'; import { z } from '#/adapter/form'; import { getDeptList } from '#/api/system/dept'; import { getSimpleUserList } from '#/api/system/user'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/dict/data.ts b/apps/web-antd/src/views/system/dict/data.ts index 36c6148ab..537d61e79 100644 --- a/apps/web-antd/src/views/system/dict/data.ts +++ b/apps/web-antd/src/views/system/dict/data.ts @@ -1,9 +1,11 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; import { getSimpleDictTypeList } from '#/api/system/dict/type'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; // ============================== 字典类型 ============================== diff --git a/apps/web-antd/src/views/system/mail/account/data.ts b/apps/web-antd/src/views/system/mail/account/data.ts index dfe9775a5..3fc85a301 100644 --- a/apps/web-antd/src/views/system/mail/account/data.ts +++ b/apps/web-antd/src/views/system/mail/account/data.ts @@ -1,8 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; -import { DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/menu/data.ts b/apps/web-antd/src/views/system/menu/data.ts index e5fd68d92..209c1a7e7 100644 --- a/apps/web-antd/src/views/system/menu/data.ts +++ b/apps/web-antd/src/views/system/menu/data.ts @@ -6,7 +6,12 @@ import type { SystemMenuApi } from '#/api/system/menu'; import { h } from 'vue'; -import { SystemMenuTypeEnum } from '@vben/constants'; +import { + CommonStatusEnum, + DICT_TYPE, + SystemMenuTypeEnum, +} from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { IconifyIcon } from '@vben/icons'; import { handleTree, isHttpUrl } from '@vben/utils'; @@ -14,7 +19,6 @@ import { z } from '#/adapter/form'; import { getMenuList } from '#/api/system/menu'; import { $t } from '#/locales'; import { componentKeys } from '#/router/routes'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/notice/data.ts b/apps/web-antd/src/views/system/notice/data.ts index c00fb0d55..7b327c0b9 100644 --- a/apps/web-antd/src/views/system/notice/data.ts +++ b/apps/web-antd/src/views/system/notice/data.ts @@ -1,8 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/oauth2/client/data.ts b/apps/web-antd/src/views/system/oauth2/client/data.ts index b53bcf514..4fd3df706 100644 --- a/apps/web-antd/src/views/system/oauth2/client/data.ts +++ b/apps/web-antd/src/views/system/oauth2/client/data.ts @@ -1,8 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/oauth2/token/data.ts b/apps/web-antd/src/views/system/oauth2/token/data.ts index 3222c8731..51390fb3f 100644 --- a/apps/web-antd/src/views/system/oauth2/token/data.ts +++ b/apps/web-antd/src/views/system/oauth2/token/data.ts @@ -1,7 +1,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/post/data.ts b/apps/web-antd/src/views/system/post/data.ts index 1016871a6..0a00f6494 100644 --- a/apps/web-antd/src/views/system/post/data.ts +++ b/apps/web-antd/src/views/system/post/data.ts @@ -1,8 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/social/client/data.ts b/apps/web-antd/src/views/system/social/client/data.ts index b564948fb..deeb0aed1 100644 --- a/apps/web-antd/src/views/system/social/client/data.ts +++ b/apps/web-antd/src/views/system/social/client/data.ts @@ -1,10 +1,14 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { SystemUserSocialTypeEnum } from '@vben/constants'; +import { + CommonStatusEnum, + DICT_TYPE, + SystemUserSocialTypeEnum, +} from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue index 51009b86a..247d73be9 100644 --- a/apps/web-antd/src/views/system/user/index.vue +++ b/apps/web-antd/src/views/system/user/index.vue @@ -6,6 +6,8 @@ import type { SystemUserApi } from '#/api/system/user'; import { ref } from 'vue'; import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictLabel } from '@vben/hooks'; import { downloadFileFromBlobPart, isEmpty } from '@vben/utils'; import { Card, message } from 'ant-design-vue'; @@ -19,7 +21,6 @@ import { updateUserStatus, } from '#/api/system/user'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictLabel } from '#/utils'; import { useGridColumns, useGridFormSchema } from './data'; import AssignRoleForm from './modules/assign-role-form.vue'; diff --git a/apps/web-ele/src/api/infra/demo/demo01/index.ts b/apps/web-ele/src/api/infra/demo/demo01/index.ts index e180a76c4..e572bb126 100644 --- a/apps/web-ele/src/api/infra/demo/demo01/index.ts +++ b/apps/web-ele/src/api/infra/demo/demo01/index.ts @@ -1,5 +1,3 @@ -import type { Dayjs } from 'dayjs'; - import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; @@ -10,7 +8,7 @@ export namespace Demo01ContactApi { id: number; // 编号 name?: string; // 名字 sex?: number; // 性别 - birthday?: Dayjs | string; // 出生年 + birthday?: Date | string; // 出生年 description?: string; // 简介 avatar: string; // 头像 } diff --git a/apps/web-ele/src/api/infra/demo/demo03/erp/index.ts b/apps/web-ele/src/api/infra/demo/demo03/erp/index.ts index 6dc7e352a..23caea01b 100644 --- a/apps/web-ele/src/api/infra/demo/demo03/erp/index.ts +++ b/apps/web-ele/src/api/infra/demo/demo03/erp/index.ts @@ -1,5 +1,3 @@ -import type { Dayjs } from 'dayjs'; - import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; @@ -26,7 +24,7 @@ export namespace Demo03StudentApi { id: number; // 编号 name?: string; // 名字 sex?: number; // 性别 - birthday?: Dayjs | string; // 出生日期 + birthday?: Date | string; // 出生日期 description?: string; // 简介 } } diff --git a/apps/web-ele/src/api/infra/demo/demo03/inner/index.ts b/apps/web-ele/src/api/infra/demo/demo03/inner/index.ts index 02bfbcc66..a2f7f31ac 100644 --- a/apps/web-ele/src/api/infra/demo/demo03/inner/index.ts +++ b/apps/web-ele/src/api/infra/demo/demo03/inner/index.ts @@ -1,5 +1,3 @@ -import type { Dayjs } from 'dayjs'; - import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; @@ -26,7 +24,7 @@ export namespace Demo03StudentApi { id: number; // 编号 name?: string; // 名字 sex?: number; // 性别 - birthday?: Dayjs | string; // 出生日期 + birthday?: Date | string; // 出生日期 description?: string; // 简介 demo03courses?: Demo03Course[]; demo03grade?: Demo03Grade; diff --git a/apps/web-ele/src/api/infra/demo/demo03/normal/index.ts b/apps/web-ele/src/api/infra/demo/demo03/normal/index.ts index 2a085a153..0fc993d9f 100644 --- a/apps/web-ele/src/api/infra/demo/demo03/normal/index.ts +++ b/apps/web-ele/src/api/infra/demo/demo03/normal/index.ts @@ -1,5 +1,3 @@ -import type { Dayjs } from 'dayjs'; - import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; @@ -26,7 +24,7 @@ export namespace Demo03StudentApi { id: number; // 编号 name?: string; // 名字 sex?: number; // 性别 - birthday?: Dayjs | string; // 出生日期 + birthday?: Date | string; // 出生日期 description?: string; // 简介 demo03courses?: Demo03Course[]; demo03grade?: Demo03Grade; diff --git a/apps/web-ele/src/components/dict-tag/dict-tag.vue b/apps/web-ele/src/components/dict-tag/dict-tag.vue index 358daf920..b4be73a92 100644 --- a/apps/web-ele/src/components/dict-tag/dict-tag.vue +++ b/apps/web-ele/src/components/dict-tag/dict-tag.vue @@ -1,10 +1,10 @@