adtec-core-package 2.8.4 → 2.8.6

package/package.json

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

package/src/components/upload/CustomElUpload.vue

@@ -46,7 +46,7 @@
     :before-upload="beforeUpload"
     drag
     :accept="getAccept"
-    :action="'/api/doc/uploadFile/' + business + '/' + businessId + '/' + association"
+    :action="'/api/doc/uploadFile/' + business + '/' + businessId + '/' + association+(watermarkCode ? '?watermarkCode=' + watermarkCode : '')"
     multiple
     :limit="limit"
     :headers="uploadHeaders"
@@ -205,7 +205,11 @@ const props = defineProps({
   showOptMessage: {
     type:Boolean,
     default:true
-  }
+  },
+  watermarkCode: {
+    type: String,
+    default: () => undefined
+  },
 })
 const mousemove = (fileName: string) => {
   hoverfileName.value = fileName

package/src/components/upload/ElUploads.vue

@@ -6,29 +6,27 @@
   <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 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;overflow: hidden">
+        <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; overflow: hidden"
+          >
             <el-icons :model-value="getIcon(item.name)" style="margin-right: 5px"></el-icons>
             <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 style="text-align: center; color: var(--el-disabled-text-color)" v-else>暂无附件</div>
   </div>
   <el-upload
     v-else
@@ -42,7 +40,15 @@
     :before-upload="beforeUpload"
     drag
     :accept="getAccept"
-    :action="'/api/doc/uploadFile/' + business + '/' + businessId + '/' + association"
+    :action="
+      '/api/doc/uploadFile/' +
+      business +
+      '/' +
+      businessId +
+      '/' +
+      association +
+      (watermarkCode ? '?watermarkCode=' + watermarkCode : '')
+    "
     multiple
     :limit="limit"
     :headers="uploadHeaders"
@@ -71,7 +77,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"
@@ -92,7 +98,13 @@
 <script setup lang="ts">
 import { UploadFilled } from '@element-plus/icons-vue'
 import { computed, onMounted, ref, watch } from 'vue'
-import { ElMessage, ElMessageBox, type UploadFile, type UploadFiles, type UploadUserFile } from 'element-plus'
+import {
+  ElMessage,
+  ElMessageBox,
+  type UploadFile,
+  type UploadFiles,
+  type UploadUserFile,
+} from 'element-plus'
 import type { ISysUploadFiles } from '../../interface/ISysUploadFiles'
 //@ts-ignore
 import useFileView from '../../hooks/useFileView.ts'
@@ -102,7 +114,7 @@ import { userInfoStore } from '../../stores/userInfoStore'
 
 const { fileView: fileView } = useFileView()
 const uploadHeaders = ref({
-  Authorization: ''
+  Authorization: '',
 })
 const userInfo = userInfoStore()
 const ref_upload = ref()
@@ -114,7 +126,7 @@ const props = defineProps({
    */
   limit: {
     type: Number,
-    default: 1
+    default: 1,
   },
   /**
    * @description 纵向排列
@@ -122,7 +134,7 @@ const props = defineProps({
    */
   vertical: {
     type: Boolean,
-    default: false
+    default: false,
   },
   /**
    * @description 上传文件类型
@@ -131,7 +143,7 @@ const props = defineProps({
    */
   accept: {
     type: String,
-    default: ''
+    default: '',
   },
   /**
    * @description 业务类型
@@ -139,7 +151,7 @@ const props = defineProps({
    */
   business: {
     type: String,
-    default: 'default'
+    default: 'default',
   },
   /**
    * @description 业务id
@@ -147,14 +159,14 @@ const props = defineProps({
    */
   businessId: {
     type: String,
-    default: 'default'
+    default: 'default',
   },
   /**
    * 文件列表
    */
   uploadFilesList: {
     type: Array<ISysUploadFiles>,
-    default: () => []
+    default: () => [],
   },
   /**
    * @description 是否编辑状态
@@ -163,7 +175,7 @@ const props = defineProps({
    */
   isEdlt: {
     type: Boolean,
-    default: true
+    default: true,
   },
   /**
    * @description 文档上传是否默认关联，默认不关联
@@ -172,17 +184,21 @@ const props = defineProps({
    */
   association: {
     type: Boolean,
-    default: false
+    default: false,
   },
   size: {
     type: Number,
-    default: 50
+    default: 50,
   },
   //附件宽度
   itemWidth: {
     type: String,
-    default: '100%'
-  }
+    default: '100%',
+  },
+  watermarkCode: {
+    type: String,
+    default: () => undefined,
+  },
 })
 const mousemove = (fileName: string) => {
   hoverfileName.value = fileName
@@ -251,7 +267,7 @@ watch(
       loading.value = false
     }
   },
-  { deep: true }
+  { deep: true },
 )
 const beforeUpload = (file: File) => {
   const f = props.uploadFilesList.find((c) => c.name === file.name)
@@ -262,9 +278,7 @@ const beforeUpload = (file: File) => {
     ElMessage.warning('文件大小不能超过' + props.size + 'MB')
     return false
   }
-  const acceptSuffixes = getAccept.value
-    ?.split(',')
-    .map(suffix => suffix.slice(1).toLowerCase())
+  const acceptSuffixes = getAccept.value?.split(',').map((suffix) => suffix.slice(1).toLowerCase())
   const fileSuffix = file.name.split('.').pop()?.toLowerCase()
   if (acceptSuffixes && !acceptSuffixes.includes(fileSuffix ?? '')) {
     ElMessage.error(`文件 ${file.name} 格式不支持，仅允许 ${getAccept.value}！`)
@@ -285,7 +299,7 @@ const fileClick = async (file: UploadFile & ISysUploadFiles) => {
     const flag = await ElMessageBox.confirm('删除不可恢复！您确定删除此附件？', '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
-      type: 'warning'
+      type: 'warning',
     })
     if (!flag) {
       return
@@ -332,7 +346,7 @@ onMounted(() => {
   uploadHeaders.value.Authorization = sessionStorage.getItem('Authorization') + ''
 })
 defineExpose({
-  remove
+  remove,
 })
 </script>
 <style scoped lang="scss">

package/src/components/workflow/TaskOperation.vue

@@ -287,6 +287,14 @@ const reloadTask = async () => {
     }
   }
 }
+const reload=()=>{
+  reloadTask()
+}
+defineExpose<{
+  reload: () => void
+}>({
+  reload,
+})
 watch(() => $props.taskId, reloadTask)
 // watchEffect(() => {
 //   //需要指定实际处理人

package/src/components/workflow/components/ProcessDetailComp.vue

@@ -153,5 +153,13 @@ watch(
   },
   { immediate: true }, // 若不需要在组件挂载时立即触发，可以设置为 false
 )
+const reload=()=>{
+  open()
+}
+defineExpose<{
+  reload: () => void
+}>({
+  reload,
+})
 </script>
 <style scoped lang="scss"></style>