adtec-core-package 3.2.4 → 3.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "private": false,
   "type": "module",
   "exports": {

package/src/components/upload/CustomElUpload.vue

@@ -44,15 +44,7 @@
     :before-upload="beforeUpload"
     drag
     :accept="getAccept"
-    :action="
-      '/api/doc/uploadFile/' +
-      business +
-      '/' +
-      businessId +
-      '/' +
-      association +
-      (watermarkCode ? '?watermarkCode=' + watermarkCode : '')
-    "
+    :action="uploadAction"
     multiple
     :limit="limit"
     :headers="uploadHeaders"
@@ -101,7 +93,7 @@
 
 <script setup lang="ts">
 import { UploadFilled } from '@element-plus/icons-vue'
-import { computed, onMounted, ref } from 'vue'
+import { computed, ref } from 'vue'
 import {
   ElMessage,
   ElMessageBox,
@@ -116,11 +108,9 @@ import documentApi from '../../api/DocumentApi.ts'
 import frameworkUtils from '../../utils/FrameworkUtils.ts'
 import { userInfoStore } from '../../stores/userInfoStore'
 import { getAcceptString } from '../../utils/uploadAccept.ts'
+import { buildUploadHeaders } from '../../utils/buildUploadHeaders.ts'
 
 const { fileView: fileView } = useFileView()
-const uploadHeaders = ref({
-  Authorization: '',
-})
 const emit = defineEmits(['success'])
 const userInfo = userInfoStore()
 const ref_upload = ref()
@@ -217,6 +207,17 @@ const props = defineProps({
     default: () => undefined,
   },
 })
+const uploadAction = computed(
+  () =>
+    '/api/doc/uploadFile/' +
+    props.business +
+    '/' +
+    props.businessId +
+    '/' +
+    props.association +
+    (props.watermarkCode ? '?watermarkCode=' + props.watermarkCode : ''),
+)
+const uploadHeaders = computed(() => buildUploadHeaders(uploadAction.value))
 /**
  * 文件列表
  */
@@ -435,9 +436,6 @@ const confirm = async (autoDelete: boolean = true) => {
     }
   }
 }
