n20-common-lib 3.2.25 → 3.2.27

package/package.json

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

package/src/assets/css/advanced-filter.scss

@@ -11,6 +11,20 @@
     background: #e9f2ff !important;
   }
 
+  &-item.notStyle{
+    border: 0px;
+    background: transparent !important;
+    padding: 0;
+    .el-form-item__label{
+      display: none;
+    }
+
+    .el-form-item__content{
+      height: auto;
+    }
+  }
+
+
   &-body {
 
     .el-form-item,

package/src/components/AdvancedFilter/index.vue

@@ -5,7 +5,7 @@
       <el-form-item
         v-for="item in GroupData"
         :key="getOnlyKey(item)"
-        :class="[prefixCls + '-item', activeClassMap[item.value || item[onlyKey]] || '']"
+        :class="[prefixCls + '-item', activeClassMap[item.value || item[onlyKey]] || '',{notStyle: item.notStyle}]"
         :label="item.label"
         :required="!!item.required"
         :disabled="item.props && item.props.disabled"
@@ -249,14 +249,16 @@ export default {
       this.GroupData.forEach((item) => {
         const key = item.value || item[this.onlyKey]
         let isActive = false
-        if (item.type === 'numberrange') {
-          isActive = hasRange(item.startValue, item.endValue)
-        } else if (rangeTypes.includes(item.type)) {
-          isActive = hasRange(item.startDate, item.endDate)
-        } else if (item.slotFields && item.slotFields.length > 0) {
-          isActive = item.slotFields.some((field) => hasValue(model[field]))
-        } else {
-          isActive = hasValue(model[item.value])
+        if(!item.notActive) {
+          if (item.type === 'numberrange') {
+            isActive = hasRange(item.startValue, item.endValue)
+          } else if (rangeTypes.includes(item.type)) {
+            isActive = hasRange(item.startDate, item.endDate)
+          } else if (item.slotFields && item.slotFields.length > 0) {
+            isActive = item.slotFields.some((field) => hasValue(model[field]))
+          } else {
+            isActive = hasValue(model[item.value])
+          }
         }
         map[key] = isActive ? this.prefixCls + '-active' : ''
       })

package/src/components/ProFilterView/index.vue

@@ -814,7 +814,7 @@ export default {
 
 <style scoped>
 .filter.is-hidden {
-  padding: 4px;
+  padding:0 !important;
   border-bottom: none !important;
 }
 </style>

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

@@ -1,6 +1,7 @@
 import { Message, MessageBox, Notification } from 'element-ui'
 import { codeDate } from '../codeMap.js'
 import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+import { isDnMatched } from '../dn.js'
 /*
 获取证书列表接口：2.7.1  IWSASkfGetCertList (DllFilePath, SucceedFunction)
 Attached签名接口：2.7.2 IWSASkfSignData (PlainText, CertIndex, UsbKeyPin, DigestArithmetic, SucceedFunction)
@@ -62,17 +63,14 @@ function checkAvailable(fn, url, count) {
 }
 
 function verifyDn(dnList, dn) {
-  if (dnList.length === 0) return 'dnListEmpty'
   if (!dnList) return 'Empty'
+  if (dnList.length === 0) return 'dnListEmpty'
   if (!dn) return 'dnIsEmpty'
 
-  let userDnAttrsArr = dn.split(',').map((c) => c.trim())
-
   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))) {
+    if (isDnMatched(C.certDN, dn)) {
       index = i
       return (isIn = true)
     }

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

@@ -1,6 +1,7 @@
 import { Message, MessageBox, Notification } from 'element-ui'
 import { codeDate } from '../codeMap.js'
 import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+import { isDnMatched } from '../dn.js'
 /*
 获取证书列表接口：2.7.1  IWSASkfGetCertList (DllFilePath, SucceedFunction)
 Attached签名接口：2.7.2 IWSASkfSignData (PlainText, CertIndex, UsbKeyPin, DigestArithmetic, SucceedFunction)
@@ -62,17 +63,14 @@ function checkAvailable(fn, url, count) {
 }
 
 function verifyDn(dnList, dn) {
-  if (dnList.length === 0) return 'dnListEmpty'
   if (!dnList) return 'Empty'
+  if (dnList.length === 0) return 'dnListEmpty'
   if (!dn) return 'dnIsEmpty'
 
   let checkRes = 0
-  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))) {
+    if (isDnMatched(C.certDN, dn)) {
       return (isIn = true)
     }
   })

package/src/plugins/Sign/dn.js

@@ -0,0 +1,57 @@
+function parseDnAttrs(dn) {
+  if (!dn || typeof dn !== 'string') return []
+  return dn
+    .split(',')
+    .map(item => item.trim())
+    .filter(Boolean)
+    .map(item => {
+      const matched = item.match(/^([^=]+)\s*=\s*(.*)$/)
+      if (!matched) return null
+      return {
+        key: matched[1].trim().toUpperCase(),
+        value: matched[2].trim().replace(/\s+/g, ' ')
+      }
+    })
+    .filter(item => item && item.key && item.value)
+}
+
+function hasAttr(attrs, target) {
+  return attrs.some(
+    item => item.key === target.key && item.value === target.value
+  )
+}
+
+function getCn(attrs) {
+  const cn = attrs.find(item => item.key === 'CN')
+  return cn && cn.value
+}
+
+export function parseCA(dn) {
+  return getCn(parseDnAttrs(dn)) || ''
+}
+
+export function isCertCheckFailed(result) {
+  return (
+    result === -1 ||
+    result === false ||
+    ['dnListEmpty', 'Empty', 'dnIsEmpty'].includes(result)
+  )
+}
+
+export function isDnMatched(certDn, userDn) {
+  if (!certDn || !userDn) return false
+  if (certDn.trim() === userDn.trim()) return true
+
+  const certAttrs = parseDnAttrs(certDn)
+  const userAttrs = parseDnAttrs(userDn)
+  if (!certAttrs.length || !userAttrs.length) return false
+
+  if (userAttrs.every(attr => hasAttr(certAttrs, attr))) return true
+  if (certAttrs.every(attr => hasAttr(userAttrs, attr))) return true
+
+  if (certAttrs.length > 1 && userAttrs.length > 1) return false
+
+  const certCn = getCn(certAttrs)
+  const userCn = getCn(userAttrs)
+  return certCn && userCn && certCn === userCn
+}

package/src/plugins/Sign/index.js

@@ -1,7 +1,7 @@
-import importG from '../../utils/importGlobal.js'
-
 import CaMap from './CaMap.js'
 
+import importG from '../../utils/importGlobal.js'
+
 /**
  * 统一处理签名逻辑
  * @param {Object} config - 签名配置
@@ -93,7 +93,6 @@ export async function getSign(p1, p2, p3) {
  */
 export function getCert(dn) {
   let signType = window.sessionStorage.getItem('signType')
-  console.log('signType', signType)
   return new Promise((resolve, reject) => {
     if (signType === 'inetSign' /* 信安CA */) {
       // 是否使用信安3.0版本sdk (默认使用2.0版本)

package/src/plugins/Sign/sign.js

@@ -1,6 +1,8 @@
 // Attached方式签名
 import { Message, Notification } from 'element-ui'
+
 import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+import { isCertCheckFailed, isDnMatched, parseCA } from './dn.js'
 
 const {
   IWSASetTimeOut,
@@ -81,7 +83,7 @@ export function verifySign(signedMsg) {
  */
 export async function getSign(plain, dn) {
   let index = await getCertInfo(dn)
-  if (index === -1) return
+  if (isCertCheckFailed(index)) return
   let plainText = typeof plain === 'object' ? JSON.stringify(plain) : plain
 
   return await performSign(plainText, index)
@@ -98,22 +100,25 @@ export function getCertInfo(dn) {
   }
   if (!dn) {
     Message.error('没有获取到签名参数DN!')
-    return false
+    return 'dnIsEmpty'
   }
   return new Promise((resolve, reject) => {
     let certInfo
     IWSAGetAllCertsListInfoByCertDN('', 'Sign', parseCA(dn), 0, (dnList) => {
       if (!dn) {
         Message.error('没有获取到签名参数DN!')
-        reject()
+        resolve('dnIsEmpty')
+        return
       }
       if (!dnList) {
         Message.error('没有获取到证书列表!')
-        reject()
+        resolve('Empty')
+        return
       }
       if (dnList.length === 0) {
         Message.error('获取到的证书列表为空!')
-        reject()
+        resolve('dnListEmpty')
+        return
       }
 
       certInfo = verifyDn(dnList, dn)
@@ -149,12 +154,6 @@ export async function performSign(plain, index) {
  * @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, '') : ''
-}
-
 /**
  * 验证Dn是否存在于Dn列表中
  * @param {Array} dnList 获取到的Dn列表
@@ -162,12 +161,9 @@ function parseCA(dn) {
  * @returns {number} - 如果找到匹配的 DN，则返回其在 dnList 中的索引；如果未找到，则返回 -1
  */
 function verifyDn(dnList, dn) {
-  let userDnAttrsArr = dn.split(',').map((c) => c.trim())
-
   let index = -1
   dnList.find((C, i) => {
-    let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
-    if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+    if (isDnMatched(C.certDN, dn)) {
       index = i
       return true
     }

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

@@ -1,6 +1,8 @@
 // Attached方式签名
-import { Message, MessageBox,Notification } from 'element-ui'
+import { Message, MessageBox, Notification } from 'element-ui'
+
 import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+import { isCertCheckFailed, isDnMatched } from '../dn.js'
 
 const {
   IWSASetTimeOut,
@@ -15,7 +17,7 @@ const {
 IWSASetTimeOut(6000)
 let certIndex = 0
 let certDN = ''
-let certType='SHA1'
+let certType = 'SHA1'
 function getDN() {
   let dn
   let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
@@ -83,14 +85,15 @@ export function verifySign(signedMsg) {
  */
 export async function getSign(plain, dn) {
   let index = await getCertInfo(dn)
-  if (index === -1) return
+  if (isCertCheckFailed(index)) return
   let plainText = typeof plain === 'object' ? JSON.stringify(plain) : plain
   if (
     navigator.platform.toLowerCase().includes('linux') ||
     navigator.userAgent.toLowerCase().includes('linux') ||
     // 检查是否为银河麒麟特有的环境变量或特征
     typeof window.KylinOS !== 'undefined' ||
-    document.documentElement.dataset.osType === 'kylin'||certType==='SM3'
+    document.documentElement.dataset.osType === 'kylin' ||
+    certType === 'SM3'
   ) {
     // 签名
     return await MessageBox.prompt('请输入PIN码', '提示', {
@@ -101,10 +104,9 @@ export async function getSign(plain, dn) {
     }).then(({ value }) => {
       return performSignSkf(plainText, value)
     })
-  }else{
+  } else {
     return await performSign(plainText, index)
   }
-  
 }
 
 /**
@@ -118,7 +120,7 @@ export function getCertInfo(dn) {
   }
   if (!dn) {
     Message.error('没有获取到签名参数DN!')
-    return false
+    return 'dnIsEmpty'
   }
   if (
     navigator.platform.toLowerCase().includes('linux') ||
@@ -134,15 +136,18 @@ export function getCertInfo(dn) {
     IWSAGetAllCertsListInfo('infosec.sm2', 'Sign', 0, (dnList) => {
       if (!dn) {
         Message.error('没有获取到签名参数DN!')
-        reject()
+        resolve('dnIsEmpty')
+        return
       }
       if (!dnList) {
         Message.error('没有获取到证书列表!')
-        reject()
+        resolve('Empty')
+        return
       }
       if (dnList.length === 0) {
         Message.error('用户证书信息与当前用户不匹配!')
-        reject()
+        resolve('dnListEmpty')
+        return
       }
 
       certInfo = verifyDn(dnList, dn)
@@ -216,7 +221,7 @@ async function performSignSkf(plainText, value) {
     } else {
       arg = process.env.VUE_APP_NetSign_ARG || window.VUE_APP_NetSign_ARG || 'WTSKFInterface.dll'
     }
-    IWSASkfDetachedSignDefaultDN(plainText, certDN, value, certType,arg,'1', (errorCode, signedData) => {
+    IWSASkfDetachedSignDefaultDN(plainText, certDN, value, certType, arg, '1', (errorCode, signedData) => {
       if (errorCode === 0 || errorCode === '0') {
         resolve(signedData)
       } else {
@@ -234,18 +239,15 @@ async function performSignSkf(plainText, value) {
  * @returns {number} - 如果找到匹配的 DN，则返回其在 dnList 中的索引；如果未找到，则返回 -1
  */
 function verifyDn(dnList, dn) {
-  let userDnAttrsArr = dn.split(',').map((c) => c.trim())
   let index = -1
   // 先过滤满足证书的条件
   let dnListA = JSON.parse(JSON.stringify(dnList)).filter((C, i) => {
-    let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
-    if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+    if (isDnMatched(C.certDN, dn)) {
       C.index = i
       certDN = C.certDN
       return C
     }
   })
-  console.log(dnListA)
   if (dnListA.length > 0) {
     for (let i = 0; i < dnListA.length; i++) {
       if (dnListA[i].CertType === 'SM2' && dnListA[i].KeyUsage === 'signature') {
@@ -253,8 +255,6 @@ function verifyDn(dnList, dn) {
         certIndex = dnListA[i].index
         certType = 'SM3'
         break
-      } else {
-        index = -1
       }
     }
   }
@@ -266,8 +266,6 @@ function verifyDn(dnList, dn) {
           certIndex = dnListA[i].index
           certType = 'SHA1'
           break
-        } else {
-          index = -1
         }
       }
     }