n20-common-lib 2.8.33 → 2.8.35

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -51,7 +51,7 @@
             </el-select>
 
             <el-select
-              v-if="addTaskMode === '0' || addTaskWay === '2'"
+              v-if="addTaskModel === '0' || addTaskWay === '2'"
               v-model="addTaskType"
               disabled
               clearable

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

@@ -53,8 +53,7 @@
       '回到应用' | $lc
     }}</el-button>
     <!-- YSCW-end -->
-    <el-dropdown v-if="!hideLang" class="m-l-lg" @command="setLang">
-      <!-- <el-tooltip v-if="!hideLang" :content="'语言切换' | $lc"> -->
+    <el-dropdown v-if="!hideLang && langMap.length > 1" class="m-l-lg" @command="setLang">
       <i
         v-if="['th', 'vi'].includes(langVal)"
         style="font-size: 20px"
@@ -73,22 +72,21 @@
         }"
       ></span>
 
-      <!-- </el-tooltip> -->
       <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item command="zh-cn"
+        <el-dropdown-item v-if="langMap.includes('zh-cn')" command="zh-cn"
           ><i class="iconfont icon-zhongwen f-s-icon"></i>{{ '简体中文' | $lc }}</el-dropdown-item
         >
-        <el-dropdown-item command="zh-hk"
+        <el-dropdown-item v-if="langMap.includes('zh-hk')" command="zh-hk"
           ><i class="iconfont icon-fanti f-s-icon"></i>{{ '繁体中文' | $lc }}</el-dropdown-item
         >
-        <el-dropdown-item command="en"
+        <el-dropdown-item v-if="langMap.includes('en')" command="en"
           ><i class="iconfont icon-yuyanqiehuan f-s-icon"></i>{{ '英文' | $lc }}</el-dropdown-item
         >
-        <el-dropdown-item command="th"
+        <el-dropdown-item v-if="langMap.includes('th')" command="th"
           ><i class="n20-icon-yuyanqiehuan f-s-icon"></i>{{ '泰文' | $lc }}</el-dropdown-item
         >
-        <el-dropdown-item command="vi"
-          ><i class="n20-icon-a-yuenanyuyanqiehuan_huaban1 f-s-icon"></i>{{ '越文' | $lc }}</el-dropdown-item
+        <el-dropdown-item v-if="langMap.includes('vi')" command="vi"
+          ><i class="n20-icon-a-yuenanyuyanqiehuan_huaban1 f-s-icon"></i>{{ '越南语' | $lc }}</el-dropdown-item
         >
       </el-dropdown-menu>
     </el-dropdown>
