@fe-free/core 6.0.15 → 6.0.17

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @fe-free/core
 
+## 6.0.17
+
+### Patch Changes
+
+- feat: i18n
+  - @fe-free/icons@6.0.17
+  - @fe-free/tool@6.0.17
+
+## 6.0.16
+
+### Patch Changes
+
+- fix bug
+  - @fe-free/icons@6.0.16
+  - @fe-free/tool@6.0.16
+
 ## 6.0.15
 
 ### Patch Changes

package/i18next.config.ts

@@ -1,10 +1,10 @@
 import { defineConfig } from 'i18next-cli';
 
 export default defineConfig({
-  locales: ['zh-CN', 'en-US'],
+  locales: ['zh-CN', 'zh-HK', 'en-US'],
   extract: {
     primaryLanguage: 'zh-CN',
-    secondaryLanguages: ['en-US'],
+    secondaryLanguages: ['zh-HK', 'en-US'],
     input: ['./src/**/*.{js,jsx,ts,tsx}'],
     output: './src/locales/{{language}}/{{namespace}}.json',
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "6.0.15",
+  "version": "6.0.17",
   "description": "React 业务核心组件库：CRUD、ProForm 扩展、布局、路由、树、上传等（Antd + ProComponents）",
   "license": "ISC",
   "author": "",
@@ -43,8 +43,8 @@
     "i18next-icu": "^2.4.1",
     "react": "^19.2.0",
     "react-i18next": "^16.4.0",
-    "@fe-free/icons": "6.0.15",
-    "@fe-free/tool": "6.0.15"
+    "@fe-free/icons": "6.0.17",
+    "@fe-free/tool": "6.0.17"
   },
   "scripts": {
     "i18n-extract": "rm -rf ./src/locales/zh-CN && npx i18next-cli extract"

package/src/core_app/index.tsx

@@ -3,6 +3,7 @@ import { useTitle } from 'ahooks';
 import { App, ConfigProvider } from 'antd';
 import enUS from 'antd/locale/en_US';
 import zhCN from 'antd/locale/zh_CN';
+import zhHK from 'antd/locale/zh_HK';
 import classNames from 'classnames';
 import { merge } from 'lodash-es';
 import { useEffect, useMemo } from 'react';
@@ -151,7 +152,15 @@ function CoreAppBase(props: CoreAppProps) {
       return configProviderProps.locale;
     }
 
-    return i18n.language === EnumLanguage.EN_US ? enUS : zhCN;
+    if (i18n.language === EnumLanguage.EN_US) {
+      return enUS;
+    }
+
+    if (i18n.language === EnumLanguage.ZH_HK) {
+      return zhHK;
+    }
+
+    return zhCN;
   }, [configProviderProps?.locale, i18n.language]);
 
   return (

package/src/crud/crud_detail.tsx

@@ -4,6 +4,7 @@ import classNames from 'classnames';
 import { isString } from 'lodash-es';
 import { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+
 import type { CRUDProps } from './types';
 
 /**
@@ -121,15 +122,27 @@ function CRUDDetail(props: CRUDDetailProps) {
 
   const handleOpenChange = useCallback(
     async (open) => {
+      // pro-components 有 bug，handleOpenChange 会重复调用，导致调用多次。
+
+      let isSame = false;
+      setIsOpen((v) => {
+        if (open === v) {
+          isSame = true;
+        }
+
+        return open;
+      });
+      if (isSame) {
+        return;
+      }
+
       if (!open) {
         // 关闭重置
         form?.resetFields();
-        setIsOpen(open);
+
         return;
       }
 
-      setIsOpen(open);
-
       if (id) {
         setLoading(true);
 

package/src/i18n.tsx

@@ -3,8 +3,12 @@ import LanguageDetector from 'i18next-browser-languagedetector';
 import ICU from 'i18next-icu';
 import { I18nextProvider, initReactI18next } from 'react-i18next';
 
+import enUSTranslation from './locales/en-US/translation.json';
+import zhHKTranslation from './locales/zh-HK/translation.json';
+
 enum EnumLanguage {
   ZH_CN = 'zh-CN',
+  ZH_HK = 'zh-HK',
   EN_US = 'en-US',
 }
 
@@ -13,6 +17,10 @@ const valueEnumLanguage = {
     text: '中文',
     value: EnumLanguage.ZH_CN,
   },
+  [EnumLanguage.ZH_HK]: {
+    text: '繁體中文',
+    value: EnumLanguage.ZH_HK,
+  },
   [EnumLanguage.EN_US]: {
     text: '英文',
     value: EnumLanguage.EN_US,
@@ -42,9 +50,18 @@ function getDefaultLng() {
   return lng;
 }
 
-function initI18n({ enTranslation = {} }: { enTranslation?: Record<string, unknown> } = {}) {
+function initI18n(
+  resources: {
+    enTranslation?: Record<string, unknown>;
+    zhHKTranslation?: Record<string, unknown>;
+  } = {},
+) {
+  const mergedEnTranslation = { ...enUSTranslation, ...resources.enTranslation };
+  const mergedZhHKTranslation = { ...zhHKTranslation, ...resources.zhHKTranslation };
+
   if (i18n.isInitialized) {
-    i18n.addResourceBundle(EnumLanguage.EN_US, 'translation', enTranslation, true, true);
+    i18n.addResourceBundle(EnumLanguage.ZH_HK, 'translation', mergedZhHKTranslation, true, true);
+    i18n.addResourceBundle(EnumLanguage.EN_US, 'translation', mergedEnTranslation, true, true);
     return;
   }
 
@@ -61,8 +78,11 @@ function initI18n({ enTranslation = {} }: { enTranslation?: Record<string, unkno
       [EnumLanguage.ZH_CN]: {
         translation: {},
       },
+      [EnumLanguage.ZH_HK]: {
+        translation: mergedZhHKTranslation,
+      },
       [EnumLanguage.EN_US]: {
-        translation: enTranslation,
+        translation: mergedEnTranslation,
       },
     },
     lng,

package/src/locales/zh-HK/translation.json

@@ -0,0 +1,87 @@
+{
+  "@fe-free/core": {
+    "app": {
+      "mainScriptNotFound": "沒找到 [data-name=\"mainScript\"]，不啟用更新提醒",
+      "newVersionFound": "發現新版本",
+      "refresh": "重新整理",
+      "refreshPrompt": "請及時重新整理頁面更新，以避免影響使用",
+      "updateLater": "稍後更新"
+    },
+    "crud": {
+      "batchActionConfirm": "確定要執行 {action} 嗎？",
+      "batchDelete": "批次刪除",
+      "cancel": "取消",
+      "clearSelection": "取消選取",
+      "confirm": "確定",
+      "create": "新增",
+      "createSuccess": "新增成功",
+      "delete": "刪除",
+      "deleteConfirm": "確認刪除 \"{name}\" 嗎？",
+      "deleteSuccess": "刪除成功",
+      "deleteWarning": "刪除後不可恢復，請謹慎操作",
+      "operate": "操作",
+      "read": "查看",
+      "requestDeleteByRecordRequired": "沒有傳 requestDeleteByRecord",
+      "selectedItems": "已選 {num} 項",
+      "update": "編輯",
+      "updateSuccess": "更新成功",
+      "warnCreateDetailForm": "actions 包含 create 時，需要傳遞 detailForm",
+      "warnReadDetailForm": "actions 包含 read 時，需要傳遞 detailForm",
+      "warnUpdateDetailForm": "actions 包含 update 時，需要傳遞 detailForm"
+    },
+    "crudOfList": {
+      "searchPlaceholder": "輸入搜尋"
+    },
+    "crudOfPure": {
+      "inputPlaceholder": "請輸入{title}",
+      "selectPlaceholder": "請選擇{title}"
+    },
+    "dataViewer": {
+      "view": "查看"
+    },
+    "fileTree": {
+      "create": "新增",
+      "createSubDirectory": "新增子目錄",
+      "delete": "刪除",
+      "directoryName": "目錄名稱",
+      "update": "編輯"
+    },
+    "formList": {
+      "add": "新增",
+      "duplicateValue": "不能有重複",
+      "edit": "編輯",
+      "emptyOption": "存在空選項"
+    },
+    "infiniteList": {
+      "loadingMore": "載入更多資料中...",
+      "noMoreData": "沒有更多資料"
+    },
+    "record": {
+      "inputPlaceholder": "請輸入"
+    },
+    "upload": {
+      "delete": "刪除",
+      "dragUpload": "點擊或拖曳到此區域進行上傳",
+      "fileCount": "檔案數量 ({success}/{total})",
+      "localUpload": "本機上傳",
+      "maxFilesWarning": "最多只能上傳 {num} 個檔案，超出部分會忽略。",
+      "pleaseSelect": "請選擇"
+    },
+    "valueTypeMap": {
+      "view": "查看"
+    }
+  },
+  "core": {
+    "crud": {
+      "warnBatchDeleteRequestDeleteByRecords": "actions 包含 batch_delete 時，需要傳遞 requestDeleteByRecords",
+      "warnCreateRequestCreateByValues": "actions 包含 create 時，需要傳遞 requestCreateByValues",
+      "warnDeleteProps": "actions 包含 delete 時，需要傳遞 deleteProps 和 requestDeleteByRecord",
+      "warnReadRequestGetByRecord": "actions 包含 read 時，需要傳遞 requestGetByRecord",
+      "warnUpdateRequest": "actions 包含 update 時，需要傳遞 requestGetByRecord 和 requestUpdateByValues"
+    },
+    "crudOfList": {
+      "warnAtLeastOneSearch": "CRUDOfList 的 columns 中至少有一個 search 為 true 的欄位",
+      "warnOnlyOneSearch": "CRUDOfList 的 columns 中只能有一個 search 為 true 的欄位"
+    }
+  }
+}