diff --git a/apps/web-antd/src/components/dict-tag/dict-tag.vue b/apps/web-antd/src/components/dict-tag/dict-tag.vue index 9e1825e0..fb26b4ae 100644 --- a/apps/web-antd/src/components/dict-tag/dict-tag.vue +++ b/apps/web-antd/src/components/dict-tag/dict-tag.vue @@ -4,7 +4,7 @@ import { computed } from 'vue'; import { Tag } from 'ant-design-vue'; // import { isHexColor } from '@/utils/color' // TODO @芋艿:【可优化】增加 cssClass 的处理 https://gitee.com/yudaocode/yudao-ui-admin-vben/blob/v2.4.1/src/components/DictTag/src/DictTag.vue#L60 -import { getDictObj } from '#/utils/dict'; +import { getDictObj } from '#/utils'; interface DictTagProps { /** diff --git a/apps/web-antd/src/components/form-create/components/dict-select.vue b/apps/web-antd/src/components/form-create/components/dict-select.vue index e6e198f0..0b436952 100644 --- a/apps/web-antd/src/components/form-create/components/dict-select.vue +++ b/apps/web-antd/src/components/form-create/components/dict-select.vue @@ -13,7 +13,7 @@ import { SelectOption, } from 'ant-design-vue'; -import { getDictObj, getIntDictOptions, getStrDictOptions } from '#/utils/dict'; +import { getDictObj, getIntDictOptions, getStrDictOptions } from '#/utils'; defineOptions({ name: 'DictSelect' }); diff --git a/apps/web-antd/src/views/_core/profile/modules/base-info.vue b/apps/web-antd/src/views/_core/profile/modules/base-info.vue index 4887424c..f4b9393b 100644 --- a/apps/web-antd/src/views/_core/profile/modules/base-info.vue +++ b/apps/web-antd/src/views/_core/profile/modules/base-info.vue @@ -11,7 +11,7 @@ import { message } from 'ant-design-vue'; import { useVbenForm, z } from '#/adapter/form'; import { updateUserProfile } from '#/api/system/user/profile'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions } from '#/utils'; const props = defineProps<{ profile?: SystemUserProfileApi.UserProfileRespVO; diff --git a/apps/web-antd/src/views/_core/profile/modules/user-social.vue b/apps/web-antd/src/views/_core/profile/modules/user-social.vue index 62f3669a..ef24bc7a 100644 --- a/apps/web-antd/src/views/_core/profile/modules/user-social.vue +++ b/apps/web-antd/src/views/_core/profile/modules/user-social.vue @@ -17,8 +17,7 @@ import { socialUnbind, } from '#/api/system/social/user'; import { $t } from '#/locales'; -import { SystemUserSocialTypeEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictLabel } from '#/utils/dict'; +import { DICT_TYPE, getDictLabel, SystemUserSocialTypeEnum } from '#/utils'; const emit = defineEmits<{ (e: 'update:activeName', v: string): void; diff --git a/apps/web-antd/src/views/bpm/category/data.ts b/apps/web-antd/src/views/bpm/category/data.ts index 179eefc0..db53d57e 100644 --- a/apps/web-antd/src/views/bpm/category/data.ts +++ b/apps/web-antd/src/views/bpm/category/data.ts @@ -5,8 +5,7 @@ import type { BpmCategoryApi } from '#/api/bpm/category'; import { useAccess } from '@vben/access'; import { z } from '#/adapter/form'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; const { hasAccessByCodes } = useAccess(); /** 新增/修改的表单 */ diff --git a/apps/web-antd/src/views/bpm/group/data.ts b/apps/web-antd/src/views/bpm/group/data.ts index 58da1944..c18a4b40 100644 --- a/apps/web-antd/src/views/bpm/group/data.ts +++ b/apps/web-antd/src/views/bpm/group/data.ts @@ -6,8 +6,7 @@ import { useAccess } from '@vben/access'; import { z } from '#/adapter/form'; import { getSimpleUserList } from '#/api/system/user'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; const { hasAccessByCodes } = useAccess(); /** 新增/修改的表单 */ diff --git a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue index 5ebcee1f..08443f1e 100644 --- a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue +++ b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue @@ -20,7 +20,7 @@ import { import { updateModelSortBatch } from '#/api/bpm/model'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '#/utils'; const props = defineProps<{ categoryInfo: BpmCategoryApi.ModelCategoryInfo; diff --git a/apps/web-antd/src/views/crm/backlog/data.ts b/apps/web-antd/src/views/crm/backlog/data.ts index d42be580..6606f801 100644 --- a/apps/web-antd/src/views/crm/backlog/data.ts +++ b/apps/web-antd/src/views/crm/backlog/data.ts @@ -7,7 +7,7 @@ import type { CrmReceivableApi } from '#/api/crm/receivable'; import { useAccess } from '@vben/access'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/crm/business/status/data.ts b/apps/web-antd/src/views/crm/business/status/data.ts index 2cdfce00..ad6c88b7 100644 --- a/apps/web-antd/src/views/crm/business/status/data.ts +++ b/apps/web-antd/src/views/crm/business/status/data.ts @@ -3,11 +3,14 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { CrmBusinessStatusApi } from '#/api/crm/business/status'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { + CommonStatusEnum, + DICT_TYPE, + getDictOptions, + getRangePickerDefaultProps, +} from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/apiAccessLog/data.ts b/apps/web-antd/src/views/infra/apiAccessLog/data.ts index 2f017a6b..e924c247 100644 --- a/apps/web-antd/src/views/infra/apiAccessLog/data.ts +++ b/apps/web-antd/src/views/infra/apiAccessLog/data.ts @@ -3,9 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { InfraApiAccessLogApi } from '#/api/infra/api-access-log'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue b/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue index 33c7f263..dcac73c0 100644 --- a/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue +++ b/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue @@ -9,7 +9,7 @@ import { formatDateTime } from '@vben/utils'; import { Descriptions } from 'ant-design-vue'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '#/utils'; const formData = ref(); diff --git a/apps/web-antd/src/views/infra/apiErrorLog/data.ts b/apps/web-antd/src/views/infra/apiErrorLog/data.ts index 5a746b48..0344c310 100644 --- a/apps/web-antd/src/views/infra/apiErrorLog/data.ts +++ b/apps/web-antd/src/views/infra/apiErrorLog/data.ts @@ -3,10 +3,13 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { InfraApiErrorLogApi } from '#/api/infra/api-error-log'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; -import { InfraApiErrorLogProcessStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { + DICT_TYPE, + getDictOptions, + getRangePickerDefaultProps, + InfraApiErrorLogProcessStatusEnum, +} from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/apiErrorLog/index.vue b/apps/web-antd/src/views/infra/apiErrorLog/index.vue index c8ee3736..f6997ca1 100644 --- a/apps/web-antd/src/views/infra/apiErrorLog/index.vue +++ b/apps/web-antd/src/views/infra/apiErrorLog/index.vue @@ -19,7 +19,7 @@ import { } from '#/api/infra/api-error-log'; import { DocAlert } from '#/components/doc-alert'; import { $t } from '#/locales'; -import { InfraApiErrorLogProcessStatusEnum } from '#/utils/constants'; +import { InfraApiErrorLogProcessStatusEnum } from '#/utils'; import { useGridColumns, useGridFormSchema } from './data'; import Detail from './modules/detail.vue'; diff --git a/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue b/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue index dec2b3ef..9b9257c3 100644 --- a/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue +++ b/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue @@ -9,7 +9,7 @@ import { formatDateTime } from '@vben/utils'; import { Descriptions, Input } from 'ant-design-vue'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '#/utils'; const formData = ref(); diff --git a/apps/web-antd/src/views/infra/codegen/data.ts b/apps/web-antd/src/views/infra/codegen/data.ts index 63625a87..90ccb899 100644 --- a/apps/web-antd/src/views/infra/codegen/data.ts +++ b/apps/web-antd/src/views/infra/codegen/data.ts @@ -10,11 +10,11 @@ import { h } from 'vue'; import { useAccess } from '@vben/access'; import { IconifyIcon } from '@vben/icons'; import { $t } from '@vben/locales'; -import { getRangePickerDefaultProps, handleTree } from '@vben/utils'; +import { handleTree } from '@vben/utils'; import { getDataSourceConfigList } from '#/api/infra/data-source-config'; import { getMenuList } from '#/api/system/menu'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/codegen/modules/generation-info.vue b/apps/web-antd/src/views/infra/codegen/modules/generation-info.vue index 9e778f4a..da859ef2 100644 --- a/apps/web-antd/src/views/infra/codegen/modules/generation-info.vue +++ b/apps/web-antd/src/views/infra/codegen/modules/generation-info.vue @@ -7,7 +7,7 @@ import { isEmpty } from '@vben/utils'; import { useVbenForm } from '#/adapter/form'; import { getCodegenTableList } from '#/api/infra/codegen'; -import { InfraCodegenTemplateTypeEnum } from '#/utils/constants'; +import { InfraCodegenTemplateTypeEnum } from '#/utils'; import { useGenerationInfoBaseFormSchema, diff --git a/apps/web-antd/src/views/infra/config/data.ts b/apps/web-antd/src/views/infra/config/data.ts index eea9ec40..1a79bc3b 100644 --- a/apps/web-antd/src/views/infra/config/data.ts +++ b/apps/web-antd/src/views/infra/config/data.ts @@ -3,9 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { InfraConfigApi } from '#/api/infra/config'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); 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 fd6b2151..b91c07b7 100644 --- a/apps/web-antd/src/views/infra/demo/demo01/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo01/data.ts @@ -3,9 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo01ContactApi } from '#/api/infra/demo/demo01'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/demo/demo02/data.ts b/apps/web-antd/src/views/infra/demo/demo02/data.ts index c5e6b211..1830d4ae 100644 --- a/apps/web-antd/src/views/infra/demo/demo02/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo02/data.ts @@ -3,9 +3,10 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo02CategoryApi } from '#/api/infra/demo/demo02'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps, handleTree } from '@vben/utils'; +import { handleTree } from '@vben/utils'; import { getDemo02CategoryList } from '#/api/infra/demo/demo02'; +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); 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 22baa000..d0c360f3 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,9 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, 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 53bad6dc..64024093 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,9 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/inner'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, 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 0134bca9..6520e9b3 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,9 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, 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 e652c2a2..46949620 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 @@ -11,7 +11,6 @@ import { cloneDeep, downloadFileFromBlobPart, formatDateTime, - getRangePickerDefaultProps, } from '@vben/utils'; import { @@ -34,7 +33,7 @@ import { ContentWrap } from '#/components/content-wrap'; import { DictTag } from '#/components/dict-tag'; import { TableToolbar } from '#/components/table-toolbar'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; import Demo01ContactForm from './modules/form.vue'; 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 d4555390..b41ba181 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 @@ -24,7 +24,7 @@ import { import { Tinymce as RichTextarea } from '#/components/tinymce'; import { ImageUpload } from '#/components/upload'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions } from '#/utils'; const emit = defineEmits(['success']); diff --git a/apps/web-antd/src/views/infra/demo/general/demo02/index.vue b/apps/web-antd/src/views/infra/demo/general/demo02/index.vue index 0114fe9c..787ead28 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo02/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo02/index.vue @@ -11,7 +11,6 @@ import { cloneDeep, downloadFileFromBlobPart, formatDateTime, - getRangePickerDefaultProps, isEmpty, } from '@vben/utils'; @@ -26,6 +25,7 @@ import { import { ContentWrap } from '#/components/content-wrap'; import { TableToolbar } from '#/components/table-toolbar'; import { $t } from '#/locales'; +import { getRangePickerDefaultProps } from '#/utils'; import Demo02CategoryForm 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 36c41692..eac71e3e 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 @@ -11,7 +11,6 @@ import { cloneDeep, downloadFileFromBlobPart, formatDateTime, - getRangePickerDefaultProps, } from '@vben/utils'; import { @@ -36,7 +35,7 @@ import { ContentWrap } from '#/components/content-wrap'; import { DictTag } from '#/components/dict-tag'; import { TableToolbar } from '#/components/table-toolbar'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, 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/erp/modules/demo03-course-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue index 61719a63..d73eb780 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue @@ -7,11 +7,7 @@ import { h, nextTick, onMounted, reactive, ref, watch } from 'vue'; import { useVbenModal } from '@vben/common-ui'; import { Plus } from '@vben/icons'; -import { - cloneDeep, - formatDateTime, - getRangePickerDefaultProps, -} from '@vben/utils'; +import { cloneDeep, formatDateTime } from '@vben/utils'; import { Button, @@ -30,6 +26,7 @@ import { import { ContentWrap } from '#/components/content-wrap'; import { TableToolbar } from '#/components/table-toolbar'; import { $t } from '#/locales'; +import { getRangePickerDefaultProps } from '#/utils'; import Demo03CourseForm from './demo03-course-form.vue'; diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue index 3cc8b9d4..30c4e425 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue @@ -7,11 +7,7 @@ import { h, nextTick, onMounted, reactive, ref, watch } from 'vue'; import { useVbenModal } from '@vben/common-ui'; import { Plus } from '@vben/icons'; -import { - cloneDeep, - formatDateTime, - getRangePickerDefaultProps, -} from '@vben/utils'; +import { cloneDeep, formatDateTime } from '@vben/utils'; import { Button, @@ -30,6 +26,7 @@ import { import { ContentWrap } from '#/components/content-wrap'; import { TableToolbar } from '#/components/table-toolbar'; import { $t } from '#/locales'; +import { getRangePickerDefaultProps } from '#/utils'; import Demo03GradeForm from './demo03-grade-form.vue'; 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 e3b9cf4b..b88bb69b 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 @@ -23,7 +23,7 @@ import { } from '#/api/infra/demo/demo03/erp'; import { Tinymce as RichTextarea } from '#/components/tinymce'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions } from '#/utils'; const emit = defineEmits(['success']); 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 2e9e11f0..c04af694 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 @@ -11,7 +11,6 @@ import { cloneDeep, downloadFileFromBlobPart, formatDateTime, - getRangePickerDefaultProps, } from '@vben/utils'; import { @@ -36,7 +35,7 @@ import { ContentWrap } from '#/components/content-wrap'; import { DictTag } from '#/components/dict-tag'; import { TableToolbar } from '#/components/table-toolbar'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, 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/modules/form.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/form.vue index 62beceea..c4e8da84 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 @@ -24,7 +24,7 @@ import { } from '#/api/infra/demo/demo03/normal'; import { Tinymce as RichTextarea } from '#/components/tinymce'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +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/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue index df93b9c4..3dfa25e3 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 @@ -11,7 +11,6 @@ import { cloneDeep, downloadFileFromBlobPart, formatDateTime, - getRangePickerDefaultProps, } from '@vben/utils'; import { @@ -35,7 +34,7 @@ import { ContentWrap } from '#/components/content-wrap'; import { DictTag } from '#/components/dict-tag'; import { TableToolbar } from '#/components/table-toolbar'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; import Demo03StudentForm from './modules/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 b4ce2e27..4681d3f2 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 @@ -24,7 +24,7 @@ import { } from '#/api/infra/demo/demo03/normal'; import { Tinymce as RichTextarea } from '#/components/tinymce'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions } from '#/utils'; import Demo03CourseForm from './demo03-course-form.vue'; import Demo03GradeForm from './demo03-grade-form.vue'; @@ -82,8 +82,8 @@ const [Modal, modalApi] = useVbenModal({ // 提交表单 const data = formData.value as Demo03StudentApi.Demo03Student; // 拼接子表的数据 - data.demo03Courses = demo03CourseFormRef.value?.getData(); - data.demo03Grade = demo03GradeFormRef.value?.getValues(); + data.demo03courses = demo03CourseFormRef.value?.getData(); + data.demo03grade = demo03GradeFormRef.value?.getValues(); try { await (formData.value?.id ? updateDemo03Student(data) diff --git a/apps/web-antd/src/views/infra/file/data.ts b/apps/web-antd/src/views/infra/file/data.ts index 2ebba679..18d580cd 100644 --- a/apps/web-antd/src/views/infra/file/data.ts +++ b/apps/web-antd/src/views/infra/file/data.ts @@ -3,7 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { InfraFileApi } from '#/api/infra/file'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; + +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/fileConfig/data.ts b/apps/web-antd/src/views/infra/fileConfig/data.ts index fec4f28f..219a362c 100644 --- a/apps/web-antd/src/views/infra/fileConfig/data.ts +++ b/apps/web-antd/src/views/infra/fileConfig/data.ts @@ -3,9 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { InfraFileConfigApi } from '#/api/infra/file-config'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/job/data.ts b/apps/web-antd/src/views/infra/job/data.ts index 953f7ba9..b2dfa08c 100644 --- a/apps/web-antd/src/views/infra/job/data.ts +++ b/apps/web-antd/src/views/infra/job/data.ts @@ -4,8 +4,7 @@ import type { InfraJobApi } from '#/api/infra/job'; import { useAccess } from '@vben/access'; -import { InfraJobStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, InfraJobStatusEnum } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/job/index.vue b/apps/web-antd/src/views/infra/job/index.vue index 081c4b0e..4da888dd 100644 --- a/apps/web-antd/src/views/infra/job/index.vue +++ b/apps/web-antd/src/views/infra/job/index.vue @@ -23,7 +23,7 @@ import { } from '#/api/infra/job'; import { DocAlert } from '#/components/doc-alert'; import { $t } from '#/locales'; -import { InfraJobStatusEnum } from '#/utils/constants'; +import { InfraJobStatusEnum } from '#/utils'; import { useGridColumns, useGridFormSchema } from './data'; import Detail from './modules/detail.vue'; 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 e16ed695..c5903edf 100644 --- a/apps/web-antd/src/views/infra/job/logger/data.ts +++ b/apps/web-antd/src/views/infra/job/logger/data.ts @@ -7,7 +7,7 @@ import { formatDateTime } from '@vben/utils'; import dayjs from 'dayjs'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/job/logger/modules/detail.vue b/apps/web-antd/src/views/infra/job/logger/modules/detail.vue index 2b52c6c1..dd6c7b5a 100644 --- a/apps/web-antd/src/views/infra/job/logger/modules/detail.vue +++ b/apps/web-antd/src/views/infra/job/logger/modules/detail.vue @@ -10,7 +10,7 @@ import { Descriptions } from 'ant-design-vue'; import { getJobLog } from '#/api/infra/job-log'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '#/utils'; const formData = ref(); diff --git a/apps/web-antd/src/views/infra/job/modules/detail.vue b/apps/web-antd/src/views/infra/job/modules/detail.vue index 8ebd101e..bd7f39b0 100644 --- a/apps/web-antd/src/views/infra/job/modules/detail.vue +++ b/apps/web-antd/src/views/infra/job/modules/detail.vue @@ -10,7 +10,7 @@ import { Descriptions, Timeline } from 'ant-design-vue'; import { getJob, getJobNextTimes } from '#/api/infra/job'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '#/utils'; const formData = ref(); // 任务详情 const nextTimes = ref([]); // 下一次执行时间 diff --git a/apps/web-antd/src/views/pay/notify/data.ts b/apps/web-antd/src/views/pay/notify/data.ts index c21814c1..48798588 100644 --- a/apps/web-antd/src/views/pay/notify/data.ts +++ b/apps/web-antd/src/views/pay/notify/data.ts @@ -4,7 +4,7 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import { useAccess } from '@vben/access'; import { getAppList } from '#/api/pay/app'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions } from '#/utils'; const { hasAccessByCodes } = useAccess(); 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 3d18c41c..1649533e 100644 --- a/apps/web-antd/src/views/pay/notify/modules/detail.vue +++ b/apps/web-antd/src/views/pay/notify/modules/detail.vue @@ -8,7 +8,7 @@ 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/dict'; +import { DICT_TYPE } from '#/utils'; import { detailColumns } from '../data'; diff --git a/apps/web-antd/src/views/pay/refund/data.ts b/apps/web-antd/src/views/pay/refund/data.ts index 2ce8917e..73928585 100644 --- a/apps/web-antd/src/views/pay/refund/data.ts +++ b/apps/web-antd/src/views/pay/refund/data.ts @@ -5,7 +5,7 @@ import type { PayRefundApi } from '#/api/pay/refund'; import { useAccess } from '@vben/access'; import { getAppList } from '#/api/pay/app'; -import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/pay/refund/modules/detail.vue b/apps/web-antd/src/views/pay/refund/modules/detail.vue index 557fb613..82d0d910 100644 --- a/apps/web-antd/src/views/pay/refund/modules/detail.vue +++ b/apps/web-antd/src/views/pay/refund/modules/detail.vue @@ -10,7 +10,7 @@ import { Descriptions, Divider, Tag } from 'ant-design-vue'; import { getRefund } from '#/api/pay/refund'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '#/utils'; const formData = ref(); diff --git a/apps/web-antd/src/views/system/dept/data.ts b/apps/web-antd/src/views/system/dept/data.ts index f868c625..1b112a59 100644 --- a/apps/web-antd/src/views/system/dept/data.ts +++ b/apps/web-antd/src/views/system/dept/data.ts @@ -8,8 +8,7 @@ import { handleTree } from '@vben/utils'; import { z } from '#/adapter/form'; import { getDeptList } from '#/api/system/dept'; import { getSimpleUserList } from '#/api/system/user'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/dict/data.ts b/apps/web-antd/src/views/system/dict/data.ts index e35800bb..48ab6c72 100644 --- a/apps/web-antd/src/views/system/dict/data.ts +++ b/apps/web-antd/src/views/system/dict/data.ts @@ -7,8 +7,7 @@ import { useAccess } from '@vben/access'; import { z } from '#/adapter/form'; import { getSimpleDictTypeList } from '#/api/system/dict/type'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/loginlog/data.ts b/apps/web-antd/src/views/system/loginlog/data.ts index dcf73932..f5d7e83d 100644 --- a/apps/web-antd/src/views/system/loginlog/data.ts +++ b/apps/web-antd/src/views/system/loginlog/data.ts @@ -3,9 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemLoginLogApi } from '#/api/system/login-log'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE, getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/loginlog/modules/detail.vue b/apps/web-antd/src/views/system/loginlog/modules/detail.vue index 0d624d2e..fd607fca 100644 --- a/apps/web-antd/src/views/system/loginlog/modules/detail.vue +++ b/apps/web-antd/src/views/system/loginlog/modules/detail.vue @@ -9,7 +9,7 @@ import { formatDateTime } from '@vben/utils'; import { Descriptions } from 'ant-design-vue'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '#/utils'; const formData = ref(); 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 9d453cb5..48a7989a 100644 --- a/apps/web-antd/src/views/system/mail/account/data.ts +++ b/apps/web-antd/src/views/system/mail/account/data.ts @@ -5,7 +5,7 @@ import type { SystemMailAccountApi } from '#/api/system/mail/account'; import { useAccess } from '@vben/access'; import { z } from '#/adapter/form'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions } from '#/utils'; const { hasAccessByCodes } = useAccess(); 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 557b2957..04f8d32e 100644 --- a/apps/web-antd/src/views/system/mail/log/data.ts +++ b/apps/web-antd/src/views/system/mail/log/data.ts @@ -3,10 +3,9 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemMailLogApi } from '#/api/system/mail/log'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; import { getSimpleMailAccountList } from '#/api/system/mail/account'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/mail/log/modules/detail.vue b/apps/web-antd/src/views/system/mail/log/modules/detail.vue index 9b001683..b6ef0b32 100644 --- a/apps/web-antd/src/views/system/mail/log/modules/detail.vue +++ b/apps/web-antd/src/views/system/mail/log/modules/detail.vue @@ -9,7 +9,7 @@ import { formatDateTime } from '@vben/utils'; import { Descriptions } from 'ant-design-vue'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '#/utils'; const formData = ref(); 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 497ff8b4..0701a0e0 100644 --- a/apps/web-antd/src/views/system/mail/template/data.ts +++ b/apps/web-antd/src/views/system/mail/template/data.ts @@ -3,12 +3,15 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemMailTemplateApi } from '#/api/system/mail/template'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; import { getSimpleMailAccountList } from '#/api/system/mail/account'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { + CommonStatusEnum, + DICT_TYPE, + getDictOptions, + getRangePickerDefaultProps, +} from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/menu/data.ts b/apps/web-antd/src/views/system/menu/data.ts index 6b0336e6..86369fed 100644 --- a/apps/web-antd/src/views/system/menu/data.ts +++ b/apps/web-antd/src/views/system/menu/data.ts @@ -14,8 +14,12 @@ import { z } from '#/adapter/form'; import { getMenuList } from '#/api/system/menu'; import { $t } from '#/locales'; import { componentKeys } from '#/router/routes'; -import { CommonStatusEnum, SystemMenuTypeEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { + CommonStatusEnum, + DICT_TYPE, + getDictOptions, + SystemMenuTypeEnum, +} from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/menu/index.vue b/apps/web-antd/src/views/system/menu/index.vue index 841d2678..6ae33c56 100644 --- a/apps/web-antd/src/views/system/menu/index.vue +++ b/apps/web-antd/src/views/system/menu/index.vue @@ -16,7 +16,7 @@ import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteMenu, getMenuList } from '#/api/system/menu'; import { DocAlert } from '#/components/doc-alert'; import { $t } from '#/locales'; -import { SystemMenuTypeEnum } from '#/utils/constants'; +import { SystemMenuTypeEnum } from '#/utils'; import { useGridColumns } from './data'; import Form from './modules/form.vue'; diff --git a/apps/web-antd/src/views/system/notice/data.ts b/apps/web-antd/src/views/system/notice/data.ts index 95b90b3c..a181a534 100644 --- a/apps/web-antd/src/views/system/notice/data.ts +++ b/apps/web-antd/src/views/system/notice/data.ts @@ -5,8 +5,7 @@ import type { SystemNoticeApi } from '#/api/system/notice'; import { useAccess } from '@vben/access'; import { z } from '#/adapter/form'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; const { hasAccessByCodes } = useAccess(); 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 3567ed2e..f8150e26 100644 --- a/apps/web-antd/src/views/system/notify/message/data.ts +++ b/apps/web-antd/src/views/system/notify/message/data.ts @@ -3,9 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemNotifyMessageApi } from '#/api/system/notify/message'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/notify/message/modules/detail.vue b/apps/web-antd/src/views/system/notify/message/modules/detail.vue index 1818b10f..f6f70bc7 100644 --- a/apps/web-antd/src/views/system/notify/message/modules/detail.vue +++ b/apps/web-antd/src/views/system/notify/message/modules/detail.vue @@ -9,7 +9,7 @@ import { formatDateTime } from '@vben/utils'; import { Descriptions } from 'ant-design-vue'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '#/utils'; const formData = ref(); 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 856930c0..80e72257 100644 --- a/apps/web-antd/src/views/system/notify/my/data.ts +++ b/apps/web-antd/src/views/system/notify/my/data.ts @@ -2,9 +2,7 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemNotifyMessageApi } from '#/api/system/notify/message'; -import { getRangePickerDefaultProps } from '@vben/utils'; - -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/notify/my/modules/detail.vue b/apps/web-antd/src/views/system/notify/my/modules/detail.vue index 53afbc31..4263a7e6 100644 --- a/apps/web-antd/src/views/system/notify/my/modules/detail.vue +++ b/apps/web-antd/src/views/system/notify/my/modules/detail.vue @@ -8,7 +8,7 @@ import { formatDateTime } from '@vben/utils'; import { useDescription } from '#/components/description'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '#/utils'; // TODO @puhui999:formData 貌似不需要了 const formData = ref(); 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 0a347d21..d85675ba 100644 --- a/apps/web-antd/src/views/system/notify/template/data.ts +++ b/apps/web-antd/src/views/system/notify/template/data.ts @@ -3,12 +3,16 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemNotifyTemplateApi } from '#/api/system/notify/template'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; import { getSimpleUserList } from '#/api/system/user'; -import { CommonStatusEnum, UserTypeEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { + CommonStatusEnum, + DICT_TYPE, + getDictOptions, + getRangePickerDefaultProps, + UserTypeEnum, +} from '#/utils'; const { hasAccessByCodes } = useAccess(); 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 5eaa3204..14e1208f 100644 --- a/apps/web-antd/src/views/system/oauth2/client/data.ts +++ b/apps/web-antd/src/views/system/oauth2/client/data.ts @@ -5,8 +5,7 @@ import type { SystemOAuth2ClientApi } from '#/api/system/oauth2/client'; import { useAccess } from '@vben/access'; import { z } from '#/adapter/form'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; const { hasAccessByCodes } = useAccess(); 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 e4a4b59f..00f540a4 100644 --- a/apps/web-antd/src/views/system/oauth2/token/data.ts +++ b/apps/web-antd/src/views/system/oauth2/token/data.ts @@ -4,7 +4,7 @@ import type { SystemOAuth2TokenApi } from '#/api/system/oauth2/token'; import { useAccess } from '@vben/access'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/operatelog/data.ts b/apps/web-antd/src/views/system/operatelog/data.ts index 1ebacf40..e7c74247 100644 --- a/apps/web-antd/src/views/system/operatelog/data.ts +++ b/apps/web-antd/src/views/system/operatelog/data.ts @@ -3,9 +3,9 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemOperateLogApi } from '#/api/system/operate-log'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; import { getSimpleUserList } from '#/api/system/user'; +import { getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/post/data.ts b/apps/web-antd/src/views/system/post/data.ts index 17d4416d..ba14bba6 100644 --- a/apps/web-antd/src/views/system/post/data.ts +++ b/apps/web-antd/src/views/system/post/data.ts @@ -5,8 +5,7 @@ import type { SystemPostApi } from '#/api/system/post'; import { useAccess } from '@vben/access'; import { z } from '#/adapter/form'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/role/data.ts b/apps/web-antd/src/views/system/role/data.ts index 638d495b..aee51e3e 100644 --- a/apps/web-antd/src/views/system/role/data.ts +++ b/apps/web-antd/src/views/system/role/data.ts @@ -3,11 +3,15 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemRoleApi } from '#/api/system/role'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; -import { CommonStatusEnum, SystemDataScopeEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { + CommonStatusEnum, + DICT_TYPE, + getDictOptions, + getRangePickerDefaultProps, + SystemDataScopeEnum, +} from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue b/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue index fa347467..2ac46dbd 100644 --- a/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue +++ b/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue @@ -14,7 +14,7 @@ import { getDeptList } from '#/api/system/dept'; import { assignRoleDataScope } from '#/api/system/permission'; import { getRole } from '#/api/system/role'; import { $t } from '#/locales'; -import { SystemDataScopeEnum } from '#/utils/constants'; +import { SystemDataScopeEnum } from '#/utils'; import { useAssignDataPermissionFormSchema } from '../data'; 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 16673d18..c37faf34 100644 --- a/apps/web-antd/src/views/system/sms/channel/data.ts +++ b/apps/web-antd/src/views/system/sms/channel/data.ts @@ -3,11 +3,14 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemSmsChannelApi } from '#/api/system/sms/channel'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { + CommonStatusEnum, + DICT_TYPE, + getDictOptions, + getRangePickerDefaultProps, +} from '#/utils'; const { hasAccessByCodes } = useAccess(); 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 c7e9c5c9..27bc2294 100644 --- a/apps/web-antd/src/views/system/sms/log/data.ts +++ b/apps/web-antd/src/views/system/sms/log/data.ts @@ -3,10 +3,9 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemSmsLogApi } from '#/api/system/sms/log'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; import { getSimpleSmsChannelList } from '#/api/system/sms/channel'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/sms/log/modules/detail.vue b/apps/web-antd/src/views/system/sms/log/modules/detail.vue index 8711724a..64f58e0c 100644 --- a/apps/web-antd/src/views/system/sms/log/modules/detail.vue +++ b/apps/web-antd/src/views/system/sms/log/modules/detail.vue @@ -9,7 +9,7 @@ import { formatDateTime } from '@vben/utils'; import { Descriptions } from 'ant-design-vue'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE } from '#/utils'; const formData = ref(); 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 ffa364e7..95061836 100644 --- a/apps/web-antd/src/views/system/sms/template/data.ts +++ b/apps/web-antd/src/views/system/sms/template/data.ts @@ -3,12 +3,15 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemSmsTemplateApi } from '#/api/system/sms/template'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; import { getSimpleSmsChannelList } from '#/api/system/sms/channel'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { + CommonStatusEnum, + DICT_TYPE, + getDictOptions, + getRangePickerDefaultProps, +} from '#/utils'; const { hasAccessByCodes } = useAccess(); 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 b4ff9630..5cf391c2 100644 --- a/apps/web-antd/src/views/system/social/client/data.ts +++ b/apps/web-antd/src/views/system/social/client/data.ts @@ -5,8 +5,12 @@ import type { SystemSocialClientApi } from '#/api/system/social/client'; import { useAccess } from '@vben/access'; import { z } from '#/adapter/form'; -import { CommonStatusEnum, SystemUserSocialTypeEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { + CommonStatusEnum, + DICT_TYPE, + getDictOptions, + SystemUserSocialTypeEnum, +} from '#/utils'; const { hasAccessByCodes } = useAccess(); 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 d1fb9e4f..9dacbf26 100644 --- a/apps/web-antd/src/views/system/social/user/data.ts +++ b/apps/web-antd/src/views/system/social/user/data.ts @@ -3,9 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemSocialUserApi } from '#/api/system/social/user'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); 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 cbd86afd..9633ec2e 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 @@ -10,7 +10,7 @@ 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/dict'; +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 bf09fbbd..16c16541 100644 --- a/apps/web-antd/src/views/system/tenant/data.ts +++ b/apps/web-antd/src/views/system/tenant/data.ts @@ -3,12 +3,15 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemTenantApi } from '#/api/system/tenant'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; import { getTenantPackageList } from '#/api/system/tenant-package'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { + CommonStatusEnum, + DICT_TYPE, + getDictOptions, + getRangePickerDefaultProps, +} from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/tenantPackage/data.ts b/apps/web-antd/src/views/system/tenantPackage/data.ts index fcbbc86f..5f1bcf9f 100644 --- a/apps/web-antd/src/views/system/tenantPackage/data.ts +++ b/apps/web-antd/src/views/system/tenantPackage/data.ts @@ -3,11 +3,14 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemTenantPackageApi } from '#/api/system/tenant-package'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { + CommonStatusEnum, + DICT_TYPE, + getDictOptions, + getRangePickerDefaultProps, +} from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/user/data.ts b/apps/web-antd/src/views/system/user/data.ts index fc3422ae..4bcb6a62 100644 --- a/apps/web-antd/src/views/system/user/data.ts +++ b/apps/web-antd/src/views/system/user/data.ts @@ -3,14 +3,18 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemUserApi } from '#/api/system/user'; import { useAccess } from '@vben/access'; -import { getRangePickerDefaultProps, handleTree } from '@vben/utils'; +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 } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { + CommonStatusEnum, + DICT_TYPE, + getDictOptions, + getRangePickerDefaultProps, +} from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue index 013be91b..d97fc454 100644 --- a/apps/web-antd/src/views/system/user/index.vue +++ b/apps/web-antd/src/views/system/user/index.vue @@ -23,7 +23,7 @@ import { } from '#/api/system/user'; import { DocAlert } from '#/components/doc-alert'; import { $t } from '#/locales'; -import { DICT_TYPE, getDictLabel } from '#/utils/dict'; +import { DICT_TYPE, getDictLabel } from '#/utils'; import { useGridColumns, useGridFormSchema } from './data'; import AssignRoleForm from './modules/assign-role-form.vue';