@skyfox2000/webui 1.5.12 → 1.5.13

package/src/locales/default.ts

@@ -228,134 +228,134 @@ export const defaultLocale = {
                "pleaseInput": "请输入{0}"
             }
          },
+      },
 
-         // 状态存储相关
-         "stores": {
-            "userInfo": {
-               "tokenParseFailed": "Token解析失败",
-               "exiting": "正在退出...",
-               "logoutSuccess": "已退出登录",
-               "authInfoFailed": "获取授权信息失败",
-               "userInfoParseFailed": "用户信息解析失败"
-            },
-            "hostInfo": {
-               "loading": "站点配置加载中……"
-            },
-            "appInfo": {
-               "loadAppListFailed": "加载应用列表失败"
-            }
+      // 状态存储相关
+      "stores": {
+         "userInfo": {
+            "tokenParseFailed": "Token解析失败",
+            "exiting": "正在退出...",
+            "logoutSuccess": "已退出登录",
+            "authInfoFailed": "获取授权信息失败",
+            "userInfoParseFailed": "用户信息解析失败"
          },
-      
-         // 工具函数相关
-         "utils": {
-            "exportTable": {
-               "exportFailed": "导出失败",
-               "fileExportFailed": "文件导出失败，请稍后重试"
-            },
-            "formValidate": {
-               "required": "不能为空",
-               "numberType": "必须是数字",
-               "enum": "必须是{enum}中的一个",
-               "stringLen": "长度必须为{len}",
-               "stringMin": "长度不能小于{min}",
-               "stringMax": "长度不能大于{max}",
-               "stringRange": "长度必须在{min}和{max}之间",
-               "numberLen": "必须为{len}",
-               "numberMin": "不能小于{min}",
-               "numberMax": "不能大于{max}",
-               "numberRange": "必须在{min}和{max}之间",
-               "arrayLen": "长度必须为{len}",
-               "arrayMin": "长度不能小于{min}",
-               "arrayMax": "长度不能大于{max}",
-               "arrayRange": "长度必须在{min}和{max}之间",
-               "formatValidationError": "格式化验证消息出错",
-               "processValidationError": "处理验证规则出错"
-            },
-            "fileUpload": {
-               "pleaseSelectFile": "请选择上传的文件！",
-               "allUploadSuccess": "全部文件上传成功！",
-               "partialUploadFailed": "上传结束，部分文件上传失败！",
-               "saveUploadSuccess": "保存上传成功的文件！",
-               "partialUploadFailedCancel": "上传结束，部分文件上传失败，取消保存！",
-               "allUploadFailed": "上传结束，所有文件上传失败！",
-               "fileUploadSuccess": "文件上传成功！",
-               "fileUploadFailed": "上传文件失败！"
-            },
-            "data": {
-               "executeSuccess": "执行成功！",
-               "noDataToSave": "错误！无保存数据！",
-               "saveSuccess": "保存成功！",
-               "conditionalDeleteForbidden": "错误！禁止无条件删除数据！",
-               "deleteSuccess": "删除成功！",
-               "urlNotSet": "URL未设置: {urlKey}"
-            },
-            "download": {
-               "downloadFailed": "下载文件失败！",
-               "fileDownloadFailed": "文件下载失败，请稍后重试",
-               "fileTypeNotSupported": "文件类型不支持预览",
-               "filePreviewFailed": "文件预览失败！"
-            },
-            "formExcel": {
-               "excelNoSheets": "Excel文件不包含工作表",
-               "excelInsufficientData": "Excel文件不包含足够的数据",
-               "validationError": "验证表格数据时发生错误",
-               "missingDuplicateFields": "表头缺少重复检测所需字段",
-               "fileNotExcel": "上传的文件不是Excel文件",
-               "processFailed": "Excel文件处理失败",
-               "validationSuccess": "数据验证成功",
-               "duplicateValidationPending": "待验证重复数据",
-               "validationFailed": "数据验证失败",
-               "validationPassed": "数据验证通过",
-               "duplicateDetected": "检测到重复数据",
-               "duplicateCheckPassed": "重复性检验通过"
-            },
-            "options": {
-               "notConfigured": "未配置选项数据！",
-               "outFieldsFormatError": "outFields 格式错误：{sourceKey}，必须是 ${index} 或者 ${index}.${key}"
-            },
-            "excelPreview": {
-               "previewUrlNotConfigured": "预览URL或Excel控制器未配置",
-               "fileLoadFailed": "文件加载失败",
-               "csvProcessingFailed": "CSV格式处理失败",
-               "previewFile": "预览文件",
-               "previewFileXlsx": "预览文件.xlsx",
-               "previewFileCsv": "preview.csv",
-               "unsupportedRawFormat": "不支持的原始文件格式",
-               "unsupportedFileFormat": "不支持的文件格式",
-               "dataEmpty": "数据为空",
-               "excelProcessingFailed": "Excel处理失败"
-            },
-            "tools": {
-               "noClickHandler": "未配置点击处理事件！",
-               "refreshTable": "刷新表格",
-               "expandSearch": "展开搜索栏",
-               "collapseSearch": "折叠搜索栏",
-               "rowHeight": "行高调整",
-               "templateManagement": "模板管理",
-               "showCheckbox": "显示多选框",
-               "hideCheckbox": "隐藏多选框",
-               "expandRows": "展开记录行",
-               "collapseRows": "折叠记录行",
-               "exportExcel": "导出Excel",
-               "exportAllRecords": "全部记录",
-               "exportSelectedRecords": "选中的记录",
-               "exportPDF": "导出PDF",
-               "tableHeaderSettings": "表头设置",
-               "setFullscreen": "设置全屏",
-               "exitFullscreen": "取消全屏"
-            },
-            "iconLoader": {
-               "networkError": "网络异常，无法加载图标库！"
-            },
-            "formCsv": {
-               "csvToExcelFailed": "CSV转Excel失败",
-               "csvProcessFailed": "CSV文件处理失败",
-               "unknownError": "未知错误"
-            },
-            "microOpenapis": {
-               "interfaceNotConfigured": "未配置{method}接口！",
-               "apiCallTimeout": "API调用超时: {method}"
-            }
+         "hostInfo": {
+            "loading": "站点配置加载中……"
+         },
+         "appInfo": {
+            "loadAppListFailed": "加载应用列表失败"
+         }
+      },
+   
+      // 工具函数相关
+      "utils": {
+         "exportTable": {
+            "exportFailed": "导出失败",
+            "fileExportFailed": "文件导出失败，请稍后重试"
+         },
+         "formValidate": {
+            "required": "不能为空",
+            "numberType": "必须是数字",
+            "enum": "必须是{enum}中的一个",
+            "stringLen": "长度必须为{len}",
+            "stringMin": "长度不能小于{min}",
+            "stringMax": "长度不能大于{max}",
+            "stringRange": "长度必须在{min}和{max}之间",
+            "numberLen": "必须为{len}",
+            "numberMin": "不能小于{min}",
+            "numberMax": "不能大于{max}",
+            "numberRange": "必须在{min}和{max}之间",
+            "arrayLen": "长度必须为{len}",
+            "arrayMin": "长度不能小于{min}",
+            "arrayMax": "长度不能大于{max}",
+            "arrayRange": "长度必须在{min}和{max}之间",
+            "formatValidationError": "格式化验证消息出错",
+            "processValidationError": "处理验证规则出错"
+         },
+         "fileUpload": {
+            "pleaseSelectFile": "请选择上传的文件！",
+            "allUploadSuccess": "全部文件上传成功！",
+            "partialUploadFailed": "上传结束，部分文件上传失败！",
+            "saveUploadSuccess": "保存上传成功的文件！",
+            "partialUploadFailedCancel": "上传结束，部分文件上传失败，取消保存！",
+            "allUploadFailed": "上传结束，所有文件上传失败！",
+            "fileUploadSuccess": "文件上传成功！",
+            "fileUploadFailed": "上传文件失败！"
+         },
+         "data": {
+            "executeSuccess": "执行成功！",
+            "noDataToSave": "错误！无保存数据！",
+            "saveSuccess": "保存成功！",
+            "conditionalDeleteForbidden": "错误！禁止无条件删除数据！",
+            "deleteSuccess": "删除成功！",
+            "urlNotSet": "URL未设置: {urlKey}"
+         },
+         "download": {
+            "downloadFailed": "下载文件失败！",
+            "fileDownloadFailed": "文件下载失败，请稍后重试",
+            "fileTypeNotSupported": "文件类型不支持预览",
+            "filePreviewFailed": "文件预览失败！"
+         },
+         "formExcel": {
+            "excelNoSheets": "Excel文件不包含工作表",
+            "excelInsufficientData": "Excel文件不包含足够的数据",
+            "validationError": "验证表格数据时发生错误",
+            "missingDuplicateFields": "表头缺少重复检测所需字段",
+            "fileNotExcel": "上传的文件不是Excel文件",
+            "processFailed": "Excel文件处理失败",
+            "validationSuccess": "数据验证成功",
+            "duplicateValidationPending": "待验证重复数据",
+            "validationFailed": "数据验证失败",
+            "validationPassed": "数据验证通过",
+            "duplicateDetected": "检测到重复数据",
+            "duplicateCheckPassed": "重复性检验通过"
+         },
+         "options": {
+            "notConfigured": "未配置选项数据！",
+            "outFieldsFormatError": "outFields 格式错误：{sourceKey}，必须是 ${index} 或者 ${index}.${key}"
+         },
+         "excelPreview": {
+            "previewUrlNotConfigured": "预览URL或Excel控制器未配置",
+            "fileLoadFailed": "文件加载失败",
+            "csvProcessingFailed": "CSV格式处理失败",
+            "previewFile": "预览文件",
+            "previewFileXlsx": "预览文件.xlsx",
+            "previewFileCsv": "preview.csv",
+            "unsupportedRawFormat": "不支持的原始文件格式",
+            "unsupportedFileFormat": "不支持的文件格式",
+            "dataEmpty": "数据为空",
+            "excelProcessingFailed": "Excel处理失败"
+         },
+         "tools": {
+            "noClickHandler": "未配置点击处理事件！",
+            "refreshTable": "刷新表格",
+            "expandSearch": "展开搜索栏",
+            "collapseSearch": "折叠搜索栏",
+            "rowHeight": "行高调整",
+            "templateManagement": "模板管理",
+            "showCheckbox": "显示多选框",
+            "hideCheckbox": "隐藏多选框",
+            "expandRows": "展开记录行",
+            "collapseRows": "折叠记录行",
+            "exportExcel": "导出Excel",
+            "exportAllRecords": "全部记录",
+            "exportSelectedRecords": "选中的记录",
+            "exportPDF": "导出PDF",
+            "tableHeaderSettings": "表头设置",
+            "setFullscreen": "设置全屏",
+            "exitFullscreen": "取消全屏"
+         },
+         "iconLoader": {
+            "networkError": "网络异常，无法加载图标库！"
+         },
+         "formCsv": {
+            "csvToExcelFailed": "CSV转Excel失败",
+            "csvProcessFailed": "CSV文件处理失败",
+            "unknownError": "未知错误"
+         },
+         "microOpenapis": {
+            "interfaceNotConfigured": "未配置{method}接口！",
+            "apiCallTimeout": "API调用超时: {method}"
          }
       }
    }

package/src/locales/en-US.json

@@ -254,7 +254,8 @@
             "noDataToSave": "Error! No data to save!",
             "saveSuccess": "Save successful!",
             "conditionalDeleteForbidden": "Error! Unconditional data deletion is forbidden!",
-            "deleteSuccess": "Delete successful!"
+            "deleteSuccess": "Delete successful!",
+            "urlNotSet": "URL not set: {urlKey}"
          },
          "download": {
             "downloadFailed": "File download failed!",
@@ -277,7 +278,8 @@
             "duplicateCheckPassed": "Duplicate check passed"
          },
          "options": {
-            "notConfigured": "Options data not configured!"
+            "notConfigured": "Options data not configured!",
+            "outFieldsFormatError": "outFields format error: {sourceKey}, must be ${index} or ${index}.${key}"
          },
          "form": {
             "submitValidationFailed": "Validation failed when submitting form!",
@@ -314,6 +316,10 @@
             "csvToExcelFailed": "CSV to Excel conversion failed",
             "csvProcessFailed": "CSV file processing failed",
             "unknownError": "Unknown error"
+         },
+         "microOpenapis": {
+            "interfaceNotConfigured": "{method} interface not configured!",
+            "apiCallTimeout": "API call timeout: {method}"
          }
       }
    }

