Merge branch 'feature/bpm' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm

src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue

@@ -40,7 +40,7 @@ defineOptions({
   name: 'SimpleProcessDesigner'
   name: 'SimpleProcessDesigner'
 })
 })
 
 
-const emits = defineEmits(['success']) // 保存成功事件
+const emits = defineEmits(['success', 'init-finished']) // 保存成功事件
 
 
 const props = defineProps({
 const props = defineProps({
   modelId: {
   modelId: {
@@ -263,6 +263,7 @@ onMounted(async () => {
     }
     }
   } finally {
   } finally {
     loading.value = false
     loading.value = false
+    emits('init-finished')
   }
   }
 })
 })
 
 

src/views/bpm/model/CategoryDraggableModel.vue

@@ -64,6 +64,7 @@
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>
+
   <!-- 模型列表 -->
   <!-- 模型列表 -->
   <el-collapse-transition>
   <el-collapse-transition>
     <div v-show="isExpand">
     <div v-show="isExpand">
@@ -90,7 +91,7 @@
             </div>
             </div>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column label="可见范围" prop="startUserIds" min-width="100">
+        <el-table-column label="可见范围" prop="startUserIds" min-width="150">
           <template #default="scope">
           <template #default="scope">
             <el-text v-if="!scope.row.startUsers || scope.row.startUsers.length === 0">
             <el-text v-if="!scope.row.startUsers || scope.row.startUsers.length === 0">
               全部可见
               全部可见
@@ -110,7 +111,7 @@
             </el-text>
             </el-text>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column label="表单信息" prop="formType" min-width="200">
+        <el-table-column label="表单信息" prop="formType" min-width="150">
           <template #default="scope">
           <template #default="scope">
             <el-button
             <el-button
               v-if="scope.row.formType === BpmModelFormType.NORMAL"
               v-if="scope.row.formType === BpmModelFormType.NORMAL"
@@ -166,16 +167,6 @@
               link
               link
               class="!ml-5px"
               class="!ml-5px"
               type="primary"
               type="primary"
-              @click="handleDesign(scope.row)"
-              v-hasPermi="['bpm:model:update']"
-              :disabled="!isManagerUser(scope.row)"
-            >
-              设计
-            </el-button>
-            <el-button
-              link
-              class="!ml-5px"
-              type="primary"
               @click="handleDeploy(scope.row)"
               @click="handleDeploy(scope.row)"
               v-hasPermi="['bpm:model:deploy']"
               v-hasPermi="['bpm:model:deploy']"
               :disabled="!isManagerUser(scope.row)"
               :disabled="!isManagerUser(scope.row)"
@@ -337,14 +328,6 @@ const handleChangeState = async (row: any) => {
   } catch {}
   } catch {}
 }
 }
 
 
-/** 设计流程 */
-const handleDesign = (row: any) => {
-  push({
-    name: 'BpmModelUpdate',
-    params: { id: row.id }
-  })
-}
-
 /** 发布流程 */
 /** 发布流程 */
 const handleDeploy = async (row: any) => {
 const handleDeploy = async (row: any) => {
   try {
   try {