n20-common-lib 3.2.25 → 3.2.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.2.25",
+  "version": "3.2.26",
   "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/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,5 +1,6 @@
 // Attached方式签名
 import { Message, Notification } from 'element-ui'
+
 import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
 
 const {
@@ -167,7 +168,7 @@ function verifyDn(dnList, dn) {
   let index = -1
   dnList.find((C, i) => {
     let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
-    if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+    if (userDnAttrsArr.every((dnAttr) => dnAttrsArr.includes(dnAttr))) {
       index = i
       return true
     }

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

@@ -1,5 +1,6 @@
 // Attached方式签名
-import { Message, MessageBox,Notification } from 'element-ui'
+import { Message, MessageBox, Notification } from 'element-ui'
+
 import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
 
 const {
@@ -15,7 +16,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'))
@@ -90,7 +91,8 @@ export async function getSign(plain, dn) {
     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 +103,9 @@ export async function getSign(plain, dn) {
     }).then(({ value }) => {
       return performSignSkf(plainText, value)
     })
-  }else{
+  } else {
     return await performSign(plainText, index)
   }
-  
 }
 
 /**
@@ -216,7 +217,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 {
@@ -239,13 +240,12 @@ function verifyDn(dnList, dn) {
   // 先过滤满足证书的条件
   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 (userDnAttrsArr.every((dnAttr) => dnAttrsArr.includes(dnAttr))) {
       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 +253,6 @@ function verifyDn(dnList, dn) {
         certIndex = dnListA[i].index
         certType = 'SM3'
         break
-      } else {
-        index = -1
       }
     }
   }
@@ -266,8 +264,6 @@ function verifyDn(dnList, dn) {
           certIndex = dnListA[i].index
           certType = 'SHA1'
           break
-        } else {
-          index = -1
         }
       }
     }