adtec-core-package 2.0.3 → 2.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "private": false,
   "type": "module",
   "scripts": {

package/src/components/workflow/components/CheckDialog.vue

@@ -149,7 +149,7 @@ const open = async (taskVo: IWfTaskVo, type: string, params: ITaskOperate, comme
   if (type === 'complete') {
     //同意
     dialogLabel.value = '审批意见'
-    dialogTitle.value = '同意审批'
+    dialogTitle.value = '流程审批'
     task.value.comment = task.value.comment ? task.value.comment : '同意。'
   } else if (type === 'refuse') {
     //终止

package/src/components/workflow/components/ProcessInstanceStep.vue

@@ -120,7 +120,7 @@ const getStatus = (task: IWfTaskVo) => {
     if (task.commentList && task.commentList.length > 0) {
       return ['待办', '已办', '已办', '终止', '委派', '转办', '终止', '撤回'][
         Number(task.commentList[task.commentList.length - 1].type)
-      ]
+        ]
     }
     return ''
   }
@@ -132,7 +132,7 @@ defineExpose({
 
 <template>
   <el-flex justify="space-around" align="center" v-loading="loading" width="100%">
-    <el-steps direction="vertical" align-center :space="160">
+    <el-steps direction="vertical" align-center :space="160" style="width:81%;">
       <el-step
         v-for="item in taskGroup"
         :key="item.parentExecutionId"
@@ -147,20 +147,24 @@ defineExpose({
         <template #description>
           <el-flex
             :vertical="false"
-            style="max-height: 300px; max-width: 690px; min-width: 150px; min-height: 60px"
+            style="max-width: 100%; min-width: 180px; min-height: 60px"
             justify="flex-start"
           >
+            <!--            width="170px"-->
             <el-flex
               :vertical="true"
               v-for="task in item.tasks"
               :key="task.taskId"
-              width="170px"
+
               style="
                 margin-bottom: 5px;
                 padding: 5px;
                 margin-right: 5px;
                 border-radius: 8px;
                 background: #f8f8f8;
+                width: 31%;
+                min-width: 160px;
+                max-width: 210px;
               "
             >
               <el-flex height="30px" align="center" justify="space-between">
@@ -173,18 +177,19 @@ defineExpose({
                   <span class="ellipsis" style="font-size: 14px">{{ task.assigneeName }}</span>
                 </el-tooltip>
                 <el-tag size="small" :type="task.finishTime ? 'success' : 'primary'">{{
-                  getStatus(task)
-                }}</el-tag>
+                    getStatus(task)
+                  }}</el-tag>
               </el-flex>
-              <el-tooltip
-                v-if="task.comment"
-                :content="task.comment"
-                placement="top"
-                effect="light"
-              >
-                <span class="ellipsis">{{ task.comment }}</span>
-              </el-tooltip>
-              <el-flex v-if="taskFiles.some((x) => x.businessId === task.taskId)" width="160px">
+              <!--              <el-tooltip-->
+              <!--                v-if="task.comment"-->
+              <!--                :content="task.comment"-->
+              <!--                placement="top"-->
+              <!--                effect="light"-->
+              <!--              >-->
+              <!--                <span class="ellipsis2">{{ task.comment }}</span>-->
+              <!--              </el-tooltip>-->
+              <span class="ellipsis2">{{ task.comment }}</span>
+              <el-flex v-if="taskFiles.some((x) => x.businessId === task.taskId)" width="100%">
                 <!--                <span style="font-size: 14px">附件：</span>-->
                 <el-uploads
                   :is-edlt="false"
@@ -195,8 +200,8 @@ defineExpose({
               </el-flex>
 
               <span style="display: block; color: #909399" v-if="task.comment">{{
-                task.finishTime?.substring(0, 19)
-              }}</span>
+                  task.finishTime?.substring(0, 19)
+                }}</span>
             </el-flex>
           </el-flex>
         </template>
@@ -215,7 +220,16 @@ defineExpose({
   min-height: 20px;
   font-size: 14px;
 }
-
+.ellipsis2 {
+  /* 移除多行限制相关属性 */
+  display: inline-block; /* 恢复为 inline-block 让高度自适应 */
+  width: 100%;
+  font-size: 14px;
+  line-height: 20px; /* 保持行高便于可能的计算 */
+  overflow: visible; /* 改为visible让内容完全显示 */
+  text-overflow: clip; /* 不需要省略号 */
+  min-height: 20px; /* 保持最小高度为单行高度 */
+}
 :deep .el-step__line {
   background-color: transparent;
   border: 1.5px solid;

package/src/interface/IUserPermissionVo.ts

@@ -37,4 +37,5 @@ export interface IUserPermissionVo {
   userBaseInfo?: IUserBaseInfo
   passwordExpired?: string
   isIup?: string
+  roleCodes?: string[]
 }