adtec-core-package 2.9.4 → 2.9.6

package/package.json

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

package/src/components/upload/CustomElUpload.vue

@@ -6,29 +6,27 @@
   <div v-if="!isEdit">
     <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
@@ -46,7 +44,15 @@
     :before-upload="beforeUpload"
     drag
     :accept="getAccept"
-    :action="'/api/doc/uploadFile/' + business + '/' + businessId + '/' + association+(watermarkCode ? '?watermarkCode=' + watermarkCode : '')"
+    :action="
+      '/api/doc/uploadFile/' +
+      business +
+      '/' +
+      businessId +
+      '/' +
+      association +
+      (watermarkCode ? '?watermarkCode=' + watermarkCode : '')
+    "
     multiple
     :limit="limit"
     :headers="uploadHeaders"
@@ -75,7 +81,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"
@@ -96,17 +102,24 @@
 <script setup lang="ts">
 import { UploadFilled } from '@element-plus/icons-vue'
 import { computed, onMounted, ref } 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'
 import documentApi from '../../api/DocumentApi.ts'
 import frameworkUtils from '../../utils/FrameworkUtils.ts'
 import { userInfoStore } from '../../stores/userInfoStore'
+import { getAcceptString } from '../../utils/uploadAccept.ts'
 
 const { fileView: fileView } = useFileView()
 const uploadHeaders = ref({
-  Authorization: ''
+  Authorization: '',
 })
 const emit = defineEmits(['success'])
 const userInfo = userInfoStore()
