adtec-core-package 2.1.9 → 2.2.1

package/package.json

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

package/src/components/RichTextEditor/RichTextEditor.vue

@@ -322,6 +322,18 @@ onMounted(() => {
     content: initHtml(model.value),
     ...defaultConfig,
     ...props.editorConfig,
+    fontFamily:{
+      values:[
+        {name: "宋体", value: "SimSun"},
+        {name: "仿宋", value: "FangSong"},
+        {name: "黑体", value: "SimHei"},
+        {name: "楷体", value: "KaiTi"},
+        {name: "微软雅黑", value: "Microsoft YaHei"},
+        {name: "方正仿宋简体_GBK", value: "FangSong_GB2312"},
+        {name: "Arial", value: "Arial"},
+        {name: "Times New Roman", value: "Times New Roman"},
+      ]
+    },
     onCreated: (editor: AiEditor) => {
     }
   }

package/src/components/business/comp.userForm.vue

@@ -140,6 +140,7 @@ interface Props<T extends IpageDataQuery, E extends IMdmEmployee> {
   defalutQueryParam?: any
   multiple?: boolean
   showOrgInfo?: boolean
+  defaultSelectUserCodes?: string
 }
 
 const props = withDefaults(defineProps<Props<IMdmEmployeeQuery, IMdmEmployee>>(), {

package/src/components/upload/ElUploads.vue

@@ -3,24 +3,33 @@
 <!--创建时间: 2024/12/2 下午1:59-->
 <!--修改时间: 2024/12/2 下午1:59-->
 <template>
-  <el-flex v-if="!isEdlt" :vertical="vertical">
-    <el-flex
-      v-for="item of uploadFilesList"
-      :key="item.id"
-      class="file-class"
-      @click="fileView(item.id)"
-      :width="itemWidth"
-    >
-      <el-flex align="center" justify="flex-start">
-        <el-tooltip class="box-item" :content="item.name" placement="top">
-          <el-text truncated style="cursor: pointer">
+  <div v-if="!isEdlt">
+    <el-auto-tool-tip v-if="uploadFilesList?.length">
+      <template #tooltipContent>
+        <div style="display:flex;flex-direction:column">
+              <span
+                v-for="item in uploadFilesList"
+                :key="item.id"
+                style="margin: 0 2px"
+              >{{ item.name }}
+              </span>
+        </div>
+      </template>
+      <template #content>
+        <div style="display:flex;flex-direction:column">
+          <div v-for="item in uploadFilesList" :key="item.id"
+               class="file-item"
+               style="display:flex; align-items:center;">
             <el-icons :model-value="getIcon(item.name)" style="margin-right: 5px"></el-icons>
-            {{ item.name }}
-          </el-text>
-        </el-tooltip>
-      </el-flex>
-    </el-flex>
-  </el-flex>
+            <span class="link-name" @click="fileView(item.id)">{{ item.name }}</span>
+          </div>
+        </div>
+      </template>
+    </el-auto-tool-tip>
+    <div style="text-align: center;color: var(--el-disabled-text-color)" v-else>
+      暂无附件
+    </div>
+  </div>
   <el-upload
     v-else
     ref="ref_upload"
@@ -62,7 +71,7 @@
         </el-flex>
         <el-flex align="center" justify="flex-end" width="50px">
           <el-text v-if="!file?.businessId && file.percentage !== 100"
-            >{{ file.percentage }}%
+          >{{ file.percentage }}%
           </el-text>
           <el-icons
             v-if="file?.businessId || file.percentage === 100"
@@ -328,4 +337,28 @@ defineExpose({
     margin-bottom: 0;
   }
 }
+.file-item {
+  position: relative;
+  padding: 2px 0;
+  border-radius: 4px;
+  transition: background-color 0.2s ease;
+
+  &:hover {
+    background-color: var(--el-fill-color-light);
+
+    .delete-icon {
+      visibility: visible;
+      opacity: 1;
+      transform: scale(1);
+    }
+  }
+}
+.link-name {
+  cursor: pointer;
+}
+
+.link-name:hover {
+  color: var(--el-color-primary);
+  text-decoration: underline;
+}
 </style>

package/src/components/workflow/TaskOperation.vue

@@ -139,6 +139,7 @@ const openDialog = async (type: string) => {
         userId: userInfoStore().getUserInfo.id,
         comment: '同意。'
       })
+      if (res === false) return
       if (res?.readonly) {
         commentReadonly = true
       }