n20-common-lib 1.3.155 → 1.3.156

package/package.json

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

package/src/components/FileUploadTable/index.vue

@@ -51,6 +51,9 @@
               <slot name="name" :row="row">{{ row[keys.name] ? row[keys.name] : '' }}</slot>
             </template>
           </el-table-column>
+          <template slot-scope="{ row }">
+            <slot name="slotCol" :row="row"></slot>
+          </template>
           <el-table-column :label="'上传时间' | $lc" :prop="keys.time" width="170" align="left">
             <template slot="header" slot-scope="scope">
               <slot name="time-header" :column="scope.column">{{ '上传时间' | $lc }}</slot>
@@ -102,7 +105,6 @@
           </div>
         </div>
       </div>
-
       <el-table :data="tableData" :row-key="keys.rowKey" @selection-change="(selection) => (selectionList = selection)">
         <slot name="selection-column">
           <el-table-column type="selection" width="50" align="center" />
@@ -118,7 +120,7 @@
             :show-overflow-tooltip="item['show-overflow-tooltip']"
           />
         </template>
-        <template v-else>
+        <template v-else >
           <el-table-column :label="'附件类型' | $lc" min-width="160">
             <template slot="header" slot-scope="scope">
               <slot name="type-header" :column="scope.column">{{ '附件类型' | $lc }}</slot>
@@ -183,6 +185,7 @@
               </slot>
             </template>
           </el-table-column>
+          <slot name="slotCol"></slot>
           <el-table-column :label="'上传时间' | $lc" :prop="keys.time" width="170" align="left">
             <template slot="header" slot-scope="scope">
               <slot name="time-header" :column="scope.column">{{ '上传时间' | $lc }}</slot>

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

@@ -1551,7 +1551,6 @@ try {
   TCA.config(config)
   initCertList()
 } catch (err) {
-  console.log(err)
   Message.warning('没有检测到证书助手，请下载并安装证书助手！')
   window.open(window.location.origin + '/portal/天诚安信数字证书助手-3.7.7.0.exe')
 }
@@ -1578,28 +1577,28 @@ export function getSign(plain, dn) {
       return false
     }
     var certs = CertStore.listAllCerts()
-
     if (certs.size() > 0) {
       var sginCert = null
       for (var i = 0; i < certs.size(); i++) {
         var cert = certs.get(i)
-        var t = cert.subject().match(/(S(?!N)|L|O(?!U)|OU|SN|CN|E)=([^=]+)(?=, |$)/g)
-        for (var i = 0; i < t.length; i++) {
-          if (t[i] == dn) {
+        let t = cert.subject()
+        if (t == dn) {
             sginCert = cert
             break
           }
         }
-      }
       if (sginCert) {
         return sginCert.signMessage(plain, false)
       } else {
-        Message.warning('签名参数DN不匹配！')
+        Message.warning('没有匹配到证书！')
       }
+    } else {
+      Message.warning('请检查key是否插入！')
     }
+
   } catch (e) {
     if (e instanceof TCACErr) {
-      alert(e.toStr())
+      Message.error(e.toStr())
     } else {
       Message.error('签名失败！')
     }