n20-common-lib 2.19.7 → 2.19.8-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.19.7",
+  "version": "2.19.8-alpha.1",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/plugins/Sign/index.js

@@ -100,29 +100,41 @@ export function getCert(dn) {
       if (window.NetSignVersion === 'signV3') {
         importG('inetSign', () => import(/*webpackChunkName: "inetSign"*/ './signV3/sign.js')).then(
           ({ getCertInfo }) => {
-            getCertInfo(dn).then((res) => {
-              resolve(res)
-            })
+            try {
+              const itrusGetCert = getCertInfo(dn)
+              resolve(itrusGetCert)
+            } catch (error) {
+              reject()
+            }
           }
         )
       } else {
         importG('inetSign', () => import(/*webpackChunkName: "inetSign"*/ './sign.js')).then(({ getCertInfo }) => {
-          getCertInfo(dn).then((res) => {
-            resolve(res)
-          })
+          try {
+            const itrusGetCert = getCertInfo(dn)
+            resolve(itrusGetCert)
+          } catch (error) {
+            reject()
+          }
         })
       }
     } else if (signType === 'SkfSign') {
       importG('SkfSign', () => import(/*webpackChunkName: "SkfSign"*/ './SkfSign/index.js')).then(({ getCertInfo }) => {
-        getCertInfo(dn).then((res) => {
-          resolve(res)
-        })
+        try {
+          const itrusGetCert = getCertInfo(dn)
+          resolve(itrusGetCert)
+        } catch (error) {
+          reject()
+        }
       })
     } else if (signType === 'NetSM3') {
       importG('NetSM3', () => import(/*webpackChunkName: "NetSM3"*/ './NetSM3/index.js')).then(({ getCertInfo }) => {
-        getCertInfo(dn).then((res) => {
-          resolve(res)
-        })
+        try {
+          const itrusGetCert = getCertInfo(dn)
+          resolve(itrusGetCert)
+        } catch (error) {
+          reject()
+        }
       })
     } else if (signType === 'ItrusSign') {
       importG('ItrusSign', () => import(/*webpackChunkName: "ItrusSign"*/ './Itrus/index.js')).then(({ getCert }) => {

package/src/utils/axios.js

@@ -34,6 +34,17 @@ const fileMap = {
   swf: 'application/x-shockwave-flash'
 }
 
+// 错误消息配置
+const ERROR_MESSAGES = {
+  400: $lc('400，参数错误！'),
+  401: $lc('超时未操作，请重新登录！'),
+  404: $lc('404，网络连接失败！'),
+  500: $lc('500，服务器链接失败！'),
+  timeout: $lc('请求超时'),
+  network: $lc('请求错误'),
+  default: $lc('未知错误')
+}
+
 /* 添加msg */
 function showMsg(msg, single = true) {
   if (!single || !document.querySelector('.xhr-msg-top')) {
@@ -45,56 +56,73 @@ function showMsg(msg, single = true) {
     })
   }
 }
-/* 添加loading */
-let loadingBox
-let loadingCount = 0
+
+/* 加载状态管理 */
+const loadingInstances = new Map()
+
 function showLoading(opt) {
   let loading = opt.loading
   if (loading === true) {
-    if (loadingCount === 0 && !document.querySelector('.xhr-loading-top:not(.el-loading-fade-leave-active)')) {
-      loadingBox = _Loading.service({
+    const loadingKey = 'global'
+    if (!loadingInstances.has(loadingKey)) {
+      const instance = _Loading.service({
         lock: true,
         text: $lc('加载中'),
         background: 'rgba(0, 0, 0, 0.1)',
         customClass: 'xhr-loading-top'
       })
+      loadingInstances.set(loadingKey, instance)
     }
-    loadingCount++
   }
 }
+
 function closeLoading(opt) {
   let loading = opt.loading
   if (loading === true) {
+    const loadingKey = 'global'
     setTimeout(() => {
-      loadingCount--
-      loadingCount === 0 && loadingBox && loadingBox.close()
+      const instance = loadingInstances.get(loadingKey)
+      if (instance && loadingInstances.size === 1) {
+        instance.close()
+        loadingInstances.delete(loadingKey)
+      }
     }, 16)
   } else if (typeof loading === 'function') {
     loading()
   }
 }
+
 /* 请求防抖 */
-let debounceObj = {}
+const debounceObj = new Map()
 
 const config = {
   baseURL: process.env.VUE_APP_BASE_API || '',
-  crossDomain: true, // 允许跨域
-  // withCredentials: true, // 跨域携带cookie
-  timeout: 120000,
+  crossDomain: true,
+  timeout: 30000,
   validateStatus(status) {
     return status === 200
-  }
+  },
+  // 添加重试配置
+  retry: 3,
+  retryDelay: 1000
 }
+
 const axios = _axios.create(config)
 
 axios.interceptors.request.use((opt) => {
   opt.headers = auth.setHeaders(opt.headers, opt.OperationDesc)
+
+  // 添加请求取消token
+  opt.cancelToken = new axios.CancelToken((cancel) => {
+    opt.cancel = cancel
+  })
+
   return opt
 })
 
 function errorFn(status, msg, noMsg, isErr, res) {
   if (status === 401 || msg === 'Request failed with status code 401') {
-    noMsg || showMsg($lc('超时未操作，请重新登录！'))
+    noMsg || showMsg(ERROR_MESSAGES[401])
     setTimeout(() => {
       if (navigator.userAgent.includes('NSTC-WebEntry')) {
         localStorage.clear()
@@ -103,20 +131,16 @@ function errorFn(status, msg, noMsg, isErr, res) {
         auth.removeToken()
       }
     }, 1000)
-  } else if (status === 400) {
-    noMsg || showMsg($lc('400，参数错误！'))
-  } else if (status === 404 || msg === 'Request failed with status code 404') {
-    noMsg || showMsg($lc('404，网络连接失败！'))
-  } else if (status === 500) {
-    noMsg || showMsg($lc('500，服务器链接失败！'))
-  } else if (status === 'ECONNABORTED' && msg.includes('timeout')) {
-    noMsg || showMsg($lc('请求超时'))
-  } else if (msg === 'Network Error') {
-    noMsg || showMsg($lc('请求错误'))
-  } else if (status >= 900 || status === -1) {
-    noMsg || showMsg(msg)
   } else {
-    // noMsg || showMsg(msg)
+    const errorMessage =
+      ERROR_MESSAGES[status] ||
+      (status === 'ECONNABORTED' && msg.includes('timeout')
+        ? ERROR_MESSAGES.timeout
+        : msg === 'Network Error'
+        ? ERROR_MESSAGES.network
+        : ERROR_MESSAGES.default)
+
+    noMsg || showMsg(errorMessage)
   }
   throw { code: status, msg: msg, response: res }
 }
@@ -146,13 +170,14 @@ function request(opt) {
   let loading = opt.loading === undefined ? true : opt.loading
   showLoading({ loading })
 
-  if (debounceObj[opt.method + opt.url]) {
-    debounceObj[opt.method + opt.url].finally(() => {
+  // 使用请求参数作为防抖key的一部分
+  const debounceKey = `${opt.method}_${opt.url}_${JSON.stringify(opt.params || opt.data)}`
+
+  if (debounceObj.has(debounceKey)) {
+    debounceObj.get(debounceKey).finally(() => {
       closeLoading({ loading })
     })
-
-    // 短时间多次请求,均返回第一次请求结果
-    return debounceObj[opt.method + opt.url]
+    return debounceObj.get(debounceKey)
   }
 
   let resPro = new Promise((resolve, reject) => {
@@ -175,8 +200,12 @@ function request(opt) {
             }
             res.data.name = filename
           }
+          // 添加文件大小检查
           if (res.data.size === 0) {
             reject({ code: 404, msg: opt.url + $lc('请求返回文件大小0KB') })
+          } else if (res.data.size > 100 * 1024 * 1024) {
+            // 100MB限制
+            reject({ code: 413, msg: $lc('文件大小超过限制') })
           } else {
             resolve(res.data)
           }
@@ -193,23 +222,32 @@ function request(opt) {
   })
 
   resPro.finally(() => {
-    delete debounceObj[opt.method + opt.url]
-
+    debounceObj.delete(debounceKey)
     closeLoading({ loading })
   })
-  debounceObj[opt.method + opt.url] = resPro
+
+  debounceObj.set(debounceKey, resPro)
   return resPro
 }
 
 function getFilename(cd = '') {
-  let cdArr = cd.split(';')
-  let filename = cdArr.find((d) => /filename/i.test(d))
-  if (filename) {
-    filename = filename.split('=')
-    if (filename[1]) {
-      return decodeURI(filename[1].trim())
+  if (!cd) return ''
+
+  try {
+    const cdArr = cd.split(';')
+    const filenameItem = cdArr.find((d) => /filename/i.test(d))
+
+    if (filenameItem) {
+      const filename = filenameItem.split('=')[1]
+      if (filename) {
+        // 支持多种编码格式
+        return decodeURIComponent(filename.replace(/["']/g, '').trim())
+      }
     }
+  } catch (error) {
+    console.warn('Failed to parse filename:', error)
   }
+
   return ''
 }