n20-common-lib 2.1.34 → 2.1.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.1.34",
+  "version": "2.1.36",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/Upload/index.vue

@@ -4,7 +4,7 @@
     :class="{ 'n20-upload-drag': $attrs.drag }"
     :action="action"
     :headers="headers | headersF"
-    :accept="accept"
+    :accept="accept | acceptFilter"
     :multiple="multiple"
     :file-list="fileList"
     :show-file-list="multiple ? true : showFileList"
@@ -50,15 +50,18 @@
 
 <script>
 import _axios from 'axios'
-import { $lc } from '../../utils/i18n/index'
 import auth from '../../utils/auth'
 import axios from '../../utils/axios'
+import { $lc } from '../../utils/i18n/index'
 import uploadMsg from './uploadMsg.vue'
 export default {
   name: 'Upload',
   filters: {
     headersF(headers) {
       return auth.setHeaders(headers)
+    },
+    acceptFilter(value) {
+      return value?.toLowerCase()
     }
   },
   components: {
@@ -214,7 +217,7 @@ export default {
         let [ftB = '', ftA = ''] = file.type.split('/')
         ftB = ftB ? ftB + '/*' : ''
         ftA = file.name.match(/\.[^.]+$/)?.[0] || '.' + ftA
-        if ((ftB && accept.includes(ftB)) || accept.includes(ftA)) {
+        if ((ftB && accept.includes(ftB.toLowerCase())) || accept.includes(ftA.toLowerCase())) {
           // console.log('文件格式' + ftB + '/' + ftA)
         } else {
           this.$message.error(ftA + $lc('格式文件，暂不支持上传！'))

package/src/plugins/Sign/NetSM3/index.js

@@ -171,13 +171,16 @@ function verifyDn(dnList, dn) {
   let checkRes = ''
   let userDnAttrsArr = dn.split(',').map((c) => c.trim())
 
+  let isIn = false
   dnList.find((C) => {
     let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
-    if (!dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
-      checkRes = 'checkRes'
-      return true
+    if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+      return (isIn = true)
     }
   })
+  if (!isIn) {
+    checkRes = 'checkRes'
+  }
 
   return checkRes
 }

package/src/plugins/Sign/SkfSign/index.js

@@ -171,13 +171,16 @@ function verifyDn(dnList, dn) {
   let checkRes = ''
   let userDnAttrsArr = dn.split(',').map((c) => c.trim())
 
+  let isIn = false
   dnList.find((C) => {
     let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
-    if (!dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
-      checkRes = 'checkRes'
-      return true
+    if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+      return (isIn = true)
     }
   })
+  if (!isIn) {
+    checkRes = 'checkRes'
+  }
 
   return checkRes
 }

package/src/plugins/Sign/sign.js

@@ -126,14 +126,16 @@ function verifyDn(dnList, dn) {
   let checkRes = ''
   let userDnAttrsArr = dn.split(',').map((c) => c.trim())
 
+  let isIn = false
   dnList.find((C) => {
     let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
-
-    if (!dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
-      checkRes = 'checkRes'
-      return true
+    if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+      return (isIn = true)
     }
   })
+  if (!isIn) {
+    checkRes = 'checkRes'
+  }
 
   return checkRes
 }

package/src/utils/axios.js

@@ -5,6 +5,35 @@ import { $lc } from './i18n/index'
 const _Loading = ElementUI.Loading
 const _Message = ElementUI.Message
 
+const fileMap = {
+  pdf: 'application/pdf',
+  jpeg: 'image/jpeg',
+  jpg: 'image/jpeg',
+  bmp: 'image/x-ms-bmp',
+  png: 'image/png',
+  gif: 'image/gif',
+  svg: 'image/svg+xml',
+  svgz: 'image/svg+xml',
+  ico: 'image/x-icon',
+  json: 'application/json',
+  doc: 'application/msword',
+  docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+  xls: 'application/vnd.ms-excel',
+  xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+  ppt: 'application/vnd.ms-powerpoint',
+  pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+  csv: 'text/plain',
+  zip: 'application/zip',
+  '7z': 'application/x-7z-compressed',
+  rar: 'application/x-rar-compressed',
+  mp3: 'audio/mpeg',
+  mp4: 'video/mp4',
+  avi: 'video/x-msvideo',
+  wmv: 'video/x-ms-wmv',
+  flv: 'video/x-flv',
+  swf: 'application/x-shockwave-flash'
+}
+
 /* 添加msg */
 function showMsg(msg, single = true) {
   if (!single || !document.querySelector('.xhr-msg-top')) {
@@ -133,8 +162,26 @@ function request(opt) {
       .then((res) => {
         if (opt.responseType === 'blob') {
           let filename = getFilename(res.headers['content-disposition'])
-          filename && res.data && (res.data.name = filename.replace(/"/g, ''))
-          res.data.size === 0 ? reject({ code: 404, msg: opt.url + $lc('请求返回文件大小0KB') }) : resolve(res.data)
+          if (filename && res.data) {
+            filename = filename.replace(/"/g, '')
+            // 调整blob类型
+            let I = filename.lastIndexOf('.')
+            if (I !== -1) {
+              let type = undefined
+              let suffix = filename.slice(I + 1)
+              type = fileMap[suffix]
+              if (type && res.data instanceof Blob && res.data.type !== type) {
+                res.data = new Blob([res.data], { type: type })
+              }
+            }
+
+            res.data.name = filename
+          }
+          if (res.data.size === 0) {
+            reject({ code: 404, msg: opt.url + $lc('请求返回文件大小0KB') })
+          } else {
+            resolve(res.data)
+          }
         } else {
           if (typeof res.data === 'object' && res.data.data === undefined) {
             res.data.data = {}