refactor: 破坏性重构,将枚举类由 utils 提取到 @vben/utils

This commit is contained in:
xingyu4j
2025-09-03 16:08:40 +08:00
parent 25468bece5
commit e6f76c097d
143 changed files with 477 additions and 1343 deletions

View File

@@ -5,12 +5,12 @@ import { onMounted } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
import { BpmModelFormType } from '@vben/utils';
import { Button, Tooltip } from 'ant-design-vue';
import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import { getProcessDefinitionPage } from '#/api/bpm/definition';
import { BpmModelFormType } from '#/utils';
// 导入 FormCreate 表单详情
import FormCreateDetail from '../../form/modules/detail.vue';

View File

@@ -12,6 +12,11 @@ import { confirm, Page } from '@vben/common-ui';
import { useTabs } from '@vben/hooks';
import { ArrowLeft } from '@vben/icons';
import { useUserStore } from '@vben/stores';
import {
BpmAutoApproveType,
BpmModelFormType,
BpmModelType,
} from '@vben/utils';
import { Button, Card, message } from 'ant-design-vue';
@@ -26,7 +31,6 @@ import {
} from '#/api/bpm/model';
import { getSimpleDeptList } from '#/api/system/dept';
import { getSimpleUserList } from '#/api/system/user';
import { BpmAutoApproveType, BpmModelFormType, BpmModelType } from '#/utils';
import BasicInfo from './modules/basic-info.vue';
import ExtraSetting from './modules/extra-setting.vue';

View File

