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

apps/web-ele/src/views/bpm/components/simple-process-design/components/simple-process-model.vue

@@ -200,7 +200,7 @@ onMounted(() => {
 </script>
 <template>
   <div class="simple-process-model-container">
-    <div class="bg-card absolute right-0 top-0">
+    <div class="absolute right-0 top-0 bg-card">
       <ElRow type="flex" justify="end">
         <ElButtonGroup key="scale-control">
           <ElButton v-if="!readonly" @click="exportJson">

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

@@ -395,7 +395,7 @@ onBeforeUnmount(() => {
     <div class="mx-auto">
       <!-- 头部导航栏 -->
       <div
-        class="bg-card absolute inset-x-0 top-0 z-10 flex h-12 items-center border-b px-5"
+        class="absolute inset-x-0 top-0 z-10 flex h-12 items-center border-b bg-card px-5"
       >
         <!-- 左侧标题 -->
         <div class="flex w-48 items-center overflow-hidden">

apps/web-ele/src/views/bpm/model/modules/category-draggable-model.vue

@@ -665,7 +665,7 @@ function handleRenameSuccess() {
                   link
                   size="small"
                   @click="modelOperation('update', row.id)"
-                  :disabled="!isManagerUser(row) || !hasPermiUpdate"
+                  :disabled="!isManagerUser(row) && !hasPermiUpdate"
                 >
                   修改
                 </ElButton>
@@ -673,7 +673,7 @@ function handleRenameSuccess() {
                   link
                   size="small"
                   @click="handleDeploy(row)"
-                  :disabled="!isManagerUser(row) || !hasPermiDeploy"
+                  :disabled="!isManagerUser(row) && !hasPermiDeploy"
                 >
                   发布
                 </ElButton>
@@ -717,7 +717,7 @@ function handleRenameSuccess() {
                       </el-dropdown-item>
                       <el-dropdown-item
                         @click="handleModelCommand('handleDelete', row)"
-                        :disabled="!isManagerUser(row) || !hasPermiDelete"
+                        :disabled="!isManagerUser(row) && !hasPermiDelete"
                       >
                         删除
                       </el-dropdown-item>

apps/web-ele/src/views/bpm/processInstance/index.vue

@@ -138,7 +138,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
         <template
           v-if="
             row.status === BpmProcessInstanceStatus.RUNNING &&
-            row.tasks!.length > 0
+            row.tasks?.length! > 0
           "
         >
           <!-- 单人审批 -->