n20-common-lib 2.22.17 → 2.22.18

package/package.json

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

package/src/components/ApprovalButtons/showOtherAttrNew.vue

@@ -1,16 +1,16 @@
 <template>
   <div
     class="w-100p flex-box"
-    style="
-      flex-wrap: wrap;
-      display: grid;
-      grid-template-columns: repeat(2, 1fr);
-      gap: 16px;
-      padding: 0;
-      overflow-x: hidden;
-    "
+    :style="{
+      display: 'grid',
+      flexWrap: 'wrap',
+      gridTemplateColumns: `repeat(${columns}, 1fr)`,
+      gap: '16px',
+      padding: '0',
+      overflowX: 'hidden'
+    }"
   >
-    <div v-for="(item, i) in otherAttData" :key="i" class="flex-box flex-v" style="width: 100%; padding: 0 20px">
+    <div v-for="(item, i) in otherAttData" :key="i" class="flex-box" style="width: 100%; padding: 0 20px">
       <el-form-item
         class="m-r-ss m-b-s"
         :label-width="labelWidth"
@@ -20,12 +20,7 @@
         <span slot="label">
           <span
             v-title="item.cfgName"
-            style="
-              display: inline-block;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-            "
+            style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
             :style="{ maxWidth: labelWidth }"
           >
             <span v-if="required" style="color: red">*</span>
@@ -93,13 +88,13 @@
         v-model="item.cfgVal"
         :type="'textarea'"
         placeholder="请输入"
-        class="w-100p m-r-ss m-b-s flex-1"
+        class="w-100p m-r-s m-b-s flex-1"
         clearable
       />
       <el-input
         v-if="item.cfgHasRemark === '1' && !['11', '12'].includes(item.cfgType)"
         v-model="item.cfgRemark"
-        class="w-100p m-r-ss m-b-s flex-1"
+        class="w-100p m-r-lg m-b-s flex-1"
         placeholder="请输入备注"
       />
     </div>
@@ -118,6 +113,10 @@ export default {
       type: [String, Number],
       default: ''
     },
