n20-common-lib 2.13.2 → 2.13.4

package/package.json

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

package/src/components/HandlingAdvice/index.vue

@@ -98,59 +98,57 @@ export default {
      */
     async getHandlingAdvice(typeCode, procInstId) {
       try {
-        this.$axios
-          .post(
-            `/bems/activiti/admin/todo/isFlowStartWithOptions`,
-            { typeCode },
+        const { code, data } = await this.$axios.post(
+          `/bems/activiti/admin/todo/isFlowStartWithOptions`,
+          { typeCode },
+          {
+            noMsg: true
+          }
+        )
+
+        if (code === 200) {
+          this.otherAttDataA = data.customizationList || []
+          this.whether = data.whether
+          this.visible = data.whether === true || this.otherAttDataA.length > 0
+          this.flowOptions = data?.opinions?.map((d) => {
+            return {
+              label: d,
+              value: d
+            }
+          })
+          if (!data.whether && this.afterGetConf && this.otherAttDataA.length === 0) {
+            this.afterGetConf()
+          }
+        }
+        // 回显操作
+        if (procInstId) {
+          const { data: data1 } = await this.$axios.get(
+            `/bems/activiti/sample/getStartEventFlowHistory/${procInstId}`,
+            {},
             {
               noMsg: true
             }
           )
-          .then(async ({ code, data }) => {
-            if (code === 200) {
-              this.otherAttDataA = data.customizationList || []
-              this.whether = data.whether
-              this.visible = data.whether === true || this.otherAttDataA.length > 0
-              this.flowOptions = data?.opinions?.map((d) => {
-                return {
-                  label: d,
-                  value: d
-                }
+          this.reason = data1?.suggestion || ''
+          this.reasonSelect = data1?.suggestion || ''
+          if (data1.flowHistoryCfgs && data1.flowHistoryCfgs.length > 0) {
+            this.otherAttDataA = this.otherAttDataA.map((item) => {
+              const bcData = data1.flowHistoryCfgs.find((item2) => {
+                return item2.cfgKey === item.cfgKey
               })
-              if (!data.whether && this.afterGetConf && this.otherAttDataA.length === 0) {
-                this.afterGetConf()
+              return {
+                ...item,
+                cfgVal: ['31'].includes(item.cfgType) ? bcData.cfgVal.split(',') : bcData.cfgVal,
+                selectList: ['31'].includes(item.cfgType) ? bcData.cfgVal.split(',') : undefined,
+                checkList: ['32'].includes(item.cfgType) ? bcData.cfgVal.split(',') : undefined,
+                cfgHasRemark: bcData.cfgHasRemark,
+                cfgRemark: bcData.cfgRemark
               }
-            }
-            // 回显操作
-            if (procInstId) {
-              const { data } = await this.$axios.get(
-                `/bems/activiti/sample/getStartEventFlowHistory/${procInstId}`,
-                {},
-                {
-                  noMsg: true
-                }
-              )
-              this.reason = data?.suggestion || ''
-              this.reasonSelect = data?.suggestion || ''
-              if (data.flowHistoryCfgs && data.flowHistoryCfgs.length > 0) {
-                this.otherAttDataA = this.otherAttDataA.map((item) => {
-                  const bcData = data.flowHistoryCfgs.find((item2) => {
-                    return item2.cfgKey === item.cfgKey
-                  })
-                  return {
-                    ...item,
-                    cfgVal: ['31'].includes(item.cfgType) ? bcData.cfgVal.split(',') : bcData.cfgVal,
-                    selectList: ['31'].includes(item.cfgType) ? bcData.cfgVal.split(',') : undefined,
-                    checkList: ['32'].includes(item.cfgType) ? bcData.cfgVal.split(',') : undefined,
-                    cfgHasRemark: bcData.cfgHasRemark,
-                    cfgRemark: bcData.cfgRemark
-                  }
-                })
-              }
-            }
-            // 重新执行一次 使数据更新
-            this.$refs.showOtherAttNew && this.$refs.showOtherAttNew.getData(this.otherAttDataA)
-          })
+            })
+          }
+        }
+        // 重新执行一次 使数据更新
+        this.$refs.showOtherAttNew && this.$refs.showOtherAttNew.getData(this.otherAttDataA)
       } catch (error) {
         if (this.afterGetConf) {
           this.afterGetConf()

package/src/plugins/Sign/index.js

@@ -73,11 +73,13 @@ function systemIdentification() {
  * @returns {Promise<*>} 签名结果
  */
 export async function getSign(p1, p2, p3) {
-  const signType = window.sessionStorage.getItem('signType')
+  let signType = window.sessionStorage.getItem('signType')
   if (!signType || !CaMap[signType]) {
-    throw new Error('请设置签名服务公司sessionStorage.signType')
+    console.error('请设置签名服务公司sessionStorage.signType')
+    signType = CaMap['null'] ? CaMap['null'].type : ''
   }
-  if (window.NetSignName === 'signV3') {
+  // 是否使用信安3.0版本sdk (默认使用2.0版本)
+  if (window.NetSignVersion === 'signV3') {
     return await disposeSign(CaMap['signV3'], p1, p2, p3)
   } else {
     return await disposeSign(CaMap[signType], p1, p2, p3)
@@ -94,8 +96,8 @@ export function getCert(dn) {
   console.log('signType', signType)
   return new Promise((resolve, reject) => {
     if (signType === 'inetSign' /* 信安CA */) {
-      // 是否使用3.0版本sdk (默认使用2.0版本)
-      if (window.NetSignName === 'signV3') {
+      // 是否使用信安3.0版本sdk (默认使用2.0版本)
+      if (window.NetSignVersion === 'signV3') {
         importG('inetSign', () => import(/*webpackChunkName: "inetSign"*/ './signV3/sign.js')).then(
           ({ getCertInfo }) => {
             getCertInfo(dn).then((res) => {