@@ -121,7 +134,7 @@ const props = defineProps({
    */
   limit: {
     type: Number,
-    default: 1
+    default: 1,
   },
   /**
    * @description 纵向排列
@@ -129,7 +142,7 @@ const props = defineProps({
    */
   vertical: {
     type: Boolean,
-    default: false
+    default: false,
   },
   /**
    * @description 上传文件类型
@@ -138,7 +151,7 @@ const props = defineProps({
    */
   accept: {
     type: String,
-    default: ''
+    default: '',
   },
   /**
    * @description 业务类型
@@ -146,7 +159,7 @@ const props = defineProps({
    */
   business: {
     type: String,
-    default: 'default'
+    default: 'default',
   },
   /**
    * @description 业务id
@@ -154,7 +167,7 @@ const props = defineProps({
    */
   businessId: {
     type: String,
-    default: 'default'
+    default: 'default',
   },
   /**
    * @description 是否编辑状态
@@ -163,7 +176,7 @@ const props = defineProps({
    */
   isEdit: {
     type: Boolean,
-    default: true
+    default: true,
   },
   /**
    * @description 文档上传是否默认关联，默认不关联
@@ -172,37 +185,37 @@ const props = defineProps({
    */
   association: {
     type: Boolean,
-    default: false
+    default: false,
   },
   size: {
     type: Number,
-    default: 50
+    default: 50,
   },
   //附件宽度
   itemWidth: {
     type: String,
-    default: '100%'
+    default: '100%',
   },
   isConfirmDelete: {
     type: Boolean,
-    default: true
+    default: true,
   },
   overwrite: {
     type: Boolean,
-    default: true
+    default: true,
   },
   autoUpload: {
     type: Boolean,
-    default: true
+    default: true,
   },
   showOptMessage: {
     type: Boolean,
-    default: true
+    default: true,
   },
   watermarkCode: {
     type: String,
-    default: () => undefined
-  }
+    default: () => undefined,
+  },
 })
 /**
  * 文件列表
@@ -214,25 +227,7 @@ const mousemove = (fileName: string) => {
 const mouseout = () => {
   hoverfileName.value = ''
 }
-const getAccept = computed(() => {
-  if (props.accept === 'images') {
-    return '.jpg,.jpeg,.png,.gif,.bmp'
-  } else if (props.accept === 'document') {
-    return '.txt,.pdf,.doc,.docx,.xls,.xlsx,.ppt,.pptx'
-  } else if (props.accept === 'txt') {
-    return '.txt'
-  } else if (props.accept === 'pdf') {
-    return '.pdf' // 正确配置，仅允许 pdf
-  } else if (props.accept === 'word') {
-    return '.doc,.docx'
-  } else if (props.accept === 'excel') {
-    return '.xls,.xlsx'
-  } else if (props.accept === 'ppt') {
-    return '.ppt,.pptx'
-  } else {
-    return undefined
-  }
-})
+const getAccept = computed(() => getAcceptString(props.accept))
 const getIcon = (fileName: string) => {
   const type: string = fileName.split('.').pop() + ''
   if ('.jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP'.includes(type)) {
@@ -272,7 +267,7 @@ const success = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles
 const loading = defineModel<boolean>('loading')
 const loadingFiles = ref<string[]>([])
 const hasPendingFiles = computed(() => {
-  return fileList.value.some(file => {
+  return fileList.value.some((file) => {
     return file.status !== 'success' && file.status !== 'error'
   })
 })
@@ -298,9 +293,7 @@ const beforeUpload = async (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}！`)
@@ -322,7 +315,7 @@ const fileClick = async (file: UploadFile & ISysUploadFiles) => {
       const flag = await ElMessageBox.confirm('删除不可恢复！您确定删除此附件？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
       if (!flag) {
         return
@@ -341,17 +334,21 @@ const exceed = async (files: File[], uploadFiles: UploadUserFile[]) => {
   if (props.limit === 1 && props.overwrite && uploadFilesList.value.length >= 1) {
     const existingFile = uploadFilesList.value[0]
     if (!props.isConfirmDelete) {
-      const flag = await ElMessageBox.confirm('只允许上传一个附件，是否点击确定覆盖原有附件？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
+      const flag = await ElMessageBox.confirm(
+        '只允许上传一个附件，是否点击确定覆盖原有附件？',
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      )
       if (!flag) {
         return
       }
       try {
         loading.value = true
-        await documentApi.delSysUploadFile(existingFile.id).catch(err => {
+        await documentApi.delSysUploadFile(existingFile.id).catch((err) => {
           frameworkUtils.messageError(err)
         })
       } catch (err) {
@@ -418,7 +415,7 @@ const confirm = async (autoDelete: boolean = true) => {
   try {
     loading.value = true
     if (props.isConfirmDelete && deleteFiles.value.length > 0 && autoDelete) {
-      await documentApi.delSysUploadFiles(deleteFiles.value.map(item => item.id))
+      await documentApi.delSysUploadFiles(deleteFiles.value.map((item) => item.id))
     }
     if (!props.autoUpload) {
       //此处判断是否存在需要上传的文件
@@ -443,7 +440,7 @@ onMounted(() => {
 })
 defineExpose({
   remove,
-  confirm
+  confirm,
 })
 </script>
 <style scoped lang="scss">

package/src/components/upload/ElUploads.vue

@@ -111,6 +111,7 @@ import useFileView from '../../hooks/useFileView.ts'
 import documentApi from '../../api/DocumentApi.ts'
 import frameworkUtils from '../../utils/FrameworkUtils.ts'
 import { userInfoStore } from '../../stores/userInfoStore'
+import { getAcceptString } from '../../utils/uploadAccept.ts'
 
 const { fileView: fileView } = useFileView()
 const uploadHeaders = ref({
@@ -206,25 +207,7 @@ const mousemove = (fileName: string) => {
 const mouseout = () => {
   hoverfileName.value = ''
 }
-const getAccept = computed(() => {
-  if (props.accept === 'images') {
-    return '.jpg,.jpeg,.png,.gif,.bmp'
-  } else if (props.accept === 'document') {
-    return '.txt,.pdf,.doc,.docx,.xls,.xlsx,.ppt,.pptx'
-  } else if (props.accept === 'txt') {
-    return '.txt'
-  } else if (props.accept === 'pdf') {
-    return '.pdf' // 正确配置，仅允许 pdf
-  } else if (props.accept === 'word') {
-    return '.doc,.docx'
-  } else if (props.accept === 'excel') {
-    return '.xls,.xlsx'
-  } else if (props.accept === 'ppt') {
-    return '.ppt,.pptx'
-  } else {
-    return undefined
-  }
-})
+const getAccept = computed(() => getAcceptString(props.accept))
 const getIcon = (fileName: string) => {
   const type: string = fileName.split('.').pop() + ''
   if ('.jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP'.includes(type)) {

package/src/components/upload/FileViewComponents.vue

@@ -15,22 +15,48 @@ const isVisible = ref(false)
 //@ts-ignore
 import 'vue-img-viewr/styles/index.css'
 //@ts-ignore
-import ImgViewr, { showImages } from 'vue-img-viewr'
+import { showImages } from 'vue-img-viewr'
 import documentApi from '../../api/DocumentApi.ts'
 import frameworkUtils from '../../utils/FrameworkUtils.ts'
 import framework from '../../api/framework.ts'
 import FileView from './FileView.vue'
+import request from '../../utils/AxiosConfig.ts'
+import { getFileSuffix, isPreviewableSuffix } from '../../utils/uploadAccept.ts'
+import type { ISysUploadFiles } from '../../interface/ISysUploadFiles.ts'
+
 const fileTitle = ref('')
 const viewUrl = ref('')
 const fileId = ref('')
 const edit = ref('view')
 
+const IMAGE_SUFFIXES = ['jpg', 'jpeg', 'png', 'gif', 'bmp']
+
+const downloadFile = async (data: ISysUploadFiles, url: string) => {
+  const res = await request<any>({
+    url,
+    method: 'get',
+    responseType: 'blob',
+  })
+  const blob = new Blob([res.data])
+  const link = document.createElement('a')
+  link.href = window.URL.createObjectURL(blob)
+  link.download = data.name
+  link.click()
+  window.URL.revokeObjectURL(link.href)
+}
+
 const viewFile = async (id: string) => {
-  //根据文件id获取文件信息
   try {
     const data = await documentApi.getUpLoadFilesVoById(id)
     const data1 = await framework.getFileAccessAddress(data.id)
-    if ('.jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP'.includes(data.type)) {
+    const suffix = getFileSuffix(data)
+
+    if (!isPreviewableSuffix(suffix)) {
+      await downloadFile(data, data1.url)
+      return
+    }
+
+    if (IMAGE_SUFFIXES.includes(suffix)) {
       showImages({
         urls: [data1.url],
         index: 0,

package/src/utils/uploadAccept.ts

@@ -0,0 +1,49 @@
+/**
+ * 与 ElUploads.vue getAccept 保持一致的 accept 配置
+ */
+export function getAcceptString(accept: string): string | undefined {
+  if (accept === 'images') {
+    return '.jpg,.jpeg,.png,.gif,.bmp'
+  } else if (accept === 'document') {
+    return '.txt,.pdf,.doc,.docx,.xls,.xlsx,.ppt,.pptx'
+  } else if (accept === 'txt') {
+    return '.txt'
+  } else if (accept === 'pdf') {
+    return '.pdf'
+  } else if (accept === 'word') {
+    return '.doc,.docx'
+  } else if (accept === 'excel') {
+    return '.xls,.xlsx'
+  } else if (accept === 'ppt') {
+    return '.ppt,.pptx'
+  }
+  return undefined
+}
+
+export function getAcceptSuffixes(accept: string): string[] | null {
+  const acceptStr = getAcceptString(accept)
+  if (!acceptStr) {
+    return null
+  }
+  return acceptStr.split(',').map((suffix) => suffix.slice(1).toLowerCase())
+}
+
+const ACCEPT_TYPES = ['images', 'document', 'txt', 'pdf', 'word', 'excel', 'ppt'] as const
+
+const ALL_PREVIEW_SUFFIXES = new Set(
+  ACCEPT_TYPES.flatMap((accept) => getAcceptSuffixes(accept) ?? []),
+)
+
+/** 后缀是否在 getAccept 支持的可预览格式内（合并所有 accept 类型） */
+export function isPreviewableSuffix(suffix: string): boolean {
+  const normalized = suffix.replace(/^\./, '').toLowerCase()
+  return ALL_PREVIEW_SUFFIXES.has(normalized)
+}
+
+export function getFileSuffix(file: { type?: string; name: string }): string {
+  const fromType = file.type?.replace(/^\./, '')
+  if (fromType) {
+    return fromType.toLowerCase()
+  }
+  return (file.name.split('.').pop() ?? '').toLowerCase()
+}