n20-common-lib 2.22.61 → 2.22.63

package/src/components/DynamicField/tableList.vue

@@ -63,7 +63,7 @@
     <div slot="footer" class="page-footer-shadow flex-box flex-lr m-t-s">
       <div class="flex-box flex-v">
         <cl-statis-item
-          type="全部合计"
+          :type="$lc('全部合计')"
           :count-label="[$lc('笔数')]"
           :list="[{ label: $lc('笔数'), value: formValue.customList.length }]"
         />

package/src/components/ElectronicArchive/index.vue

@@ -132,7 +132,7 @@
                 <template slot="prefix">
                   <i
                     v-if="row.isEnable === '0'"
-                    v-title="`附件已禁用`"
+                    v-title="$lc('附件已禁用')"
                     class="el-input__icon n20-icon-yichu color-danger"
                   ></i>
                 </template>
@@ -300,7 +300,7 @@
           <template v-slot="{ row }">
             <i v-if="row.isEnable === '0'" class="el-input__icon n20-icon-yichu color-danger"></i>
             <i v-if="row.isEnable === '1'" class="el-input__icon n20-icon-chenggong color-success"></i>
-            <span>{{ row.isEnable === '1' ? '启用' : '禁用' }}</span>
+            <span>{{ $lc(row.isEnable === '1' ? '启用' : '禁用') }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -764,7 +764,7 @@ export default {
         )
         .then((res) => {
           if (res) {
-            downloadBlob(res, $lc('附件压缩包.zip'))
+            downloadBlob(res, `${$lc('附件压缩包')}.zip`)
           }
         })
     },

package/src/components/FileUploadTable/FileUploadTableV3.vue

@@ -626,7 +626,7 @@ export default {
       if (code === 200) {
         let aDom = document.createElement('a')
         aDom.href = data
-        aDom.download = $lc("批量附件.pdf")
+        aDom.download = `${$lc('批量附件')}.pdf`
         aDom.click()
 
         this.$nextTick(() => {

package/src/components/FileUploadTable/index.vue

@@ -298,7 +298,7 @@
         :multiple="true"
         :show-file-list="true"
         :action="apiPrefix ? apiPrefix + action : action"
-        :data="_batchFileData || fileData"
+        :data="batchFileData || fileData"
         :headers="headers"
         :accept="fileAccept"
         :size="fileSize"
@@ -520,7 +520,7 @@ export default {
       officeStatus: false,
       batchUploading: false,
       // 批量上传使用的文件数据（避免直接修改计算属性）
-      _batchFileData: null,
+      batchFileData: null,
       sortable: null
     }
   },
@@ -608,10 +608,11 @@ export default {
               return
             }
             this.tableData.splice(newIndex, 0, targetRow)
-            this.$emit('sort', this.tableData.slice())
+            // 先调用保存排序接口，确保即使 $emit 抛出异常也能执行
             this.saveFileSort().catch(() => {
               this.$message.error($lc('附件排序保存失败'))
             })
+            this.$emit('sort', this.tableData.slice())
           }
         })
       })
@@ -634,9 +635,12 @@ export default {
         return
       }
 
+      // 排序请求每次数据不同，跳过 axios 请求去重和 loading，
+      // 避免短时间内第二次拖拽排序被错误合并到第一次请求
       await axios.post(
         this.apiPrefix ? `${this.apiPrefix}/neams/eamsbaserecord/fileSort` : '/neams/eamsbaserecord/fileSort',
-        sortList
+        sortList,
+        { loading: false }
       )
     },
     // ai校验取消
