t20-common-lib 0.14.6 → 0.14.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.14.6",
+  "version": "0.14.8",
   "description": "T20",
   "private": false,
   "main": "dist/index.js",

package/packages/file-import/src/Upload/uploadMsg.vue

@@ -4,7 +4,7 @@
     style="margin-bottom: 0; margin-top: 30px"
     :width="width"
     :visible.sync="progressV"
-    :title="title"
+    :title="dialogTitle"
     append-to-body
     :close-on-click-modal="false"
     :close-on-press-escape="false"
@@ -13,14 +13,14 @@
     <slot name="top" :validateResult="validateResult"></slot>
     <div style="min-height: 28px">
       <template v-if="!hidePercent">
-        <p v-if="!percentType">系统处理中，请稍等......</p>
+        <p v-if="!percentType">{{ $lc('系统处理中，请稍等......') }}</p>
         <div v-else>
           <div v-if="validateResult" class="m-b">
-            <span class="m-r-m">导入文件</span>
+            <span class="m-r-m">{{ $lc('导入文件') }}</span>
             {{ validateResult.name }}
           </div>
           <div class="flex-box">
-            <div class="m-r-m">导入进度</div>
+            <div class="m-r-m">{{ $lc('导入进度') }}</div>
             <div class="flex-item">
               <el-progress
                 class="m-b"
@@ -33,24 +33,24 @@
       </template>
       <template v-if="validateResult">
         <div class="m-b">
-          <span class="m-r">导入统计</span>
-          <span>共计导入{{ validateResult.totalNum }}条,</span>
+          <span class="m-r">{{ $lc('导入统计') }}</span>
+          <span>{{ $lc('共计导入') }}{{ validateResult.totalNum }}{{ $lc('条') }},</span>
           <span class="m-r-s">
-            其中有效数据
+            {{ $lc('其中有效数据') }}
             <span class="color-success">{{ validateResult.successNum }}</span>
-            条,
+            {{ $lc('条') }},
           </span>
           <span>
-            无效数据
+            {{ $lc('无效数据') }}
             <span class="color-danger">{{ validateResult.errorList?.length }}</span>
-            条。
+            {{ $lc('条。') }}
           </span>
         </div>
         <template v-if="validateResult.errorList?.length">
           <div class="bd-a">
             <div class="flex-box flex-lr flex-v m-t m-b p-l p-r">
-              <span>无效数据详情</span>
-              <el-button v-if="showErrorExport" type="text" @click="importError">导出错误数据</el-button>
+              <span>{{ $lc('无效数据详情') }}</span>
+              <el-button v-if="showErrorExport" type="text" @click="importError">{{ $lc('导出错误数据') }}</el-button>
             </div>
             <N20-table-pro
               ref="vTable"
@@ -72,9 +72,7 @@
               />
             </div>
           </div>
-          <slot name="error" :validateResult="validateResult">
-            <div class="color-warning m-t-s">上述数据输入有误，请修改导入文件中相关信息！</div>
-          </slot>
+          <div class="color-warning m-t-s">{{ '上述数据输入有误，请修改导入文件中相关信息！' | $lc }}</div>
         </template>
       </template>
     </div>
@@ -104,9 +102,7 @@
           {{ footerBtn.cancel.text | $lc }}
         </el-button>
       </template>
-      <el-button v-else-if="validateResult || percentType === 'success'" type="primary" @click="confirmFn">
-        确认
-      </el-button>
+      <el-button v-else-if="validateResult || percentType === 'success'" type="primary" @click="confirmFn">{{ $lc('确认') }}</el-button>
     </div>
   </el-dialog>
 </template>
@@ -156,6 +152,9 @@ export default {
     }
   },
   computed: {
+    dialogTitle() {
+      return this.title || this.$lc('提示')
+    },
     progressV: {
       get() {
         return this.visible

package/packages/file-import/src/main.vue

@@ -4,13 +4,13 @@
       <el-button size="mini" type="primary">{{ $t('gbebit_w_c_0103') }}</el-button>
     </slot>
     <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item command="import">模版导入</el-dropdown-item>
-      <el-dropdown-item command="down">模版下载</el-dropdown-item>
+      <el-dropdown-item command="import">{{ $lc('模版导入') }}</el-dropdown-item>
+      <el-dropdown-item command="down">{{ $lc('模版下载') }}</el-dropdown-item>
     </el-dropdown-menu>
     <div style="display: none">
       <uploadMsg
         :pagination="pagination"
-        :title="$t('导入文件')"
+        :title="$lc('导入文件')"
         :visible.sync="errorV"
         :width="width"
         :show-error-export="showErrorExport"
@@ -81,10 +81,10 @@ export default {
   },
   methods: {
     getDefaultErrorExportFileName() {
-      const baseName = String(this.fileName || '导入文件')
+      const baseName = String(this.fileName || this.$lc('导入文件'))
       const pureName = baseName.replace(/\.(xlsx|xls|csv)$/i, '')
-      const date = parseDate(new Date(), "yyyyMMdd");
-      return `${pureName}-错误数据-${date}.xlsx`
+      const date = parseDate(new Date(), 'yyyyMMdd')
+      return `${pureName}-${this.$lc('错误数据')}-${date}.xlsx`
     },
     getErrorExportParams() {
       return {
@@ -198,8 +198,9 @@ export default {
     },
     expectedHeaderForColumn(col) {
       const label = String(col.label == null ? '' : col.label).trim()
-      const required = col.required === true
-      return required ? `* ${label}` : label
+      // const required = col.required === true
+      // return required ? `* ${label}` : label
+      return label
     },
     buildSheetPayload(headers, rows, columnTree) {
       const leafCols = this.flattenLeafColumns(columnTree)
@@ -247,7 +248,7 @@ export default {
       }
       writeImportErrorExcel(this.getErrorExportParams()).catch(error => {
         console.error('writeImportErrorExcel failed:', error)
-        this.$message.error(this.$l('导入模板解析失败，请检查模板内容后重试'))
+        this.$message.error(this.$lc('导入模板解析失败，请检查模板内容后重试'))
       })
     },
     commandFn(val) {

package/src/i18n.json

@@ -37,5 +37,53 @@
   },
   "请输入": {
     "en": "Please enter"
+  },
+  "模版导入": {
+    "en": "Import Template"
+  },
+  "模版下载": {
+    "en": "Download Template"
+  },
+  "导入文件": {
+    "en": "Import File"
+  },
+  "错误数据": {
+    "en": "Error Data"
+  },
+  "导入模板解析失败，请检查模板内容后重试": {
+    "en": "Failed to parse import template. Please check the template content and try again."
+  },
+  "提示": {
+    "en": "Prompt"
+  },
+  "系统处理中，请稍等......": {
+    "en": "Processing, please wait..."
+  },
+  "导入进度": {
+    "en": "Import Progress"
+  },
+  "导入统计": {
+    "en": "Import Statistics"
+  },
+  "共计导入": {
+    "en": "Total Imported"
+  },
+  "其中有效数据": {
+    "en": "Valid Data"
+  },
+  "无效数据": {
+    "en": "Invalid Data"
+  },
+  "无效数据详情": {
+    "en": "Invalid Data Details"
+  },
+  "导出错误数据": {
+    "en": "Export Error Data"
+  },
+  "条": {
+    "en": " items"
+  },
+  "条。": {
+    "en": " items."
   }
 }