n20-common-lib 2.7.13 → 2.7.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.13",
+  "version": "2.7.15",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/FileUploadTable/index.vue

@@ -54,6 +54,7 @@
               :disabled="row._typeDisabled"
               :placeholder="'请选择' | $lc"
               style="width: 100%"
+              @change="$emit('typeChange', row[keys.type])"
             >
               <el-option
                 v-for="item in typeOptions"
@@ -434,9 +435,13 @@ export default {
           showClose: true
         })
       }
-      const { code, data } = await this.$axios.post(`/api/neams/eamsbaserecord/mergeDownladPdf`,this.selectionList.map(res =>res.beid) || [],{
-        responseType: 'blob'
-      })
+      const { code, data } = await this.$axios.post(
+        `/api/neams/eamsbaserecord/mergeDownladPdf`,
+        this.selectionList.map((res) => res.beid) || [],
+        {
+          responseType: 'blob'
+        }
+      )
       if (code === 200) {
         let aDom = document.createElement('a')
         aDom.href = data
@@ -448,7 +453,6 @@ export default {
           data && URL.revokeObjectURL(data)
         })
       }
-
     },
     batchBeforeUploadFn(file) {
       let bu = this.$listeners['before-upload'] || this.$listeners['beforeUpload']

package/src/plugins/Sign/NetSM3/InfosecNetSignCNGAgent.min.js

@@ -245,7 +245,7 @@ function sendAjaxSniffingData(t) {
   ajaxInfosec({
     url: r,
     method: 'GET',
-    timeout: 300,
+    timeout: 1000,
     data: '',
     async: false,
     dataType: 'json',
@@ -273,7 +273,7 @@ function sendAjaxSniffingDataAsync(t) {
   ajaxInfosec({
     url: r,
     method: 'GET',
-    timeout: 300,
+    timeout: 1000,
     data: '',
     async: true,
     dataType: 'json',

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

@@ -159,7 +159,7 @@ export function availableSign(fn, url) {
           duration: 5000
         })
       }
-    }, 300)
+    }, 1000)
   }
 }
 
@@ -168,21 +168,22 @@ function verifyDn(dnList, dn) {
   if (!dnList) return 'Empty'
   if (!dn) return 'dnIsEmpty'
 
-  let checkRes = 0
   let userDnAttrsArr = dn.split(',').map((c) => c.trim())
 
   let isIn = false
-  dnList.find((C) => {
+  let index = 0
+  dnList.find((C, i) => {
     let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
     if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+      index = i
       return (isIn = true)
     }
   })
   if (!isIn) {
-    checkRes = -1
+    index = -1
   }
 
-  return checkRes
+  return index
 }
 
 // 签名
@@ -201,7 +202,7 @@ export async function getSign(plain, dn) {
     plainText = plain
   }
   let answer
-  const checkRes = await getCertInfo()
+  const checkRes = await getCertInfo(dn)
 
   if (checkRes != 'checkRes') {
     switch (checkRes) {

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

@@ -159,7 +159,7 @@ export function availableSign(fn, url) {
           duration: 5000
         })
       }
-    }, 300)
+    }, 1000)
   }
 }
 

package/src/plugins/Sign/sign.js

@@ -1,6 +1,6 @@
 // Attached方式签名
-import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
 import { Message, Notification } from 'element-ui'
+import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
 const {
   IWSASetTimeOut,
   IWSAAttachedSign,
@@ -42,7 +42,7 @@ export function availableSign(fn, url) {
           duration: 5000
         })
       }
-    }, 300)
+    }, 1000)
   }
 }
 
@@ -68,16 +68,15 @@ export function getSign(plain, dn) {
   } else {
     plainText = plain
   }
-  return  performSign(plainText,index)
+  return performSign(plainText, index)
 }
 
-
 /**
  * 获取证书信息
  * @param dn
  * @returns {*|string|boolean}
  */
-export  function getCertInfo(dn) {
+export function getCertInfo(dn) {
   if (dn === undefined) {
     dn = getDN()
   }