+    columns: {
+      type: Number,
+      default: 1
+    },
     form: {
       type: Object,
       default: () => ({})

package/src/components/HandlingAdvice/index.vue

@@ -44,6 +44,7 @@
               :other-att-data-a="otherAttDataA"
               :proc-inst-id="procInstId || this.$route.query.processInstanceId"
               :required="true"
+              :columns="columns"
               :label-width="labelWidth"
             />
           </div>
@@ -74,6 +75,10 @@ export default {
       type: String,
       default: '12em'
     },
+    columns: {
+      type: Number,
+      default: 1
+    },
     afterGetConf: {
       type: Function,
       default: undefined

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

@@ -1,281 +1,281 @@
-// Attached方式签名
-import { Message, MessageBox,Notification } from 'element-ui'
-import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
-
-const {
-  IWSASetTimeOut,
-  IWSADetachedSign,
-  IWSAAttachedVerify,
-  IWSASendAvailable,
-  IWSAGetAvailable,
-  IWSAGetAllCertsListInfo,
-  IWSASkfGetCertList,
-  IWSASkfDetachedSignDefaultDN
-} = new IWSAgent()
-IWSASetTimeOut(6000)
-let certIndex = 0
-let certDN = ''
-let certType='SHA1'
-function getDN() {
-  let dn
-  let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
-  if (userInfo && userInfo.dn) {
-    dn = userInfo.dn
-  }
-  return dn
-}
-
-/* 检测本地签名端口是否可用 */
-export function availableSign(fn, url) {
-  let available = IWSAGetAvailable()
-  if (available) {
-    fn && fn(available)
-  } else {
-    IWSASendAvailable()
-    let count = 0
-    checkAvailable(fn, url, count)
-  }
-}
-
-function checkAvailable(fn, url, count) {
-  let name = window.NetSignDownloadName || 'NetSignCNG签名助手'
-  let available = IWSAGetAvailable()
-  if (available) {
-    fn && fn(available)
-  } else if (count == 10) {
-    fn && fn(available)
-    Notification({
-      title: '提示',
-      dangerouslyUseHTMLString: true,
-      message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>${name}</div>`,
-      duration: 5000
-    })
-  } else {
-    count++
-    setTimeout(() => {
-      checkAvailable(fn, url, count)
-    }, 200)
-  }
-}
-
-/**
- * 签名解签函数
- * @param {string} signedMsg 要解签的密文
- * @returns {string}  解签后的明文
- */
-export function verifySign(signedMsg) {
-  let plainText
-  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText) => {
-    if (errorCode === 0 || errorCode === '0') {
-      plainText = PlainText
-    } else {
-      Message.error('签名解签失败!')
-    }
-  })
-  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) 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'
-  ) {
-    // 签名
-    return await MessageBox.prompt('请输入PIN码', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      closeOnClickModal: false,
-      inputType: 'password'
-    }).then(({ value }) => {
-      return performSignSkf(plainText, value)
-    })
-  }else{
-    return await performSign(plainText, index)
-  }
-  
-}
-
-/**
- * 获取证书信息
- * @param {string} dn 要验证的Dn
- * @returns {Promise} - 解析后的证书信息
- */
-export function getCertInfo(dn) {
-  if (dn === undefined) {
-    dn = getDN()
-  }
-  if (!dn) {
-    Message.error('没有获取到签名参数DN!')
-    return false
-  }
-  if (
-    navigator.platform.toLowerCase().includes('linux') ||
-    navigator.userAgent.toLowerCase().includes('linux') ||
-    // 检查是否为银河麒麟特有的环境变量或特征
-    typeof window.KylinOS !== 'undefined' ||
-    document.documentElement.dataset.osType === 'kylin'
-  ) {
-    return getCertInfoSkf(dn)
-  }
-  return new Promise((resolve, reject) => {
-    let certInfo
-    IWSAGetAllCertsListInfo('infosec.sm2', 'Sign', 0, (dnList) => {
-      if (!dn) {
-        Message.error('没有获取到签名参数DN!')
-        reject()
-      }
-      if (!dnList) {
-        Message.error('没有获取到证书列表!')
-        reject()
-      }
-      if (dnList.length === 0) {
-        Message.error('用户证书信息与当前用户不匹配!')
-        reject()
-      }
-
-      certInfo = verifyDn(dnList, dn)
-      resolve(certInfo)
-    })
-  })
-}
-
-/**
- * 获取证书信息
- * @param dn
- * @returns {Promise<*>}
- */
-export async function getCertInfoSkf(dn) {
-  return new Promise((resolve, reject) => {
-    let arg
-    if (
-      navigator.platform.toLowerCase().includes('linux') ||
-      navigator.userAgent.toLowerCase().includes('linux') ||
-      // 检查是否为银河麒麟特有的环境变量或特征
-      typeof window.KylinOS !== 'undefined' ||
-      document.documentElement.dataset.osType === 'kylin'
-    ) {
-      arg = window.VUE_APP_NetSign_ARG_Linux
-    } else {
-      arg = process.env.VUE_APP_NetSign_ARG || window.VUE_APP_NetSign_ARG || 'WTSKFInterface.dll'
-    }
-    // 获取证书列表
-    IWSASkfGetCertList(arg, (CertListData, errorCode) => {
-      if (errorCode) {
-        Message.error(codeDate[errorCode])
-        reject()
-      } else {
-        const checkRes = verifyDn(CertListData, dn)
-        resolve(checkRes)
-      }
-    })
-  })
-}
-
-/**
- * 执行签名函数
- * @param {string} plain 要签名的明文
- * @param index 签名的证书索引
- * @returns {Promise<string>}  签名后的密文信息
- */
-export async function performSign(plain, index) {
-  return new Promise((resolve, reject) => {
-    IWSADetachedSign(2, plain, certIndex, certType, (errorCode, signedData) => {
-      if (errorCode === 0 || errorCode === '0') {
-        resolve(signedData)
-      } else {
-        Message.error('签名失败!')
-        reject(errorCode)
-      }
-    })
-  })
-}
-
-async function performSignSkf(plainText, value) {
-  return new Promise((resolve, reject) => {
-    let arg
-    if (
-      navigator.platform.toLowerCase().includes('linux') ||
-      navigator.userAgent.toLowerCase().includes('linux') ||
-      // 检查是否为银河麒麟特有的环境变量或特征
-      typeof window.KylinOS !== 'undefined' ||
-      document.documentElement.dataset.osType === 'kylin'
-    ) {
-      arg = window.VUE_APP_NetSign_ARG_Linux
-    } else {
-      arg = process.env.VUE_APP_NetSign_ARG || window.VUE_APP_NetSign_ARG || 'WTSKFInterface.dll'
-    }
-    IWSASkfDetachedSignDefaultDN(plainText, certDN, value, certType,arg,'1', (errorCode, signedData) => {
-      if (errorCode === 0 || errorCode === '0') {
-        resolve(signedData)
-      } else {
-        Message.error('签名失败!')
-        reject()
-      }
-    })
-  })
-}
-
-/**
- * 验证Dn是否存在于Dn列表中
- * @param {Array} dnList 获取到的Dn列表
- * @param {string} dn 要验证的Dn
- * @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))) {
-      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') {
-        index = dnListA[i].index
-        certIndex = dnListA[i].index
-        certType = 'SM3'
-        break
-      } else {
-        index = -1
-      }
-    }
-  }
-  if (index === -1) {
-    if (dnListA.length > 0) {
-      for (let i = 0; i < dnListA.length; i++) {
-        if (dnListA[i].CertType === 'RSA') {
-          index = dnListA[i].index
-          certIndex = dnListA[i].index
-          certType = 'SHA1'
-          break
-        } else {
-          index = -1
-        }
-      }
-    }
-  }
-  if (index === -1) {
-    let dnListB = dnList?.map((res) => res.certDN)?.join(',')
-    Message.error(`证书Dn不匹配:${dnListB}里面无法匹配===>${dn}`)
-    return index
-  }
-  return index
-}
+// Attached方式签名
+import { Message, MessageBox,Notification } from 'element-ui'
+import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+
+const {
+  IWSASetTimeOut,
+  IWSADetachedSign,
+  IWSAAttachedVerify,
+  IWSASendAvailable,
+  IWSAGetAvailable,
+  IWSAGetAllCertsListInfo,
+  IWSASkfGetCertList,
+  IWSASkfDetachedSignDefaultDN
+} = new IWSAgent()
+IWSASetTimeOut(6000)
+let certIndex = 0
+let certDN = ''
+let certType='SHA1'
+function getDN() {
+  let dn
+  let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+  if (userInfo && userInfo.dn) {
+    dn = userInfo.dn
+  }
+  return dn
+}
+
+/* 检测本地签名端口是否可用 */
+export function availableSign(fn, url) {
+  let available = IWSAGetAvailable()
+  if (available) {
+    fn && fn(available)
+  } else {
+    IWSASendAvailable()
+    let count = 0
+    checkAvailable(fn, url, count)
+  }
+}
+
+function checkAvailable(fn, url, count) {
+  let name = window.NetSignDownloadName || 'NetSignCNG签名助手'
+  let available = IWSAGetAvailable()
+  if (available) {
+    fn && fn(available)
+  } else if (count == 10) {
+    fn && fn(available)
+    Notification({
+      title: '提示',
+      dangerouslyUseHTMLString: true,
+      message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>${name}</div>`,
+      duration: 5000
+    })
+  } else {
+    count++
+    setTimeout(() => {
+      checkAvailable(fn, url, count)
+    }, 200)
+  }
+}
+
+/**
+ * 签名解签函数
+ * @param {string} signedMsg 要解签的密文
+ * @returns {string}  解签后的明文
+ */
+export function verifySign(signedMsg) {
+  let plainText
+  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText) => {
+    if (errorCode === 0 || errorCode === '0') {
+      plainText = PlainText
+    } else {
+      Message.error('签名解签失败!')
+    }
+  })
+  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) 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'
+  ) {
+    // 签名
+    return await MessageBox.prompt('请输入PIN码', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      closeOnClickModal: false,
+      inputType: 'password'
+    }).then(({ value }) => {
+      return performSignSkf(plainText, value)
+    })
+  }else{
+    return await performSign(plainText, index)
+  }
+  
+}
+
+/**
+ * 获取证书信息
+ * @param {string} dn 要验证的Dn
+ * @returns {Promise} - 解析后的证书信息
+ */
+export function getCertInfo(dn) {
+  if (dn === undefined) {
+    dn = getDN()
+  }
+  if (!dn) {
+    Message.error('没有获取到签名参数DN!')
+    return false
+  }
+  if (
+    navigator.platform.toLowerCase().includes('linux') ||
+    navigator.userAgent.toLowerCase().includes('linux') ||
+    // 检查是否为银河麒麟特有的环境变量或特征
+    typeof window.KylinOS !== 'undefined' ||
+    document.documentElement.dataset.osType === 'kylin'
+  ) {
+    return getCertInfoSkf(dn)
+  }
+  return new Promise((resolve, reject) => {
+    let certInfo
+    IWSAGetAllCertsListInfo('infosec.sm2', 'Sign', 0, (dnList) => {
+      if (!dn) {
+        Message.error('没有获取到签名参数DN!')
+        reject()
+      }
+      if (!dnList) {
+        Message.error('没有获取到证书列表!')
+        reject()
+      }
+      if (dnList.length === 0) {
+        Message.error('用户证书信息与当前用户不匹配!')
+        reject()
+      }
+
+      certInfo = verifyDn(dnList, dn)
+      resolve(certInfo)
+    })
+  })
+}
+
+/**
+ * 获取证书信息
+ * @param dn
+ * @returns {Promise<*>}
+ */
+export async function getCertInfoSkf(dn) {
+  return new Promise((resolve, reject) => {
+    let arg
+    if (
+      navigator.platform.toLowerCase().includes('linux') ||
+      navigator.userAgent.toLowerCase().includes('linux') ||
+      // 检查是否为银河麒麟特有的环境变量或特征
+      typeof window.KylinOS !== 'undefined' ||
+      document.documentElement.dataset.osType === 'kylin'
+    ) {
+      arg = window.VUE_APP_NetSign_ARG_Linux
+    } else {
+      arg = process.env.VUE_APP_NetSign_ARG || window.VUE_APP_NetSign_ARG || 'WTSKFInterface.dll'
+    }
+    // 获取证书列表
+    IWSASkfGetCertList(arg, (CertListData, errorCode) => {
+      if (errorCode) {
+        Message.error(codeDate[errorCode])
+        reject()
+      } else {
+        const checkRes = verifyDn(CertListData, dn)
+        resolve(checkRes)
+      }
+    })
+  })
+}
+
+/**
+ * 执行签名函数
+ * @param {string} plain 要签名的明文
+ * @param index 签名的证书索引
+ * @returns {Promise<string>}  签名后的密文信息
+ */
+export async function performSign(plain, index) {
+  return new Promise((resolve, reject) => {
+    IWSADetachedSign(2, plain, certIndex, certType, (errorCode, signedData) => {
+      if (errorCode === 0 || errorCode === '0') {
+        resolve(signedData)
+      } else {
+        Message.error('签名失败!')
+        reject(errorCode)
+      }
+    })
+  })
+}
+
+async function performSignSkf(plainText, value) {
+  return new Promise((resolve, reject) => {
+    let arg
+    if (
+      navigator.platform.toLowerCase().includes('linux') ||
+      navigator.userAgent.toLowerCase().includes('linux') ||
+      // 检查是否为银河麒麟特有的环境变量或特征
+      typeof window.KylinOS !== 'undefined' ||
+      document.documentElement.dataset.osType === 'kylin'
+    ) {
+      arg = window.VUE_APP_NetSign_ARG_Linux
+    } else {
+      arg = process.env.VUE_APP_NetSign_ARG || window.VUE_APP_NetSign_ARG || 'WTSKFInterface.dll'
+    }
+    IWSASkfDetachedSignDefaultDN(plainText, certDN, value, certType,arg,'1', (errorCode, signedData) => {
+      if (errorCode === 0 || errorCode === '0') {
+        resolve(signedData)
+      } else {
+        Message.error('签名失败!')
+        reject()
+      }
+    })
+  })
+}
+
+/**
+ * 验证Dn是否存在于Dn列表中
+ * @param {Array} dnList 获取到的Dn列表
+ * @param {string} dn 要验证的Dn
+ * @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))) {
+      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') {
+        index = dnListA[i].index
+        certIndex = dnListA[i].index
+        certType = 'SM3'
+        break
+      } else {
+        index = -1
+      }
+    }
+  }
+  if (index === -1) {
+    if (dnListA.length > 0) {
+      for (let i = 0; i < dnListA.length; i++) {
+        if (dnListA[i].CertType === 'RSA') {
+          index = dnListA[i].index
+          certIndex = dnListA[i].index
+          certType = 'SHA1'
+          break
+        } else {
+          index = -1
+        }
+      }
+    }
+  }
+  if (index === -1) {
+    let dnListB = dnList?.map((res) => res.certDN)?.join(',')
+    Message.error(`证书Dn不匹配:${dnListB}里面无法匹配===>${dn}`)
+    return index
+  }
+  return index
+}