diff --git a/apps/web-antd/src/views/ai/knowledge/knowledge/data.ts b/apps/web-antd/src/views/ai/knowledge/knowledge/data.ts index 21625fe9..37c5cb99 100644 --- a/apps/web-antd/src/views/ai/knowledge/knowledge/data.ts +++ b/apps/web-antd/src/views/ai/knowledge/knowledge/data.ts @@ -2,10 +2,12 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { AiModelTypeEnum, CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { z } from '#/adapter/form'; import { getModelSimpleList } from '#/api/ai/model/model'; -import { getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; + /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { return [ diff --git a/apps/web-antd/src/views/crm/statistics/portrait/data.ts b/apps/web-antd/src/views/crm/statistics/portrait/data.ts index 8c0e6944..673d2fda 100644 --- a/apps/web-antd/src/views/crm/statistics/portrait/data.ts +++ b/apps/web-antd/src/views/crm/statistics/portrait/data.ts @@ -1,12 +1,13 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { DICT_TYPE } from '@vben/constants'; import { useUserStore } from '@vben/stores'; import { beginOfDay, endOfDay, formatDateTime, handleTree } from '@vben/utils'; import { getSimpleDeptList } from '#/api/system/dept'; import { getSimpleUserList } from '#/api/system/user'; -import { DICT_TYPE, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; const userStore = useUserStore(); diff --git a/apps/web-antd/src/views/erp/sale/out/data.ts b/apps/web-antd/src/views/erp/sale/out/data.ts index 9212d47f..b345974a 100644 --- a/apps/web-antd/src/views/erp/sale/out/data.ts +++ b/apps/web-antd/src/views/erp/sale/out/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/out/data.ts b/apps/web-antd/src/views/erp/stock/out/data.ts index ca2095c3..a34ba517 100644 --- a/apps/web-antd/src/views/erp/stock/out/data.ts +++ b/apps/web-antd/src/views/erp/stock/out/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 { getCustomerSimpleList } from '#/api/erp/sale/customer'; 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/infra/apiAccessLog/data.ts b/apps/web-antd/src/views/infra/apiAccessLog/data.ts index e9cc4865..1183a4bb 100644 --- a/apps/web-antd/src/views/infra/apiAccessLog/data.ts +++ b/apps/web-antd/src/views/infra/apiAccessLog/data.ts @@ -5,10 +5,12 @@ import type { DescriptionItemSchema } from '#/components/description'; import { h } from 'vue'; import { JsonViewer } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { formatDateTime } from '@vben/utils'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/infra/apiErrorLog/data.ts b/apps/web-antd/src/views/infra/apiErrorLog/data.ts index 31f27cab..201c8911 100644 --- a/apps/web-antd/src/views/infra/apiErrorLog/data.ts +++ b/apps/web-antd/src/views/infra/apiErrorLog/data.ts @@ -5,13 +5,14 @@ import type { DescriptionItemSchema } from '#/components/description'; import { h } from 'vue'; import { JsonViewer } from '@vben/common-ui'; -import { InfraApiErrorLogProcessStatusEnum } from '@vben/constants'; +import { DICT_TYPE, InfraApiErrorLogProcessStatusEnum } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { formatDateTime } from '@vben/utils'; import { Textarea } from 'ant-design-vue'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/infra/config/data.ts b/apps/web-antd/src/views/infra/config/data.ts index 612b00ce..49945885 100644 --- a/apps/web-antd/src/views/infra/config/data.ts +++ b/apps/web-antd/src/views/infra/config/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/infra/demo/demo01/data.ts b/apps/web-antd/src/views/infra/demo/demo01/data.ts index c1f4f3b7..ec8ca5d0 100644 --- a/apps/web-antd/src/views/infra/demo/demo01/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo01/data.ts @@ -2,7 +2,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo01ContactApi } from '#/api/infra/demo/demo01'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/data.ts b/apps/web-antd/src/views/infra/demo/demo03/erp/data.ts index e734550e..31ce2d45 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/erp/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo03/erp/data.ts @@ -3,8 +3,10 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp'; import { useAccess } from '@vben/access'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/demo/demo03/inner/data.ts b/apps/web-antd/src/views/infra/demo/demo03/inner/data.ts index 54a15423..126a1d98 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/inner/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo03/inner/data.ts @@ -3,8 +3,10 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/inner'; import { useAccess } from '@vben/access'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts b/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts index 8aa1eeaf..67cc1aa8 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts @@ -3,8 +3,10 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal'; import { useAccess } from '@vben/access'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/demo/general/demo01/index.vue b/apps/web-antd/src/views/infra/demo/general/demo01/index.vue index 52f1b755..e31598bc 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo01/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo01/index.vue @@ -4,6 +4,8 @@ import type { Demo01ContactApi } from '#/api/infra/demo/demo01'; import { h, onMounted, reactive, ref } from 'vue'; import { Page, useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { Download, Plus, Trash2 } from '@vben/icons'; import { cloneDeep, @@ -34,7 +36,7 @@ import { DictTag } from '#/components/dict-tag'; import { TableToolbar } from '#/components/table-toolbar'; import { useTableToolbar } from '#/hooks'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; import Demo01ContactForm from './modules/form.vue'; diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue index 2cfeedc1..64146d8c 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue @@ -4,6 +4,8 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp'; import { h, onMounted, reactive, ref } from 'vue'; import { Page, useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { Download, Plus, Trash2 } from '@vben/icons'; import { cloneDeep, @@ -35,7 +37,7 @@ import { DictTag } from '#/components/dict-tag'; import { TableToolbar } from '#/components/table-toolbar'; import { useTableToolbar } from '#/hooks'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; import Demo03CourseList from './modules/demo03-course-list.vue'; import Demo03GradeList from './modules/demo03-grade-list.vue'; diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue index 2b15dd10..7a3fe922 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue @@ -4,6 +4,8 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal'; import { h, onMounted, reactive, ref } from 'vue'; import { Page, useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { Download, Plus, Trash2 } from '@vben/icons'; import { cloneDeep, @@ -35,7 +37,7 @@ import { DictTag } from '#/components/dict-tag'; import { TableToolbar } from '#/components/table-toolbar'; import { useTableToolbar } from '#/hooks'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; import Demo03CourseList from './modules/demo03-course-list.vue'; import Demo03GradeList from './modules/demo03-grade-list.vue'; diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue index d2dd4db3..17cf7942 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue @@ -4,6 +4,8 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal'; import { h, onMounted, reactive, ref } from 'vue'; import { Page, useVbenModal } from '@vben/common-ui'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; import { Download, Plus, Trash2 } from '@vben/icons'; import { cloneDeep, @@ -34,7 +36,7 @@ import { DictTag } from '#/components/dict-tag'; import { TableToolbar } from '#/components/table-toolbar'; import { useTableToolbar } from '#/hooks'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; import Demo03StudentForm from './modules/form.vue'; diff --git a/apps/web-antd/src/views/infra/fileConfig/data.ts b/apps/web-antd/src/views/infra/fileConfig/data.ts index b28d53de..233eca8d 100644 --- a/apps/web-antd/src/views/infra/fileConfig/data.ts +++ b/apps/web-antd/src/views/infra/fileConfig/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/promotion/article/category/data.ts b/apps/web-antd/src/views/mall/promotion/article/category/data.ts index d03a5d87..92b1f0d8 100644 --- a/apps/web-antd/src/views/mall/promotion/article/category/data.ts +++ b/apps/web-antd/src/views/mall/promotion/article/category/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeGridPropTypes } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/promotion/banner/data.ts b/apps/web-antd/src/views/mall/promotion/banner/data.ts index cdc7acbe..f2c78268 100644 --- a/apps/web-antd/src/views/mall/promotion/banner/data.ts +++ b/apps/web-antd/src/views/mall/promotion/banner/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeGridPropTypes } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/promotion/bargain/record/data.ts b/apps/web-antd/src/views/mall/promotion/bargain/record/data.ts index 9bd74a66..47480820 100644 --- a/apps/web-antd/src/views/mall/promotion/bargain/record/data.ts +++ b/apps/web-antd/src/views/mall/promotion/bargain/record/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/promotion/coupon/data.ts b/apps/web-antd/src/views/mall/promotion/coupon/data.ts index 36c9fe71..891e46cb 100644 --- a/apps/web-antd/src/views/mall/promotion/coupon/data.ts +++ b/apps/web-antd/src/views/mall/promotion/coupon/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; import { discountFormat } from './formatter'; diff --git a/apps/web-antd/src/views/mall/trade/afterSale/data.ts b/apps/web-antd/src/views/mall/trade/afterSale/data.ts index fbe685f1..eadc2982 100644 --- a/apps/web-antd/src/views/mall/trade/afterSale/data.ts +++ b/apps/web-antd/src/views/mall/trade/afterSale/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeGridPropTypes } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/trade/brokerage/record/data.ts b/apps/web-antd/src/views/mall/trade/brokerage/record/data.ts index c5e6ae68..f2ebf271 100644 --- a/apps/web-antd/src/views/mall/trade/brokerage/record/data.ts +++ b/apps/web-antd/src/views/mall/trade/brokerage/record/data.ts @@ -3,7 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { fenToYuan } from '@vben/utils'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue index 54dcf08f..f6c14a52 100644 --- a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue +++ b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue @@ -12,7 +12,10 @@ import { fenToYuan } from '@vben/utils'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getBrokerageRecordPage } from '#/api/mall/trade/brokerage/record'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 推广订单列表 */ defineOptions({ name: 'BrokerageOrderListModal' }); diff --git a/apps/web-antd/src/views/mall/trade/brokerage/withdraw/data.ts b/apps/web-antd/src/views/mall/trade/brokerage/withdraw/data.ts index f72e5281..be0fca3e 100644 --- a/apps/web-antd/src/views/mall/trade/brokerage/withdraw/data.ts +++ b/apps/web-antd/src/views/mall/trade/brokerage/withdraw/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/trade/order/data.ts b/apps/web-antd/src/views/mall/trade/order/data.ts index 375f280b..c411741b 100644 --- a/apps/web-antd/src/views/mall/trade/order/data.ts +++ b/apps/web-antd/src/views/mall/trade/order/data.ts @@ -8,7 +8,10 @@ import { DeliveryTypeEnum } from '@vben/constants'; import { getSimpleDeliveryExpressList } from '#/api/mall/trade/delivery/express'; import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pickUpStore'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; const pickUpStoreList = ref([]); diff --git a/apps/web-antd/src/views/member/point/record/data.ts b/apps/web-antd/src/views/member/point/record/data.ts index 69e082fd..01dba610 100644 --- a/apps/web-antd/src/views/member/point/record/data.ts +++ b/apps/web-antd/src/views/member/point/record/data.ts @@ -5,7 +5,10 @@ import { h } from 'vue'; import { Tag } from 'ant-design-vue'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/member/user/components/user-experience-record-list.vue b/apps/web-antd/src/views/member/user/components/user-experience-record-list.vue index 990d4554..eb7ad794 100644 --- a/apps/web-antd/src/views/member/user/components/user-experience-record-list.vue +++ b/apps/web-antd/src/views/member/user/components/user-experience-record-list.vue @@ -4,11 +4,14 @@ import type { MemberExperienceRecordApi } from '#/api/member/experience-record'; import { h } from 'vue'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + import { Tag } from 'ant-design-vue'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getExperienceRecordPage } from '#/api/member/experience-record'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; const props = defineProps<{ userId: number; diff --git a/apps/web-antd/src/views/member/user/components/user-point-list.vue b/apps/web-antd/src/views/member/user/components/user-point-list.vue index d82e93f6..cddd60db 100644 --- a/apps/web-antd/src/views/member/user/components/user-point-list.vue +++ b/apps/web-antd/src/views/member/user/components/user-point-list.vue @@ -4,7 +4,10 @@ import type { MemberPointRecordApi } from '#/api/member/point/record'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getRecordPage } from '#/api/member/point/record'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; import { useGridColumns } from '#/views/member/point/record/data'; const props = defineProps<{ diff --git a/apps/web-antd/src/views/pay/notify/data.ts b/apps/web-antd/src/views/pay/notify/data.ts index f1642cda..b2e48d9f 100644 --- a/apps/web-antd/src/views/pay/notify/data.ts +++ b/apps/web-antd/src/views/pay/notify/data.ts @@ -2,7 +2,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { getAppList } from '#/api/pay/app'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/pay/refund/data.ts b/apps/web-antd/src/views/pay/refund/data.ts index d34170f7..eb181c9b 100644 --- a/apps/web-antd/src/views/pay/refund/data.ts +++ b/apps/web-antd/src/views/pay/refund/data.ts @@ -10,7 +10,10 @@ import { Tag } from 'ant-design-vue'; import { getAppList } from '#/api/pay/app'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/pay/transfer/data.ts b/apps/web-antd/src/views/pay/transfer/data.ts index f400e334..815aaf2e 100644 --- a/apps/web-antd/src/views/pay/transfer/data.ts +++ b/apps/web-antd/src/views/pay/transfer/data.ts @@ -9,7 +9,10 @@ import { erpPriceInputFormatter, formatDateTime } from '@vben/utils'; import { Tag } from 'ant-design-vue'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/pay/wallet/balance/data.ts b/apps/web-antd/src/views/pay/wallet/balance/data.ts index f5e2c6ac..f7752822 100644 --- a/apps/web-antd/src/views/pay/wallet/balance/data.ts +++ b/apps/web-antd/src/views/pay/wallet/balance/data.ts @@ -2,7 +2,10 @@ import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; import type { VbenFormSchema } from '#/adapter/form'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ // TODO @xingyu:少了 placeholder diff --git a/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts b/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts index c0e70e62..0f8d3ae6 100644 --- a/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts +++ b/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/loginlog/data.ts b/apps/web-antd/src/views/system/loginlog/data.ts index b298022e..9ec1f92a 100644 --- a/apps/web-antd/src/views/system/loginlog/data.ts +++ b/apps/web-antd/src/views/system/loginlog/data.ts @@ -4,10 +4,11 @@ import type { DescriptionItemSchema } from '#/components/description'; import { h } from 'vue'; +import { DICT_TYPE } from '@vben/constants'; import { formatDateTime } from '@vben/utils'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getRangePickerDefaultProps } from '#/utils'; +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/mail/log/data.ts b/apps/web-antd/src/views/system/mail/log/data.ts index 9248fdb1..2d568850 100644 --- a/apps/web-antd/src/views/system/mail/log/data.ts +++ b/apps/web-antd/src/views/system/mail/log/data.ts @@ -8,7 +8,10 @@ import { formatDateTime } from '@vben/utils'; import { getSimpleMailAccountList } from '#/api/system/mail/account'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/notify/message/data.ts b/apps/web-antd/src/views/system/notify/message/data.ts index 76c3eb01..850a8256 100644 --- a/apps/web-antd/src/views/system/notify/message/data.ts +++ b/apps/web-antd/src/views/system/notify/message/data.ts @@ -7,7 +7,10 @@ import { h } from 'vue'; import { formatDateTime } from '@vben/utils'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/notify/my/data.ts b/apps/web-antd/src/views/system/notify/my/data.ts index fc060600..7427bcc0 100644 --- a/apps/web-antd/src/views/system/notify/my/data.ts +++ b/apps/web-antd/src/views/system/notify/my/data.ts @@ -7,7 +7,10 @@ import { h } from 'vue'; import { formatDateTime } from '@vben/utils'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/notify/template/data.ts b/apps/web-antd/src/views/system/notify/template/data.ts index 80cecdd7..4a251c24 100644 --- a/apps/web-antd/src/views/system/notify/template/data.ts +++ b/apps/web-antd/src/views/system/notify/template/data.ts @@ -5,7 +5,10 @@ import { CommonStatusEnum, UserTypeEnum } from '@vben/constants'; import { z } from '#/adapter/form'; import { getSimpleUserList } from '#/api/system/user'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { return [ diff --git a/apps/web-antd/src/views/system/role/data.ts b/apps/web-antd/src/views/system/role/data.ts index 3a0496cd..6029ac2f 100644 --- a/apps/web-antd/src/views/system/role/data.ts +++ b/apps/web-antd/src/views/system/role/data.ts @@ -4,7 +4,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { CommonStatusEnum, SystemDataScopeEnum } from '@vben/constants'; import { z } from '#/adapter/form'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/sms/log/data.ts b/apps/web-antd/src/views/system/sms/log/data.ts index ae514725..e256287a 100644 --- a/apps/web-antd/src/views/system/sms/log/data.ts +++ b/apps/web-antd/src/views/system/sms/log/data.ts @@ -8,7 +8,10 @@ import { formatDateTime } from '@vben/utils'; import { getSimpleSmsChannelList } from '#/api/system/sms/channel'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/social/user/data.ts b/apps/web-antd/src/views/system/social/user/data.ts index 7271efdd..7b8e1dae 100644 --- a/apps/web-antd/src/views/system/social/user/data.ts +++ b/apps/web-antd/src/views/system/social/user/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/infra/apiAccessLog/data.ts b/apps/web-ele/src/views/infra/apiAccessLog/data.ts index f89f82e2..eaea3ebe 100644 --- a/apps/web-ele/src/views/infra/apiAccessLog/data.ts +++ b/apps/web-ele/src/views/infra/apiAccessLog/data.ts @@ -4,7 +4,10 @@ import type { InfraApiAccessLogApi } from '#/api/infra/api-access-log'; import { useAccess } from '@vben/access'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-ele/src/views/infra/apiErrorLog/data.ts b/apps/web-ele/src/views/infra/apiErrorLog/data.ts index 658883db..11dd95c9 100644 --- a/apps/web-ele/src/views/infra/apiErrorLog/data.ts +++ b/apps/web-ele/src/views/infra/apiErrorLog/data.ts @@ -5,7 +5,10 @@ import type { InfraApiErrorLogApi } from '#/api/infra/api-error-log'; import { useAccess } from '@vben/access'; import { InfraApiErrorLogProcessStatusEnum } from '@vben/constants'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-ele/src/views/infra/codegen/data.ts b/apps/web-ele/src/views/infra/codegen/data.ts index e4115430..0c739a68 100644 --- a/apps/web-ele/src/views/infra/codegen/data.ts +++ b/apps/web-ele/src/views/infra/codegen/data.ts @@ -14,7 +14,10 @@ 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 { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-ele/src/views/infra/config/data.ts b/apps/web-ele/src/views/infra/config/data.ts index 72afcb9d..ae85e01a 100644 --- a/apps/web-ele/src/views/infra/config/data.ts +++ b/apps/web-ele/src/views/infra/config/data.ts @@ -4,7 +4,10 @@ import type { InfraConfigApi } from '#/api/infra/config'; import { useAccess } from '@vben/access'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-ele/src/views/infra/demo/demo01/data.ts b/apps/web-ele/src/views/infra/demo/demo01/data.ts index b621b970..bb54cf1e 100644 --- a/apps/web-ele/src/views/infra/demo/demo01/data.ts +++ b/apps/web-ele/src/views/infra/demo/demo01/data.ts @@ -2,7 +2,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo01ContactApi } from '#/api/infra/demo/demo01'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/infra/demo/demo03/erp/data.ts b/apps/web-ele/src/views/infra/demo/demo03/erp/data.ts index 8f202c04..a1dc7349 100644 --- a/apps/web-ele/src/views/infra/demo/demo03/erp/data.ts +++ b/apps/web-ele/src/views/infra/demo/demo03/erp/data.ts @@ -2,7 +2,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/infra/demo/demo03/inner/data.ts b/apps/web-ele/src/views/infra/demo/demo03/inner/data.ts index d9d95009..5a8e537e 100644 --- a/apps/web-ele/src/views/infra/demo/demo03/inner/data.ts +++ b/apps/web-ele/src/views/infra/demo/demo03/inner/data.ts @@ -2,7 +2,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/inner'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/infra/demo/demo03/normal/data.ts b/apps/web-ele/src/views/infra/demo/demo03/normal/data.ts index 3872175e..583437d9 100644 --- a/apps/web-ele/src/views/infra/demo/demo03/normal/data.ts +++ b/apps/web-ele/src/views/infra/demo/demo03/normal/data.ts @@ -2,7 +2,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/infra/fileConfig/data.ts b/apps/web-ele/src/views/infra/fileConfig/data.ts index 1fee714d..77d5cf1c 100644 --- a/apps/web-ele/src/views/infra/fileConfig/data.ts +++ b/apps/web-ele/src/views/infra/fileConfig/data.ts @@ -4,7 +4,10 @@ import type { InfraFileConfigApi } from '#/api/infra/file-config'; import { useAccess } from '@vben/access'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-ele/src/views/mall/promotion/article/category/data.ts b/apps/web-ele/src/views/mall/promotion/article/category/data.ts index d03a5d87..92b1f0d8 100644 --- a/apps/web-ele/src/views/mall/promotion/article/category/data.ts +++ b/apps/web-ele/src/views/mall/promotion/article/category/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeGridPropTypes } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/mall/promotion/banner/data.ts b/apps/web-ele/src/views/mall/promotion/banner/data.ts index cdc7acbe..f2c78268 100644 --- a/apps/web-ele/src/views/mall/promotion/banner/data.ts +++ b/apps/web-ele/src/views/mall/promotion/banner/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeGridPropTypes } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/mall/promotion/bargain/record/data.ts b/apps/web-ele/src/views/mall/promotion/bargain/record/data.ts index 74d904fe..836500ce 100644 --- a/apps/web-ele/src/views/mall/promotion/bargain/record/data.ts +++ b/apps/web-ele/src/views/mall/promotion/bargain/record/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/mall/promotion/coupon/data.ts b/apps/web-ele/src/views/mall/promotion/coupon/data.ts index 36c9fe71..891e46cb 100644 --- a/apps/web-ele/src/views/mall/promotion/coupon/data.ts +++ b/apps/web-ele/src/views/mall/promotion/coupon/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; import { discountFormat } from './formatter'; diff --git a/apps/web-ele/src/views/mall/trade/afterSale/data.ts b/apps/web-ele/src/views/mall/trade/afterSale/data.ts index 652757a7..94c3ed76 100644 --- a/apps/web-ele/src/views/mall/trade/afterSale/data.ts +++ b/apps/web-ele/src/views/mall/trade/afterSale/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeGridPropTypes } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/mall/trade/brokerage/record/data.ts b/apps/web-ele/src/views/mall/trade/brokerage/record/data.ts index c5e6ae68..f2ebf271 100644 --- a/apps/web-ele/src/views/mall/trade/brokerage/record/data.ts +++ b/apps/web-ele/src/views/mall/trade/brokerage/record/data.ts @@ -3,7 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { fenToYuan } from '@vben/utils'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue index 162a47ce..10134b44 100644 --- a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue +++ b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue @@ -12,7 +12,10 @@ import { fenToYuan } from '@vben/utils'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getBrokerageRecordPage } from '#/api/mall/trade/brokerage/record'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 推广订单列表 */ defineOptions({ name: 'BrokerageOrderListModal' }); diff --git a/apps/web-ele/src/views/mall/trade/brokerage/withdraw/data.ts b/apps/web-ele/src/views/mall/trade/brokerage/withdraw/data.ts index 34bce206..dbf6d094 100644 --- a/apps/web-ele/src/views/mall/trade/brokerage/withdraw/data.ts +++ b/apps/web-ele/src/views/mall/trade/brokerage/withdraw/data.ts @@ -1,7 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/mall/trade/order/data.ts b/apps/web-ele/src/views/mall/trade/order/data.ts index a9bd9130..fad53d58 100644 --- a/apps/web-ele/src/views/mall/trade/order/data.ts +++ b/apps/web-ele/src/views/mall/trade/order/data.ts @@ -8,7 +8,10 @@ import { DeliveryTypeEnum } from '@vben/constants'; import { getSimpleDeliveryExpressList } from '#/api/mall/trade/delivery/express'; import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pickUpStore'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; const pickUpStoreList = ref([]); diff --git a/apps/web-ele/src/views/member/point/record/data.ts b/apps/web-ele/src/views/member/point/record/data.ts index df373c37..2ae8a5d2 100644 --- a/apps/web-ele/src/views/member/point/record/data.ts +++ b/apps/web-ele/src/views/member/point/record/data.ts @@ -5,7 +5,10 @@ import { h } from 'vue'; import { ElTag } from 'element-plus'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/member/user/components/user-after-sale-list.vue b/apps/web-ele/src/views/member/user/components/user-after-sale-list.vue index d867593e..8d18f07c 100644 --- a/apps/web-ele/src/views/member/user/components/user-after-sale-list.vue +++ b/apps/web-ele/src/views/member/user/components/user-after-sale-list.vue @@ -8,7 +8,10 @@ import { ElTabPane, ElTabs } from 'element-plus'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getAfterSalePage } from '#/api/mall/trade/afterSale'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; import { useGridColumns } from '#/views/mall/trade/order/data'; const props = defineProps<{ diff --git a/apps/web-ele/src/views/member/user/components/user-coupon-list.vue b/apps/web-ele/src/views/member/user/components/user-coupon-list.vue index d5a5760e..6b40c2ce 100644 --- a/apps/web-ele/src/views/member/user/components/user-coupon-list.vue +++ b/apps/web-ele/src/views/member/user/components/user-coupon-list.vue @@ -11,7 +11,10 @@ import { deleteCoupon, getCouponPage, } from '#/api/mall/promotion/coupon/coupon'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; const props = defineProps<{ userId: number; diff --git a/apps/web-ele/src/views/member/user/components/user-experience-record-list.vue b/apps/web-ele/src/views/member/user/components/user-experience-record-list.vue index c66fab8d..cf046f5f 100644 --- a/apps/web-ele/src/views/member/user/components/user-experience-record-list.vue +++ b/apps/web-ele/src/views/member/user/components/user-experience-record-list.vue @@ -8,7 +8,10 @@ import { ElTag } from 'element-plus'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getExperienceRecordPage } from '#/api/member/experience-record'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; const props = defineProps<{ userId: number; diff --git a/apps/web-ele/src/views/member/user/components/user-order-list.vue b/apps/web-ele/src/views/member/user/components/user-order-list.vue index ee6a0f49..fa09ddb9 100644 --- a/apps/web-ele/src/views/member/user/components/user-order-list.vue +++ b/apps/web-ele/src/views/member/user/components/user-order-list.vue @@ -17,7 +17,10 @@ import { getSimpleDeliveryExpressList } from '#/api/mall/trade/delivery/express' import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pickUpStore'; import * as OrderApi from '#/api/mall/trade/order/index'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; import { useGridColumns } from '#/views/mall/trade/order/data'; const props = defineProps<{ diff --git a/apps/web-ele/src/views/member/user/components/user-point-list.vue b/apps/web-ele/src/views/member/user/components/user-point-list.vue index d82e93f6..cddd60db 100644 --- a/apps/web-ele/src/views/member/user/components/user-point-list.vue +++ b/apps/web-ele/src/views/member/user/components/user-point-list.vue @@ -4,7 +4,10 @@ import type { MemberPointRecordApi } from '#/api/member/point/record'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getRecordPage } from '#/api/member/point/record'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; import { useGridColumns } from '#/views/member/point/record/data'; const props = defineProps<{ diff --git a/apps/web-ele/src/views/pay/notify/data.ts b/apps/web-ele/src/views/pay/notify/data.ts index 2b2cdfcc..9acba93c 100644 --- a/apps/web-ele/src/views/pay/notify/data.ts +++ b/apps/web-ele/src/views/pay/notify/data.ts @@ -2,7 +2,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { getAppList } from '#/api/pay/app'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ // TODO @霖:缺少 placeholder diff --git a/apps/web-ele/src/views/pay/refund/data.ts b/apps/web-ele/src/views/pay/refund/data.ts index 2050fcd3..35d0ecf6 100644 --- a/apps/web-ele/src/views/pay/refund/data.ts +++ b/apps/web-ele/src/views/pay/refund/data.ts @@ -10,7 +10,10 @@ import { ElTag } from 'element-plus'; import { getAppList } from '#/api/pay/app'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/pay/transfer/data.ts b/apps/web-ele/src/views/pay/transfer/data.ts index 9da7183b..c1860ab0 100644 --- a/apps/web-ele/src/views/pay/transfer/data.ts +++ b/apps/web-ele/src/views/pay/transfer/data.ts @@ -9,7 +9,10 @@ import { erpPriceInputFormatter, formatDateTime } from '@vben/utils'; import { ElTag } from 'element-plus'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/pay/wallet/balance/data.ts b/apps/web-ele/src/views/pay/wallet/balance/data.ts index 13e30558..fa4dc9fc 100644 --- a/apps/web-ele/src/views/pay/wallet/balance/data.ts +++ b/apps/web-ele/src/views/pay/wallet/balance/data.ts @@ -2,7 +2,10 @@ import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; import type { VbenFormSchema } from '#/adapter/form'; -import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; +import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ // TODO @霖:少了 placeholder