n20-common-lib 2.9.28 → 2.9.30

package/package.json

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

package/src/components/AdvancedFilter/index.vue

@@ -401,7 +401,7 @@ export default {
             }
           }
           this.checkList = this.GroupData.map((res) => res.id)
-          this.cancelCheck = cloneDeep(this.checkList)
+          this.cancelCheck = XEUtils.clone(this.checkList, true)
           // 查找排序，在this.filterList中查找this.checkList中的每一项，并将其排在前面
           this.filterList = this.filterList.sort((a, b) => {
             if (this.checkList.includes(a[this.onlyKey]) && !this.checkList.includes(b[this.onlyKey])) {

package/src/components/ApprovalCard/index.vue

@@ -244,6 +244,8 @@ export default {
           return prefix + 'danger'
         case status.end:
           return prefix + 'primary'
+        case status.revocation:
+          return prefix + 'warning'
         default:
           return undefined
       }
@@ -272,7 +274,8 @@ export default {
         approval: 2,
         reject: 3,
         invalid: 4,
-        end: 5
+        end: 5,
+        revocation: 6
       })
     },
     approvalData: {

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -325,6 +325,8 @@ export default {
           this.setRejectLink(from, to, $lc('驳回至'))
         } else if (type === '4') {
           this.setPropelLink(from, to, $lc('推进至'))
+        } else if (type === '5') {
+          this.setRejectLink(from, to, $lc('撤回至上一步'))
         }
       }
     },

package/src/plugins/Sign/sign.js

@@ -55,10 +55,14 @@ function checkAvailable(fn, url, count) {
   }
 }
 
