n20-common-lib 2.22.65 → 2.22.66-patch

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -187,7 +187,9 @@
       <el-button v-if="showApprovalTo && showApproveTo" type="primary" @click="approvalToV = true"
         >{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button
       >
-      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ $lc(btnsNames['rejectTo']) }}</el-button>
+      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{
+        $lc(btnsNames['rejectTo'])
+      }}</el-button>
       <el-button v-if="authList.includes('reject')" plain @click="rejectFn">{{ $lc(btnsNames['reject']) }}</el-button>
       <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{
         $lc(btnsNames['rejectPre'])
@@ -341,6 +343,7 @@
 <script>
 import selectSpr from './selectSpr.vue'
 import getJsonc from '../../assets/getJsonc.js'
+import { getServerConfig } from '../../utils/serverConfig'
 import { closeTagsForBackPage } from '../../plugins/CompatibleOld'
 import axios from '../../utils/axios'
 import { $lc } from '../../utils/i18n/index'
@@ -643,7 +646,7 @@ export default {
     },
     // 意见是否必填
     getConfiguration() {
-      getJsonc('portal/server-config.jsonc', null, true)
+      getServerConfig()
         .then(({ opinionRequired, showApproveTo }) => {
           this.requiredC = opinionRequired ?? this.required
           this.showApproveTo = showApproveTo ?? true

package/src/components/ApprovalButtons/indexApp.vue

@@ -126,7 +126,9 @@
     </div>
 
     <div v-else-if="!authList.includes('byAddTask')" class="text-c">
-      <div v-if="!approveBtns" style="text-align: center; font-size: 18px">{{ $lc('请点击左上角返回处，进入OA待办页面') }}</div>
+      <div v-if="!approveBtns" style="text-align: center; font-size: 18px">
+        {{ $lc('请点击左上角返回处，进入OA待办页面') }}
+      </div>
       <!-- 特殊会签按钮 START -->
       <el-button v-if="authList.includes('pass')" type="primary" @click="checkFlowFn">{{
         $lc(btnsNames['pass'])
@@ -303,6 +305,7 @@
 <script>
 import selectSpr from './selectSpr.vue'
 import getJsonc from '../../assets/getJsonc.js'
+import { getServerConfig } from '../../utils/serverConfig'
 import { closeTagsForBackPage } from '../../plugins/CompatibleOld'
 import axios from '../../utils/axios'
 import { $lc } from '../../utils/i18n/index'
@@ -554,7 +557,7 @@ export default {
     },
     // 意见是否必填
     getConfiguration() {
-      getJsonc('portal/server-config.jsonc', null, true)
+      getServerConfig()
         .then(({ opinionRequired }) => {
           this.requiredC = opinionRequired ?? this.required
           // 读取该工作流是否意见必填
@@ -860,7 +863,7 @@ export default {
       if (this.isWyfk) {
         this.attributes = {
           appOrPc: '3',
-          ebsPaymentRiskWarning: $lc("核实无误")
+          ebsPaymentRiskWarning: $lc('核实无误')
         }
       } else {
         this.attributes = { appOrPc: '3' }

package/src/components/ApprovalRecord/index.vue

@@ -61,7 +61,7 @@
 import expandableWrap from '../Expandable/main.vue'
 import approvalCard from '../ApprovalCard/index.vue'
 import approvalImg from './approvalImg.vue'
-import getJsonc from '../../assets/getJsonc'
+import { getServerConfig } from '../../utils/serverConfig'
 export default {
   name: 'ApprovalRecord',
   components: {
@@ -100,7 +100,7 @@ export default {
     }
   },
   mounted() {
-    getJsonc('portal/server-config.jsonc').then(({ approvalMode }) => {
+    getServerConfig().then(({ approvalMode }) => {
       this.approvalMode = approvalMode || 'dialog'
     })
   }

package/src/components/ApprovalRecord/indexApp.vue

@@ -13,7 +13,6 @@
 <script>
 import approvalCard from 'n20-common-lib/src/components/ApprovalCard/indexApp.vue'
 import approvalImg from 'n20-common-lib/src/components/ApprovalRecord/approvalImg.vue'
-import getJsonc from 'n20-common-lib/src/assets/getJsonc'
 export default {
   name: 'ApprovalRecord',
   components: {
@@ -46,10 +45,6 @@ export default {
       return this.procInstId || this.$route.query.processInstanceId
     }
   },
-  mounted() {
-    /* getJsonc('portal/server-config.jsonc').then(({ approvalMode }) => {
-      this.approvalMode = approvalMode
-    }) */
-  }
+  mounted() {}
 }
 </script>

package/src/components/FileUploadTable/FileUploadTableV3.vue

@@ -188,7 +188,8 @@
       </el-table-column>
     </el-table> -->
     <div class="flex-box flex-v flex-lr">
-      <div class="title">{{ $lc('附件上传') }}<span>{{ $lc('（带 * 为必要上传的附件）') }}</span>
+      <div class="title">
+        {{ $lc('附件上传') }}<span>{{ $lc('（带 * 为必要上传的附件）') }}</span>
       </div>
     </div>
     <div class="file-list">
@@ -313,10 +314,10 @@
 </template>
 
 <script>
-import getJsonc from '../../assets/getJsonc.js'
 import _axios from 'axios'
 import dayjs from 'dayjs'
 import XEUtils from 'xe-utils'
+import { getServerConfig } from '../../utils/serverConfig'
 
 import 'viewerjs/dist/viewer.css'
 import auth from '../../utils/auth.js'
@@ -326,7 +327,6 @@ import importG from '../../utils/importGlobal.js'
 import Dialog from '../Dialog/index.vue'
 import Upload from '../Upload/index.vue'
 
-
 const ViewerImg = async function () {
   let { component } = await importG('v-viewer', () => import(/*webpackChunkName: "v-viewer"*/ 'v-viewer'))
   return component
@@ -340,9 +340,9 @@ const keysDefault = {
   user: 'user'
 }
 const typeOptionsDefault = [
-  { type: '001', label: $lc("信贷合同") },
-  { type: '002', label: $lc("贴现合同") },
-  { type: '003', label: $lc("其他合同") }
+  { type: '001', label: $lc('信贷合同') },
+  { type: '002', label: $lc('贴现合同') },
+  { type: '003', label: $lc('其他合同') }
 ]
 
 export default {
@@ -499,7 +499,7 @@ export default {
       return this.dataPorp.fileSize || undefined
     },
     fileAcceptTip() {
-      return this.dataPorp.fileAcceptTip || $lc("支持扩展名：.rar .zip .doc .docx .pdf .jpg...")
+      return this.dataPorp.fileAcceptTip || $lc('支持扩展名：.rar .zip .doc .docx .pdf .jpg...')
     },
     fileData() {
       return this.dataPorp.fileData || undefined
@@ -540,7 +540,7 @@ export default {
     // ai识别
     async AiFn(row) {
       if (!this.AIOptions.bussType) {
-        this.$message.error($lc("请先配置bussType"))
+        this.$message.error($lc('请先配置bussType'))
         return false
       }
       const { data, code } = await axios.post(
@@ -582,7 +582,7 @@ export default {
       }
     },
     getConfiguration() {
-      getJsonc('portal/server-config.jsonc', null, true)
+      getServerConfig()
         .then(({ loginConf, fileRequired }) => {
           this.fileText = loginConf?.sLogan?.fileText
           this.fileRequired = fileRequired ?? true
@@ -704,7 +704,7 @@ export default {
     deleteRows() {
       if (!this.selectionList.length) {
         return this.$message({
-          message: $lc("请先勾选要删除的数据！"),
+          message: $lc('请先勾选要删除的数据！'),
           type: 'warning',
           showClose: true
         })

package/src/components/FileUploadTable/index.vue

@@ -332,7 +332,7 @@ import XEUtils from 'xe-utils'
 
 import aiCheckDialog from './aiCheckDialog.vue'
 
-import getJsonc from '../../assets/getJsonc.js'
+import { getServerConfig } from '../../utils/serverConfig'
 import auth from '../../utils/auth'
 import axios from '../../utils/axios'
 import { $lc } from '../../utils/i18n/index'
@@ -742,7 +742,7 @@ export default {
       }
     },
     getConfiguration() {
-      getJsonc('portal/server-config.jsonc', null, true)
+      getServerConfig()
         .then(({ loginConf, fileRequired }) => {
           this.fileText = loginConf?.sLogan?.fileText
           this.fileRequired = fileRequired ?? true

package/src/utils/auth.js

@@ -64,7 +64,7 @@ const auth = {
     }
     let token = auth.getToken()
     let defaultHd = {
-      Authorization: token ? 'Bearer ' + token : 'Basic TlNUQzpWVkIxVG1sVlVURlNMemxyTkhoc2VtNXdObFJaUVQwOQ==',
+      Authorization: token ? 'Bearer ' + token : '',
       OperationDesc: desc ? encodeURI(desc) : encodeURI(OperationDesc),
       timestamp: Date.now(),
       requestKey: Date.now(),

package/src/utils/serverConfig.js

@@ -0,0 +1,77 @@
+import axios from './axios'
+import CryptoJS from 'crypto-js'
+
+let configPromise = null
+
+// 生成密钥
+const generateKey = () => {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = String(now.getMonth() + 1).padStart(2, '0')
+  const day = String(now.getDate()).padStart(2, '0')
+  const dateStr = `${year}${month}${day}`
+  const keyStr = dateStr.padEnd(32, '0')
+  return keyStr
+}
+/**
+ * AES 解密 - 后端返回 Base64 编码的密文和 IV
+ * @param ciphertextBase64 Base64编码的密文
+ * @param ivBase64 Base64编码的IV
+ */
+const decrypt = (ciphertextBase64, ivBase64) => {
+  const keyStr = generateKey()
+
+  const key = CryptoJS.enc.Utf8.parse(keyStr)
+  // 后端返回的 IV 是 Base64 编码，需要解码
+  const iv = CryptoJS.enc.Base64.parse(ivBase64)
+
+  // 执行解密（CryptoJS.AES.decrypt 可以直接解析 Base64 密文）
+  const decrypted = CryptoJS.AES.decrypt(ciphertextBase64, key, {
+    iv: iv,
+    mode: CryptoJS.mode.CBC,
+    padding: CryptoJS.pad.Pkcs7
+  })
+  return decrypted.toString(CryptoJS.enc.Utf8)
+}
+/**
+ * 获取服务端配置（带缓存）
+ * 替代原有的 getJsonc('/server-config.jsonc')
+ * 后端接口返回与 server-config.jsonc 一致的 JSON 结构
+ * @returns {Promise<Object>} 配置对象
+ */
+export function getServerConfig() {
+  if (!configPromise) {
+    configPromise = axios
+      .get('/bems/getPortalServerConfig', null, {
+        loading: false,
+        noMsg: true
+      })
+      .then(({ data, code }) => {
+        if (code !== 200) return
+        // 检查是否有密文数据需要解密
+        if (data.ciphertext && data.iv) {
+          const decryptedData = decrypt(data.ciphertext, data.iv)
+
+          // 如果解密成功，解析JSON并合并到列表
+          if (decryptedData) {
+            return JSON.parse(decryptedData) || {}
+          }
+          return {}
+        }
+        return data || {}
+      })
+      .catch((err) => {
+        console.error('获取服务端配置失败:', err)
+        // 返回空对象，避免阻塞应用启动
+        return {}
+      })
+  }
+  return configPromise
+}
+
+/**
+ * 清除配置缓存（如需刷新配置时调用）
+ */
+export function clearConfigCache() {
+  configPromise = null
+}