@@ -783,7 +787,7 @@ export default {
       if (code === 200) {
         let aDom = document.createElement('a')
         aDom.href = data
-        aDom.download = '批量附件.pdf'
+        aDom.download = `${$lc('批量附件')}.pdf`
         aDom.click()
 
         this.$nextTick(() => {
@@ -801,7 +805,7 @@ export default {
       let fileData = this.fileData || {}
       let dto = JSON.parse(fileData.data || '{}')
       dto[this.keys.type] = this.bathType
-      this._batchFileData = {
+      this.batchFileData = {
         ...fileData,
         data: JSON.stringify(dto)
       }

package/src/components/LoginSetting/index.vue

@@ -150,7 +150,7 @@ export default {
       })
       for (const i of _this.checkedList) {
         if (!this.LOGIN_MODE) this.LOGIN_MODE = i
-        else this.LOGIN_MODE += $lc(',') + i
+        else this.LOGIN_MODE += ',' + i
       }
     },
     getdata(list) {
@@ -159,7 +159,7 @@ export default {
         if (i.pmName === 'LOGIN_MODE') {
           _this.LOGIN_MODE = i.pmValue
           _this.LOGIN_MODE_ID = i.pmId
-          _this.checkedList = i.pmValue.split($lc(','))
+          _this.checkedList = i.pmValue.split(',')
         } else if (i.pmName === 'MAIN_PAGE_TEXT') {
           _this.loginModel.MAIN_PAGE_TEXT = i.pmValue
           _this.MAIN_PAGE_TEXT_ID = i.pmId
@@ -202,7 +202,9 @@ export default {
         if (type) {
           if (this.imgSize < size) {
             await this.$confirm(
-              `当前图片尺寸大于建议大小（${screen.width}*${screen.height}），将以填充的方式进行处理，是否继续？`,
+              `${$lc('当前图片尺寸大于建议大小（')}${screen.width}*${screen.height}${$lc(
+                '），将以填充的方式进行处理，是否继续？'
+              )}`,
               $lc("提示"),
               {
                 type: 'warning'
@@ -211,7 +213,9 @@ export default {
             this.$refs.bgUpload.$refs.upload.submit()
           } else if (this.imgSize >= size) {
             await this.$confirm(
-              `当前图片尺寸小于建议大小（${screen.width}*${screen.height}），可能会发生失真，是否继续？`,
+              `${$lc('当前图片尺寸小于建议大小（')}${screen.width}*${screen.height}${$lc(
+                '），可能会发生失真，是否继续？'
+              )}`,
               $lc("提示"),
               {
                 type: 'warning'
@@ -222,7 +226,9 @@ export default {
         } else {
           if (this.logoSize < size) {
             await this.$confirm(
-              `当前图片尺寸大于建议大小（108*30px），将以填充的方式进行处理，是否继续？`,
+              `${$lc('当前图片尺寸大于建议大小（')}108*30px${$lc(
+                '），将以填充的方式进行处理，是否继续？'
+              )}`,
               $lc("提示"),
               {
                 type: 'warning'
@@ -230,9 +236,13 @@ export default {
             )
             this.$refs.logUpload.$refs.upload.submit()
           } else if (this.logoSize >= size) {
-            await this.$confirm(`当前图片尺寸小于建议大小（108*30px），可能会发生失真，是否继续？`, $lc("提示"), {
-              type: 'warning'
-            })
+            await this.$confirm(
+              `${$lc('当前图片尺寸小于建议大小（')}108*30px${$lc('），可能会发生失真，是否继续？')}`,
+              $lc("提示"),
+              {
+                type: 'warning'
+              }
+            )
             this.$refs.logUpload.$refs.upload.submit()
           }
         }
@@ -318,7 +328,7 @@ export default {
       }
       for (const i of e) {
         if (!this.LOGIN_MODE) this.LOGIN_MODE = i
-        else this.LOGIN_MODE += $lc(',') + i
+        else this.LOGIN_MODE += ',' + i
       }
     }
   }

package/src/components/LoginTemporary/form.vue

@@ -404,9 +404,7 @@ export default {
               { loading: this.loadingSub }
             )
             .then(() => {
-              this.$message.success(
-                `${typeName}: ${this.form[type]} 验证码发送成功`
-              )
+              this.$message.success(`${typeName}: ${this.form[type]} ${$lc('验证码发送成功')}`)
             })
             .catch(() => {
               clearTimeout(this.setTimeNum)
@@ -471,7 +469,7 @@ export default {
             })
         } else {
           // 当重新请求大于3次,抛出错误
-          this.$message.warning(`登录失败，请重新登录！`)
+          this.$message.warning($lc('登录失败，请重新登录！'))
           this.getAzCount = 0
           reject()
         }

package/src/components/LoginTemporary/index.vue

@@ -44,7 +44,7 @@
           <a
             class="login-form-download el-icon-bottom"
             href="https://down.360safe.com/se/360se13.1.5101.0.exe"
-            download="启程浏览器.exe"
+            :download="`${$lc('启程浏览器')}.exe`"
             >{{ '下载' | $lc }}</a
           >
           <span>{{ '启程浏览器' | $lc }}</span>

package/src/components/LoginTemporary/retrievePw.vue

@@ -31,12 +31,12 @@
         <el-form-item class="m-b" :label="'账号' | $lc">
           <el-input v-model="username" :placeholder="'请输入账号' | $lc" />
         </el-form-item>
-        <el-form-item class="m-b" :label="$lc('uk验证')" prop="code">
+        <el-form-item class="m-b" :label="$lc('UK验证')" prop="code">
           <br />
           <div v-if="checkCert" class="filed-tips">{{ '该账号未开启UK校验！' | $lc }}</div>
           <div v-if="ukCode !== 1">
             <div :class="ukCode ? 'success-tips' : 'filed-tips'">
-              {{ ukCode ? '验证成功！' : '验证失败！' }}
+              {{ $lc(ukCode ? '验证成功！' : '验证失败！') }}
             </div>
             <div v-show="!ukCode" class="filed-tips">{{ '自助找回密码失败，请联系管理员' | $lc }}</div>
           </div>
@@ -80,19 +80,19 @@ export default {
     const lengthToFirstPassword = (rule, value, callback) => {
       if (value) {
         if (this.dataForm.maxLength < value.length || this.dataForm.minLength > value.length) {
-          callback(new Error(`密码长度为${this.dataForm.minLength}-${this.dataForm.maxLength}!`))
+          callback(new Error(`${$lc('密码长度为')}${this.dataForm.minLength}-${this.dataForm.maxLength}!`))
         } else if (
           Number(this.dataForm.passwordStrength) === 2 &&
           !/^(((?=.*[0-9])(?=.*[a-zA-Z])|(?=.*[0-9])(?=.*[^\s0-9a-zA-Z])|(?=.*[a-zA-Z])(?=.*[^\s0-9a-zA-Z]))[^\s]+)$/.test(
             value
           )
         ) {
-          callback(new Error(`密码至少包括数字,字母,特殊符号其中两种`))
+          callback(new Error($lc('密码至少包括数字,字母,特殊符号其中两种')))
         } else if (
           Number(this.dataForm.passwordStrength) === 3 &&
           !/^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*])[\da-zA-Z~!@#$%^&*]{0,}$/.test(value)
         ) {
-          callback(new Error(`密码同时包括包括数字,字母,特殊符号三种`))
+          callback(new Error($lc('密码同时包括包括数字,字母,特殊符号三种')))
         } else {
           callback()
         }
@@ -216,12 +216,12 @@ export default {
               noMsg: true
             })
             .then(() => {
-              this.$message.success(`${typeName}: ${this.updateForm[type]} 验证码发送成功`)
+              this.$message.success(`${typeName}: ${this.updateForm[type]} ${$lc('验证码发送成功')}`)
             })
             .catch(() => {
               clearTimeout(this.setTimeNum)
               this.codeNum = $lc("验证码")
-              this.$message.warning(`${typeName}: ${this.updateForm[type]} 验证码发送失败`)
+              this.$message.warning(`${typeName}: ${this.updateForm[type]} ${$lc('验证码发送失败')}`)
             })
         }
       })
@@ -269,7 +269,7 @@ export default {
         data.sign = this.sign
         data.certDn = this.certDn
         axios.post(`/bems/prod_1.0/uas/api/authorization/password/reset`, data, { loading: false }).then((res) => {
-          this.$message.success(`密码更新成功！`)
+          this.$message.success($lc('密码更新成功！'))
           this.type = 'phone'
         })
       })

package/src/components/SelectDatePickerPro/halfYearPicker.vue

@@ -11,14 +11,14 @@
       <div class="el-date-picker__header el-date-picker__header--bordered">
         <button
           type="button"
-          aria-label="前一年"
+          :aria-label="$lc('前一年')"
           class="el-picker-panel__icon-btn el-date-picker__prev-btn el-icon-d-arrow-left"
           @click="prev"
         ></button>
-        <span role="button" class="el-date-picker__header-label" @click="handleYear">{{ year }}{{ '年' | $lc }}</span>
+        <span role="button" class="el-date-picker__header-label" @click="handleYear">{{ formatYear(year) }}</span>
         <button
           type="button"
-          aria-label="后一年"
+          :aria-label="$lc('后一年')"
           class="el-picker-panel__icon-btn el-date-picker__next-btn el-icon-d-arrow-right"
           @click="next"
         ></button>
@@ -30,14 +30,14 @@
           class="half-year-picker__btn"
           :class="halfYear === 1 ? 'isactive' : ''"
           @click="selectHalfYear(0)"
-          >{{ year }}{{ '年 上半年' | $lc }}</el-button
+          >{{ formatHalfYear(year, true) }}</el-button
         >
         <el-button
           type="text"
           class="half-year-picker__btn"
           :class="halfYear === 2 ? 'isactive' : ''"
           @click="selectHalfYear(1)"
-          >{{ year }}{{ '年 下半年' | $lc }}</el-button
+          >{{ formatHalfYear(year, false) }}</el-button
         >
       </div>
       <div v-else class="n20-quarter-date-picker__year__grid">
@@ -49,7 +49,7 @@
           :class="year === item ? 'color-primary' : ''"
           class="n20-quarter-date-picker__btn"
           @click="selectYear(item)"
-          >{{ item }}{{ '年' | $lc }}</el-button
+          >{{ formatYear(item) }}</el-button
         >
       </div>
     </div>
@@ -104,7 +104,7 @@ export default {
           const [, year, startMonth] = startDateMatch
           this.year = year
           this.halfYear = startMonth === '01' ? 1 : 2
-          this.showValue = `${year} 年 ${startMonth === '01' ? $lc("上半年") : $lc("下半年")}`
+          this.showValue = this.formatHalfYear(year, startMonth === '01')
         } else {
           this.showValue = ''
         }
@@ -113,6 +113,12 @@ export default {
     }
   },
   methods: {
+    formatYear(year) {
+      return $lc('YEAR年').replace('YEAR', year)
+    },
+    formatHalfYear(year, firstHalf) {
+      return $lc(firstHalf ? 'YEAR年上半年' : 'YEAR年下半年').replace('YEAR', year)
+    },
     selectYear(i) {
       this.year = i
       this.isHalfYear = true
@@ -133,7 +139,7 @@ export default {
       this.halfYear = i + 1
       let arr = [`${this.year}-${i === 0 ? '01' : '07'}`, `${this.year}-${i === 0 ? '06' : '12'}`]
       this.showHalfYear = false
-      this.showValue = `${this.year} 年 ${i === 0 ? $lc("上半年") : $lc("下半年")}`
+      this.showValue = this.formatHalfYear(this.year, i === 0)
       // 6月最后一天是30 12月最后一天是31
       this.$emit('input', { startDate: arr[0] + '-01', endDate: i === 0 ? arr[1] + '-30' : arr[1] + '-31' })
       this.$emit('change', { startDate: arr[0] + '-01', endDate: i === 0 ? arr[1] + '-30' : arr[1] + '-31' })

package/src/components/SelectDatePickerPro/index.vue

@@ -19,7 +19,7 @@
       v-if="type === $lc('周') && selectList.includes(type)"
       key="week"
       v-model="week"
-      format="yyyy 第 WW 周"
+      :format="$lc('yyyy 第 WW 周')"
       type="week"
       v-bind="$attrs"
       :picker-options="attrs"

package/src/components/SelectDatePickerPro/quarterDatePicker.vue

@@ -12,14 +12,14 @@
       <div class="el-date-picker__header el-date-picker__header--bordered">
         <button
           type="button"
-          aria-label="前一年"
+          :aria-label="$lc('前一年')"
           class="el-picker-panel__icon-btn el-date-picker__prev-btn el-icon-d-arrow-left"
           @click="prev"
         ></button>
-        <span role="button" class="el-date-picker__header-label" @click="handleYear">{{ year }}{{ '年' | $lc }}</span>
+        <span role="button" class="el-date-picker__header-label" @click="handleYear">{{ formatYear(year) }}</span>
         <button
           type="button"
-          aria-label="后一年"
+          :aria-label="$lc('后一年')"
           class="el-picker-panel__icon-btn el-date-picker__next-btn el-icon-d-arrow-right"
           @click="next"
         ></button>
@@ -34,7 +34,7 @@
             class="n20-quarter-date-picker__btn"
             :class="this.season == 1 ? 'isactive' : ''"
             @click="selectSeason(0)"
-            >{{ year }}{{ '年' | $lc }} {{ '第一季度' | $lc }}</el-button
+            >{{ formatQuarter(year, 1) }}</el-button
           >
           <el-button
             type="text"
@@ -43,7 +43,7 @@
             class="n20-quarter-date-picker__btn"
             :class="this.season == 2 ? 'isactive' : ''"
             @click="selectSeason(1)"
-            >{{ year }}{{ '年' | $lc }} {{ '第二季度' | $lc }}</el-button
+            >{{ formatQuarter(year, 2) }}</el-button
           >
           <el-button
             type="text"
@@ -52,7 +52,7 @@
             class="n20-quarter-date-picker__btn"
             :class="this.season == 3 ? 'isactive' : ''"
             @click="selectSeason(2)"
-            >{{ year }}{{ '年' | $lc }} {{ '第三季度' | $lc }}</el-button
+            >{{ formatQuarter(year, 3) }}</el-button
           >
           <el-button
             :disabled="isDisabled(year, '4')"
@@ -61,7 +61,7 @@
             class="n20-quarter-date-picker__btn"
             :class="this.season == 4 ? 'isactive' : ''"
             @click="selectSeason(3)"
-            >{{ year }}{{ '年' | $lc }} {{ '第四季度' | $lc }}</el-button
+            >{{ formatQuarter(year, 4) }}</el-button
           >
         </div>
         <div v-else class="n20-quarter-date-picker__year__grid">
@@ -73,7 +73,7 @@
             :class="year === item ? 'color-primary' : ''"
             class="n20-quarter-date-picker__btn"
             @click="selectYear(item)"
-            >{{ item }}{{ '年' | $lc }}</el-button
+            >{{ formatYear(item) }}</el-button
           >
         </div>
       </div>
@@ -153,8 +153,9 @@ export default {
     showValue: {
       set(value) {
         if (value) {
-          const regex = /(\d{4}) 年 (\d) 季度/
+          const regex = /(\d{4})\s*年\s*第?([1-4])季度/
           const match = value.match(regex)
+          if (!match) return
           const [, year, quarter] = match
           switch (quarter) {
             case '1':
@@ -178,9 +179,7 @@ export default {
       },
       get() {
         if (this.value.startDate && this.value.endDate) {
-          return `${dayjs(this.value.startDate).year()} 年 第${this.getChinese(
-            dayjs(this.value.endDate).quarter()
-          )}季度`
+          return this.formatQuarter(dayjs(this.value.startDate).year(), dayjs(this.value.endDate).quarter())
         } else {
           return ''
         }
@@ -192,6 +191,12 @@ export default {
     // this.getDefaultTime()
   },
   methods: {
+    formatYear(year) {
+      return $lc('YEAR年').replace('YEAR', year)
+    },
+    formatQuarter(year, quarter) {
+      return $lc('YEAR年第QUARTER季度').replace('YEAR', year).replace('QUARTER', quarter)
+    },
     getChinese(val) {
       let value = ''
       switch (val) {
@@ -234,7 +239,6 @@ export default {
       that.season = i + 1
       let arr = that.valueArr[i].split(' - ')
       that.showSeason = false
-      this.showValue = `${this.year} 年 ${this.season} 季度`
       that.$emit('input', { startDate: this.year + '-' + arr[0], endDate: this.year + '-' + arr[1] })
       that.$emit('change', { startDate: this.year + '-' + arr[0], endDate: this.year + '-' + arr[1] }) // 每次选择时间都将当前选择时间发送到父组件
     },

package/src/components/TableSetSize/index.vue

@@ -2,11 +2,11 @@
   <div class="el-table-set-size flex-box">
     <div class="el-table-set-size-item m-r-0" :class="sizeC === 'mini' && 'active'" @click="setSize('mini')">
       <img class="icon-mini" src="./mini.png" />
-      <div class="text-mini">{{ _lang === 'zh' ? '小行距' : 'mini' }}</div>
+      <div class="text-mini">{{ $lc('小行距') }}</div>
     </div>
     <div class="el-table-set-size-item" :class="sizeC === 'small' && 'active'" @click="setSize('small')">
       <img class="icon-small" src="./small.png" />
-      <div class="text-small">{{ _lang === 'zh' ? '中行距' : 'small' }}</div>
+      <div class="text-small">{{ $lc('中行距') }}</div>
     </div>
   </div>
 </template>

package/src/components/operatingStatus/index.vue

@@ -3,7 +3,7 @@
     <el-carousel-item v-for="tip in tips" :key="tip.id">
       <div v-if="tip.isShow === '1'" v-title:br="list" :class="`tip_color_${tip.style || 'default'}`">
         {{ tip.busNname }}{{ enumData[tip.busState] }}{{ tip.busCode.includes('CENTER') ? '(' + tip.currency + ')' : ''
-        }}{{ tip.isError === '1' ? '(有异常)' : '' }}
+        }}{{ tip.isError === '1' ? $lc('（有异常）') : '' }}
       </div>
     </el-carousel-item>
   </el-carousel>