n20-common-lib 2.22.64 → 2.22.65-patch

package/nstc-g6/components/NstcDialog/NstcDialog.vue

@@ -44,8 +44,6 @@
 </template>
 
 <script>
-import { $lc } from '../../../src/utils/i18n/index.js'
-
 export default {
   name: 'NstcDialog',
   props: {
@@ -138,7 +136,6 @@ export default {
     }
   },
   methods: {
-    $lc,
     handleConfirm() {
       this.handleListeners('confirm')
     },

package/nstc-g6/components/NstcDialogTable/NstcDialogTable.vue

@@ -142,7 +142,6 @@ export default {
     }
   },
   methods: {
-    $lc,
     queryData(eventname) {
       this.tableData = []
       this.setPagination(0)

package/nstc-g6/components/NstcElectronicFile/NstcElectronicFile.vue

@@ -146,7 +146,6 @@
 <script>
 import axios from 'axios'
 import Cookies from 'js-cookie'
-import { $lc } from '../../../src/utils/i18n/index.js'
 var CancelToken = axios.CancelToken
 let token = Cookies.get('Admin-Token')
 function randomString(num) {
@@ -225,7 +224,6 @@ export default {
     this.getUploadedFile()
   },
   methods: {
-    $lc,
     formatDate(date, fmt) {
       date = new Date(date)
       if (/(y+)/.test(fmt)) {
@@ -294,9 +292,9 @@ export default {
         })
     },
     batchload() {
-      this.$confirm($lc('确定下载选中的附件?'), {
-        confirmButtonText: $lc('确定'),
-        cancelButtonText: $lc('取消'),
+      this.$confirm(this.$lc('确定下载选中的附件?'), {
+        confirmButtonText: this.$lc('确定'),
+        cancelButtonText: this.$lc('取消'),
         type: 'warning'
       }).then(() => {
         let multipleSelection = this.multipleSelection
@@ -308,9 +306,9 @@ export default {
       })
     },
     batchdel() {
-      this.$confirm($lc('确定删除选中的附件?'), {
-        confirmButtonText: $lc('确定'),
-        cancelButtonText: $lc('取消'),
+      this.$confirm(this.$lc('确定删除选中的附件?'), {
+        confirmButtonText: this.$lc('确定'),
+        cancelButtonText: this.$lc('取消'),
         type: 'warning'
       }).then(() => {
         let files = this.files
@@ -333,10 +331,10 @@ export default {
           .post('/api/neams/eamsbaserecord/delete', idArr)
           .then((res) => {
             if (res.code == '200') {
-              this.$message.success($lc('删除成功'))
+              this.$message.success(this.$lc('删除成功'))
               this.files = files
             } else {
-              this.$message.success($lc('删除失败') + res.data.msg)
+              this.$message.success(this.$lc('删除失败') + res.data.msg)
             }
           })
           .catch(function (error) {
@@ -393,19 +391,19 @@ export default {
     cantTip() {
       this.$message({
         showClose: true,
-        message: $lc('请选择附件类型')
+        message: this.$lc('请选择附件类型')
       })
     },
     cantTip1() {
       this.$message({
         showClose: true,
-        message: $lc('请输入附件名称')
+        message: this.$lc('请输入附件名称')
       })
     },
     cantTip2() {
       this.$message({
         showClose: true,
-        message: $lc('没有上传完成，不能再次上传')
+        message: this.$lc('没有上传完成，不能再次上传')
       })
     },
     uploadFile(params) {
@@ -446,7 +444,7 @@ export default {
       this.eamsAttachfiles.forEach((item) => {
         if (_file.attnoadd == item.attno) {
           if (item.attSize * 1024 < _file.size) {
-            this.$message.error($lc('附件超过设置大小，目前附件限制大小为') + item.attSize + 'M')
+            this.$message.error(this.$lc('附件超过设置大小，目前附件限制大小为') + item.attSize + 'M')
             return
           }
         }
@@ -486,7 +484,7 @@ export default {
             this.$message.error(res.data.msg)
           } else {
             _file.upstatus = 2
-            this.$message.success($lc('上传成功！'))
+            this.$message.success(this.$lc('上传成功！'))
             let recordno = res.data.data.replace(',', '')
             // _file.recordno = recordno
             // if (this.recordarr.indexOf(recordno) === -1) {
@@ -546,7 +544,7 @@ export default {
             }
             // resolve(response)
           } else {
-            this.$message.error($lc('下载失败数据已删除!'))
+            this.$message.error(this.$lc('下载失败数据已删除!'))
           }
         })
         .catch((error) => this.$message.error(error))

package/nstc-g6/components/NstcExcelCustomImport/NstcExcelCustomImport.vue

@@ -327,7 +327,6 @@ export default {
     console.log('批量导入的国际化', '上述数据输入有误，请修改导入文件中相关信息！')
   },
   methods: {
-    $lc,
     beforeUpload(file) {
       this.percentage = 0
       this.progressStatus = ''
@@ -388,7 +387,7 @@ export default {
       this.reset = false
       this.statisticsFlag = false
       this.placeholderHasFile = false
-      this.placeholderText = $lc('请选择')
+      this.placeholderText = this.$lc('请选择')
       console.log('执行了弹框关闭事件')
       ![`delete`].includes(flag) && (this._value = false)
       this.$nextTick(() => {

package/nstc-g6/components/NstcExcelImport/NstcExcelImport.vue

@@ -341,7 +341,6 @@ export default {
   },
   created() {},
   methods: {
-    $lc,
     beforeUpload(file) {
       this.percentage = 0
       this.progressStatus = ''
@@ -421,7 +420,7 @@ export default {
       this.reset = false
       this.statisticsFlag = false
       this.placeholderHasFile = false
-      this.placeholderText = $lc('请选择')
+      this.placeholderText = this.$lc('请选择')
       console.log('执行了弹框关闭事件')
       ![`delete`].includes(flag) && (this._value = false)
       this.$nextTick(() => {

package/nstc-g6/components/NstcExcelImportN/NstcExcelImportN.vue

@@ -233,7 +233,6 @@ export default {
     }
   },
   methods: {
-    $lc,
     cancel() {
       this.handleConfirmImportExcel()
     },

package/nstc-g6/components/NstcFileUpload/NstcFileUpload.vue

@@ -320,7 +320,6 @@ export default {
     }, 1)
   },
   methods: {
-    $lc,
     beforeUpload(file, row) {
       console.log(file, row)
       // if(!row.attachmentName) {
@@ -447,17 +446,17 @@ export default {
     deleteFile(index) {
       this.$confirmTip({
         type: 'info',
-        title: $lc('确认删除该文件？'),
+        title: this.$lc('确认删除该文件？'),
         info: '',
         button: {
-          ok: $lc('提交'),
-          cancel: $lc('取消')
+          ok: this.$lc('提交'),
+          cancel: this.$lc('取消')
         }
       }).then(() => {
         this.tableData.splice(index, 1)
         this.$message({
           type: 'success',
-          message: $lc('删除成功!')
+          message: this.$lc('删除成功!')
         })
       })
     },
@@ -486,7 +485,7 @@ export default {
           // 阻断下载
           this.$message({
             type: 'warning',
-            message: $lc('勾选文件中有文件未上传')
+            message: this.$lc('勾选文件中有文件未上传')
           })
           return
         }
@@ -523,7 +522,7 @@ export default {
             let elink = document.createElement('a')
             elink.style.display = 'none'
             elink.href = window.URL.createObjectURL(blob)
-            elink.download = `${$lc('批量下载')}.zip`
+            elink.download = `${this.$lc('批量下载')}.zip`
             document.body.appendChild(elink)
             elink.click()
             URL.revokeObjectURL(elink.href)
@@ -535,7 +534,7 @@ export default {
       } else {
         this.$message({
           type: 'warning',
-          message: $lc('请选择要下载的附件')
+          message: this.$lc('请选择要下载的附件')
         })
       }
     },
@@ -548,11 +547,11 @@ export default {
         this.dialogShowDelete = true
         this.$confirmTip({
           type: 'error',
-          title: $lc('确认要删除所选附件吗？'),
-          info: $lc('删除后数据不可恢复'),
+          title: this.$lc('确认要删除所选附件吗？'),
+          info: this.$lc('删除后数据不可恢复'),
           button: {
-            ok: $lc('提交'),
-            cancel: $lc('取消')
+            ok: this.$lc('提交'),
+            cancel: this.$lc('取消')
           }
         }).then(() => {
           this.tableData = this.tableData.filter((i) => {
@@ -563,13 +562,13 @@ export default {
           }, 30)
           this.$message({
             type: 'success',
-            message: $lc('删除成功!')
+            message: this.$lc('删除成功!')
           })
         })
       } else {
         this.$message({
           type: 'warning',
-          message: $lc('请选择要删除的附件')
+          message: this.$lc('请选择要删除的附件')
         })
       }
     },
@@ -583,7 +582,7 @@ export default {
       this.dialogShowDelete = false
       this.$message({
         type: 'success',
-        message: $lc('删除成功!')
+        message: this.$lc('删除成功!')
       })
     },
 
@@ -608,7 +607,7 @@ export default {
       const isLt2M = fileObj.file.size / 1024 / 1024 < 20
       if (!isLt2M) {
         this.$message({
-          message: $lc('上传文件大小不能超过 20MB!'),
+          message: this.$lc('上传文件大小不能超过 20MB!'),
           type: 'warning'
         })
         this.tableData[this.currentUploadIndex].percentage = 75
@@ -662,7 +661,7 @@ export default {
     handleExceed() {
       this.$message({
         type: 'error',
-        message: $lc('最多只能选择一个文件')
+        message: this.$lc('最多只能选择一个文件')
       })
     },
 
@@ -727,7 +726,7 @@ export default {
       if (t.length) {
         this.$message({
           type: 'error',
-          message: $lc('文件名不能超过64个字，请重新上传!')
+          message: this.$lc('文件名不能超过64个字，请重新上传!')
         })
         // this.tableData[index].status = 'exception';
         return null
@@ -740,7 +739,7 @@ export default {
       if (temp.length) {
         this.$message({
           type: 'error',
-          message: $lc('暂不支持 .exe, .bin等格式文件格式上传！')
+          message: this.$lc('暂不支持 .exe, .bin等格式文件格式上传！')
         })
         this.tableData[index].fileName = ''
         return null

package/nstc-g6/components/NstcPagination/NstcPagination.vue

@@ -134,7 +134,6 @@ export default {
     this.handleTotal()
   },
   methods: {
-    $lc,
     prevent(e) {
       e.preventDefault()
       e.stopPropagation()

package/nstc-g6/components/NstcScreenFull/NstcScreenFull.vue

@@ -12,7 +12,6 @@
 <script>
 import screenfull from 'screenfull'
 import NstcSvgIcon from '../NstcSvgIcon/NstcSvgIcon'
-import { $lc } from '../../../src/utils/i18n/index.js'
 export default {
   name: 'NstcScreenFull',
   components: {
@@ -30,12 +29,11 @@ export default {
     this.destroy()
   },
   methods: {
-    $lc,
     click() {
       console.log(screenfull)
       if (!screenfull.isEnabled) {
         this.$message({
-          message: $lc('浏览器不允许全屏'),
+          message: this.$lc('浏览器不允许全屏'),
           type: 'warning'
         })
         return false

package/nstc-g6/components/NstcTableSet/NstcTableSet.vue

@@ -231,7 +231,6 @@ export default {
   },
 
   methods: {
-    $lc,
     upDown(index) {
       this.$set(this.arrowStates, index, !this.arrowStates[index])
     },
@@ -282,7 +281,7 @@ export default {
       if (['condition', 'set'].includes(this.type)) {
         const k = this.type === 'set' ? 'userUnit' : 'userCondition'
         if (this.result.length == 0) {
-          return this.$message.warning($lc('至少勾选一个字段'))
+          return this.$message.warning(this.$lc('至少勾选一个字段'))
         }
         this.saveObj[k] = this.result.map((item) => item.id).join(',')
         if (k == 'userUnit') {
@@ -309,12 +308,12 @@ export default {
           .catch((e) => {
             this.$message({
               type: 'error',
-              message: e.msg || $lc('保存失败')
+              message: e.msg || this.$lc('保存失败')
             })
           })
       } else {
         if (this.result.length == 0) {
-          return this.$message.warning($lc('至少勾选一个字段'))
+          return this.$message.warning(this.$lc('至少勾选一个字段'))
         }
         await this.exportAction()
       }

package/nstc-g6/components/NstcWorkBench/NstcWorkBench.vue

@@ -100,7 +100,6 @@
 </template>
 <script>
 import axios from '../../utils/axios'
-import { $lc } from '../../../src/utils/i18n/index.js'
 export default {
   name: 'NstcWorkBench',
   data() {
@@ -115,7 +114,6 @@ export default {
     this.intData()
   },
   methods: {
-    $lc,
     async intData() {
       try {
         //待审核

package/nstc-g6/components/Search/NstcSearch.vue

@@ -274,7 +274,6 @@ export default {
     console.log(444)
   },
   methods: {
-    $lc,
     /**
      * 组件联动，避免多次触发nstcform.watch.config
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.22.64",
+  "version": "2.22.65-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