package/src/locales/index.ts

@@ -89,7 +89,11 @@ async function loadLocaleFromCloud(locale: string): Promise<LocaleMessages> {
       const cloudMessages = await response.json();
       return cloudMessages;
    } catch (error) {
-      console.error(`Error loading locale ${locale}:`, error);
+      // 只有在网络错误等真正异常情况下才记录错误（但仍不显示给用户）
+      // fetch的网络错误通常是TypeError，而HTTP错误状态码不会触发catch
+      if (error instanceof TypeError) {
+         console.error(`Error loading locale ${locale}:`, error);
+      }
       // 如果加载失败，返回空对象
       return {};
    }
@@ -201,55 +205,71 @@ export function getI18nMessages(
    return loadedMessages;
 }
 
+/**
+ * 优化的深拷贝函数 - 避免JSON.parse/stringify的性能问题
+ */
+function deepClone<T>(obj: T): T {
+   if (obj === null || typeof obj !== 'object') {
+      return obj;
+   }
+   
+   if (obj instanceof Date) {
+      return new Date(obj.getTime()) as unknown as T;
+   }
+   
+   if (obj instanceof Array) {
+      return obj.map(item => deepClone(item)) as unknown as T;
+   }
+   
+   if (typeof obj === 'object') {
+      const cloned = {} as T;
+      for (const key in obj) {
+         if (obj.hasOwnProperty(key)) {
+            cloned[key] = deepClone(obj[key]);
+         }
+      }
+      return cloned;
+   }
+   
+   return obj;
+}
+
 /**
  * 加载语言包 - 使用缓存优先策略
- * 实现合并逻辑：loadLocaleFromCloud未加载前，低defaultLocale+本地缓存高
- * 确保不修改原始数据，创建新对象
+ * 实现合并逻辑：defaultLocale作为基础，缓存和云端进行合并
+ * 确保异步加载完成后再继续执行
  */
 async function loadLocale(locale: string): Promise<void> {
-   // 优先使用缓存
+   // 1. 首先加载defaultLocale作为基础
+   const baseMessages = deepClone(defaultLocale);
+   
+   // 2. 获取本地缓存（如果有）
    const cachedMessages = getCachedLocale(locale);
    
-   // 合并逻辑：低defaultLocale + 本地缓存高
-   let finalMessages: LocaleMessages;
-   if (cachedMessages) {
-      // 本地缓存优先级高于defaultLocale，确保创建新对象
-      finalMessages = deepMerge(JSON.parse(JSON.stringify(defaultLocale)), cachedMessages);
-
-   } else {
-      // 没有缓存，只有zh-CN才使用defaultLocale
-      if (locale === 'zh-CN') {
-         finalMessages = JSON.parse(JSON.stringify(defaultLocale));
-
-      } else {
-         // 其他语言没有缓存时，使用空对象
-         finalMessages = {};
-
-      }
+   // 3. 同步加载云端语言包（必须等待完成）
+   let cloudMessages: LocaleMessages = {};
+   try {
+      cloudMessages = await loadLocaleFromCloud(locale);
+   } catch (error) {
+      // 加载失败时使用空对象，不报错
+   }
+   
+   // 4. 合并策略：defaultLocale + 缓存 + 云端
+   // 优先级：云端 > 缓存 > defaultLocale
+   let finalMessages = baseMessages;
+   
+   if (cachedMessages && Object.keys(cachedMessages).length > 0) {
+      finalMessages = deepMerge(finalMessages, cachedMessages);
+   }
+   
+   if (cloudMessages && Object.keys(cloudMessages).length > 0) {
+      finalMessages = deepMerge(finalMessages, cloudMessages);
    }
    
-   // 存入本地内存和缓存
+   // 5. 设置到内存和缓存
    loadedMessages[locale] = finalMessages;
    i18n.global.setLocaleMessage(locale, finalMessages);
    cacheLocale(locale, finalMessages);
-
-
-   // 强制加载更新：无论是否有缓存，都强制加载最新语言包
-   try {
-      // 强制加载最新语言包并直接更新缓存和内存
-      const freshMessages = await loadLocaleFromCloud(locale);
-      
-      // 合并逻辑：低defaultLocale + loadLocaleFromCloud高，确保创建新对象
-      const updatedMessages = deepMerge(JSON.parse(JSON.stringify(defaultLocale)), freshMessages);
-      
-      loadedMessages[locale] = updatedMessages;
-      i18n.global.setLocaleMessage(locale, updatedMessages);
-      cacheLocale(locale, updatedMessages);
-
-   } catch (error) {
-      // 加载失败时跳过，不报错
-
-   }
 }
 /**
  * 初始化语言 - 使用缓存优先+异步后台加载策略
@@ -327,7 +347,7 @@ export function $t(key: string, params?: Record<string, any>): string {
       const result = i18n.global.t(key, params);
       // 如果返回的是翻译键本身，说明没有找到翻译
       if (result === key) {
-
+         
          
          // 检查当前messages是否为空
          const currentMessages = i18n.global.getLocaleMessage(i18n.global.locale.value);