kz-ui-base 1.0.160 → 1.0.161

package/common/src/components/custom/Material/index.vue

@@ -11,11 +11,9 @@
     >
       <template slot="title">
         <div class="title-text">
-          <span class="title-main">添加文件</span
+          <span class="title-main">{{ t('common.addFile') }}</span
           ><span class="title-supplement"
-            >（只能添加"jpg", "jpeg", "bmp", "png", "gif", "pdf", "doc", "docx",
-            "md", "xmind", "mp4", "xlsx"
-            ,"bmp","tif","avi","wmv","xls"大小不超过5M。）</span
+            >{{ t('common.addFileTip') }}</span
           >
         </div>
       </template>
@@ -27,7 +25,7 @@
           class="material"
           style="height: 500px"
         >
-          <el-tab-pane label="我的文件" name="first">
+          <el-tab-pane :label="t('common.myFiles')" name="first">
             <el-container>
               <el-header class="container-header">
                 <el-row :gutter="20" type="flex" justify="space-between">
@@ -54,7 +52,7 @@
                             icon="el-icon-upload2"
                             :loading="upload.isUploading"
                           >
-                            直接上传
+                            {{ t('common.uploadDirectly') }}
                           </el-button>
                         </el-upload>
                       </el-col>
@@ -65,14 +63,14 @@
                           icon="el-icon-folder-add"
                           @click="handleAddFolder"
                           :loading="upload.isUploading"
-                          >新增文件夹
+                          >{{ t('common.addFolder') }}
                         </el-button>
                       </el-col>
                     </el-row>
                   </el-col>
                   <el-col :xs="4" :sm="4" :md="4" :lg="4" :xl="4" :pull="2">
                     <el-input
-                      placeholder="搜索所有文件"
+                      :placeholder="t('common.searchAllFiles')"
                       v-model="form.folderName"
                       class="header-search"
                       @change="searchChange"
@@ -233,18 +231,18 @@
               </el-main>
             </el-container>
           </el-tab-pane>
-          <el-tab-pane label="图库中心" name="second"></el-tab-pane>
+          <el-tab-pane :label="t('common.galleryCenter')" name="second"></el-tab-pane>
         </el-tabs>
       </div>
       <div slot="footer" class="dialog-footer dialogTop-footer">
         <el-button class="dialogTop-footer-button" @click="handleClose"
-          >取 消</el-button
+          >{{ t('common.cancel') }}</el-button
         >
         <el-button
           class="dialogTop-footer-button"
           type="primary"
           @click="onSubmit"
-          >确 定</el-button
+          >{{ t('common.confirm') }}</el-button
         >
       </div>
     </el-dialog>
@@ -262,7 +260,7 @@
       <template slot="title">
         <div class="minor-title-text">
           <span class="minor-increase"
-            >待添加({{ choiceList.length }}/{{ max }})</span
+            {{ t('common.toBeAdded') }}({{ choiceList.length }}/{{ max }})</span
           >
         </div>
       </template>
