n20-common-lib 2.22.65-patch → 2.22.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.22.65-patch",
+  "version": "2.22.66",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -9,7 +9,7 @@
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
     "build:Jenkins_1": "vue-cli-service build --serverConfig ./server-config-jenkins.jsonc",
-    "build:css": "node build_css",
+    "build:css": "node build_css.js",
     "build:dev": "vue-cli-service build",
     "build:doc": "node versionInfo.js && vue-cli-service build --testTheme",
     "build:gzip": "vue-cli-service build --gzip",

package/src/components/ApprovalButtons/index.vue

@@ -187,9 +187,7 @@
       <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'])
@@ -343,7 +341,6 @@
 <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'
@@ -646,7 +643,7 @@ export default {
     },
     // 意见是否必填
     getConfiguration() {
-      getServerConfig()
+      getJsonc('portal/server-config.jsonc', null, true)
         .then(({ opinionRequired, showApproveTo }) => {
           this.requiredC = opinionRequired ?? this.required
           this.showApproveTo = showApproveTo ?? true

package/src/components/ApprovalButtons/indexApp.vue

@@ -126,9 +126,7 @@
     </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'])
@@ -305,7 +303,6 @@
 <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'
@@ -557,7 +554,7 @@ export default {
     },
     // 意见是否必填
     getConfiguration() {
-      getServerConfig()
+      getJsonc('portal/server-config.jsonc', null, true)
         .then(({ opinionRequired }) => {
           this.requiredC = opinionRequired ?? this.required
           // 读取该工作流是否意见必填
@@ -863,7 +860,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 { getServerConfig } from '../../utils/serverConfig'
+import getJsonc from '../../assets/getJsonc'
 export default {
   name: 'ApprovalRecord',
   components: {
@@ -100,7 +100,7 @@ export default {
     }
   },
   mounted() {
-    getServerConfig().then(({ approvalMode }) => {
+    getJsonc('portal/server-config.jsonc').then(({ approvalMode }) => {
       this.approvalMode = approvalMode || 'dialog'
     })
   }

package/src/components/ApprovalRecord/indexApp.vue

@@ -13,6 +13,7 @@
 <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: {
@@ -45,6 +46,10 @@ export default {
       return this.procInstId || this.$route.query.processInstanceId
     }
   },
-  mounted() {}
+  mounted() {
+    /* getJsonc('portal/server-config.jsonc').then(({ approvalMode }) => {
+      this.approvalMode = approvalMode
+    }) */
+  }
 }
 </script>

package/src/components/FileUploadTable/FileUploadTableV3.vue

@@ -188,8 +188,7 @@
       </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">
@@ -314,10 +313,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'
@@ -327,6 +326,7 @@ 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() {
-      getServerConfig()
+      getJsonc('portal/server-config.jsonc', null, true)
         .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 { getServerConfig } from '../../utils/serverConfig'
+import getJsonc from '../../assets/getJsonc.js'
 import auth from '../../utils/auth'
 import axios from '../../utils/axios'
 import { $lc } from '../../utils/i18n/index'
@@ -742,7 +742,7 @@ export default {
       }
     },
     getConfiguration() {
-      getServerConfig()
+      getJsonc('portal/server-config.jsonc', null, true)
         .then(({ loginConf, fileRequired }) => {
           this.fileText = loginConf?.sLogan?.fileText
           this.fileRequired = fileRequired ?? true