n20-common-lib 1.3.23 → 1.3.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.23",
+  "version": "1.3.24",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -28,8 +28,8 @@
     "style/*.css",
     "style/*.css.map",
     "style/fonts",
-    "treme/*.css",
-    "treme/fonts",
+    "theme/*.css",
+    "theme/fonts",
     "g6.js",
     "nstc-g6/index.js",
     "nstc-g6/assets",

package/src/assets/css/cl-layout-tabs.scss

@@ -68,12 +68,12 @@ $--item-hover-padding: 12px;
     height: $--tabsnav-height - 2 * $--layou-margin;
     line-height: $--tabsnav-height - 2 * $--layou-margin;
     border-radius: $--item-radius;
-    background: #ffffff;
+    background: $--color-white;
 
     top: $--layou-margin;
     z-index: 9;
     &:hover {
-      background: #f0f2f5;
+      background: $--body-background;
     }
   }
 }

package/src/assets/css/cl-layout.scss

@@ -7,7 +7,7 @@ $--tabsnav-height: 46px;
 $--layou-margin: 10px;
 
 body {
-  background: #f0f2f5;
+  background: $--body-background;
   &.aside-nav--collapse {
     .tabs-nav-wrap {
       left: $--aside-collapse-width;
@@ -70,7 +70,7 @@ body {
   width: auto;
   height: $--tabsnav-height;
   border-top: 1px solid $--background-color-base;
-  background: #f0f2f5;
+  background: $--body-background;
   transition: left 0.3s ease-in;
 
   overflow-y: hidden;
@@ -86,7 +86,7 @@ body {
   bottom: 0;
   width: auto;
   height: auto;
-  background: #f0f2f5;
+  background: $--body-background;
 
   overflow-y: auto;
   overflow-y: overlay;

package/src/assets/css/cl-secondary-tab.scss

@@ -15,7 +15,7 @@
       &::after {
         content: '';
         height: 2px;
-        background-color: #007aff;
+        background-color: $--color-primary;
         display: block;
         margin-top: -1px;
       }

package/src/assets/css/element-variables.scss

@@ -3,7 +3,6 @@
 // Special comment for theme configurator
 // type|skipAutoTranslation|Category|Order
 // skipAutoTranslation 1
-
 /* Transition
 -------------------------- */
 $--all-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1) !default;
@@ -13,6 +12,7 @@ $--md-fade-transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1), opacity 3
 $--border-transition-base: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1) !default;
 $--color-transition-base: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1) !default;
 
+$--body-background: #f0f2f5 !default;
 /* Color
 -------------------------- */
 /// color|1|Brand Color|0

package/src/components/LoginTemporary/form.vue

@@ -394,18 +394,16 @@ export default {
         let certDn = undefined
         if (checkCert) {
           if (supplier === 'bjca') {
-            let { getSign } = await import('../../plugins/Sign/bjca/index')
-            sign = await getSign(username, userDn)
-            certDn = userDn
+            // 北京CA
+            window.sessionStorage.setItem('signType', 'bjcaSign')
           } else {
-            let { getSign } = await import('../../plugins/Sign/index')
-            sign = getSign(username, userDn)
-            certDn = userDn
+            // 信安CA
+            window.sessionStorage.setItem('signType', 'inetSign')
           }
-          window.localStorage.setItem(
-            'signType',
-            supplier === 'bjca' ? 'bjcaSign' : 'nstcSign'
-          )
+
+          let { getSign } = await import('../../plugins/Sign')
+          sign = await getSign(username, userDn)
+          certDn = userDn
         }
 
         await this.authorizationCode(username, password, code) // authorizationValue 使用一次后就失效了

package/src/directives/VTitle/index.js

@@ -7,7 +7,7 @@ function tipShow(el, tip) {
   if (el.$tooltipTitle) {
     let _el = _input || el
     if (!el.$tooltipTitleOverflow || _el.clientWidth < _el.scrollWidth) {
-      tip.title = el.$tooltipTitle
+      document.querySelector('.' + popClass).innerText = el.$tooltipTitle
 
       tip.$refs['title-pop'].referenceElm = el
       tip.$refs['title-pop'].doDestroy()
@@ -33,27 +33,29 @@ TitleDirective.install = (Vue) => {
     el: document.createElement('div'),
     data() {
       return {
-        title: '',
         visible: false
       }
     },
     render(_h) {
       var _vm = this
-      return _h('el-popover', {
-        ref: 'title-pop',
-        attrs: {
-          value: _vm.visible,
-          content: _vm.title,
-          trigger: 'manual',
-          'popper-class': 'n20-title-pop ' + popClass,
-          placement: 'top'
-        },
-        on: {
-          input(v) {
-            _vm.visible = v
+      return _h(
+        'el-popover',
+        {
+          ref: 'title-pop',
+          attrs: {
+            value: _vm.visible,
+            trigger: 'manual',
+            'popper-class': 'n20-title-pop',
+            placement: 'top'
+          },
+          on: {
+            input(v) {
+              _vm.visible = v
+            }
           }
-        }
-      })
+        },
+        [_h('span', { staticClass: popClass })]
+      )
     }
   })
   document.querySelector('body').appendChild(tooltip.$el)

package/src/plugins/Sign/index.js

@@ -1,64 +1,28 @@
-// Attached方式签名
-import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
-const { IWSASetTimeOut, IWSAAttachedSign, IWSAAttachedVerify, IWSASendAvailable, IWSAGetAvailable } = new IWSAgent()
-IWSASetTimeOut(6000)
-
-let _dn
-function getDN() {
-  if (!_dn) {
-    let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
-    if (userInfo?.dn) {
-      _dn = userInfo.dn
-    }
-  }
-  return _dn
-}
-
-/* 检测本地签名端口是否可用 */
-export function availableSign(fn) {
-  IWSASendAvailable() // 异步请求,需等待
-  setTimeout(() => {
-    let available = IWSAGetAvailable()
-    fn && fn(available)
-  }, 300)
-}
-
-/* 签名解签 */
-export function verifySign(signedMsg) {
-  let plainText
-  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText, SigncertDN) => {
-    if (errorCode === 0 || errorCode === '0') {
-      plainText = PlainText
-    } else {
-      alert('签名解签失败!')
-    }
-  })
-  return plainText
-}
-
-/* 给对象或字符串签名 */
-export function getSign(plain, dn) {
-  if (dn === undefined) {
-    dn = getDN()
+export async function getSign(p1, p2, p3) {
+  let signType = window.sessionStorage.getItem('signType')
+  let CaMap = {
+    inetSign: '信安CA',
+    bjcaSign: '北京CA'
   }
-  if (!dn) {
-    alert('签名参数DN错误!')
-    return false
+  if (!signType || !CaMap[signType]) {
+    console.error('请设置签名服务公司sessionStorage.signType,公司字段映射:', CaMap)
+    signType = 'inetSign'
   }
-  let plainText = ''
-  if (typeof plain === 'object') {
-    plainText = JSON.stringify(plain)
-  } else {
-    plainText = plain
-  }
-
-  let answer = undefined
-  IWSAAttachedSign('1', plainText, '0', 'SHA1', (errorCode, signedData) => {
-    if (errorCode === 0 || errorCode === '0') {
-      answer = signedData
-    } else {
-      alert('签名失败!')
+  const por = new Promise((resolve) => {
+    if (signType === 'inetSign' /* 信安CA */) {
+      import('./sign.js').then(({ getSign }) => {
+        const sign = getSign(p1, p2, p3)
+        resolve(sign)
+      })
+    } else if (signType === 'bjcaSign' /* 北京CA */) {
+      import('./bjca/index.js').then(({ getSign }) => {
+        getSign(p1, p2, p3).then((sign) => {
+          resolve(sign)
+        })
+      })
     }
   })
-  return answer
+  return por
 }
+
+export { availableSign, verifySign } from './sign.js'

package/src/plugins/Sign/sign.js

@@ -1 +1,64 @@
-export { availableSign, verifySign, getSign } from './index.js'
+// Attached方式签名
+import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+const { IWSASetTimeOut, IWSAAttachedSign, IWSAAttachedVerify, IWSASendAvailable, IWSAGetAvailable } = new IWSAgent()
+IWSASetTimeOut(6000)
+
+let _dn
+function getDN() {
+  if (!_dn) {
+    let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+    if (userInfo?.dn) {
+      _dn = userInfo.dn
+    }
+  }
+  return _dn
+}
+
+/* 检测本地签名端口是否可用 */
+export function availableSign(fn) {
+  IWSASendAvailable() // 异步请求,需等待
+  setTimeout(() => {
+    let available = IWSAGetAvailable()
+    fn && fn(available)
+  }, 300)
+}
+
+/* 签名解签 */
+export function verifySign(signedMsg) {
+  let plainText
+  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText, SigncertDN) => {
+    if (errorCode === 0 || errorCode === '0') {
+      plainText = PlainText
+    } else {
+      alert('签名解签失败!')
+    }
+  })
+  return plainText
+}
+
+/* 给对象或字符串签名 */
+export function getSign(plain, dn) {
+  if (dn === undefined) {
+    dn = getDN()
+  }
+  if (!dn) {
+    alert('签名参数DN错误!')
+    return false
+  }
+  let plainText = ''
+  if (typeof plain === 'object') {
+    plainText = JSON.stringify(plain)
+  } else {
+    plainText = plain
+  }
+
+  let answer = undefined
+  IWSAAttachedSign('1', plainText, '0', 'SHA1', (errorCode, signedData) => {
+    if (errorCode === 0 || errorCode === '0') {
+      answer = signedData
+    } else {
+      alert('签名失败!')
+    }
+  })
+  return answer
+}

package/src/utils/theme.js

@@ -4,7 +4,7 @@ export function setTheme(val) {
   var links = document.querySelectorAll('link[rel="stylesheet"]')
   var link, newLink, nextEl, pEl
   links.forEach(function (el) {
-    if (el.href && el.href.indexOf('/treme/') !== -1) {
+    if (el.href && el.href.indexOf('/theme/') !== -1) {
       link = el
     }
   })