@@ -440,6 +438,7 @@ export default {
   },
   data() {
     return {
+      langMap: [],
       systemList: [],
       show: false,
       headerLogoUrl: undefined,
@@ -477,7 +476,7 @@ export default {
       byLabel: '',
       byEV: false,
       headerUserInfoBg: realUrl('/server-assets/userInfoBg.png'),
-      inBack: window.localStorage.getItem('pageInType') === 'inBack'
+      inBack: window.sessionStorage.getItem('pageInType') === 'inBack'
     }
   },
   computed: {
@@ -497,6 +496,7 @@ export default {
       this.headerBgColor = _layoutData.headerBgColor
       this.hideHelpDoc = _layoutData.hideHelpDoc
       this.hideLang = _layoutData.hideLang
+      this.langMap = _layoutData.lang
       this.hideDowApp = _layoutData.hideDowApp
       this.hideTheme = _layoutData.hideTheme
       this.showNavigation = _layoutData.showNavigation
@@ -581,7 +581,7 @@ export default {
     },
     async clickSystemChange(item) {
       await this.getTreeList(item)
-      // localStorage.setItem('pageInType', 'toFront')
+      // sessionStorage.setItem('pageInType', 'toFront')
       window.localStorage.setItem('pageInSystemNo', item.NO)
       // 切换系统的时候清除缓存的页签
       window.sessionStorage.removeItem('tab-list')
@@ -814,7 +814,7 @@ export default {
       this.themeV = true
     },
     toBack() {
-      window.localStorage.setItem('pageInType', 'toBack')
+      window.sessionStorage.setItem('pageInType', 'toBack')
 
       let { base = '/' } = this.$router.options
       if (!/\/$/.test(base)) base += '/'
@@ -822,7 +822,7 @@ export default {
       window.location.href = window.location.origin + base + 'dashboard/workplace'
     },
     toSystem() {
-      window.localStorage.setItem('pageInType', 'toFront')
+      window.sessionStorage.setItem('pageInType', 'toFront')
 
       let { base = '/' } = this.$router.options
       if (!/\/$/.test(base)) base += '/'

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

@@ -63,7 +63,7 @@ export default {
     async clickMenu(row, MenuTre) {
       window.sessionStorage.setItem('navFlog', true)
       let pageInSystemNo = window.localStorage.getItem('pageInSystemNo')
-      window.localStorage.setItem('pageInType', 'toFront')
+      window.sessionStorage.setItem('pageInType', 'toFront')
       if (pageInSystemNo === row.systemNo) {
         this.$emit('clickMenu', false)
         if (row?.children?.length) {

package/src/components/Layout/indexN.vue

@@ -267,13 +267,13 @@ export default {
       this.tabList = tabList
     },
     setTabList() {
-      let pageInType = localStorage.getItem('pageInType')
+      let pageInType = sessionStorage.getItem('pageInType')
       if (pageInType === 'toFront') {
         window.sessionStorage.removeItem('tab-list')
-        window.localStorage.setItem('pageInType', 'inFront')
+        window.sessionStorage.setItem('pageInType', 'inFront')
       } else if (pageInType === 'toBack') {
         window.sessionStorage.removeItem('tab-list')
-        window.localStorage.setItem('pageInType', 'inBack')
+        window.sessionStorage.setItem('pageInType', 'inBack')
       } else {
         window.sessionStorage.setItem('tab-list', JSON.stringify(this.tabList))
       }

package/src/components/LoginTemporary/indexN.vue

@@ -95,13 +95,22 @@
         @changType="getChangetype"
       >
         <div slot="header" class="login-form-header m-b text-c">
-          <el-dropdown class="m-l-lg login-language-box" @command="setLang">
+          <el-dropdown
+            v-if="!jsonData.hideLang && jsonData.lang.length > 1"
+            class="m-l-lg login-language-box"
+            @command="setLang"
+          >
             <span>{{ langMap[langVal] | $lc }}<i class="el-icon-arrow-down el-icon--right"></i></span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="zh-cn">{{ '简体中文' | $lc }}</el-dropdown-item>
-              <el-dropdown-item command="zh-hk">{{ '繁体中文' | $lc }}</el-dropdown-item>
-              <el-dropdown-item command="en">{{ '英文' | $lc }}</el-dropdown-item>
-              <el-dropdown-item command="th">{{ '泰文' | $lc }}</el-dropdown-item>
+              <el-dropdown-item v-if="jsonData.lang.includes('zh-cn')" command="zh-cn">{{
+                '简体中文' | $lc
+              }}</el-dropdown-item>
+              <el-dropdown-item v-if="jsonData.lang.includes('zh-hk')" command="zh-hk">{{
+                '繁体中文' | $lc
+              }}</el-dropdown-item>
+              <el-dropdown-item v-if="jsonData.lang.includes('en')" command="en">{{ '英文' | $lc }}</el-dropdown-item>
+              <el-dropdown-item v-if="jsonData.lang.includes('th')" command="th">{{ '泰文' | $lc }}</el-dropdown-item>
+              <el-dropdown-item v-if="jsonData.lang.includes('vi')" command="vi">{{ '越南语' | $lc }}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <slot name="header">{{ '欢 迎 登 录' | $lc }}</slot>
@@ -214,7 +223,8 @@ export default {
         'zh-cn': '简体中文',
         'zh-hk': '繁体中文',
         en: '英文',
-        th: '泰文'
+        th: '泰文',
+        vi: '越南语'
       },
       wrapStyle: '',
       logUrl: `${protocol}//${host}${pathname}`,
@@ -227,7 +237,8 @@ export default {
         loginLogoText: undefined,
         loginCopyright: undefined,
         loginSloganHtml: undefined,
-        hideLang: undefined
+        hideLang: undefined,
+        lang: []
       },
       langVal: window.localStorage.getItem('pageLang') || 'zh-cn',
       operateType: 'login',
@@ -390,7 +401,7 @@ export default {
 
     this.init()
     this.getIsImgCode()
-    localStorage.removeItem('pageInType')
+    sessionStorage.removeItem('pageInType')
   },
   beforeDestroy() {},
   methods: {
@@ -584,12 +595,11 @@ export default {
     },
     selSystem(item) {
       localStorage.setItem('pageInSystemNo', item.NO)
-      localStorage.setItem('pageInType', 'inFront')
+      sessionStorage.setItem('pageInType', 'inFront')
       this.sltSys = item
     },
     setLang(val) {
       this.langVal = val
-
       window.localStorage.setItem('pageLang', this.langVal)
       Cookies.set('language', ['zh-cn', 'zh-hk'].includes(this.langVal) ? 'zh' : this.langVal, { expires: 365 })
       auth.setReqLang()

package/src/i18n.json

@@ -1,4 +1,54 @@
 {
+  "财司综合业务系统": {
+    "en": "Corporate Finance System",
+    "th": "ระบบการเงินองค์กร",
+    "vi": "Hệ thống Quản lý Tài chính Công ty"
+  },
+  "财司业务管理系统": {
+    "en": "Corporate Finance System",
+    "th": "ระบบการเงินองค์กร",
+    "vi": "Hệ thống Quản lý Tài chính Công ty"
+  },
+  "财司辅助决策系统": {
+    "en": "Corporate Finance System",
+    "th": "ระบบการเงินองค์กร",
+    "vi": "Hệ thống Quản lý Tài chính Công ty"
+  },
+  "财司网银系统": {
+    "en": "Corporate Finance System",
+    "th": "ระบบการเงินธุรกิจ",
+    "vi": "Hệ thống Quản lý Tài chính Công ty"
+  },
+  "财司直连平台系统": {
+    "en": "Corporate Finance System",
+    "th": "ระบบการเงินธุรกิจ",
+    "vi": "Hệ thống Quản lý Tài chính Công ty"
+  },
+  "金融网关系统": {
+    "en": "Corporate Finance System",
+    "th": "ระบบการเงินธุรกิจ",
+    "vi": "Hệ thống Quản lý Tài chính Công ty"
+  },
+  "集团司库业务管控系统": {
+    "en": "Corporate Finance System",
+    "th": "ระบบการจัดการเงินสำหรับกลุ่ม",
+    "vi": "Hệ thống Quản lý Tài chính Công ty"
+  },
+  "集团数据分析系统": {
+    "en": "Corporate Finance System",
+    "th": "ระบบการจัดการเงินสำหรับกลุ่ม",
+    "vi": "Hệ thống Quản lý Tài chính Công ty"
+  },
+  "致用助手": {
+    "en": "Corporate Finance System",
+    "th": "ระบบการเงินธุรกิจ",
+    "vi": "Hệ thống Quản lý Tài chính Công ty"
+  },
+  "金融风险管控系统": {
+    "en": "Corporate Finance System",
+    "th": "ระบบการจัดการเงินสำหรับกลุ่ม",
+    "vi": "Hệ thống Quản lý Tài chính Công ty"
+  },
   "筛选": {
     "en": "Filter",
     "th": "กรอง",
@@ -449,7 +499,7 @@
     "th": "ไทย",
     "vi": "Tiếng Thái"
   },
-  "越文": {
+  "越南语": {
     "en": "Vietnamese",
     "th": "เวียด",
     "vi": "Tiếng Việt"