-/* 签名解签 */
+/**
+ * 签名解签函数
+ * @param {string} signedMsg 要解签的密文
+ * @returns {string}  解签后的明文
+ */
 export function verifySign(signedMsg) {
   let plainText
-  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText, SigncertDN) => {
+  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText) => {
     if (errorCode === 0 || errorCode === '0') {
       plainText = PlainText
     } else {
@@ -68,50 +72,46 @@ export function verifySign(signedMsg) {
   return plainText
 }
 
-/* 给对象或字符串签名 */
+/**
+ * 签名函数
+ * @param {string} plain 要签名的明文
+ * @param {string} dn 用户对应的Dn
+ * @returns {Promise<string>}  签名后的密文信息
+ */
 export async function getSign(plain, dn) {
   let index = await getCertInfo(dn)
-  if (index === -1 || ['dnListEmpty', 'dnIsEmpty', 'Empty'].includes(index)) {
-    switch (index) {
-      case 'dnListEmpty':
-        Message.warning('没有匹配到证书!')
-        break
-      case 'dnIsEmpty':
-        Message.warning('DN参数为空!')
-        break
-      case 'Empty':
-        Message.warning('当前Ukey不匹配!')
-        break
-      default:
-        Message.warning('没有匹配到证书!')
-    }
-    return ''
-  }
-  let plainText = ''
-  if (typeof plain === 'object') {
-    plainText = JSON.stringify(plain)
-  } else {
-    plainText = plain
-  }
+  if (index === -1) return
+  let plainText = typeof plain === 'object' ? JSON.stringify(plain) : plain
+
   return await performSign(plainText, index)
 }
 
 /**
  * 获取证书信息
- * @param dn
- * @returns {*|string|boolean}
+ * @param {string} dn 要验证的Dn
+ * @returns {Promise} - 解析后的证书信息
  */
 export function getCertInfo(dn) {
   if (dn === undefined) {
     dn = getDN()
   }
   if (!dn) {
-    Message.error('签名参数DN错误!')
+    Message.error('没有获取到签名参数DN!')
     return false
   }
   return new Promise((resolve, reject) => {
     let certInfo
     IWSAGetAllCertsListInfoByCertDN('', 'Sign', parseCA(dn), 0, (dnList) => {
+      if (!dn) {
+        reject('没有获取到签名参数DN!')
+      }
+      if (!dnList) {
+        reject('没有获取到证书列表!')
+      }
+      if (dnList.length === 0) {
+        reject('获取到的证书列表为空!')
+      }
+
       certInfo = verifyDn(dnList, dn)
       resolve(certInfo)
     })
@@ -119,54 +119,59 @@ export function getCertInfo(dn) {
 }
 
 /**
- * 执行签名
- * @param plain
- * @param index
- * @returns {*|string}
+ * 执行签名函数
+ * @param {string} plain 要签名的明文
+ * @param index 签名的证书索引
+ * @returns {Promise<string>}  签名后的密文信息
  */
 export async function performSign(plain, index) {
   return new Promise((resolve, reject) => {
-    let answer
     IWSAAttachedSign('1', plain, index, 'SHA1', (errorCode, signedData) => {
       if (errorCode === 0 || errorCode === '0') {
         resolve(signedData)
       } else {
         Message.error('签名失败!')
-        reject()
+        reject(errorCode)
       }
     })
   })
 }
-
+/**
+ * 从Dn中获取CN
+ * @param {string} dn 要解析的Dn
+ * @returns {string} 解析后的CN
+ */
 function parseCA(dn) {
   const mark = /^CN=/
-  let cn = ''
-  if (dn == null) return cn
-
-  let booked = dn.split(',')
-  let dnC = booked.find((b) => mark.test(b))
-  dnC && (cn = dnC.replace(mark, ''))
-  return cn
+  let CN = dn.split(',').find((b) => mark.test(b))
+  return CN ? CN.replace(mark, '') : ''
 }
 
+/**
+ * 验证Dn是否存在于Dn列表中
+ * @param {Array} dnList 获取到的Dn列表
+ * @param {string} dn 要验证的Dn
+ * @returns {number} - 如果找到匹配的 DN，则返回其在 dnList 中的索引；如果未找到，则返回 -1
+ */
 function verifyDn(dnList, dn) {
-  if (dnList.length === 0) return 'dnListEmpty'
-  if (!dnList) return 'Empty'
-  if (!dn) return 'dnIsEmpty'
-
   let userDnAttrsArr = dn.split(',').map((c) => c.trim())
 
-  let isIn = false
-  let index = 0
+  let index = -1
   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)
+      return true
     }
   })
-  if (!isIn) {
-    index = -1
+  if (index === -1) {
+    let dnList = dnList?.map((res) => res.certDN)?.join(',')
+    Message({
+      type: 'error',
+      text: `证书Dn不匹配:${dnList}里面无法匹配===>${dn}`,
+      duration: 5000
+    })
+    return index
   }
   return index
 }

package/src/plugins/Sign/{sign_fix.js → sign_back.js}

@@ -55,14 +55,10 @@ function checkAvailable(fn, url, count) {
   }
 }
 
-/**
- * 签名解签函数
- * @param {string} signedMsg 要解签的密文
- * @returns {string}  解签后的明文
- */
+/* 签名解签 */
 export function verifySign(signedMsg) {
   let plainText
-  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText) => {
+  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText, SigncertDN) => {
     if (errorCode === 0 || errorCode === '0') {
       plainText = PlainText
     } else {
@@ -72,54 +68,50 @@ export function verifySign(signedMsg) {
   return plainText
 }
 
-/**
- * 签名函数
- * @param {string} plain 要签名的明文
- * @param {string} dn 用户对应的Dn
- * @returns {Promise<string>}  签名后的密文信息
- */
+/* 给对象或字符串签名 */
 export async function getSign(plain, dn) {
   let index = await getCertInfo(dn)
-  if (index === -1) {
-    Message.error('没有匹配到证书!')
-    return
+  if (index === -1 || ['dnListEmpty', 'dnIsEmpty', 'Empty'].includes(index)) {
+    switch (index) {
+      case 'dnListEmpty':
+        Message.warning('没有匹配到证书!')
+        break
+      case 'dnIsEmpty':
+        Message.warning('DN参数为空!')
+        break
+      case 'Empty':
+        Message.warning('当前Ukey不匹配!')
+        break
+      default:
+        Message.warning('没有匹配到证书!')
+    }
+    return ''
   }
-  if (typeof index === 'string') {
-    Message.error(index)
-    return
+  let plainText = ''
+  if (typeof plain === 'object') {
+    plainText = JSON.stringify(plain)
+  } else {
+    plainText = plain
   }
-
-  let plainText = typeof plain === 'object' ? JSON.stringify(plain) : plain
-
   return await performSign(plainText, index)
 }
 
 /**
  * 获取证书信息
- * @param {string} dn 要验证的Dn
- * @returns {Promise} - 解析后的证书信息
+ * @param dn
+ * @returns {*|string|boolean}
  */
 export function getCertInfo(dn) {
   if (dn === undefined) {
     dn = getDN()
   }
   if (!dn) {
-    Message.error('没有获取到签名参数DN!')
+    Message.error('签名参数DN错误!')
     return false
   }
   return new Promise((resolve, reject) => {
     let certInfo
     IWSAGetAllCertsListInfoByCertDN('', 'Sign', parseCA(dn), 0, (dnList) => {
-      if (!dn) {
-        reject('没有获取到签名参数DN!')
-      }
-      if (!dnList) {
-        reject('没有获取到证书列表!')
-      }
-      if (dnList.length === 0) {
-        reject('获取到的证书列表为空!')
-      }
-
       certInfo = verifyDn(dnList, dn)
       resolve(certInfo)
     })
@@ -127,13 +119,14 @@ export function getCertInfo(dn) {
 }
 
 /**
- * 执行签名函数
- * @param {string} plain 要签名的明文
- * @param index 签名的证书索引
- * @returns {Promise<string>}  签名后的密文信息
+ * 执行签名
+ * @param plain
+ * @param index
+ * @returns {*|string}
  */
 export async function performSign(plain, index) {
   return new Promise((resolve, reject) => {
+    let answer
     IWSAAttachedSign('1', plain, index, 'SHA1', (errorCode, signedData) => {
       if (errorCode === 0 || errorCode === '0') {
         resolve(signedData)
@@ -144,33 +137,36 @@ export async function performSign(plain, index) {
     })
   })
 }
-/**
- * 从Dn中获取CN
- * @param {string} dn 要解析的Dn
- * @returns {string} 解析后的CN
- */
+
 function parseCA(dn) {
   const mark = /^CN=/
-  let CN = dn.split(',').find((b) => mark.test(b))
-  return CN ? CN.replace(mark, '') : ''
+  let cn = ''
+  if (dn == null) return cn
+
+  let booked = dn.split(',')
+  let dnC = booked.find((b) => mark.test(b))
+  dnC && (cn = dnC.replace(mark, ''))
+  return cn
 }
 
-/**
- * 验证Dn是否存在于Dn列表中
- * @param {Array} dnList 获取到的Dn列表
- * @param {string} dn 要验证的Dn
- * @returns {number} - 如果找到匹配的 DN，则返回其在 dnList 中的索引；如果未找到，则返回 -1
- */
 function verifyDn(dnList, dn) {
+  if (dnList.length === 0) return 'dnListEmpty'
+  if (!dnList) return 'Empty'
+  if (!dn) return 'dnIsEmpty'
+
   let userDnAttrsArr = dn.split(',').map((c) => c.trim())
 
-  let index = -1
+  let isIn = false
+  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 true
+      return (isIn = true)
     }
   })
+  if (!isIn) {
+    index = -1
+  }
   return index
 }