n20-common-lib 2.8.21 → 2.8.23

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -100,9 +100,11 @@
             ref="msg-input"
             v-model="messageC"
             type="textarea"
-            :placeholder="
-              $lc('请输入操作意见（') + messageMax + $lc('字以内），批准该意见为非必填，驳回/作废该意见为必填！')
-            "
+            :placeholder="`${$lc('请输入操作意见（')}${messageMax}${
+              requiredC
+                ? $lc('字以内），批准该意见为必填，驳回/作废该意见为必填！')
+                : $lc('字以内），批准该意见为非必填，驳回/作废该意见为必填！')
+            }`"
             :maxlength="messageMax"
             show-word-limit
             :autosize="{ rows: 1 }"
@@ -407,9 +409,13 @@ export default {
   methods: {
     // 意见是否必填
     getConfiguration() {
-      getJsonc('portal/server-config.jsonc', null, true).then(({ opinionRequired }) => {
-        this.requiredC = opinionRequired ?? this.required
-      })
+      getJsonc('portal/server-config.jsonc', null, true)
+        .then(({ opinionRequired }) => {
+          this.requiredC = opinionRequired ?? this.required
+        })
+        .catch(() => {
+          this.requiredC = this.required
+        })
     },
     getTodoList() {
       return new Promise((resolve, reject) => {

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -65,11 +65,12 @@ export default {
       }
     },
     getOnlyData(data) {
+      let result = []
       const length = data.length
       if (length === 0) {
         return result
       }
-      let result = []
+
       const suggestionMap = {}
       for (let i = 0; i < length; i++) {
         let currentItem = data[i]

package/src/components/InputNumber/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="n20-num-w" @mouseenter="isHove = true" @mouseleave="isHove = false">
+  <div class="n20-num-w"  @mouseenter="isHove = true" @mouseleave="isHove = false">
     <el-input
       ref="input"
       v-model="valueStr"
@@ -30,8 +30,8 @@
 </template>
 
 <script>
-import { $lc } from '../../utils/i18n/index'
 import emitter from '../../utils/element-ui-emitter'
+import { $lc } from '../../utils/i18n/index'
 import N from '../../utils/numberPor'
 
 export default {
@@ -162,7 +162,6 @@ export default {
     },
     blurFn() {
       this.isFocus = false
-
       this.changeFn(this.valueStr)
       this.$emit('blur')
       this.dispatch('ElFormItem', 'el.form.blur', [this.value])

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

@@ -321,67 +321,83 @@ const prefix = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_UR
 const SYSTEM_LIST = [
   {
     NO: 'CSZHYW',
-    NAME: '财司综合业务系统',
-    ICON: '',
-    LOGIN_MODE: ['account'],
-    LOGIN_FORGET_MODE: ['phoneCode'],
-    OPEN: true
+    NAME: $lc('财司综合业务系统'),
+    ICON: undefined,
+    LOGIN_MODE: [],
+    LOGIN_FORGET_MODE: [],
+    OPEN: false
   },
   {
     NO: 'CSYWGL',
-    NAME: '财司业务管理系统',
-    ICON: '',
-    LOGIN_MODE: ['account'],
+    NAME: $lc('财司业务管理系统'),
+    ICON: undefined,
+    LOGIN_MODE: [],
     LOGIN_FORGET_MODE: [],
-    OPEN: true
+    OPEN: false
   },
   {
     NO: 'CSFZJC',
-    NAME: '财司辅助决策系统',
-    ICON: '',
-    LOGIN_MODE: ['pthon'],
-    LOGIN_FORGET_MODE: ['ukCode'],
-    OPEN: true
+    NAME: $lc('财司辅助决策系统'),
+    ICON: undefined,
+    LOGIN_MODE: [],
+    LOGIN_FORGET_MODE: [],
+    OPEN: false
   },
   {
     NO: 'CSWY',
-    NAME: '财司网银系统',
-    ICON: '',
-    LOGIN_MODE: ['qrcode', 'account'],
-    LOGIN_FORGET_MODE: ['phoneCode'],
-    OPEN: true
+    NAME: $lc('财司网银系统'),
+    ICON: undefined,
+    LOGIN_MODE: [],
+    LOGIN_FORGET_MODE: [],
+    OPEN: false
   },
   {
     NO: 'JTZL',
-    NAME: '财司直连平台系统',
-    ICON: '',
-    LOGIN_MODE: ['accountPthon'],
-    LOGIN_FORGET_MODE: ['phoneCode'],
-    OPEN: true
+    NAME: $lc('财司直连平台系统'),
+    ICON: undefined,
+    LOGIN_MODE: [],
+    LOGIN_FORGET_MODE: [],
+    OPEN: false
   },
   {
     NO: 'JRWG',
-    NAME: '金融网关系统',
-    ICON: '',
-    LOGIN_MODE: ['account'],
-    LOGIN_FORGET_MODE: ['ukCode'],
-    OPEN: true
+    NAME: $lc('金融网关系统'),
+    ICON: undefined,
+    LOGIN_MODE: [],
+    LOGIN_FORGET_MODE: [],
+    OPEN: false
   },
   {
     NO: 'JTSKYWGK',
-    NAME: '集团司库业务管控系统',
-    ICON: '',
-    LOGIN_FORGET_MODE: ['phoneCode'],
-    LOGIN_MODE: ['pthon', 'account'],
-    OPEN: true
+    NAME: $lc('集团司库业务管控系统'),
+    ICON: undefined,
+    LOGIN_MODE: [],
+    LOGIN_FORGET_MODE: [],
+    OPEN: false
   },
   {
     NO: 'JTSKSJFX',
-    NAME: '集团数据分析系统',
-    ICON: '',
-    LOGIN_FORGET_MODE: ['phoneCode'],
-    LOGIN_MODE: ['account'],
-    OPEN: true
+    NAME: $lc('集团数据分析系统'),
+    ICON: undefined,
+    LOGIN_MODE: [],
+    LOGIN_FORGET_MODE: [],
+    OPEN: false
+  },
+  {
+    NO: 'ZHIYONG',
+    NAME: $lc('致用助手'),
+    ICON: undefined,
+    LOGIN_MODE: [],
+    LOGIN_FORGET_MODE: [],
+    OPEN: false
+  },
+  {
+    NO: 'JRFXGKXT',
+    NAME: $lc('金融风险管控系统'),
+    ICON: undefined,
+    LOGIN_MODE: [],
+    LOGIN_FORGET_MODE: [],
+    OPEN: false
   }
 ]
 

package/src/i18n.json

@@ -2719,6 +2719,11 @@
     "th": "ภายในคำ), การอนุมัติความคิดเห็นนี้ไม่จำเป็น, การปฏิเสธ/ยกเลิกความคิดเห็นนี้จำเป็น!",
     "vi": "trong từ), không yêu cầu phê duyệt ý kiến này, phải yêu cầu từ chối/hủy ý kiến này!"
   },
+  "字以内），批准该意见为必填，驳回/作废该意见为必填！": {
+    "en": "within words), approve this opinion is required, reject/void this opinion is required!",
+    "th": "ภายในคำ), การอนุมัติความคิดเห็นนี้จำเป็น, การปฏิเสธ/ยกเลิกความคิดเห็นนี้จำเป็น!",
+    "vi": "trong từ), phê duyệt ý kiến này là bắt buộc, từ chối/hủy ý kiến này là bắt buộc!"
+  },
   "批准至": {
     "en": "Approved to",
     "th": "อนุมัติถึง",
@@ -3323,5 +3328,10 @@
     "en": "APP permission application",
     "th": "การยื่นขอสิทธิ์ใช้งาน APP",
     "vi": "Yêu cầu cấp quyền cho ứng dụng"
+  },
+  "'字以内）": {
+    "en": "within (up to) characters",
+    "th": "ใน (ไม่เกิน) ตัวอักษร",
+    "vi": "trong (tối đa) ký tự"
   }
 }

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

@@ -121,6 +121,7 @@ export async function getSign(plain, dn) {
   await MessageBox.prompt('请输入PIN码', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
+    closeOnClickModal: false,
     inputType: 'password'
   }).then(({ value }) => {
     return performSign(plainText, value).then((signedData) => {

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

@@ -120,8 +120,8 @@ export async function getSign(plain, dn) {
   await MessageBox.prompt('请输入PIN码', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    inputType: 'password',
-    zIndex: 99999
+    closeOnClickModal: false,
+    inputType: 'password'
   }).then(({ value }) => {
     return performSign(plainText, value).then((signedData) => {
       answer = signedData

package/src/utils/monitor.js

@@ -13,9 +13,11 @@ class Monitor {
   clickEvent() {
     // 监听点击事件
     document.addEventListener('click', (e) => {
-      const currentMenu = this.router.currentRoute
-      const { meta } = currentMenu
-      window.localStorage.setItem('currentMenu', meta?.desc)
+      const currentMenu = this.router?.currentRoute
+      if (currentMenu) {
+        const { meta } = currentMenu
+        window.localStorage.setItem('currentMenu', meta?.desc)
+      }
     })
   }
 }