@@ -467,7 +465,7 @@ export default {
     handleAddFolder() {
       this.upload.isUploading = true;
       addFolder(this.form).then((response) => {
-        this.msgSuccess("新增成功");
+        this.msgSuccess(this.t('common.addSuccess'));
         this.getList();
         this.upload.isUploading = false;
       });
@@ -540,12 +538,12 @@ export default {
     updateMaterialNick(type, item, index) {
       if (type === 0) {
         updateFolder(item).then((response) => {
-          this.msgSuccess("修改成功");
+          this.msgSuccess(this.t('common.modifySuccess'));
           this.getList();
         });
       } else if (type === 1) {
         updateMaterial(item).then((response) => {
-          this.msgSuccess("修改成功");
+          this.msgSuccess(this.t('common.modifySuccess'));
           this.getList();
         });
       }
@@ -554,12 +552,12 @@ export default {
     imageDelete(type, item, index) {
       this.$confirm(
         type === 0
-          ? "您确定将该文件夹以及该文件夹内的所有文件放入回收站吗？"
-          : "将文件放入回收站会影响使用该文件的地方，确定放入回收站吗？",
-        "提示",
+          ? this.t('common.deleteFolderConfirm')
+          : this.t('common.deleteFileConfirm'),
+        this.t('common.tip'),
         {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
+          confirmButtonText: this.t('common.confirm'),
+          cancelButtonText: this.t('common.cancel'),
           type: "warning",
           center: true,
         }
@@ -575,13 +573,13 @@ export default {
           this.getList();
           this.$message({
             type: "success",
-            message: "删除成功!",
+            message: this.t('common.deleteSuccess'),
           });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "已取消删除",
+            message: this.t('common.deleteCancelled'),
           });
         });
     },
@@ -590,7 +588,7 @@ export default {
       const fileSuffix = file.name.substring(file.name.lastIndexOf(".") + 1);
       if (this.upload.whiteList.indexOf(fileSuffix) === -1) {
         this.$message({
-          message: "您上传的文件暂不支持，请联系管理员",
+          message: this.t('common.unsupportedFileType'),
           type: "warning",
         });
         return false;
@@ -598,7 +596,7 @@ export default {
       const isLt2M = file.size / 1024 / 1024 < 100;
       if (!isLt2M) {
         this.$message({
-          message: "上传文件大小不能超过 100MB",
+          message: this.t('common.fileSizeLimit'),
           type: "warning",
         });
         return false;
@@ -613,10 +611,10 @@ export default {
       this.upload.fileList = [];
       this.upload.isUploading = false;
       if (response.code != 200) {
-        this.$message.error("上传失败：" + response.msg);
+        this.$message.error(this.t('common.uploadFailed') + response.msg);
       } else {
         this.$message({
-          message: "上传成功！",
+          message: this.t('common.uploadSuccess'),
           type: "success",
         });
       }
@@ -626,7 +624,7 @@ export default {
     handleFileError(err, file, fileList) {
       this.upload.fileList = [];
       this.upload.isUploading = false;
-      this.$message.error("上传失败：" + err);
+      this.$message.error(this.t('common.uploadFailed') + err);
     },
     /** 确定 */
     onSubmit() {

package/common/src/components/custom/Material/indexTs.vue

@@ -11,11 +11,9 @@
     >
       <template slot="title">
         <div class="title-text">
-          <span class="title-main">添加文件</span
+          <span class="title-main">{{ t('common.addFile') }}</span
           ><span class="title-supplement"
-            >（只能添加"jpg", "jpeg", "bmp", "png", "gif", "pdf", "doc", "docx",
-            "md", "xmind", "mp4", "xlsx"
-            ,"bmp","tif","avi","wmv","xls"大小不超过5M。）</span
+            >{{ t('common.addFileTip') }}</span
           >
         </div>
       </template>
@@ -27,7 +25,7 @@
           class="material"
           style="height: 500px"
         >
-          <el-tab-pane label="我的文件" name="first">
+          <el-tab-pane :label="t('common.myFiles')" name="first">
             <el-container>
               <el-header class="container-header">
                 <el-row :gutter="20" type="flex" justify="space-between">
@@ -54,7 +52,7 @@
                             icon="el-icon-upload2"
                             :loading="upload.isUploading"
                           >
-                            直接上传
+                            {{ t('common.uploadDirectly') }}
                           </el-button>
                         </el-upload>
                       </el-col>
@@ -65,14 +63,14 @@
                           icon="el-icon-folder-add"
                           @click="handleAddFolder"
                           :loading="upload.isUploading"
-                          >新增文件夹
+                          >{{ t('common.addFolder') }}
                         </el-button>
                       </el-col>
                     </el-row>
                   </el-col>
                   <el-col :xs="4" :sm="4" :md="4" :lg="4" :xl="4" :pull="2">
                     <el-input
-                      placeholder="搜索所有文件"
+                      :placeholder="t('common.searchAllFiles')"
                       v-model="form.folderName"
                       class="header-search"
                       @change="searchChange"
@@ -233,18 +231,18 @@
               </el-main>
             </el-container>
           </el-tab-pane>
-          <el-tab-pane label="图库中心" name="second"></el-tab-pane>
+          <el-tab-pane :label="t('common.galleryCenter')" name="second"></el-tab-pane>
         </el-tabs>
       </div>
       <div slot="footer" class="dialog-footer dialogTop-footer">
         <el-button class="dialogTop-footer-button" @click="handleClose"
-          >取 消</el-button
+          >{{ t('common.cancel') }}</el-button
         >
         <el-button
           class="dialogTop-footer-button"
           type="primary"
           @click="onSubmit"
-          >确 定</el-button
+          >{{ t('common.confirm') }}</el-button
         >
       </div>
     </el-dialog>
@@ -262,7 +260,7 @@
       <template slot="title">
         <div class="minor-title-text">
           <span class="minor-increase"
-            >待添加({{ choiceList.length }}/{{ max }})</span
+            {{ t('common.toBeAdded') }}({{ choiceList.length }}/{{ max }})</span
           >
         </div>
       </template>
@@ -465,7 +463,7 @@ export default class material extends Vue {
   public handleAddFolder() {
     this.upload.isUploading = true;
     addFolder(this.form).then((response) => {
-      (this as any).msgSuccess("新增成功");
+      (this as any).msgSuccess((this as any).t('common.addSuccess'));
       this.getList();
       this.upload.isUploading = false;
     });
@@ -536,12 +534,12 @@ export default class material extends Vue {
   public updateMaterialNick(type, item, index) {
     if (type === 0) {
       updateFolder(item).then((response) => {
-        (this as any).msgSuccess("修改成功");
+        (this as any).msgSuccess((this as any).t('common.modifySuccess'));
         this.getList();
       });
     } else if (type === 1) {
       updateMaterial(item).then((response) => {
-        (this as any).msgSuccess("修改成功");
+        (this as any).msgSuccess((this as any).t('common.modifySuccess'));
         this.getList();
       });
     }
@@ -551,12 +549,12 @@ export default class material extends Vue {
     (this as any)
       .$confirm(
         type === 0
-          ? "您确定将该文件夹以及该文件夹内的所有文件放入回收站吗？"
-          : "将文件放入回收站会影响使用该文件的地方，确定放入回收站吗？",
-        "提示",
+          ? (this as any).t('common.deleteFolderConfirm')
+          : (this as any).t('common.deleteFileConfirm'),
+        (this as any).t('common.tip'),
         {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
+          confirmButtonText: (this as any).t('common.confirm'),
+          cancelButtonText: (this as any).t('common.cancel'),
           type: "warning",
           center: true,
         }
@@ -572,13 +570,13 @@ export default class material extends Vue {
         this.getList();
         (this as any).$message({
           type: "success",
-          message: "删除成功!",
+          message: (this as any).t('common.deleteSuccess'),
         });
       })
       .catch(() => {
         (this as any).$message({
           type: "info",
-          message: "已取消删除",
+          message: (this as any).t('common.deleteCancelled'),
         });
       });
   }
@@ -587,7 +585,7 @@ export default class material extends Vue {
     const fileSuffix = file.name.substring(file.name.lastIndexOf(".") + 1);
     if (this.upload.whiteList.indexOf(fileSuffix) === -1) {
       (this as any).$message({
-        message: "您上传的文件暂不支持，请联系管理员",
+        message: (this as any).t('common.unsupportedFileType'),
         type: "warning",
       });
       return false;
@@ -595,7 +593,7 @@ export default class material extends Vue {
     const isLt2M = file.size / 1024 / 1024 < 100;
     if (!isLt2M) {
       (this as any).$message({
-        message: "上传文件大小不能超过 100MB",
+        message: (this as any).t('common.fileSizeLimit'),
         type: "warning",
       });
       return false;
@@ -611,10 +609,10 @@ export default class material extends Vue {
     this.upload.fileList = [];
     this.upload.isUploading = false;
     if (response.code != 200) {
-      (this as any).$message.error("上传失败：" + response.msg);
+      (this as any).$message.error((this as any).t('common.uploadFailed') + response.msg);
     } else {
       (this as any).$message({
-        message: "上传成功！",
+        message: (this as any).t('common.uploadSuccess'),
         type: "success",
       });
     }
@@ -624,7 +622,7 @@ export default class material extends Vue {
   public handleFileError(err, file, fileList) {
     this.upload.fileList = [];
     this.upload.isUploading = false;
-    (this as any).$message.error("上传失败：" + err);
+    (this as any).$message.error((this as any).t('common.uploadFailed') + err);
   }
   /** 确定 */
   public onSubmit() {

package/components/base/dialog/MultiLanguageDialog.vue

@@ -96,7 +96,7 @@ export default {
      */
     getFieldValueByMap(row, field) {
       // 如果直接能找到字段，直接返回
-      if (row[field] !== undefined && row[field] !== null) {
+      if (row[field] !== undefined && row[field] !== null && row[field] !== '') {
         return row[field]
       }
       // 如果找不到，尝试通过 dataLangFieldMap 映射
@@ -104,7 +104,7 @@ export default {
       if (fieldMap) {
         // 查找映射关系中 value 等于 field 的 key
         const mappedKey = Object.keys(fieldMap).find(key => fieldMap[key] === field)
-        if (mappedKey && row[mappedKey] !== undefined && row[mappedKey] !== null) {
+        if (mappedKey && row[mappedKey] !== undefined && row[mappedKey] !== null && row[mappedKey] !== '') {
           return row[mappedKey]
         }
       }
@@ -119,6 +119,7 @@ export default {
       const data = this.config.data.map((row, index) => {
         const item = {
           id: this.getFieldValueByMap(row, this.config.dataLangIdField) || row.configId,
+          // 使用 getFieldValueByMap 获取原始值（会处理字段映射）
           value: this.getFieldValueByMap(row, columnName) || '-',
           configKey: row.configKey
         }
@@ -137,6 +138,7 @@ export default {
         this.tableDataMap[columnName] = this.config.data.map((row, index) => {
           const item = {
             id: this.getFieldValueByMap(row, this.config.dataLangIdField) || row.configId,
+            // 使用 getFieldValueByMap 获取原始值（会处理字段映射）
             value: this.getFieldValueByMap(row, columnName) || '-',
             configKey: row.configKey
           }
@@ -159,6 +161,8 @@ export default {
           }))
           // 语言加载完成后初始化表格数据
           this.initTableData()
+          // 批量查询翻译并回填
+          this.fetchAndFillTranslations()
         }
       }).catch(error => {
         console.error('获取语言列表失败:', error)
@@ -169,6 +173,68 @@ export default {
         ]
         // 语言加载完成后初始化表格数据
         this.initTableData()
+        // 批量查询翻译并回填
+        this.fetchAndFillTranslations()
+      })
+    },
+    /** 批量获取翻译并回填 - 按每个语言调用接口 */
+    fetchAndFillTranslations() {
+      if (!this.config.data || this.config.data.length === 0 || this.languages.length === 0) {
+        return
+      }
+      const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
+      const tenantId = userInfo.tenantId
+
+      // 构建请求参数 - 公共部分
+      const recordIds = this.config.data.map((item) =>
+        String(this.getFieldValueByMap(item, this.config.dataLangIdField))
+      ).filter((id) => id && id !== "" && id !== "undefined" && id !== "null")
+
+      if (recordIds.length === 0) {
+        return
+      }
+
+      // 【重要】循环每个语言，分别调用接口回填
+      this.languages.forEach(lang => {
+        const params = {
+          entityName: this.config.entityName,
+          recordIds: recordIds,
+          columnNames: this.config.dataLangColumnFields,
+          locale: lang.value,
+          tenantId: tenantId
+        }
+
+        // 批量查询翻译接口 - 单语言
+        request({
+          url: '/system/api/i18n/translation/batch-get-multi',
+          method: 'post',
+          data: params
+        }).then(response => {
+          if (response.code === 200 && response.data) {
+            this.fillTranslationsByLocale(response.data, lang.value)
+          }
+        }).catch(error => {
+          console.error(`获取${lang.label}翻译失败:`, error)
+        })
+      })
+    },
+    /** 按指定语言回填到对应的 input 列 */
+    fillTranslationsByLocale(translationMap, currentLocale) {
+      // translationMap 格式：{"1": {"dictName": "用户性别"}}
+      // currentLocale: "zh_CN" / "en_US"
+      this.config.dataLangColumnFields.forEach(columnName => {
+        const tableData = this.tableDataMap[columnName] || []
+        tableData.forEach((rowData, rowIndex) => {
+          const originalRow = this.config.data[rowIndex]
+          const recordId = String(this.getFieldValueByMap(originalRow, this.config.dataLangIdField))
+
+          // 如果这条数据有翻译，放到对应语言的 input 中
+          if (translationMap[recordId] && translationMap[recordId][columnName]) {
+            const translationValue = translationMap[recordId][columnName]
+            // currentLocale = "zh_CN" 对应 rowData["zh_CN"]
+            rowData[currentLocale] = translationValue
+          }
+        })
       })
     },
     handleClose() {

package/list-base-page/listBasePageTs.vue

@@ -1403,6 +1403,8 @@ export default class listBasePage extends Vue {
     dataLangIdField: undefined,
     data: []
   };
+  // 原始数据副本（用于多语言对话框展示原始值）
+  originalListData = [];
   // 树名称
   treeShapeName = undefined;
   defaultProps = {
@@ -2188,6 +2190,8 @@ export default class listBasePage extends Vue {
     )
       .then((response) => {
         this.listData = (response as any).rows;
+        // 保存原始数据副本
+        this.originalListData = JSON.parse(JSON.stringify((response as any).rows));
 
         this.listQueryParams.total = Number((response as any).total);
         this.contentLoading = false;
@@ -2753,8 +2757,11 @@ export default class listBasePage extends Vue {
     //this.setOpMenuEnable();
     this.currentEntities = selection;
     this.setOpMenuEnable();
-    // 更新多语言配置的数据
-    this.multiLanguageConfig.data = selection;
+    // 更新多语言配置的数据 - 使用原始数据而不是已翻译的数据
+    const selectedOriginalData = this.originalListData.filter(item =>
+      selection.some(selected => selected[this.multiLanguageConfig.dataLangIdField] === item[this.multiLanguageConfig.dataLangIdField])
+    );
+    this.multiLanguageConfig.data = selectedOriginalData;
   }
   // 表单重置
   reset() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kz-ui-base",
-  "version": "1.0.160",
+  "version": "1.0.161",
   "description": "",
   "main": "index.js",
   "scripts": {