-onMounted(() => {
-  uploadHeaders.value.Authorization = sessionStorage.getItem('Authorization') + ''
-})
 defineExpose({
   remove,
   confirm,

package/src/components/upload/ElUploads.vue

@@ -40,15 +40,7 @@
     :before-upload="beforeUpload"
     drag
     :accept="getAccept"
-    :action="
-      '/api/doc/uploadFile/' +
-      business +
-      '/' +
-      businessId +
-      '/' +
-      association +
-      (watermarkCode ? '?watermarkCode=' + watermarkCode : '')
-    "
+    :action="uploadAction"
     multiple
     :limit="limit"
     :headers="uploadHeaders"
@@ -97,7 +89,7 @@
 
 <script setup lang="ts">
 import { UploadFilled } from '@element-plus/icons-vue'
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import {
   ElMessage,
   ElMessageBox,
@@ -112,11 +104,9 @@ import documentApi from '../../api/DocumentApi.ts'
 import frameworkUtils from '../../utils/FrameworkUtils.ts'
 import { userInfoStore } from '../../stores/userInfoStore'
 import { getAcceptString } from '../../utils/uploadAccept.ts'
+import { buildUploadHeaders } from '../../utils/buildUploadHeaders.ts'
 
 const { fileView: fileView } = useFileView()
-const uploadHeaders = ref({
-  Authorization: '',
-})
 const userInfo = userInfoStore()
 const ref_upload = ref()
 const hoverfileName = ref('')
@@ -201,6 +191,17 @@ const props = defineProps({
     default: () => undefined,
   },
 })
+const uploadAction = computed(
+  () =>
+    '/api/doc/uploadFile/' +
+    props.business +
+    '/' +
+    props.businessId +
+    '/' +
+    props.association +
+    (props.watermarkCode ? '?watermarkCode=' + props.watermarkCode : ''),
+)
+const uploadHeaders = computed(() => buildUploadHeaders(uploadAction.value))
 const mousemove = (fileName: string) => {
   hoverfileName.value = fileName
 }
@@ -325,9 +326,6 @@ const remove = async (file: UploadFile) => {
   }
   // }
 }
-onMounted(() => {
-  uploadHeaders.value.Authorization = sessionStorage.getItem('Authorization') + ''
-})
 defineExpose({
   remove,
 })

package/src/config/VxeTableConfig.ts

@@ -4,7 +4,6 @@ import {
   VxeUI,
   VxeTooltip } from 'vxe-pc-ui'
 
-import VxeUIPluginRenderElement from '@vxe-ui/plugin-render-element'
 import '@vxe-ui/plugin-render-element/dist/style.css'
 import 'vxe-pc-ui/lib/style.css'
 import '../css/vxeTableUI/all.scss'
@@ -23,8 +22,17 @@ export function initVxeTableInPage(
   VxeUI.setI18n('zh-CN', zhCN)
   VxeUI.setLanguage('zh-CN')
   VxeUI.component(VxeTooltip)
-  // 局部注册插件
-  enableElementPlus && VxeUI.use(VxeUIPluginRenderElement)
+  // 局部注册插件（CJS 包动态加载，避免 Vite 静态 import 无 default 导出）
+  if (enableElementPlus) {
+    void import('@vxe-ui/plugin-render-element').then((renderModule) => {
+      const VxeUIPluginRenderElement =
+        renderModule.default ??
+        (renderModule as { VxeUIPluginRenderElement?: typeof renderModule.default })
+          .VxeUIPluginRenderElement ??
+        renderModule
+      VxeUI.use(VxeUIPluginRenderElement)
+    })
+  }
   if (enableExcel) {
     void Promise.all([
       import('exceljs'),

package/src/utils/AxiosConfig.ts

@@ -14,6 +14,7 @@ import encrypt from './encrypt'
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
 import { Md5 } from 'ts-md5'
+import { computeSigna, normalizeSignaPayload } from './buildUploadHeaders'
 import { ElMessage } from 'element-plus'
 import { useEventBus } from '@vueuse/core'
 /** 是否正在刷新的标志 */
@@ -31,7 +32,6 @@ const request = axios.create({
 function setHeaders(config: any) {
   //数据防止篡改
   const Authorization = config.skipAuthorization ? '' : sessionStorage.getItem('Authorization')
-  const signa = 'F2E49299-D0D2-4AA1-87A3-270272EA3D6A'
   let dataJson: string = ''
   if (config.method === 'get') {
     if (config.params) {
@@ -52,14 +52,11 @@ function setHeaders(config: any) {
     }
   }
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  dataJson=dataJson.replace(/[^\u4E00-\u9FA5A-Za-z0-9]/g, '')
-  dataJson = dataJson.split('').sort().join('').trim()
+  const normalizedPayload = normalizeSignaPayload(dataJson)
   config.headers.sessionId = config.skipAuthorization ? '' : sessionStorage.getItem('sessionId')
   config.headers.Authorization = Authorization
-  config.headers.signa = Md5.hashStr(Authorization + signa + dataJson)
-  config.headers.antiShakeKey = Md5.hashStr(dataJson)
+  config.headers.signa = computeSigna(Authorization || '', dataJson)
+  config.headers.antiShakeKey = Md5.hashStr(normalizedPayload)
   //防止重放 GUID+当前时间+TOKEN 加密
   const timeDifference = sessionStorage.getItem('timeDifference')
   const id = uuidv4()

package/src/utils/buildUploadHeaders.ts

@@ -0,0 +1,58 @@
+import { Md5 } from 'ts-md5'
+import { v4 as uuidv4 } from 'uuid'
+import encrypt from './encrypt'
+
+/** 与后端 token.dataSigna / DataTamperingFilter 一致 */
+export const SIGNA_KEY = 'F2E49299-D0D2-4AA1-87A3-270272EA3D6A'
+
+/**
+ * 规范化 signa 参与签名的字符串（strip 非字母数字 → 字符排序）。
+ * multipart 上传使用完整 URL（含 query）；JSON 接口使用序列化后的 body。
+ */
+export function normalizeSignaPayload(raw: string): string {
+  return raw
+    .replace(/[^\u4E00-\u9FA5A-Za-z0-9]/g, '')
+    .split('')
+    .sort()
+    .join('')
+    .trim()
+}
+
+export function computeSigna(authorization: string, payload: string): string {
+  return Md5.hashStr(authorization + SIGNA_KEY + normalizeSignaPayload(payload))
+}
+
+export interface BuildUploadHeadersOptions {
+  /** 上传 action 路径，如 /api/doc/uploadFile/biz/id/true?watermarkCode=xxx */
+  url: string
+  skipAuthorization?: boolean
+}
+
+/**
+ * el-upload / uni.uploadFile 等不走 axios 拦截器的上传请求头。
+ * signa 按 URL 计算，与 DataTamperingFilter multipart 分支对齐。
+ */
+export function buildUploadHeaders(
+  options: BuildUploadHeadersOptions | string,
+): Record<string, string> {
+  const url = typeof options === 'string' ? options : options.url
+  const skipAuthorization =
+    typeof options === 'string' ? false : (options.skipAuthorization ?? false)
+
+  const Authorization = skipAuthorization ? '' : sessionStorage.getItem('Authorization') || ''
+  const normalizedPayload = normalizeSignaPayload(url)
+
+  const timeDifference = sessionStorage.getItem('timeDifference')
+  const id = uuidv4()
+  const localTime = new Date().getTime()
+  const replayObj = { timeDifference, guid: id, localTime }
+
+  return {
+    Authorization,
+    sessionId: skipAuthorization ? '' : sessionStorage.getItem('sessionId') || '',
+    signa: computeSigna(Authorization, url),
+    antiShakeKey: Md5.hashStr(normalizedPayload),
+    'Cache-Control': 'no-cache',
+    replayToken: encrypt.encrypt(JSON.stringify(replayObj)),
+  }
+}

package/src/utils/uploadAccept.ts

@@ -16,6 +16,8 @@ export function getAcceptString(accept: string): string | undefined {
     return '.xls,.xlsx'
   } else if (accept === 'ppt') {
     return '.ppt,.pptx'
+  } else if (accept === 'zip') {
+    return '.zip'
   }
   return undefined
 }
@@ -28,7 +30,7 @@ export function getAcceptSuffixes(accept: string): string[] | null {
   return acceptStr.split(',').map((suffix) => suffix.slice(1).toLowerCase())
 }
 
-const ACCEPT_TYPES = ['images', 'document', 'txt', 'pdf', 'word', 'excel', 'ppt'] as const
+const ACCEPT_TYPES = ['images', 'document', 'txt', 'pdf', 'word', 'excel', 'ppt', 'zip'] as const
 
 const ALL_PREVIEW_SUFFIXES = new Set(
   ACCEPT_TYPES.flatMap((accept) => getAcceptSuffixes(accept) ?? []),