n20-common-lib 2.9.37 → 2.9.38

package/package.json

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

package/src/components/ApprovalCard/index.vue

@@ -51,7 +51,7 @@
               <div
                 v-if="item.result !== 0 && item.appOrPc !== null && item.appOrPc !== '' && item.appOrPc !== undefined"
               >
-                {{ item.appOrPc === '1' ? 'PC端审批' : 'App端审批' }}
+                {{ item.appOrPc === '1' ? 'PC端审批' : 'App端审批' | $lc }}
               </div>
               <div v-if="item.showConnect === '1'" class="m-l-s">
                 <span class="pointer color-ccc f-s-s" @click="seeDetail(item)"

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

@@ -21,13 +21,9 @@
     <div class="m-l-m"></div>
     <h3 :class="['header-title ', showNavigation ? 'm-r-s' : 'm-r-auto']">{{ headerTitle | $l }}</h3>
     <div v-if="showNavigation" class="m-r-auto p-a-ss pointer header_change_system_box" @click="handleChangeSystem">
-      <svg class="icon" aria-hidden="true">
-        <use xlink:href="#n20-icon-caidan" />
-      </svg>
-      <span class="m-l-ss f-s-b color-primary">{{ $lc('导航') }}</span>
-      <svg class="icon m-l-ss f-s-s" aria-hidden="true">
-        <use xlink:href="#n20-icon-lujing" />
-      </svg>
+      <i class="n20-icon-caidan color-primary"></i>
+      <span class="m-l-ss f-s-b color-primary">{{ $l('导航') }}</span>
+      <i class="n20-icon-xiangxia1 color-primary" style="font-size: 14px"></i>
     </div>
 
     <span v-if="byLabel && !inBack" class="header-uif-by">{{ byLabel }}</span>
@@ -504,13 +500,19 @@ export default {
       this.headerBgColor = _layoutData.headerBgColor
       this.hideHelpDoc = _layoutData.hideHelpDoc
       this.hideLang = (_layoutData.hideLang || langConf.hideLang) ?? false
-      this.langMap = _layoutData.lang
+      this.langMap = _layoutData.lang || langConf.lang || ['zh-cn', 'zh-hk', 'en']
       this.hideDowApp = _layoutData.hideDowApp
       this.hideTheme = _layoutData.hideTheme
       this.showNavigation = _layoutData.showNavigation
       this.systemChange = _layoutData.systemChange
-      if (this.langMap && this.langMap.lang && this.langMap.lang.length > 0) {
-        window.localStorage.setItem('pageLang', this.jsonData?.lang[0])
+      if (this.langMap?.lang?.length > 0) {
+        let pageLang = window.localStorage.getItem('pageLang')
+        if (!pageLang) {
+          window.localStorage.setItem('pageLang', this.jsonData?.lang[0])
+          Cookies.set('language', ['zh-cn', 'zh-hk'].includes(this.jsonData?.lang[0]) ? 'zh' : this.jsonData?.lang[0], {
+            expires: 365
+          })
+        }
       }
       if (_loginSetting !== 'JSON') {
         this.headerTitle = sessionStorage.getItem('headerTitle') || this.headerTitle

package/src/i18n.json

@@ -3439,5 +3439,15 @@
     "en": "within (up to) characters",
     "th": "ใน (ไม่เกิน) ตัวอักษร",
     "vi": "trong (tối đa) ký tự"
+  },
+  "PC端审批": {
+    "en": "PC approval",
+    "th": "การอนุมัติบน PC",
+    "vi": "Phe duyệt bằng PC"
+  },
+  "App端审批": {
+    "en": "App approval",
+    "th": "การอนุมัติบน App",
+    "vi": "Phe duyệt bằng App"
   }
-}
+}

package/src/plugins/Sign/sign.js

