n20-common-lib 2.10.19 → 2.10.21

package/package.json

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

package/src/components/TablePro/index.vue

@@ -61,7 +61,7 @@
           :field="item.prop"
         >
           <template slot-scope="scope">
-            <renderer :renderContent="item.render" :scope="scope"></renderer>
+            <renderer :render-content="item.render" :scope="scope" />
           </template>
         </vxe-column>
         <vxe-column
@@ -216,6 +216,11 @@ export default {
       key: 0
     }
   },
+  computed: {
+    _columns() {
+      return this.calcColumnWidth(this.columns)
+    }
+  },
   watch: {
     columns() {
       this.colsKey = this.colsKey + 1
@@ -231,11 +236,6 @@ export default {
       }
     }
   },
-  computed: {
-    _columns() {
-      return this.calcColumnWidth(this.columns)
-    }
-  },
   activated() {
     this.$refs.vxeTable.loadData(this.data)
   },
@@ -336,9 +336,7 @@ export default {
     calcColumnWidth(columns) {
       columns = XEUtils.clone(columns, true)
       const wrapperEl = document.querySelector('div#app')
-      const notHasWidth = columns.filter(
-        (column) => !column.width && !column.minWidth && column.label !== $lc('操作')
-      )
+      const notHasWidth = columns.filter((column) => !column.width && !column.minWidth && column.label !== $lc('操作'))
       if (!wrapperEl || notHasWidth.length > 0) {
         return columns
       }
@@ -349,7 +347,7 @@ export default {
           if (column.static && column.label === $lc('操作') && !column.width && !column.minWidth) {
             column.width = 80
           }
-          if (column.type) {
+          if (column.type === 'checkbox') {
             column.width = 80
           }
           const width = column.minWidth || column.width
@@ -358,6 +356,7 @@ export default {
           column['minWidth'] = undefined
           columnsWidth += column.width
         })
+
         if (columnsWidth >= windowWidth) return columns
         return columns.map((column) => {
           if (!column.type) {
@@ -365,9 +364,11 @@ export default {
             column['width'] = windowWidth * rate
             return column
           }
+
           return column
         })
       }
+
       return calc(columns)
     }
   }

package/src/plugins/Sign/index.js

@@ -34,11 +34,8 @@ async function disposeSign(config, p1, p2, p3) {
       config = CaMap['SkfSign']
     }
 
-    const path =
-      typeof config.path === 'function' ? config.path(p3) : config.path
-    const module = await importG(config.type, () =>
-      import(`${path}`)
-    )
+    const path = typeof config.path === 'function' ? config.path(p3) : config.path
+    const module = await importG(config.type, () => import(`${path}`))
 
     if (config.needAvailable) {
       await new Promise((resolve, reject) => {
@@ -89,29 +86,38 @@ export async function getSign(p1, p2, p3) {
  * @param {string} dn - 证书DN
  * @returns {Promise<*>} 证书信息
  */
-export async function getCert(dn) {
-  const signType = window.sessionStorage.getItem('signType')
-  const signModules = {
-    inetSign: { path: './sign.js', method: 'getCertInfo' },
-    SkfSign: { path: './SkfSign/index.js', method: 'getCertInfo' },
-    NetSM3: { path: './NetSM3/index.js', method: 'getCertInfo' },
-    ItrusSign: { path: './Itrus/index.js', method: 'getCert' }
-  }
-
-  const module = signModules[signType]
-  if (!module) {
-    throw new Error('不支持的签名类型')
-  }
-
-  try {
-    const { [module.method]: certMethod } = await importG(signType, () =>
-      import(/*webpackChunkName: "[request]"*/ module.path)
-    )
-    return await certMethod(dn)
-  } catch (error) {
-    console.error('获取证书失败:', error)
-    throw error
-  }
+export function getCert(dn) {
+  let signType = window.sessionStorage.getItem('signType')
+  return new Promise((resolve, reject) => {
+    if (signType === 'inetSign' /* 信安CA */) {
+      importG('inetSign', () => import(/*webpackChunkName: "inetSign"*/ './sign.js')).then(({ getCertInfo }) => {
+        getCertInfo(dn).then((res) => {
+          resolve(res)
+        })
+      })
+    } else if (signType === 'SkfSign') {
+      importG('SkfSign', () => import(/*webpackChunkName: "SkfSign"*/ './SkfSign/index.js')).then(({ getCertInfo }) => {
+        getCertInfo(dn).then((res) => {
+          resolve(res)
+        })
+      })
+    } else if (signType === 'NetSM3') {
+      importG('NetSM3', () => import(/*webpackChunkName: "NetSM3"*/ './NetSM3/index.js')).then(({ getCertInfo }) => {
+        getCertInfo(dn).then((res) => {
+          resolve(res)
+        })
+      })
+    } else if (signType === 'ItrusSign') {
+      importG('ItrusSign', () => import(/*webpackChunkName: "ItrusSign"*/ './Itrus/index.js')).then(({ getCert }) => {
+        try {
+          const itrusGetCert = getCert(dn)
+          resolve(itrusGetCert)
+        } catch (error) {
+          reject()
+        }
+      })
+    }
+  })
 }
 
 /**
@@ -120,9 +126,7 @@ export async function getCert(dn) {
  * @returns {Promise<void>}
  */
 export async function updateCert(cspName) {
-  const { updateCert } = await importG('NetV3', () =>
-    import(/*webpackChunkName: "NetV3"*/ './NetV3/index.js')
-  )
+  const { updateCert } = await importG('NetV3', () => import(/*webpackChunkName: "NetV3"*/ './NetV3/index.js'))
   await updateCert(cspName)
 }
 
@@ -132,8 +136,6 @@ export async function updateCert(cspName) {
  * @returns {Promise<void>}
  */
 export async function updateCertHG(uno) {
-  const { updateCertHG } = await importG('NetV3', () =>
-    import(/*webpackChunkName: "NetV3"*/ './NetV3/index.js')
-  )
+  const { updateCertHG } = await importG('NetV3', () => import(/*webpackChunkName: "NetV3"*/ './NetV3/index.js'))
   await updateCertHG(uno)
 }