@@ -2,6 +2,11 @@
import { computed, provide, ref, watch } from 'vue';
import { CircleHelp } from '@vben/icons';
import {
BpmAutoApproveType,
BpmModelFormType,
ProcessVariableEnum,
} from '@vben/utils';
import {
Checkbox,
@@ -26,11 +31,6 @@ import {
HttpRequestSetting,
parseFormFields,
} from '#/components/simple-process-design';
import {
BpmAutoApproveType,
BpmModelFormType,
ProcessVariableEnum,
} from '#/utils';
const modelData = defineModel<any>();

View File

@@ -6,6 +6,7 @@ import type { BpmFormApi } from '#/api/bpm/form';
import { ref, watch } from 'vue';
import { CircleHelp } from '@vben/icons';
import { BpmModelFormType } from '@vben/utils';
import FormCreate from '@form-create/ant-design-vue';
import {
@@ -20,12 +21,7 @@ import {
} from 'ant-design-vue';
import { getFormDetail } from '#/api/bpm/form';
import {
BpmModelFormType,
DICT_TYPE,
getDictOptions,
setConfAndFields2,
} from '#/utils';
import { DICT_TYPE, getDictOptions, setConfAndFields2 } from '#/utils';
const props = defineProps({
formList: {

View File

@@ -3,7 +3,7 @@ import type { Ref } from 'vue';
import { computed, inject, nextTick, ref } from 'vue';
import { BpmModelType } from '#/utils';
import { BpmModelType } from '@vben/utils';
// TODO BPM 流程模型设计器 BpmModelEditor 待整合
import SimpleModelDesign from './simple-model-design.vue';

View File

@@ -9,7 +9,12 @@ import { useAccess } from '@vben/access';
import { confirm, EllipsisText, useVbenModal } from '@vben/common-ui';
import { IconifyIcon } from '@vben/icons';
import { useUserStore } from '@vben/stores';
import { cloneDeep, formatDateTime, isEqual } from '@vben/utils';
import {
BpmModelFormType,
cloneDeep,
formatDateTime,
isEqual,
} from '@vben/utils';
import { useDebounceFn } from '@vueuse/core';
import { useSortable } from '@vueuse/integrations/useSortable';
@@ -34,7 +39,6 @@ import {
updateModelState,
} from '#/api/bpm/model';
import { $t } from '#/locales';
import { BpmModelFormType } from '#/utils';
// 导入重命名表单
import CategoryRenameForm from '../../category/modules/rename-form.vue';

View File

@@ -6,6 +6,7 @@ import { computed, onMounted, ref, watch } from 'vue';
import { confirm, Page, useVbenForm } from '@vben/common-ui';
import { IconifyIcon } from '@vben/icons';
import { BpmCandidateStrategyEnum, BpmNodeIdEnum } from '@vben/utils';
import { Button, Card, message, Space } from 'ant-design-vue';
import dayjs from 'dayjs';
@@ -15,7 +16,6 @@ import { createLeave, updateLeave } from '#/api/bpm/oa/leave';
import { getApprovalDetail as getApprovalDetailApi } from '#/api/bpm/processInstance';
import { $t } from '#/locales';
import { router } from '#/router';
import { BpmCandidateStrategyEnum, BpmNodeIdEnum } from '#/utils';
import ProcessInstanceTimeline from '#/views/bpm/processInstance/detail/modules/time-line.vue';
import { useFormSchema } from './data';
@@ -171,7 +171,7 @@ function selectUserConfirm(id: string, userList: any[]) {
/** 审批相关:预测流程节点会因为输入的参数值而产生新的预测结果值,所以需重新预测一次, formData.value可改成实际业务中的特定字段 */
watch(
formData.value,
formData.value as object,
(newValue, oldValue) => {
if (!oldValue) {
return;

View File

@@ -6,6 +6,13 @@ import { computed, nextTick, ref, watch } from 'vue';
import { useTabs } from '@vben/hooks';
import { IconifyIcon } from '@vben/icons';
import {
BpmCandidateStrategyEnum,
BpmFieldPermissionType,
BpmModelFormType,
BpmModelType,
BpmNodeIdEnum,
} from '@vben/utils';
import formCreate from '@form-create/ant-design-vue';
import { Button, Card, Col, message, Row, Space, Tabs } from 'ant-design-vue';
@@ -16,15 +23,7 @@ import {
getApprovalDetail as getApprovalDetailApi,
} from '#/api/bpm/processInstance';
import { router } from '#/router';
import {
BpmCandidateStrategyEnum,
BpmFieldPermissionType,
BpmModelFormType,
BpmModelType,
BpmNodeIdEnum,
decodeFields,
setConfAndFields2,
} from '#/utils';
import { decodeFields, setConfAndFields2 } from '#/utils';
import ProcessInstanceSimpleViewer from '#/views/bpm/processInstance/detail/modules/simple-bpm-viewer.vue';
import ProcessInstanceTimeline from '#/views/bpm/processInstance/detail/modules/time-line.vue';

View File

@@ -6,7 +6,12 @@ import type { SystemUserApi } from '#/api/system/user';
import { nextTick, onMounted, ref, shallowRef, watch } from 'vue';
import { Page } from '@vben/common-ui';
import { formatDateTime } from '@vben/utils';
import {
BpmModelFormType,
BpmModelType,
BpmTaskStatusEnum,
formatDateTime,
} from '@vben/utils';
import { Avatar, Card, Col, message, Row, TabPane, Tabs } from 'ant-design-vue';
@@ -16,14 +21,7 @@ import {
} from '#/api/bpm/processInstance';
import { getSimpleUserList } from '#/api/system/user';
import DictTag from '#/components/dict-tag/dict-tag.vue';
import {
BpmModelFormType,
BpmModelType,
BpmTaskStatusEnum,
DICT_TYPE,
registerComponent,
setConfAndFields2,
} from '#/utils';
import { DICT_TYPE, registerComponent, setConfAndFields2 } from '#/utils';
import {
SvgBpmApproveIcon,
SvgBpmCancelIcon,

View File

@@ -10,7 +10,16 @@ import { useRouter } from 'vue-router';
import { useVbenModal } from '@vben/common-ui';
import { IconifyIcon } from '@vben/icons';
import { useUserStore } from '@vben/stores';
import { isEmpty } from '@vben/utils';
import {
BpmCandidateStrategyEnum,
BpmModelFormType,
BpmNodeTypeEnum,
BpmProcessInstanceStatus,
BpmTaskOperationButtonTypeEnum,
BpmTaskStatusEnum,
isEmpty,
OPERATION_BUTTON_NAME,
} from '@vben/utils';
import FormCreate from '@form-create/ant-design-vue';
import {
@@ -34,16 +43,7 @@ import {
} from '#/api/bpm/processInstance';
import * as TaskApi from '#/api/bpm/task';
import * as UserApi from '#/api/system/user';
import {
BpmCandidateStrategyEnum,
BpmModelFormType,
BpmNodeTypeEnum,
BpmProcessInstanceStatus,
BpmTaskOperationButtonTypeEnum,
BpmTaskStatusEnum,
OPERATION_BUTTON_NAME,
setConfAndFields2,
} from '#/utils';
import { setConfAndFields2 } from '#/utils';
import Signature from './signature.vue';
import ProcessInstanceTimeline from './time-line.vue';

View File

@@ -3,8 +3,9 @@ import type { SimpleFlowNode } from '#/components/simple-process-design';
import { ref, watch } from 'vue';
import { BpmNodeTypeEnum, BpmTaskStatusEnum } from '@vben/utils';
import { SimpleProcessViewer } from '#/components/simple-process-design';
import { BpmNodeTypeEnum, BpmTaskStatusEnum } from '#/utils';
defineOptions({ name: 'BpmProcessInstanceSimpleViewer' });

View File

@@ -7,16 +7,17 @@ import { useRouter } from 'vue-router';
import { useVbenModal } from '@vben/common-ui';
import { IconifyIcon } from '@vben/icons';
import { formatDateTime, isEmpty } from '@vben/utils';
import { Avatar, Button, Image, Timeline, Tooltip } from 'ant-design-vue';
import { UserSelectModal } from '#/components/select-modal';
import {
BpmCandidateStrategyEnum,
BpmNodeTypeEnum,
BpmTaskStatusEnum,
} from '#/utils';
formatDateTime,
isEmpty,
} from '@vben/utils';
import { Avatar, Button, Image, Timeline, Tooltip } from 'ant-design-vue';
import { UserSelectModal } from '#/components/select-modal';
defineOptions({ name: 'BpmProcessInstanceTimeline' });

View File

@@ -5,6 +5,7 @@ import type { BpmProcessInstanceApi } from '#/api/bpm/processInstance';
import { h } from 'vue';
import { DocAlert, Page, prompt } from '@vben/common-ui';
import { BpmProcessInstanceStatus } from '@vben/utils';
import { message, Textarea } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
} from '#/api/bpm/processInstance';
import { $t } from '#/locales';
import { router } from '#/router';
import { BpmProcessInstanceStatus } from '#/utils';
import { useGridColumns, useGridFormSchema } from './data';