From 386370f640b0d9ebf40e945f34aef4039e57f646 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Fri, 5 Sep 2025 12:10:52 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A0=B4=E5=9D=8F=E6=80=A7?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20dict=20=E6=8A=BD=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/infra/codegen/data.ts | 4 +++- apps/web-antd/src/views/mall/product/brand/data.ts | 10 ++++------ apps/web-antd/src/views/mall/promotion/article/data.ts | 10 ++++------ .../src/views/mall/promotion/coupon/template/data.ts | 10 ++++------ .../src/views/mall/promotion/coupon/template/index.vue | 4 ++-- .../src/views/mall/promotion/diy/template/data.ts | 2 +- .../src/views/mall/promotion/point/activity/data.ts | 2 +- .../src/views/mall/trade/delivery/pickUpStore/data.ts | 10 ++++------ .../views/member/user/components/user-basic-info.vue | 2 +- apps/web-antd/src/views/member/user/data.ts | 9 +++------ .../src/views/pay/app/modules/channel-form.vue | 2 +- apps/web-antd/src/views/pay/demo/order/data.ts | 2 +- apps/web-antd/src/views/pay/demo/withdraw/data.ts | 2 +- apps/web-antd/src/views/pay/notify/modules/detail.vue | 2 +- apps/web-antd/src/views/system/mail/log/index.vue | 2 +- apps/web-antd/src/views/system/mail/template/data.ts | 10 ++++------ apps/web-antd/src/views/system/sms/channel/data.ts | 10 ++++------ apps/web-antd/src/views/system/sms/template/data.ts | 10 ++++------ .../src/views/system/social/user/modules/detail.vue | 2 +- apps/web-antd/src/views/system/tenant/data.ts | 10 ++++------ apps/web-antd/src/views/system/tenantPackage/data.ts | 10 ++++------ apps/web-antd/src/views/system/user/data.ts | 9 +++------ apps/web-ele/src/views/mall/product/brand/data.ts | 10 ++++------ apps/web-ele/src/views/mall/promotion/article/data.ts | 10 ++++------ .../src/views/mall/promotion/coupon/template/data.ts | 10 ++++------ .../src/views/mall/promotion/diy/template/data.ts | 2 +- .../src/views/mall/trade/delivery/pickUpStore/data.ts | 10 ++++------ .../member/user/components/user-favorite-list.vue | 3 ++- apps/web-ele/src/views/member/user/data.ts | 9 +++------ apps/web-ele/src/views/pay/demo/order/data.ts | 2 +- apps/web-ele/src/views/pay/demo/withdraw/data.ts | 2 +- apps/web-ele/src/views/system/mail/log/index.vue | 2 +- .../src/views/system/mail/log/modules/detail.vue | 2 +- apps/web-ele/src/views/system/mail/template/data.ts | 9 +++------ apps/web-ele/src/views/system/notify/template/data.ts | 10 +++------- apps/web-ele/src/views/system/sms/channel/data.ts | 9 +++------ apps/web-ele/src/views/system/sms/template/data.ts | 9 +++------ .../src/views/system/social/user/modules/detail.vue | 2 +- apps/web-ele/src/views/system/tenant/data.ts | 9 +++------ apps/web-ele/src/views/system/tenantPackage/data.ts | 9 +++------ apps/web-ele/src/views/system/user/data.ts | 9 +++------ 41 files changed, 104 insertions(+), 158 deletions(-) diff --git a/apps/web-antd/src/views/infra/codegen/data.ts b/apps/web-antd/src/views/infra/codegen/data.ts index 928f2700..6b76521b 100644 --- a/apps/web-antd/src/views/infra/codegen/data.ts +++ b/apps/web-antd/src/views/infra/codegen/data.ts @@ -7,13 +7,15 @@ import type { SystemMenuApi } from '#/api/system/menu'; import { h } from 'vue'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { IconifyIcon } from '@vben/icons'; import { handleTree } from '@vben/utils'; import { getDataSourceConfigList } from '#/api/infra/data-source-config'; import { getMenuList } from '#/api/system/menu'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 导入数据库表的表单 */ export function useImportTableFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/product/brand/data.ts b/apps/web-antd/src/views/mall/product/brand/data.ts index 654809ac..36576abd 100644 --- a/apps/web-antd/src/views/mall/product/brand/data.ts +++ b/apps/web-antd/src/views/mall/product/brand/data.ts @@ -1,13 +1,11 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeGridPropTypes } 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, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/promotion/article/data.ts b/apps/web-antd/src/views/mall/promotion/article/data.ts index b12a6cd6..4ccb4375 100644 --- a/apps/web-antd/src/views/mall/promotion/article/data.ts +++ b/apps/web-antd/src/views/mall/promotion/article/data.ts @@ -1,14 +1,12 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeGridPropTypes } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; import { getSimpleArticleCategoryList } from '#/api/mall/promotion/articleCategory'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/promotion/coupon/template/data.ts b/apps/web-antd/src/views/mall/promotion/coupon/template/data.ts index b2ea902f..fe2a50d6 100644 --- a/apps/web-antd/src/views/mall/promotion/coupon/template/data.ts +++ b/apps/web-antd/src/views/mall/promotion/coupon/template/data.ts @@ -1,14 +1,12 @@ 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, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; import { discountFormat, diff --git a/apps/web-antd/src/views/mall/promotion/coupon/template/index.vue b/apps/web-antd/src/views/mall/promotion/coupon/template/index.vue index 1e8ed42c..70c39f06 100644 --- a/apps/web-antd/src/views/mall/promotion/coupon/template/index.vue +++ b/apps/web-antd/src/views/mall/promotion/coupon/template/index.vue @@ -5,6 +5,7 @@ import type { MallCouponTemplateApi } from '#/api/mall/promotion/coupon/couponTe import { ref } from 'vue'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { CommonStatusEnum } from '@vben/constants'; import { $t } from '@vben/locales'; import { message, Switch } from 'ant-design-vue'; @@ -15,7 +16,6 @@ import { getCouponTemplatePage, updateCouponTemplateStatus, } from '#/api/mall/promotion/coupon/couponTemplate'; -import { CommonStatusEnum } from '#/utils'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; @@ -77,7 +77,7 @@ async function handleStatusChange(row: MallCouponTemplateApi.CouponTemplate) { key: 'status_key_msg', }); try { - await updateCouponTemplateStatus(row.id as number, row.status as number); + await updateCouponTemplateStatus(row.id, row.status as 0 | 1); message.success({ content: `${text}成功`, key: 'status_key_msg', diff --git a/apps/web-antd/src/views/mall/promotion/diy/template/data.ts b/apps/web-antd/src/views/mall/promotion/diy/template/data.ts index 0c46faf7..ca09c59f 100644 --- a/apps/web-antd/src/views/mall/promotion/diy/template/data.ts +++ b/apps/web-antd/src/views/mall/promotion/diy/template/data.ts @@ -1,7 +1,7 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '@vben/constants'; /** 表单配置 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/promotion/point/activity/data.ts b/apps/web-antd/src/views/mall/promotion/point/activity/data.ts index 27625475..a7fe0e4f 100644 --- a/apps/web-antd/src/views/mall/promotion/point/activity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/point/activity/data.ts @@ -1,7 +1,7 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '@vben/constants'; /** 表单配置 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts index ed5b0498..ee422abd 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts +++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts @@ -1,15 +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 { z } from '#/adapter/form'; import { getAreaTree } from '#/api/system/area'; import { getSimpleUserList } from '#/api/system/user'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/member/user/components/user-basic-info.vue b/apps/web-antd/src/views/member/user/components/user-basic-info.vue index f0b4601e..6182f9a2 100644 --- a/apps/web-antd/src/views/member/user/components/user-basic-info.vue +++ b/apps/web-antd/src/views/member/user/components/user-basic-info.vue @@ -3,13 +3,13 @@ import type { MemberUserApi } from '#/api/member/user'; import { h } from 'vue'; +import { DICT_TYPE } from '@vben/constants'; import { formatDate } from '@vben/utils'; import { Avatar, Card, Col, Row } from 'ant-design-vue'; import { useDescription } from '#/components/description'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils'; withDefaults( defineProps<{ mode?: 'kefu' | 'member'; user: MemberUserApi.User }>(), diff --git a/apps/web-antd/src/views/member/user/data.ts b/apps/web-antd/src/views/member/user/data.ts index ee18ddda..30ce8a24 100644 --- a/apps/web-antd/src/views/member/user/data.ts +++ b/apps/web-antd/src/views/member/user/data.ts @@ -3,6 +3,8 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { h } from 'vue'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { convertToInteger, formatToFraction } from '@vben/utils'; import { Tag } from 'ant-design-vue'; @@ -12,12 +14,7 @@ import { getSimpleGroupList } from '#/api/member/group'; import { getSimpleLevelList } from '#/api/member/level'; import { getSimpleTagList } from '#/api/member/tag'; import { getAreaTree } from '#/api/system/area'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/pay/app/modules/channel-form.vue b/apps/web-antd/src/views/pay/app/modules/channel-form.vue index 7e298a99..a0cdc31c 100644 --- a/apps/web-antd/src/views/pay/app/modules/channel-form.vue +++ b/apps/web-antd/src/views/pay/app/modules/channel-form.vue @@ -4,13 +4,13 @@ import type { PayChannelApi } from '#/api/pay/channel'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { CommonStatusEnum } from '@vben/constants'; import { $t } from '@vben/locales'; import { message } from 'ant-design-vue'; import { useVbenForm } from '#/adapter/form'; import { createChannel, getChannel, updateChannel } from '#/api/pay/channel'; -import { CommonStatusEnum } from '#/utils'; import { channelSchema } from './data'; diff --git a/apps/web-antd/src/views/pay/demo/order/data.ts b/apps/web-antd/src/views/pay/demo/order/data.ts index 9dde3e14..9e61188f 100644 --- a/apps/web-antd/src/views/pay/demo/order/data.ts +++ b/apps/web-antd/src/views/pay/demo/order/data.ts @@ -1,7 +1,7 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/pay/demo/withdraw/data.ts b/apps/web-antd/src/views/pay/demo/withdraw/data.ts index bd2ee616..ebf9b855 100644 --- a/apps/web-antd/src/views/pay/demo/withdraw/data.ts +++ b/apps/web-antd/src/views/pay/demo/withdraw/data.ts @@ -1,7 +1,7 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/pay/notify/modules/detail.vue b/apps/web-antd/src/views/pay/notify/modules/detail.vue index 85f1a285..fcd31958 100644 --- a/apps/web-antd/src/views/pay/notify/modules/detail.vue +++ b/apps/web-antd/src/views/pay/notify/modules/detail.vue @@ -2,13 +2,13 @@ import { ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; import { formatDateTime } from '@vben/utils'; import { Descriptions, Divider, Table, Tag } from 'ant-design-vue'; import { getNotifyTaskDetail } from '#/api/pay/notify'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils'; import { detailColumns } from '../data'; diff --git a/apps/web-antd/src/views/system/mail/log/index.vue b/apps/web-antd/src/views/system/mail/log/index.vue index c0cd79f4..9bf68355 100644 --- a/apps/web-antd/src/views/system/mail/log/index.vue +++ b/apps/web-antd/src/views/system/mail/log/index.vue @@ -3,11 +3,11 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemMailLogApi } from '#/api/system/mail/log'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { getMailLogPage } from '#/api/system/mail/log'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils'; import { useGridColumns, useGridFormSchema } from './data'; import Detail from './modules/detail.vue'; diff --git a/apps/web-antd/src/views/system/mail/template/data.ts b/apps/web-antd/src/views/system/mail/template/data.ts index a3df7484..d500a650 100644 --- a/apps/web-antd/src/views/system/mail/template/data.ts +++ b/apps/web-antd/src/views/system/mail/template/data.ts @@ -1,14 +1,12 @@ 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 { getSimpleMailAccountList } from '#/api/system/mail/account'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/sms/channel/data.ts b/apps/web-antd/src/views/system/sms/channel/data.ts index f00ea26d..d4841c0d 100644 --- a/apps/web-antd/src/views/system/sms/channel/data.ts +++ b/apps/web-antd/src/views/system/sms/channel/data.ts @@ -1,13 +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 { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/sms/template/data.ts b/apps/web-antd/src/views/system/sms/template/data.ts index d7f12f64..701e532f 100644 --- a/apps/web-antd/src/views/system/sms/template/data.ts +++ b/apps/web-antd/src/views/system/sms/template/data.ts @@ -1,14 +1,12 @@ 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 { getSimpleSmsChannelList } from '#/api/system/sms/channel'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/social/user/modules/detail.vue b/apps/web-antd/src/views/system/social/user/modules/detail.vue index 9633ec2e..e6aa6084 100644 --- a/apps/web-antd/src/views/system/social/user/modules/detail.vue +++ b/apps/web-antd/src/views/system/social/user/modules/detail.vue @@ -4,13 +4,13 @@ import type { SystemSocialUserApi } from '#/api/system/social/user'; import { ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; import { Descriptions, DescriptionsItem, Image } from 'ant-design-vue'; import { getSocialUser } from '#/api/system/social/user'; import { DictTag } from '#/components/dict-tag'; import { $t } from '#/locales'; -import { DICT_TYPE } from '#/utils'; const formData = ref(); diff --git a/apps/web-antd/src/views/system/tenant/data.ts b/apps/web-antd/src/views/system/tenant/data.ts index e9f36376..208092c1 100644 --- a/apps/web-antd/src/views/system/tenant/data.ts +++ b/apps/web-antd/src/views/system/tenant/data.ts @@ -1,14 +1,12 @@ 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 { getTenantPackageList } from '#/api/system/tenant-package'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/tenantPackage/data.ts b/apps/web-antd/src/views/system/tenantPackage/data.ts index 7826f9c7..87581717 100644 --- a/apps/web-antd/src/views/system/tenantPackage/data.ts +++ b/apps/web-antd/src/views/system/tenantPackage/data.ts @@ -1,13 +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 { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/user/data.ts b/apps/web-antd/src/views/system/user/data.ts index 8ec46607..75ea02ad 100644 --- a/apps/web-antd/src/views/system/user/data.ts +++ b/apps/web-antd/src/views/system/user/data.ts @@ -2,18 +2,15 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemUserApi } from '#/api/system/user'; +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 { getSimplePostList } from '#/api/system/post'; import { getSimpleRoleList } from '#/api/system/role'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/mall/product/brand/data.ts b/apps/web-ele/src/views/mall/product/brand/data.ts index ac0271e6..e8891d7f 100644 --- a/apps/web-ele/src/views/mall/product/brand/data.ts +++ b/apps/web-ele/src/views/mall/product/brand/data.ts @@ -1,13 +1,11 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeGridPropTypes } 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, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/mall/promotion/article/data.ts b/apps/web-ele/src/views/mall/promotion/article/data.ts index ded3024f..f06e6d1f 100644 --- a/apps/web-ele/src/views/mall/promotion/article/data.ts +++ b/apps/web-ele/src/views/mall/promotion/article/data.ts @@ -1,14 +1,12 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeGridPropTypes } from '#/adapter/vxe-table'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { z } from '#/adapter/form'; import { getSimpleArticleCategoryList } from '#/api/mall/promotion/articleCategory'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/mall/promotion/coupon/template/data.ts b/apps/web-ele/src/views/mall/promotion/coupon/template/data.ts index daeb8842..aacd8cc3 100644 --- a/apps/web-ele/src/views/mall/promotion/coupon/template/data.ts +++ b/apps/web-ele/src/views/mall/promotion/coupon/template/data.ts @@ -1,14 +1,12 @@ 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, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; import { discountFormat, diff --git a/apps/web-ele/src/views/mall/promotion/diy/template/data.ts b/apps/web-ele/src/views/mall/promotion/diy/template/data.ts index 0c46faf7..ca09c59f 100644 --- a/apps/web-ele/src/views/mall/promotion/diy/template/data.ts +++ b/apps/web-ele/src/views/mall/promotion/diy/template/data.ts @@ -1,7 +1,7 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '@vben/constants'; /** 表单配置 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/data.ts b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/data.ts index a4a9f9c9..ea27b1ae 100644 --- a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/data.ts +++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/data.ts @@ -1,15 +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 { z } from '#/adapter/form'; import { getAreaTree } from '#/api/system/area'; import { getSimpleUserList } from '#/api/system/user'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/member/user/components/user-favorite-list.vue b/apps/web-ele/src/views/member/user/components/user-favorite-list.vue index 54acaa10..2c12a7ca 100644 --- a/apps/web-ele/src/views/member/user/components/user-favorite-list.vue +++ b/apps/web-ele/src/views/member/user/components/user-favorite-list.vue @@ -2,9 +2,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MallFavoriteApi } from '#/api/mall/product/favorite'; +import { DICT_TYPE } from '@vben/constants'; + import { useVbenVxeGrid } from '#/adapter/vxe-table'; import * as FavoriteApi from '#/api/mall/product/favorite'; -import { DICT_TYPE } from '#/utils'; const props = defineProps<{ userId: number; diff --git a/apps/web-ele/src/views/member/user/data.ts b/apps/web-ele/src/views/member/user/data.ts index aaadde5f..a9a76007 100644 --- a/apps/web-ele/src/views/member/user/data.ts +++ b/apps/web-ele/src/views/member/user/data.ts @@ -3,6 +3,8 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { h } from 'vue'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { convertToInteger, formatToFraction } from '@vben/utils'; import { ElTag } from 'element-plus'; @@ -12,12 +14,7 @@ import { getSimpleGroupList } from '#/api/member/group'; import { getSimpleLevelList } from '#/api/member/level'; import { getSimpleTagList } from '#/api/member/tag'; import { getAreaTree } from '#/api/system/area'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/pay/demo/order/data.ts b/apps/web-ele/src/views/pay/demo/order/data.ts index db91034d..5434f3b7 100644 --- a/apps/web-ele/src/views/pay/demo/order/data.ts +++ b/apps/web-ele/src/views/pay/demo/order/data.ts @@ -1,7 +1,7 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/pay/demo/withdraw/data.ts b/apps/web-ele/src/views/pay/demo/withdraw/data.ts index f73f65d6..643bb596 100644 --- a/apps/web-ele/src/views/pay/demo/withdraw/data.ts +++ b/apps/web-ele/src/views/pay/demo/withdraw/data.ts @@ -1,7 +1,7 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/system/mail/log/index.vue b/apps/web-ele/src/views/system/mail/log/index.vue index 7aaeef2f..4a91b7c1 100644 --- a/apps/web-ele/src/views/system/mail/log/index.vue +++ b/apps/web-ele/src/views/system/mail/log/index.vue @@ -6,11 +6,11 @@ import type { import type { SystemMailLogApi } from '#/api/system/mail/log'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getMailLogPage } from '#/api/system/mail/log'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils'; import { useGridColumns, useGridFormSchema } from './data'; import Detail from './modules/detail.vue'; diff --git a/apps/web-ele/src/views/system/mail/log/modules/detail.vue b/apps/web-ele/src/views/system/mail/log/modules/detail.vue index ab7828ac..f93ca191 100644 --- a/apps/web-ele/src/views/system/mail/log/modules/detail.vue +++ b/apps/web-ele/src/views/system/mail/log/modules/detail.vue @@ -4,12 +4,12 @@ import type { SystemMailLogApi } from '#/api/system/mail/log'; import { ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; import { formatDateTime } from '@vben/utils'; import { ElDescriptions, ElDescriptionsItem } from 'element-plus'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils'; const formData = ref(); diff --git a/apps/web-ele/src/views/system/mail/template/data.ts b/apps/web-ele/src/views/system/mail/template/data.ts index 26295395..f01fa54e 100644 --- a/apps/web-ele/src/views/system/mail/template/data.ts +++ b/apps/web-ele/src/views/system/mail/template/data.ts @@ -3,15 +3,12 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemMailTemplateApi } from '#/api/system/mail/template'; import { useAccess } from '@vben/access'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { z } from '#/adapter/form'; import { getSimpleMailAccountList } from '#/api/system/mail/account'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-ele/src/views/system/notify/template/data.ts b/apps/web-ele/src/views/system/notify/template/data.ts index 7d26d80b..2168089f 100644 --- a/apps/web-ele/src/views/system/notify/template/data.ts +++ b/apps/web-ele/src/views/system/notify/template/data.ts @@ -3,16 +3,12 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemNotifyTemplateApi } from '#/api/system/notify/template'; import { useAccess } from '@vben/access'; -import { UserTypeEnum } from '@vben/constants'; +import { CommonStatusEnum, DICT_TYPE, UserTypeEnum } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { z } from '#/adapter/form'; import { getSimpleUserList } from '#/api/system/user'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-ele/src/views/system/sms/channel/data.ts b/apps/web-ele/src/views/system/sms/channel/data.ts index 9f9232a8..2c39e618 100644 --- a/apps/web-ele/src/views/system/sms/channel/data.ts +++ b/apps/web-ele/src/views/system/sms/channel/data.ts @@ -3,14 +3,11 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemSmsChannelApi } from '#/api/system/sms/channel'; import { useAccess } from '@vben/access'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { z } from '#/adapter/form'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-ele/src/views/system/sms/template/data.ts b/apps/web-ele/src/views/system/sms/template/data.ts index 5bb5bc33..848e327b 100644 --- a/apps/web-ele/src/views/system/sms/template/data.ts +++ b/apps/web-ele/src/views/system/sms/template/data.ts @@ -3,15 +3,12 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemSmsTemplateApi } from '#/api/system/sms/template'; import { useAccess } from '@vben/access'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { z } from '#/adapter/form'; import { getSimpleSmsChannelList } from '#/api/system/sms/channel'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-ele/src/views/system/social/user/modules/detail.vue b/apps/web-ele/src/views/system/social/user/modules/detail.vue index 742c25a0..b91de387 100644 --- a/apps/web-ele/src/views/system/social/user/modules/detail.vue +++ b/apps/web-ele/src/views/system/social/user/modules/detail.vue @@ -4,13 +4,13 @@ import type { SystemSocialUserApi } from '#/api/system/social/user'; import { ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; import { ElDescriptions, ElDescriptionsItem, ElImage } from 'element-plus'; import { getSocialUser } from '#/api/system/social/user'; import { DictTag } from '#/components/dict-tag'; import { $t } from '#/locales'; -import { DICT_TYPE } from '#/utils'; const formData = ref(); diff --git a/apps/web-ele/src/views/system/tenant/data.ts b/apps/web-ele/src/views/system/tenant/data.ts index 2e5f6832..44e648ff 100644 --- a/apps/web-ele/src/views/system/tenant/data.ts +++ b/apps/web-ele/src/views/system/tenant/data.ts @@ -3,15 +3,12 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemTenantApi } from '#/api/system/tenant'; import { useAccess } from '@vben/access'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { z } from '#/adapter/form'; import { getTenantPackageList } from '#/api/system/tenant-package'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-ele/src/views/system/tenantPackage/data.ts b/apps/web-ele/src/views/system/tenantPackage/data.ts index 93e7aea1..010728c0 100644 --- a/apps/web-ele/src/views/system/tenantPackage/data.ts +++ b/apps/web-ele/src/views/system/tenantPackage/data.ts @@ -3,14 +3,11 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemTenantPackageApi } from '#/api/system/tenant-package'; import { useAccess } from '@vben/access'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { z } from '#/adapter/form'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-ele/src/views/system/user/data.ts b/apps/web-ele/src/views/system/user/data.ts index ad3d94f4..51bc5c07 100644 --- a/apps/web-ele/src/views/system/user/data.ts +++ b/apps/web-ele/src/views/system/user/data.ts @@ -2,6 +2,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemUserApi } from '#/api/system/user'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { $t } from '@vben/locales'; import { handleTree } from '@vben/utils'; @@ -9,12 +11,7 @@ import { z } from '#/adapter/form'; import { getDeptList } from '#/api/system/dept'; import { getSimplePostList } from '#/api/system/post'; import { getSimpleRoleList } from '#/api/system/role'; -import { - CommonStatusEnum, - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] {