n20-common-lib 2.13.6 → 2.13.8

package/package.json

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

package/src/components/HandlingAdvice/index.vue

@@ -23,6 +23,7 @@
             :show-word-limit="showWordLimit"
             :maxlength="maxlength"
             class="w-100p"
+            :placeholder="placeholder"
           />
         </el-form-item>
       </el-form>
@@ -88,7 +89,9 @@ export default {
       reason: '',
       otherAttDataA: [],
       procInstId: '',
-      whether: false
+      whether: false,
+      optionsRequired: false,
+      placeholder: ''
     }
   },
   methods: {
@@ -109,6 +112,12 @@ export default {
         if (code === 200) {
           this.otherAttDataA = data.customizationList || []
           this.whether = data.whether
+          this.optionsRequired = data.optionsRequired
+          if (data.optionsRequired) {
+            this.placeholder = '请选择或输入意见（必填）'
+          } else {
+            this.placeholder = '请选择或输入意见（选填）'
+          }
           this.visible = data.whether === true || this.otherAttDataA.length > 0
           this.flowOptions = data?.opinions?.map((d) => {
             return {
@@ -159,6 +168,10 @@ export default {
       this.reason = val
     },
     submit() {
+      if (this.whether && this.optionsRequired && !this.reason) {
+        this.$message.warning('请选择或输入意见')
+        return
+      }
       const getOtherAttData = this.$refs['showOtherAttNew'] && this.$refs['showOtherAttNew']?.getOtherAttData()
       this.visible = false
       if (this.beforeSubmit) {

package/src/components/TablePro/index.vue

@@ -334,7 +334,12 @@ export default {
     },
     // 计算列宽
     calcColumnWidth(columns) {
-      columns = XEUtils.clone(columns, true)
+      columns = columns.map((item) => {
+        return {
+          ...item,
+          _width_: 0
+        }
+      })
       const wrapperEl = document.querySelector('div#app')
       const notHasWidth = columns.filter((column) => !column.width && !column.minWidth && column.label !== $lc('操作'))
       if (!wrapperEl || notHasWidth.length > 0) {
@@ -368,7 +373,6 @@ export default {
           return column
         })
       }
-
       return calc(columns)
     }
   }

package/src/plugins/Sign/signV3/sign.js

@@ -102,22 +102,24 @@ export function getCertInfo(dn) {
   }
   return new Promise((resolve, reject) => {
     let certInfo
-    IWSAGetAllCertsListInfo('infosec.sm2', 'Sign', 2, (dnList) => {
-      if (!dn) {
-        Message.error('没有获取到签名参数DN!')
-        reject()
-      }
-      if (!dnList) {
-        Message.error('没有获取到证书列表!')
-        reject()
-      }
-      if (dnList.length === 0) {
-        Message.error('用户证书信息与当前用户不匹配!')
-        reject()
-      }
+    IWSAGetAllCertsListInfo('infosec.sm2', 'Sign', 0, (dnList) => {
+      IWSAGetAllCertsListInfo('infosec.sm2', 'Sign', 2, (dnList2) => {
+        if (!dn) {
+          Message.error('没有获取到签名参数DN!')
+          reject()
+        }
+        if (!dnList && !dnList2) {
+          Message.error('没有获取到证书列表!')
+          reject()
+        }
+        if (dnList.length === 0 && dnList2.length === 0) {
+          Message.error('用户证书信息与当前用户不匹配!')
+          reject()
+        }
 
-      certInfo = verifyDn(dnList, dn)
-      resolve(certInfo)
+        certInfo = verifyDn([...dnList, ...dnList2], dn)
+        resolve(certInfo)
+      })
     })
   })
 }
@@ -169,10 +171,10 @@ function verifyDn(dnList, dn) {
     }
   })
   if (index === -1) {
-    let dnList = dnList?.map((res) => res.certDN)?.join(',')
+    let dnListA = dnList?.map((res) => res.certDN)?.join(',')
     Message({
       type: 'error',
-      text: `证书Dn不匹配:${dnList}里面无法匹配===>${dn}`,
+      text: `证书Dn不匹配:${dnListA}里面无法匹配===>${dn}`,
       duration: 5000
     })
     return index