refactor: 将枚举和常量从utils移动到constants

This commit is contained in:
xingyu4j
2025-09-04 18:19:49 +08:00
parent d7d445617f
commit 37fba1474e
144 changed files with 255 additions and 245 deletions

View File

@@ -1,5 +1,5 @@
import type { AiWriteTypeEnum } from '@vben/constants';
import type { PageParam, PageResult } from '@vben/request';
import type { AiWriteTypeEnum } from '@vben/utils';
import { useAppConfig } from '@vben/hooks';
import { fetchEventSource } from '@vben/request';

View File

@@ -2,7 +2,7 @@
// TODO @芋艿:后续合并到 diy-editor 里,并不是通用的;
import { computed } from 'vue';
import { PREDEFINE_COLORS } from '@vben/utils';
import { PREDEFINE_COLORS } from '@vben/constants';
// 颜色输入框
defineOptions({ name: 'ColorInput' });

View File

@@ -2,7 +2,8 @@ import type { MallCouponTemplateApi } from '#/api/mall/promotion/coupon/couponTe
import { defineComponent } from 'vue';
import { floatToFixed2, PromotionDiscountTypeEnum } from '@vben/utils';
import { PromotionDiscountTypeEnum } from '@vben/constants';
import { floatToFixed2 } from '@vben/utils';
// 优惠描述
export const CouponDiscountDesc = defineComponent({

View File

@@ -2,7 +2,8 @@ import type { MallCouponTemplateApi } from '#/api/mall/promotion/coupon/couponTe
import { defineComponent } from 'vue';
import { floatToFixed2, PromotionDiscountTypeEnum } from '@vben/utils';
import { PromotionDiscountTypeEnum } from '@vben/constants';
import { floatToFixed2 } from '@vben/utils';
// 优惠值
export const CouponDiscount = defineComponent({

View File

@@ -2,7 +2,8 @@ import type { MallCouponTemplateApi } from '#/api/mall/promotion/coupon/couponTe
import { defineComponent } from 'vue';
import { CouponTemplateValidityTypeEnum, formatDate } from '@vben/utils';
import { CouponTemplateValidityTypeEnum } from '@vben/constants';
import { formatDate } from '@vben/utils';
// 有效期
export const CouponValidTerm = defineComponent({

View File

@@ -5,12 +5,12 @@ import type { MallCouponTemplateApi } from '#/api/mall/promotion/coupon/couponTe
import { ref, watch } from 'vue';
import { IconifyIcon } from '@vben/icons';
import {
CouponTemplateTakeTypeEnum,
floatToFixed2,
PromotionDiscountTypeEnum,
} from '@vben/utils';
} from '@vben/constants';
import { IconifyIcon } from '@vben/icons';
import { floatToFixed2 } from '@vben/utils';
import { useVModel } from '@vueuse/core';
import {

View File

@@ -5,8 +5,8 @@ import type { MallCombinationActivityApi } from '#/api/mall/promotion/combinatio
import { onMounted, ref } from 'vue';
import { CommonStatusEnum } from '@vben/constants';
import { IconifyIcon } from '@vben/icons';
import { CommonStatusEnum } from '@vben/utils';
import { useVModel } from '@vueuse/core';
import {

View File

@@ -5,8 +5,8 @@ import type { MallSeckillActivityApi } from '#/api/mall/promotion/seckill/seckil
import { onMounted, ref } from 'vue';
import { CommonStatusEnum } from '@vben/constants';
import { IconifyIcon } from '@vben/icons';
import { CommonStatusEnum } from '@vben/utils';
import { useVModel } from '@vueuse/core';
import {

View File

@@ -1,5 +1,5 @@
<script lang="ts" setup>
import { PREDEFINE_COLORS } from '@vben/utils';
import { PREDEFINE_COLORS } from '@vben/constants';
// TODO @芋艿:后续合并到 diy-editor 里,并不是通用的;
import { useVModels } from '@vueuse/core';

View File

@@ -1,7 +1,7 @@
// TODO @芋艿:后续再优化
// TODO @芋艿:可以共享么?
import { DICT_TYPE, isObject } from '@vben/utils';
import { isObject } from '@vben/utils';
import { useDictStore } from '#/store';
@@ -140,4 +140,6 @@ export const getBoolDictOptions = (dictType: string) => {
return dictOption;
};
export { DICT_TYPE, getDictLabel, getDictObj, getDictOptions };
export { getDictLabel, getDictObj, getDictOptions };
export { DICT_TYPE } from '@vben/constants';

View File

@@ -3,4 +3,4 @@ export * from './dict';
export * from './formCreate';
export * from './rangePickerProps';
export * from './routerHelper';
export { CommonStatusEnum } from '@vben/utils';
export { CommonStatusEnum } from '@vben/constants';

View File

@@ -6,7 +6,8 @@ import { computed, onMounted, ref } from 'vue';
import { useRoute } from 'vue-router';
import { confirm } from '@vben/common-ui';
import { getUrlValue, SystemUserSocialTypeEnum } from '@vben/utils';
import { SystemUserSocialTypeEnum } from '@vben/constants';
import { getUrlValue } from '@vben/utils';
import { ElButton, ElCard, ElImage, ElMessage } from 'element-plus';

View File

@@ -3,7 +3,7 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
import type { InfraApiErrorLogApi } from '#/api/infra/api-error-log';
import { useAccess } from '@vben/access';
import { InfraApiErrorLogProcessStatusEnum } from '@vben/utils';
import { InfraApiErrorLogProcessStatusEnum } from '@vben/constants';
import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils';

View File

@@ -6,11 +6,9 @@ import type {
import type { InfraApiErrorLogApi } from '#/api/infra/api-error-log';
import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
import { InfraApiErrorLogProcessStatusEnum } from '@vben/constants';
import { Download } from '@vben/icons';
import {
downloadFileFromBlobPart,
InfraApiErrorLogProcessStatusEnum,
} from '@vben/utils';
import { downloadFileFromBlobPart } from '@vben/utils';
import { ElButton, ElMessage } from 'element-plus';

View File

@@ -4,7 +4,8 @@ import type { InfraApiErrorLogApi } from '#/api/infra/api-error-log';
import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { DICT_TYPE, formatDateTime } from '@vben/utils';
import { DICT_TYPE } from '@vben/constants';
import { formatDateTime } from '@vben/utils';
import { ElDescriptions, ElDescriptionsItem, ElInput } from 'element-plus';

View File

@@ -3,7 +3,8 @@ import type { InfraCodegenApi } from '#/api/infra/codegen';
import { computed, ref, watch } from 'vue';
import { InfraCodegenTemplateTypeEnum, isEmpty } from '@vben/utils';
import { InfraCodegenTemplateTypeEnum } from '@vben/constants';
import { isEmpty } from '@vben/utils';
import { useVbenForm } from '#/adapter/form';
import { getCodegenTableList } from '#/api/infra/codegen';

View File

@@ -3,7 +3,7 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
import type { InfraJobApi } from '#/api/infra/job';
import { useAccess } from '@vben/access';
import { InfraJobStatusEnum } from '@vben/utils';
import { InfraJobStatusEnum } from '@vben/constants';
import { DICT_TYPE, getDictOptions } from '#/utils';

View File

@@ -9,11 +9,8 @@ import { ref } from 'vue';
import { useRouter } from 'vue-router';
import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
import {
downloadFileFromBlobPart,
InfraJobStatusEnum,
isEmpty,
} from '@vben/utils';
import { InfraJobStatusEnum } from '@vben/constants';
import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
import { ElLoading, ElMessage } from 'element-plus';

View File

@@ -4,7 +4,8 @@ import type { InfraJobLogApi } from '#/api/infra/job-log';
import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { DICT_TYPE, formatDateTime } from '@vben/utils';
import { DICT_TYPE } from '@vben/constants';
import { formatDateTime } from '@vben/utils';
import { ElDescriptions, ElDescriptionsItem } from 'element-plus';

View File

@@ -4,7 +4,8 @@ import type { InfraJobApi } from '#/api/infra/job';
import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { DICT_TYPE, formatDateTime } from '@vben/utils';
import { DICT_TYPE } from '@vben/constants';
import { formatDateTime } from '@vben/utils';
import {
ElDescriptions,

View File

@@ -1,7 +1,13 @@
<script lang="ts" setup>
import { onMounted, ref } from 'vue';
import * as DateUtil from '@vben/utils';
import {
getDateRange,
getDayRange,
getLast1Year,
getLast7Days,
getLast30Days,
} from '@vben/utils';
import dayjs from 'dayjs';
@@ -19,11 +25,11 @@ defineExpose({ times }); // 暴露时间范围参数
const shortcuts = [
{
text: '昨天',
value: () => DateUtil.getDayRange(new Date(), -1),
value: () => getDayRange(new Date(), -1),
},
{
text: '最近7天',
value: () => DateUtil.getLast7Days(),
value: () => getLast7Days(),
},
{
text: '本月',
@@ -31,11 +37,11 @@ const shortcuts = [
},
{
text: '最近30天',
value: () => DateUtil.getLast30Days(),
value: () => getLast30Days(),
},
{
text: '最近1年',
value: () => DateUtil.getLast1Year(),
value: () => getLast1Year(),
},
];
@@ -43,7 +49,7 @@ const shortcuts = [
function setTimes() {
const beginDate = dayjs().subtract(shortcutDays.value, 'd');
const yesterday = dayjs().subtract(1, 'd');
times.value = DateUtil.getDateRange(beginDate, yesterday);
times.value = getDateRange(beginDate, yesterday);
}
/** 快捷日期单选按钮选中 */

View File

@@ -1,7 +1,7 @@
<script lang="ts" setup>
import { watch } from 'vue';
import { DeliveryTypeEnum } from '@vben/utils';
import { DeliveryTypeEnum } from '@vben/constants';
import { ElMessage } from 'element-plus';

View File

@@ -6,11 +6,11 @@ import { onMounted, ref } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import { confirm, DocAlert, Page } from '@vben/common-ui';
import { ProductSpuStatusEnum } from '@vben/constants';
import {
downloadFileFromBlobPart,
fenToYuan,
handleTree,
ProductSpuStatusEnum,
treeToString,
} from '@vben/utils';

View File

@@ -3,7 +3,7 @@ import type { MallCouponTemplateApi } from '#/api/mall/promotion/coupon/couponTe
import { reactive, ref } from 'vue';
import { CouponTemplateTakeTypeEnum } from '@vben/utils';
import { CouponTemplateTakeTypeEnum } from '@vben/constants';
import * as CouponTemplateApi from '#/api/mall/promotion/coupon/couponTemplate';
import { DICT_TYPE, getIntDictOptions } from '#/utils/dict';

View File

@@ -2,10 +2,9 @@ import type { MallCouponTemplateApi } from '#/api/mall/promotion/coupon/couponTe
import {
CouponTemplateValidityTypeEnum,
floatToFixed2,
formatDate,
PromotionDiscountTypeEnum,
} from '@vben/utils';
} from '@vben/constants';
import { floatToFixed2, formatDate } from '@vben/utils';
// 格式化【优惠金额/折扣】
export function discountFormat(row: MallCouponTemplateApi.CouponTemplate) {

View File

@@ -5,8 +5,8 @@ import type { MallCouponTemplateApi } from '#/api/mall/promotion/coupon/couponTe
import { ref } from 'vue';
import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
import { CommonStatusEnum } from '@vben/constants';
import { $t } from '@vben/locales';
import { CommonStatusEnum } from '@vben/utils';
import { ElLoading, ElMessage, ElSwitch } from 'element-plus';

View File

@@ -7,7 +7,8 @@ import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { BrokerageRecordBizTypeEnum, fenToYuan } from '@vben/utils';
import { BrokerageRecordBizTypeEnum } from '@vben/constants';
import { fenToYuan } from '@vben/utils';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import { getBrokerageRecordPage } from '#/api/mall/trade/brokerage/record';

View File

@@ -9,8 +9,8 @@ import {
BrokerageWithdrawStatusEnum,
BrokerageWithdrawTypeEnum,
DICT_TYPE,
formatDateTime,
} from '@vben/utils';
} from '@vben/constants';
import { formatDateTime } from '@vben/utils';
import { ElInput, ElMessage } from 'element-plus';

View File

@@ -4,10 +4,10 @@ import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickU
import { ref } from 'vue';
import { DeliveryTypeEnum } from '@vben/utils';
import { DeliveryTypeEnum, DICT_TYPE } from '@vben/constants';
import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pickUpStore';
import { DICT_TYPE, getRangePickerDefaultProps } from '#/utils';
import { getRangePickerDefaultProps } from '#/utils';
const pickUpStoreList = ref<MallDeliveryPickUpStoreApi.PickUpStore[]>([]);

View File

@@ -5,7 +5,8 @@ import type { MallOrderApi } from '#/api/mall/trade/order';
import { h, onMounted, ref } from 'vue';
import { Page, prompt } from '@vben/common-ui';
import { DeliveryTypeEnum, fenToYuan, TradeOrderStatusEnum } from '@vben/utils';
import { DeliveryTypeEnum, TradeOrderStatusEnum } from '@vben/constants';
import { fenToYuan } from '@vben/utils';
import { ElCard, ElInput, ElMessage } from 'element-plus';

View File

@@ -4,7 +4,7 @@ import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickU
import { ref } from 'vue';
import { DeliveryTypeEnum } from '@vben/utils';
import { DeliveryTypeEnum } from '@vben/constants';
import { getSimpleDeliveryExpressList } from '#/api/mall/trade/delivery/express';
import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pickUpStore';

View File

@@ -9,9 +9,9 @@ import { DocAlert, Page, prompt, useVbenModal } from '@vben/common-ui';
import {
DeliveryTypeEnum,
DICT_TYPE,
fenToYuan,
TradeOrderStatusEnum,
} from '@vben/utils';
} from '@vben/constants';
import { fenToYuan } from '@vben/utils';
import { ElImage, ElInput, ElTag } from 'element-plus';
@@ -119,7 +119,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
<!-- TODO @列表有点丑 -->
<template #expand_content="{ row }">
<div class="order-items">
<div v-for="item in row.items" :key="item.id" class="order-item">
<div
v-for="(item, index) in row.items"
:key="index"
class="order-item"
>
<div class="order-item-image">
<ElImage :src="item.picUrl" class="h-40 w-40" />
</div>

View File

@@ -7,12 +7,8 @@ import { onMounted, ref } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import { confirm, Page, useVbenModal } from '@vben/common-ui';
import {
DeliveryTypeEnum,
fenToYuan,
formatDate,
TradeOrderStatusEnum,
} from '@vben/utils';
import { DeliveryTypeEnum, TradeOrderStatusEnum } from '@vben/constants';
import { fenToYuan, formatDate } from '@vben/utils';
import {
ElDescriptions,

View File

@@ -3,7 +3,8 @@ import type { MemberUserApi } from '#/api/member/user';
import { h } from 'vue';
import { DICT_TYPE, formatDate } from '@vben/utils';
import { DICT_TYPE } from '@vben/constants';
import { formatDate } from '@vben/utils';
import { ElAvatar, ElCard, ElCol, ElRow } from 'element-plus';

View File

@@ -6,8 +6,9 @@ import type { MallOrderApi } from '#/api/mall/trade/order/index';
import { ref } from 'vue';
import { useRouter } from 'vue-router';
import { DeliveryTypeEnum } from '@vben/constants';
import { $t } from '@vben/locales';
import { DeliveryTypeEnum, fenToYuan } from '@vben/utils';
import { fenToYuan } from '@vben/utils';
import { ElImage, ElTag } from 'element-plus';
@@ -179,7 +180,7 @@ const [Grid] = useVbenVxeGrid({
<Grid table-title="订单列表">
<template #expand_content="{ row }">
<div class="order-items">
<div v-for="item in row.items" :key="item.id" class="order-item">
<div v-for="(item, index) in row.items" :key="index" class="order-item">
<div class="order-item-image">
<ElImage :src="item.picUrl" :width="40" :height="40" />
</div>

View File

@@ -3,7 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { PayAppApi } from '#/api/pay/app/index';
import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
import { CommonStatusEnum, PayChannelEnum } from '@vben/utils';
import { CommonStatusEnum, PayChannelEnum } from '@vben/constants';
import { ElLoading, ElMessage } from 'element-plus';
@@ -34,11 +34,11 @@ function handleCreate() {
appFormModalApi.setData(null).open();
}
function handleEdit(row: Required<PayAppApi.App>) {
function handleEdit(row: PayAppApi.App) {
appFormModalApi.setData({ id: row.id }).open();
}
async function handleDelete(row: Required<PayAppApi.App>) {
async function handleDelete(row: PayAppApi.App) {
const loadingInstance = ElLoading.service({
text: $t('ui.actionMessage.deleting', [row.name]),
fullscreen: true,

View File

@@ -4,8 +4,8 @@ import type { PayChannelApi } from '#/api/pay/channel';
import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { CommonStatusEnum } from '@vben/constants';
import { $t } from '@vben/locales';
import { CommonStatusEnum } from '@vben/utils';
import { ElMessage } from 'element-plus';

View File

@@ -5,14 +5,13 @@ import { onMounted, ref } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import { Page, useVbenModal } from '@vben/common-ui';
import { useTabs } from '@vben/hooks';
import {
fenToYuan,
formatDate,
PayChannelEnum,
PayDisplayModeEnum,
PayOrderStatusEnum,
} from '@vben/utils';
} from '@vben/constants';
import { useTabs } from '@vben/hooks';
import { fenToYuan, formatDate } from '@vben/utils';
import {
ElButton,

View File

@@ -2,7 +2,8 @@
import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { DICT_TYPE, formatDateTime } from '@vben/utils';
import { DICT_TYPE } from '@vben/constants';
import { formatDateTime } from '@vben/utils';
import {
ElDescriptions,

View File

@@ -4,7 +4,8 @@ import type { SystemLoginLogApi } from '#/api/system/login-log';
import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { DICT_TYPE, formatDateTime } from '@vben/utils';
import { DICT_TYPE } from '@vben/constants';
import { formatDateTime } from '@vben/utils';
import { ElDescriptions, ElDescriptionsItem } from 'element-plus';

View File

@@ -7,8 +7,9 @@ import type { SystemMenuApi } from '#/api/system/menu';
import { h } from 'vue';
import { useAccess } from '@vben/access';
import { SystemMenuTypeEnum } from '@vben/constants';
import { IconifyIcon } from '@vben/icons';
import { handleTree, isHttpUrl, SystemMenuTypeEnum } from '@vben/utils';
import { handleTree, isHttpUrl } from '@vben/utils';
import { z } from '#/adapter/form';
import { getMenuList } from '#/api/system/menu';

View File

@@ -8,8 +8,8 @@ import type { SystemMenuApi } from '#/api/system/menu';
import { ref } from 'vue';
import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
import { SystemMenuTypeEnum } from '@vben/constants';
import { IconifyIcon, Plus } from '@vben/icons';
import { SystemMenuTypeEnum } from '@vben/utils';
import { ElButton, ElLoading, ElMessage } from 'element-plus';

View File

@@ -4,7 +4,8 @@ import type { SystemNotifyMessageApi } from '#/api/system/notify/message';
import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { DICT_TYPE, formatDateTime } from '@vben/utils';
import { DICT_TYPE } from '@vben/constants';
import { formatDateTime } from '@vben/utils';
import { ElDescriptions, ElDescriptionsItem } from 'element-plus';

View File

@@ -3,7 +3,7 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
import type { SystemNotifyTemplateApi } from '#/api/system/notify/template';
import { useAccess } from '@vben/access';
import { UserTypeEnum } from '@vben/utils';
import { UserTypeEnum } from '@vben/constants';
import { z } from '#/adapter/form';
import { getSimpleUserList } from '#/api/system/user';

View File

@@ -3,7 +3,7 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
import type { SystemRoleApi } from '#/api/system/role';
import { useAccess } from '@vben/access';
import { CommonStatusEnum, SystemDataScopeEnum } from '@vben/utils';
import { CommonStatusEnum, SystemDataScopeEnum } from '@vben/constants';
import { z } from '#/adapter/form';
import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils';

View File

@@ -5,7 +5,8 @@ import type { SystemRoleApi } from '#/api/system/role';
import { ref } from 'vue';
import { useVbenModal, VbenTree } from '@vben/common-ui';
import { handleTree, SystemDataScopeEnum } from '@vben/utils';
import { SystemDataScopeEnum } from '@vben/constants';
import { handleTree } from '@vben/utils';
import { ElCheckbox, ElMessage } from 'element-plus';

View File

@@ -4,7 +4,8 @@ import type { SystemSmsLogApi } from '#/api/system/sms/log';
import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { DICT_TYPE, formatDateTime } from '@vben/utils';
import { DICT_TYPE } from '@vben/constants';
import { formatDateTime } from '@vben/utils';
import { ElDescriptions, ElDescriptionsItem } from 'element-plus';

View File

@@ -3,7 +3,7 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
import type { SystemSocialClientApi } from '#/api/system/social/client';
import { useAccess } from '@vben/access';
import { SystemUserSocialTypeEnum } from '@vben/utils';
import { SystemUserSocialTypeEnum } from '@vben/constants';
import { z } from '#/adapter/form';
import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils';