n20-common-lib 2.9.3 → 2.9.5

package/package.json

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

package/src/components/DynamicField/DynamicTable.vue

@@ -242,7 +242,7 @@
 
 <script>
 export default {
-  name: 'CustomTable',
+  name: 'DynamicTable',
   components: {},
   props: {
     listName: {

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -674,7 +674,16 @@ export default {
           this.changePassword()
           break
         case 'updateCertificate':
-          this.updateCertificate()
+          switch (this.customOpt.updateCertType) {
+            case '1':
+              this.updateCertificate()
+              break
+            case '2':
+              this.updateCertFn()
+              break
+            default:
+              break
+          }
           break
         case 'changeUserInfo':
           this.goMdmUser()
@@ -763,12 +772,22 @@ export default {
       this.cpwdV = true
     },
     /**
-     * 更新证书
+     * 京能更新证书
      */
     async updateCertificate() {
       const { updateCert } = await import('../../../plugins/Sign/index.js')
       updateCert('ArgusKey CSP For BEHFC v1.0')
     },
+    /**
+     * 海港更新证书
+     */
+    async updateCertFn() {
+      const { updateCertHG } = await import('../../../plugins/Sign/index.js')
+      const { uno } = this.userInfo
+
+      updateCertHG(uno || undefined)
+    },
+
     switchUser() {
       this.scV = true
     },

package/src/components/Layout/indexN.vue

@@ -176,11 +176,11 @@ export default {
 
     window.addEventListener('beforeunload', this.setTabList)
 
-    const { enableCertify } = await getJsonc('/server-config.jsonc')
+    const { enableCertify, enableTime } = await getJsonc('/server-config.jsonc')
     if (enableCertify) {
       this.certifyInterval = setInterval(() => {
         this.getCertify()
-      }, 60000)
+      }, enableTime || 60000)
     }
   },
   mounted() {

package/src/directives/WorkCard/index.vue

@@ -0,0 +1,58 @@
+<template>
+  <div class="work-card flex-column p-a m-a-0">
+    <slot name="header">
+      <div v-if="header" class="m-b flex-box">
+        <el-badge :value="badgeNum" :hidden="!badgeNum">
+          <span class="f-s-m work-card-title">{{ header }}</span>
+        </el-badge>
+        <el-link v-if="showMore" class="m-l-auto work-card-more" :underline="false" @click="$emit('more')"
+          >{{ '更多' | $lc }}<i class="el-icon-arrow-right"></i
+        ></el-link>
+      </div>
+    </slot>
+    <div class="flex-item" style="height: 50%">
+      <clEmpty v-if="isEmpty" type="empty" :width="150" :height="150" style="height: 100%">
+        <span slot="content" class="work-card--empty-title">{{ '暂无数据' | $lc }}</span>
+      </clEmpty>
+      <slot v-else></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+import clEmpty from '../Empty/index.vue'
+export default {
+  name: 'WorkCard',
+  components: {
+    clEmpty
+  },
+  props: {
+    header: {
+      type: String,
+      default: undefined
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    badgeNum: {
+      type: Number,
+      default: 0
+    },
+    isEmpty: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      showMore: false
+    }
+  },
+  mounted() {
+    if (this.$listeners.more) {
+      this.showMore = true
+    }
+  }
+}
+</script>

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

@@ -7,6 +7,8 @@ let {
   IWSA_rsa_csp_setProvider, // 设置cspName
   IWSASetAsyncMode, // 设置通讯方式 同步/异步
   IWSA_rsa_csp_genContainerP10,
+  IWSA_rsa_csp_AdvgenContainerP10,
+  IWSA_rsa_csp_AdvImportSignEncCert,
   IWSA_rsa_csp_importSignP7Cert
 } = new IWSAgent()
 
@@ -43,8 +45,58 @@ function getDnCertBase64(dn, res) {
       }
     })
 }
+
+function getUserCert(uno) {
+  try {
+    axios.post(`/bems/prod_1.0/dssc/sign/updateCert_direct/${uno}`).then(({ code, data }) => {
+      if (code === 200) {
+        // 设置提供者
+        IWSA_rsa_csp_setProvider(data.certProvider)
+        // 设置同步模式
+        IWSASetAsyncMode(false)
+        let alg = data.alg === 'RSA_1024' ? '1024' : ata.alg === 'RSA_2048' ? '2048' : '1024'
+        let dn = getDN()
+        let sd = data.sd === 'd'
+        const data = IWSA_rsa_csp_AdvgenContainerP10(alg, data.subjectDN || dn, sd)
+        if (data[0] === '0') {
+          let dto = {
+            ...data,
+            publicKey: data[1],
+            tmpPubKey: data[2]
+          }
+          axios.post(`/bems/prod_1.0/dssc/sign/getRadsCert`, dto).then(({ code, data }) => {
+            if (code === 200) {
+              const certData = IWSA_rsa_csp_AdvImportSignEncCert(
+                'X509',
+                data.signCer,
+                data.encCer,
+                data.encPri,
+                data.ukek
+              )
+              if (certData[0] === '0') {
+                Message.success('证书导入成功')
+              } else {
+                Message.error('导入证书失败，错误码：：' + certData[0])
+              }
+            }
+          })
+        } else {
+          Message.error('产生 P10失败，错误码：：' + data[0])
+        }
+      }
+    })
+  } catch (error) {
+    console.error(error)
+  }
+}
+
+/**
+ * 京能版本证书自动更新
+ * @param {*} cspName
+ * @returns
+ */
 export function updateCert(cspName) {
-  // 设置cspName 'ArgusKey CSP For BEHFC v1.0'
+  // 设置提供者  'ArgusKey CSP For BEHFC v1.0'
   IWSA_rsa_csp_setProvider(cspName)
   // 设置同步模式
   IWSASetAsyncMode(false)
@@ -60,3 +112,12 @@ function GetDateNotAfter(res, dn) {
     getDnCertBase64(dn, res)
   }
 }
+
+/**
+ * 海港版本证书自动更新
+ * @param {*} cspName
+ * @returns
+ */
+export function updateCertHG(uno) {
+  getUserCert(uno)
+}

package/src/plugins/Sign/index.js

@@ -129,3 +129,9 @@ export function updateCert(cspName) {
     updateCert(cspName)
   })
 }
+
+export function updateCertHG(uno) {
+  return importG('NetV3', () => import(/*webpackChunkName: "NetV3"*/ './NetV3/index.js')).then(({ updateCertHG }) => {
+    updateCertHG(uno)
+  })
+}