@@ -103,13 +103,16 @@ export function getCertInfo(dn) {
     let certInfo
     IWSAGetAllCertsListInfoByCertDN('', 'Sign', parseCA(dn), 0, (dnList) => {
       if (!dn) {
-        reject('没有获取到签名参数DN!')
+        Message.error('没有获取到签名参数DN!')
+        reject()
       }
       if (!dnList) {
-        reject('没有获取到证书列表!')
+        Message.error('没有获取到证书列表!')
+        reject()
       }
       if (dnList.length === 0) {
-        reject('获取到的证书列表为空!')
+        Message.error('获取到的证书列表为空!')
+        reject()
       }
 
       certInfo = verifyDn(dnList, dn)

package/src/utils/asyncGetRelaNos.js

@@ -1,15 +1,29 @@
 import axios from './axios'
 import { getItem, setItem } from './storageEdit'
-// 按需/按模块 加载权限
+
+/**
+ * @description: 按需/按模块 加载权限
+ * @param {string} appNo 模块标识
+ * @param {string|string[]} rns 权限编码
+ * @return {Promise<void>}
+ */
 async function asyncGetRelaNos(appNo, rns) {
+  // 获取当前用户的 userNo
   let uno = sessionStorage.getItem('userNo')
-  // if (['system1', 'audit1'].includes(uno)) return
 
+  // 获取已经加载过的模块
   let RLFM = JSON.parse(sessionStorage.getItem('relanosLoadModiles')) || []
+
+  // 如果已经加载过当前模块,则直接返回
   if (RLFM.includes(appNo)) return
+
+  // 如果没有加载过当前模块,则将当前模块加入到已经加载过的模块中
   RLFM.push(appNo)
+
+  // 将已经加载过的模块写回到 sessionStorage 中
   sessionStorage.setItem('relanosLoadModiles', JSON.stringify(RLFM))
 
+  // 获取当前模块的权限列表
   let { data } = await axios.post(
     '/bems/prod_1.0/user/api/userController/qryBusyInfoNo?r=' + Math.random(),
     {
@@ -20,14 +34,19 @@ async function asyncGetRelaNos(appNo, rns) {
     { loading: false, noMsg: true }
   )
 
-  let ssRelaNos = getItem('relaNos') // JSON.parse(sessionStorage.getItem('relaNos'))
-  let ssCltrelaNos = getItem('cltrelaNos') // JSON.parse(sessionStorage.getItem('cltrelaNos'))
+  // 获取当前模块的权限列表
+  let ssRelaNos = getItem('relaNos')
+  let ssCltrelaNos = getItem('cltrelaNos')
 
+  // 如果当前模块的权限列表没有找到,则创建一个新的权限列表
   let rnObj = ssRelaNos.find((el) => el.appNo === appNo)
+
   if (!rnObj) {
     rnObj = { appNo: appNo || 'null', relaNos: [] }
     ssRelaNos.push(rnObj)
   }
+
+  // 遍历 data,并将每个元素的 relaNos  push 到 oRelaNos  中
   let oRelaNos = []
   data?.forEach((el) => {
     if (ssCltrelaNos[el.cltNo]) {
@@ -37,9 +56,12 @@ async function asyncGetRelaNos(appNo, rns) {
     }
     oRelaNos.push(...el.relaNos)
   })
+  // 将 oRelaNos  重新赋值成一个不重复的数组
   oRelaNos = [...new Set(oRelaNos)]
+  // 将 oRelaNos  赋值给 rnObj.relaNos
   rnObj.relaNos = oRelaNos
 
+  // 获取window._keep_syncStorageAppNos,并判断是否需要同步
   let syncArr = window._keep_syncStorageAppNos
   let isSync = false
   if (syncArr) {
@@ -50,9 +72,11 @@ async function asyncGetRelaNos(appNo, rns) {
     }
   }
 
-  // sessionStorage.setItem('relaNos', JSON.stringify(ssRelaNos))
+  //  将 rnObj  重新赋值给 ssRelaNos  ,并将 ssRelaNos  重新写回到 sessionStorage 中
+  // 将 ssCltrelaNos  重新赋值给 ssCltrelaNos  ,并将 ssCltrelaNos  重新写回到 sessionStorage 中
+  // 将 oRelaNos  重新赋值给 ssRelaNosG  ,并将 ssRelaNosG  重新写回到 sessionStorage 中
+  // 如果需要同步,则将 isSync  写回到 sessionStorage 中
   setItem('relaNos', ssRelaNos, isSync)
-  // sessionStorage.setItem('cltrelaNos', JSON.stringify(ssCltrelaNos))
   setItem('cltrelaNos', ssCltrelaNos, isSync)
 
   let ssRelaNosG = getItem('relaNosGlobal')