!115 Merge remote-tracking branch 'yudao/dev' into dev

Merge pull request !115 from Jason/dev

apps/web-antd/src/views/bpm/model/form/index.vue

@@ -26,6 +26,7 @@ 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 FormDesign from './modules/form-design.vue';
@@ -33,24 +34,6 @@ import ProcessDesign from './modules/process-design.vue';
 
 defineOptions({ name: 'BpmModelCreate' });
 
-// TODO 这个常量是不是所有 apps 都可以使用， 放 @utils/constant.ts 不能共享， @芋艿 这些常量放哪里合适！
-// TODO @jason：/Users/yunai/Java/yudao-ui-admin-vben-v5/apps/web-antd/src/utils/constants.ts；先不多个 apps 共享哈；
-const BpmModelType = {
-  BPMN: 10, // BPMN 设计器
-  SIMPLE: 20, // 简易设计器
-};
-
-const BpmModelFormType = {
-  NORMAL: 10, // 流程表单
-  CUSTOM: 20, // 业务表单
-};
-
-const BpmAutoApproveType = {
-  NONE: 0, // 不自动通过
-  APPROVE_ALL: 1, // 仅审批一次，后续重复的审批节点均自动通过
-  APPROVE_SEQUENT: 2, // 仅针对连续审批的节点自动通过
-};
-
 // 流程定义类型
 type BpmProcessDefinitionType = Omit<
   BpmProcessDefinitionApi.ProcessDefinitionVO,

apps/web-antd/src/views/bpm/model/form/modules/process-design.vue

@@ -55,9 +55,9 @@ defineExpose({
     <template v-else>
       <SimpleModelDesign
         v-if="showDesigner"
-        :model-id="modelData.id"
-        :model-key="modelData.key"
         :model-name="modelData.name"
+        :model-form-id="modelData.formId"
+        :model-form-type="modelData.formType"
         :start-user-ids="modelData.startUserIds"
         :start-dept-ids="modelData.startDeptIds"
         @success="handleDesignSuccess"

apps/web-antd/src/views/bpm/model/form/modules/simple-model-design.vue

@@ -7,8 +7,8 @@ import { SimpleProcessDesigner } from '#/components/simple-process-design';
 defineOptions({ name: 'SimpleModelDesign' });
 
 defineProps<{
-  modelId?: string;
-  modelKey?: string;
+  modelFormId?: number;
+  modelFormType?: number;
   modelName?: string;
   startDeptIds?: number[];
   startUserIds?: number[];
@@ -27,9 +27,9 @@ const handleSuccess = (data?: any) => {
 <template>
   <ContentWrap :body-style="{ padding: '20px 16px' }">
     <SimpleProcessDesigner
-      :model-id="modelId"
-      :model-key="modelKey"
+      :model-form-id="modelFormId"
       :model-name="modelName"
+      :model-form-type="modelFormType"
       @success="handleSuccess"
       :start-user-ids="startUserIds"
       :start-dept-ids="startDeptIds"

apps/web-antd/src/views/bpm/model/index.vue

@@ -162,7 +162,7 @@ const handleCategorySortSubmit = async () => {
 
 <template>
   <Page auto-content-height>
-    <!-- TODO @jaosn：没头像的图标，展示文字头像哈 -->
+    <!-- TODO @jaosn：没头像的图标，展示文字头像哈 @芋艿 好像已经展示了文字头像。是模型列表中吗? -->
     <!-- 流程分类表单弹窗 -->
     <CategoryFormModal @success="getList" />
     <Card