n20-common-lib 2.9.0 → 2.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.9.0",
+  "version": "2.9.2",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -127,4 +127,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

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

@@ -1,8 +1,12 @@
 .content-box {
   box-sizing: border-box;
+  -webkit-box-sizing: border-box; /* Safari/Chrome */
+  -moz-box-sizing: border-box; /* Firefox */
   margin: 0 8px 8px 8px;
   padding: 8px;
   border-radius: 0 0 6px 6px;
+  -webkit-border-radius: 0 0 6px 6px; /* Safari/Chrome */
+  -moz-border-radius: 0 0 6px 6px; /* Firefox */
   height: var(--client-height);
   background: $--color-white;
   overflow: auto;

package/src/assets/css/normalize.scss

@@ -287,6 +287,7 @@ iframe {
 .block {
   display: block;
 }
+
 .inline_block {
   display: inline-block;
 }
@@ -669,7 +670,9 @@ $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 2
   }
 }
 
+/* height: 100%; 速龙浏览器下子元素无法继承父元素的高速度 */
 .n20-page-content {
+  height: 100%;
   overflow-y: auto;
   overflow-x: hidden;
 }
@@ -861,4 +864,4 @@ $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 2
     transform: translateY(0);
     animation-timing-function: cubic-bezier(0, 0, 0.2, 1);
   }
-}
+}

package/src/components/Layout/indexN.vue

@@ -48,14 +48,13 @@ const routerBaseRe = new RegExp('^' + routerBase)
 
 import { addListener, removeListener } from 'resize-detector'
 
-import { getCert } from '../../plugins/Sign'
+import auth from '../../utils/auth'
 import forEachs from '../../utils/forEachs'
 import { setRela } from '../../utils/relaNo'
 import asideNav from './AsideNav/index.vue'
 import headerWrap from './HeaderWrap/indexN.vue'
 import menuDrawer from './HeaderWrap/menuDrawer.vue'
 import tabsNav from './TabsNav/index.vue'
-import auth from '../../utils/auth'
 
 export default {
   name: 'Layout',
@@ -203,6 +202,7 @@ export default {
   },
   methods: {
     async getCertify() {
+      let { getCert } = await import('../../plugins/Sign')
       const cert = await getCert()
       if (cert === -1 || ['dnListEmpty', 'dnIsEmpty', 'Empty'].includes(cert)) {
         this.$message.error($lc(`证书验证失败，请重新登录`))

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

@@ -2501,23 +2501,21 @@ const config = {
   disableExeUrl: true
 }
 
-function init() {
-  let url = window.NetSignName || `/portal/天诚安信数字证书助手-3.7.7.0.exe`
-  let name = window.NetSignDownloadName || '天诚安信数字证书助手'
-  try {
-    TCA.config(config)
-  } catch (error) {
-    Notification({
-      title: '提示',
-      dangerouslyUseHTMLString: true,
-      message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>${name}</div>`,
-      duration: 5000
-    })
-  }
-
-  initCertList()
+let url = window.NetSignName || `/portal/天诚安信数字证书助手-3.7.7.0.exe`
+let name = window.NetSignDownloadName || '天诚安信数字证书助手'
+try {
+  TCA.config(config)
+} catch (error) {
+  Notification({
+    title: '提示',
+    dangerouslyUseHTMLString: true,
+    message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>${name}</div>`,
+    duration: 5000
+  })
 }
 
+initCertList()
+
 function getDN() {
   let dn
   let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
@@ -2528,7 +2526,6 @@ function getDN() {
 }
 
 export function getCert(dn) {
-  init()
   if (dn === undefined) {
     dn = getDN()
   }
@@ -2563,7 +2560,7 @@ export function getCert(dn) {
 
 // 签名方法
 export function getSign(plain, dn) {
-  init()
+  let plainText = undefined
   if (typeof plain === 'object') {
     plainText = JSON.stringify(plain)
   } else {
@@ -2599,7 +2596,7 @@ export function getSign(plain, dn) {
           sginCert.clearPinCache()
         }
         return sginCert.signMessage(
-          plain,
+          plainText,
           process.env.VUE_APP_NetSign_ARG_PLAIN ?? window.VUE_APP_NetSign_ARG_PLAIN ?? false
         )
       } else {

package/src/utils/axios.js

@@ -93,7 +93,7 @@ axios.interceptors.request.use((opt) => {
 })
 
 function errorFn(status, msg, noMsg, isErr, res) {
-  if (status === 401 || (isErr && msg.includes('401'))) {
+  if (status === 401) {
     noMsg || showMsg($lc('超时未操作，请重新登录！'))
     setTimeout(() => {
       if (navigator.userAgent.includes('NSTC-WebEntry')) {
@@ -104,11 +104,11 @@ function errorFn(status, msg, noMsg, isErr, res) {
         auth.removeToken()
       }
     }, 1000)
-  } else if (status === 400 || (isErr && msg.includes('400'))) {
+  } else if (status === 400 ) {
     noMsg || showMsg($lc('400，参数错误！'))
-  } else if (status === 404 || (isErr && msg.includes('404'))) {
+  } else if (status === 404 ) {
     noMsg || showMsg($lc('404，网络连接失败！'))
-  } else if (status === 500 || (isErr && msg.includes('500'))) {
+  } else if (status === 500) {
     noMsg || showMsg($lc('500，服务器链接失败！'))
   } else if (status === 'ECONNABORTED' && msg.includes('timeout')) {
     noMsg || showMsg($lc('请求超时'))