@creekjs/web-components 1.0.10 → 1.0.12

package/.turbo/turbo-father$colon$build.log

@@ -1,54 +1,54 @@
 
 
-> @creekjs/web-components@1.0.9 father:build /Users/ernestwang/Documents/code-resoorce/creek/packages/web-components
+> @creekjs/web-components@1.0.11 father:build /Users/ernestwang/Documents/code-resoorce/creek/packages/web-components
 > father build
 
 info  - Clean output directories
 info  - Bundless for src directory to cjs format
+event - Bundless index.tsx to dist/creek-config-provider/index.js (with declaration)
 event - Bundless CreekConfigContext.tsx to dist/creek-config-provider/CreekConfigContext.js (with declaration)
 event - Bundless index.ts to dist/creek-hooks/index.js (with declaration)
 event - Bundless CreekI18nProvider.tsx to dist/creek-config-provider/CreekI18nProvider.js (with declaration)
-event - Bundless types.ts to dist/creek-hooks/useApp/types.js (with declaration)
-event - Bundless ModalHelper.tsx to dist/creek-hooks/useApp/ModalHelper.js (with declaration)
+event - Bundless DrawerHelper.tsx to dist/creek-hooks/useApp/DrawerHelper.js (with declaration)
 event - Bundless index.tsx to dist/creek-hooks/useApp/index.js (with declaration)
-event - Bundless useViewportHeight.tsx to dist/creek-hooks/useViewportHeight.js (with declaration)
+event - Bundless ModalHelper.tsx to dist/creek-hooks/useApp/ModalHelper.js (with declaration)
+event - Bundless types.ts to dist/creek-hooks/useApp/types.js (with declaration)
 event - Bundless index.tsx to dist/creek-icon/index.js (with declaration)
+event - Bundless FullScreen.tsx to dist/creek-layout/ActionRender/FullScreen.js (with declaration)
 event - Bundless index.tsx to dist/creek-keep-alive/index.js (with declaration)
+event - Bundless index.tsx to dist/creek-layout/ActionRender/index.js (with declaration)
+event - Bundless UserInfo.tsx to dist/creek-layout/ActionRender/UserInfo.js (with declaration)
+event - Bundless LayoutSettings.tsx to dist/creek-layout/ActionRender/LayoutSettings.js (with declaration)
 event - Bundless index.tsx to dist/creek-layout/Exception/index.js (with declaration)
-event - Bundless DrawerHelper.tsx to dist/creek-hooks/useApp/DrawerHelper.js (with declaration)
-event - Bundless index.tsx to dist/creek-config-provider/index.js (with declaration)
-event - Bundless FullScreen.tsx to dist/creek-layout/ActionRender/FullScreen.js (with declaration)
+event - Bundless NotFound.tsx to dist/creek-layout/Exception/NotFound.js (with declaration)
 event - Bundless CollapseButton.tsx to dist/creek-layout/CollapseButton.js (with declaration)
 event - Bundless NotFoundPage.tsx to dist/creek-layout/Exception/NotFoundPage.js (with declaration)
-event - Bundless NotFound.tsx to dist/creek-layout/Exception/NotFound.js (with declaration)
-event - Bundless index.tsx to dist/creek-layout/ActionRender/index.js (with declaration)
-event - Bundless useLayoutSettingsStore.ts to dist/creek-layout/useLayoutSettingsStore.js (with declaration)
 event - Bundless index.tsx to dist/creek-layout/index.js (with declaration)
-event - Bundless LayoutSettings.tsx to dist/creek-layout/ActionRender/LayoutSettings.js (with declaration)
 event - Bundless index.tsx to dist/creek-loading/index.js (with declaration)
-event - Bundless index.tsx to dist/creek-page-container/index.js (with declaration)
-event - Bundless UserInfo.tsx to dist/creek-layout/ActionRender/UserInfo.js (with declaration)
 event - Bundless index.tsx to dist/creek-locale-button/index.js (with declaration)
 event - Bundless index.ts to dist/creek-style/index.js (with declaration)
-event - Bundless DensityIcon.tsx to dist/creek-table/components/DensityIcon.js (with declaration)
+event - Bundless scrollbar.ts to dist/creek-style/scrollbar.js (with declaration)
+event - Bundless index.tsx to dist/creek-page-container/index.js (with declaration)
 event - Bundless EllipsisTooltip.tsx to dist/creek-table/components/EllipsisTooltip.js (with declaration)
-event - Bundless index.tsx to dist/creek-table/components/index.js (with declaration)
+event - Bundless DensityIcon.tsx to dist/creek-table/components/DensityIcon.js (with declaration)
 event - Bundless index.ts to dist/creek-table/hooks/index.js (with declaration)
+event - Bundless index.tsx to dist/creek-table/components/index.js (with declaration)
 event - Bundless useAdaptiveToolBar.tsx to dist/creek-table/hooks/useAdaptiveToolBar.js (with declaration)
-event - Bundless scrollbar.ts to dist/creek-style/scrollbar.js (with declaration)
-event - Bundless useAutoWidthColumns.tsx to dist/creek-table/hooks/useAutoWidthColumns.js (with declaration)
 event - Bundless useEllipsisColumns.tsx to dist/creek-table/hooks/useEllipsisColumns.js (with declaration)
+event - Bundless useAutoWidthColumns.tsx to dist/creek-table/hooks/useAutoWidthColumns.js (with declaration)
 event - Bundless useIndexColumn.tsx to dist/creek-table/hooks/useIndexColumn.js (with declaration)
 event - Bundless useResizableColumns.tsx to dist/creek-table/hooks/useResizableColumns.js (with declaration)
 event - Bundless useElementDistance.tsx to dist/creek-table/hooks/useElementDistance.js (with declaration)
+event - Bundless index.tsx to dist/creek-table/index.js (with declaration)
 event - Bundless useTableOptions.tsx to dist/creek-table/hooks/useTableOptions.js (with declaration)
 event - Bundless useTableScrollHeight.tsx to dist/creek-table/hooks/useTableScrollHeight.js (with declaration)
-event - Bundless SearchTable.tsx to dist/creek-table/SearchTable.js (with declaration)
 event - Bundless type.ts to dist/creek-table/type.js (with declaration)
-event - Bundless useStatusColumns.tsx to dist/creek-table/hooks/useStatusColumns.js (with declaration)
+event - Bundless zh_CN.ts to dist/locales/zh_CN.js (with declaration)
+event - Bundless useViewportHeight.tsx to dist/creek-hooks/useViewportHeight.js (with declaration)
 event - Bundless index.tsx to dist/index.js (with declaration)
-event - Bundless en-US.ts to dist/locales/en-US.js (with declaration)
-event - Bundless index.tsx to dist/creek-table/index.js (with declaration)
-event - Bundless zh-CN.ts to dist/locales/zh-CN.js (with declaration)
+event - Bundless useLayoutSettingsStore.ts to dist/creek-layout/useLayoutSettingsStore.js (with declaration)
+event - Bundless en_US.ts to dist/locales/en_US.js (with declaration)
+event - Bundless useStatusColumns.tsx to dist/creek-table/hooks/useStatusColumns.js (with declaration)
+event - Bundless SearchTable.tsx to dist/creek-table/SearchTable.js (with declaration)
 event - Generate declaration files...
-event - Transformed successfully in 4375 ms (45 files)
+event - Transformed successfully in 6572 ms (45 files)

package/dist/creek-config-provider/CreekConfigContext.d.ts

@@ -1,9 +1,5 @@
 /// <reference types="react" />
 export type CreekConfigContextProps = {
     iconFontCNs?: string[];
-    /**
-     * 国际化语言包
-     */
-    locale?: Record<string, string>;
 };
 export declare const CreekConfigContext: import("react").Context<CreekConfigContextProps>;

package/dist/creek-config-provider/CreekConfigContext.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/creek-config-provider/CreekConfigContext.tsx"],
-  "sourcesContent": ["import { createContext } from 'react';\n\nexport type CreekConfigContextProps = {\n  iconFontCNs?: string[];\n  /**\n   * 国际化语言包\n   */\n  locale?: Record<string, string>;\n};\n\nexport const CreekConfigContext = createContext<CreekConfigContextProps>({});\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA8B;AAUvB,IAAM,yBAAqB,4BAAuC,CAAC,CAAC;",
+  "sourcesContent": ["import { createContext } from 'react';\n\nexport type CreekConfigContextProps = {\n  iconFontCNs?: string[];\n};\n\nexport const CreekConfigContext = createContext<CreekConfigContextProps>({});\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA8B;AAMvB,IAAM,yBAAqB,4BAAuC,CAAC,CAAC;",
   "names": []
 }

package/dist/creek-config-provider/CreekI18nProvider.d.ts

@@ -1,22 +1,23 @@
 import type { ReactNode } from 'react';
+export type LocaleCode = 'en_US' | 'zh_CN';
 export interface CreekI18nProviderProps {
     children?: ReactNode;
     /**
      * 语言标识
-     * @default 'zh-CN'
+     * @default 'zh_CN'
      */
-    locale?: string;
+    locale?: LocaleCode;
     /**
      * 国际化语言包，透传给 react-intl
      */
     messages?: Record<string, string>;
 }
 export declare const LocaleContext: import("react").Context<{
-    locale: string;
+    locale: LocaleCode;
     changeLocale: (lang: string) => void;
 }>;
 export declare const useAppLocale: () => {
-    locale: string;
+    locale: LocaleCode;
     changeLocale: (lang: string) => void;
 };
 export declare const CreekI18nProvider: (props: CreekI18nProviderProps) => import("react/jsx-runtime").JSX.Element;

package/dist/creek-config-provider/CreekI18nProvider.js

@@ -36,52 +36,75 @@ __export(CreekI18nProvider_exports, {
 module.exports = __toCommonJS(CreekI18nProvider_exports);
 var import_react = require("react");
 var import_react2 = require("@creekjs/i18n/react");
-var import_en_US = __toESM(require("../locales/en-US"));
-var import_zh_CN = __toESM(require("../locales/zh-CN"));
+var import_en_US = __toESM(require("../locales/en_US"));
+var import_zh_CN = __toESM(require("../locales/zh_CN"));
 var import_jsx_runtime = require("react/jsx-runtime");
-var DEFAULT_LOCALE = "zh-CN";
+var DEFAULT_LOCALE = "zh_CN";
+var SUPPORTED_LOCALES = ["zh_CN", "en_US"];
+var toUnderscoreLocale = (input) => {
+  if (!input)
+    return DEFAULT_LOCALE;
+  const normalized = input.replace("-", "_");
+  return SUPPORTED_LOCALES.includes(normalized) ? normalized : DEFAULT_LOCALE;
+};
 var MESSAGES_MAP = {
-  [DEFAULT_LOCALE]: import_zh_CN.default,
-  "en-US": import_en_US.default
+  zh_CN: import_zh_CN.default,
+  en_US: import_en_US.default
 };
 var LocaleContext = (0, import_react.createContext)({
-  locale: (0, import_react2.getLocale)() || DEFAULT_LOCALE,
+  locale: toUnderscoreLocale((0, import_react2.getLocale)()),
   changeLocale: (lang) => {
   }
 });
 var useAppLocale = () => (0, import_react.useContext)(LocaleContext);
 var CreekI18nProvider = (props) => {
-  var _a;
   const { children, locale, messages } = props;
   const parentIntl = (0, import_react.useContext)(import_react2.IntlContext);
-  const [intl, setIntl] = (0, import_react.useState)(() => (0, import_react2.getIntl)());
+  const [internalLocale, setInternalLocale] = (0, import_react.useState)();
   const changeLocale = (0, import_react.useCallback)((lang) => {
-    (0, import_react2.setLocale)(lang, false);
-    setIntl((0, import_react2.getIntl)());
+    const underscore = toUnderscoreLocale(lang);
+    (0, import_react2.setLocale)(underscore, false);
+    setInternalLocale(underscore);
   }, []);
-  const currentLocale = (intl == null ? void 0 : intl.locale) || locale || (parentIntl == null ? void 0 : parentIntl.locale) || DEFAULT_LOCALE;
-  const intlConfig = parentIntl || intl || {};
-  const safeConfig = {
-    formats: intlConfig.formats,
-    defaultLocale: intlConfig.defaultLocale,
-    defaultFormats: intlConfig.defaultFormats,
-    onError: intlConfig.onError
-  };
-  let baseMessages = {};
-  if (parentIntl && parentIntl.locale === currentLocale) {
-    baseMessages = parentIntl.messages;
-  } else {
-    baseMessages = ((_a = (0, import_react2.getIntl)()) == null ? void 0 : _a.messages) || {};
-  }
-  const finalMessages = {
-    ...baseMessages,
-    ...MESSAGES_MAP[currentLocale] || import_zh_CN.default,
-    ...messages || {}
-  };
+  const currentLocale = (0, import_react.useMemo)(() => {
+    var _a;
+    const rawLocale = internalLocale || locale || (parentIntl == null ? void 0 : parentIntl.locale) || ((_a = (0, import_react2.getIntl)()) == null ? void 0 : _a.locale) || DEFAULT_LOCALE;
+    return toUnderscoreLocale(rawLocale);
+  }, [internalLocale, locale, parentIntl == null ? void 0 : parentIntl.locale]);
+  const safeConfig = (0, import_react.useMemo)(() => {
+    const intlConfig = parentIntl || (0, import_react2.getIntl)() || {};
+    return {
+      formats: intlConfig.formats,
+      defaultLocale: intlConfig.defaultLocale,
+      defaultFormats: intlConfig.defaultFormats,
+      onError: intlConfig.onError
+    };
+  }, [parentIntl]);
+  const finalMessages = (0, import_react.useMemo)(() => {
+    var _a, _b;
+    let baseMessages = {};
+    if (parentIntl && parentIntl.locale === currentLocale.replace("_", "-")) {
+      baseMessages = parentIntl.messages;
+    } else {
+      baseMessages = ((_a = import_react2.appLocales) == null ? void 0 : _a[currentLocale]) || ((_b = (0, import_react2.getIntl)()) == null ? void 0 : _b.messages) || {};
+    }
+    return {
+      ...baseMessages,
+      ...MESSAGES_MAP[currentLocale] || import_zh_CN.default,
+      ...messages || {}
+    };
+  }, [parentIntl, currentLocale, messages]);
   (0, import_react.useEffect)(() => {
     (0, import_react2.setLocaleMessages)(currentLocale, finalMessages);
   }, [currentLocale, finalMessages]);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react2.IntlProvider, { ...safeConfig, locale: currentLocale, messages: finalMessages, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LocaleContext.Provider, { value: { locale: currentLocale, changeLocale }, children }) });
+  const contextValue = (0, import_react.useMemo)(
+    () => ({
+      locale: currentLocale,
+      changeLocale
+    }),
+    [currentLocale, changeLocale]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react2.IntlProvider, { ...safeConfig, locale: currentLocale.replace("_", "-"), messages: finalMessages, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LocaleContext.Provider, { value: contextValue, children }) });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/creek-config-provider/CreekI18nProvider.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/creek-config-provider/CreekI18nProvider.tsx"],
-  "sourcesContent": ["import type { ReactNode } from 'react';\nimport { createContext, useCallback, useContext, useEffect, useState } from 'react';\n\nimport { IntlContext, IntlProvider, getIntl, getLocale, setLocale, setLocaleMessages } from '@creekjs/i18n/react';\n\nimport enUS from '../locales/en-US';\nimport zhCN from '../locales/zh-CN';\n\nconst DEFAULT_LOCALE = 'zh-CN';\n\nexport interface CreekI18nProviderProps {\n  children?: ReactNode;\n  /**\n   * 语言标识\n   * @default 'zh-CN'\n   */\n  locale?: string;\n  /**\n   * 国际化语言包，透传给 react-intl\n   */\n  messages?: Record<string, string>;\n}\n\nconst MESSAGES_MAP: Record<string, Record<string, string>> = {\n  [DEFAULT_LOCALE]: zhCN,\n  'en-US': enUS,\n};\n\nexport const LocaleContext = createContext({\n  locale: getLocale() || DEFAULT_LOCALE,\n  changeLocale: (lang: string) => {},\n});\n\nexport const useAppLocale = () => useContext(LocaleContext);\n\nexport const CreekI18nProvider = (props: CreekI18nProviderProps) => {\n  const { children, locale, messages } = props;\n\n  // Try to get parent intl context\n  const parentIntl = useContext(IntlContext);\n\n  const [intl, setIntl] = useState(() => getIntl());\n\n  const changeLocale = useCallback((lang: string) => {\n    setLocale(lang, false);\n    setIntl(getIntl());\n  }, []);\n\n  // 1. 确定最终生效的 locale\n  // 优先级：当前组件内部的 state > props.locale > parentIntl.locale > 全局默认\n  const currentLocale = intl?.locale || locale || parentIntl?.locale || DEFAULT_LOCALE;\n\n  // 2. 提取父级上下文的安全配置 (避免将 IntlShape 的内部方法直接传给 IntlProvider)\n  const intlConfig = parentIntl || intl || {};\n  const safeConfig = {\n    formats: intlConfig.formats,\n    defaultLocale: intlConfig.defaultLocale,\n    defaultFormats: intlConfig.defaultFormats,\n    onError: intlConfig.onError,\n  };\n\n  // 3. 确定最终的 messages\n  // 避免使用 stale 的 parentIntl.messages\n  let baseMessages = {};\n  if (parentIntl && parentIntl.locale === currentLocale) {\n    baseMessages = parentIntl.messages;\n  } else {\n    baseMessages = getIntl()?.messages || {};\n  }\n\n  const finalMessages = {\n    ...baseMessages,\n    ...(MESSAGES_MAP[currentLocale] || zhCN),\n    ...(messages || {}),\n  };\n\n  // 4. 同步给全局 globalIntl，确保非 React 组件能够拿到\n  useEffect(() => {\n    setLocaleMessages(currentLocale, finalMessages);\n  }, [currentLocale, finalMessages]);\n\n  return (\n    <IntlProvider {...safeConfig} locale={currentLocale} messages={finalMessages}>\n      <LocaleContext.Provider value={{ locale: currentLocale, changeLocale }}>{children}</LocaleContext.Provider>\n    </IntlProvider>\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAA4E;AAE5E,IAAAA,gBAA4F;AAE5F,mBAAiB;AACjB,mBAAiB;AA6EX;AA3EN,IAAM,iBAAiB;AAevB,IAAM,eAAuD;AAAA,EAC3D,CAAC,cAAc,GAAG,aAAAC;AAAA,EAClB,SAAS,aAAAC;AACX;AAEO,IAAM,oBAAgB,4BAAc;AAAA,EACzC,YAAQ,yBAAU,KAAK;AAAA,EACvB,cAAc,CAAC,SAAiB;AAAA,EAAC;AACnC,CAAC;AAEM,IAAM,eAAe,UAAM,yBAAW,aAAa;AAEnD,IAAM,oBAAoB,CAAC,UAAkC;AAnCpE;AAoCE,QAAM,EAAE,UAAU,QAAQ,SAAS,IAAI;AAGvC,QAAM,iBAAa,yBAAW,yBAAW;AAEzC,QAAM,CAAC,MAAM,OAAO,QAAI,uBAAS,UAAM,uBAAQ,CAAC;AAEhD,QAAM,mBAAe,0BAAY,CAAC,SAAiB;AACjD,iCAAU,MAAM,KAAK;AACrB,gBAAQ,uBAAQ,CAAC;AAAA,EACnB,GAAG,CAAC,CAAC;AAIL,QAAM,iBAAgB,6BAAM,WAAU,WAAU,yCAAY,WAAU;AAGtE,QAAM,aAAa,cAAc,QAAQ,CAAC;AAC1C,QAAM,aAAa;AAAA,IACjB,SAAS,WAAW;AAAA,IACpB,eAAe,WAAW;AAAA,IAC1B,gBAAgB,WAAW;AAAA,IAC3B,SAAS,WAAW;AAAA,EACtB;AAIA,MAAI,eAAe,CAAC;AACpB,MAAI,cAAc,WAAW,WAAW,eAAe;AACrD,mBAAe,WAAW;AAAA,EAC5B,OAAO;AACL,qBAAe,gCAAQ,MAAR,mBAAW,aAAY,CAAC;AAAA,EACzC;AAEA,QAAM,gBAAgB;AAAA,IACpB,GAAG;AAAA,IACH,GAAI,aAAa,aAAa,KAAK,aAAAD;AAAA,IACnC,GAAI,YAAY,CAAC;AAAA,EACnB;AAGA,8BAAU,MAAM;AACd,yCAAkB,eAAe,aAAa;AAAA,EAChD,GAAG,CAAC,eAAe,aAAa,CAAC;AAEjC,SACE,4CAAC,8BAAc,GAAG,YAAY,QAAQ,eAAe,UAAU,eAC7D,sDAAC,cAAc,UAAd,EAAuB,OAAO,EAAE,QAAQ,eAAe,aAAa,GAAI,UAAS,GACpF;AAEJ;",
+  "sourcesContent": ["import type { ReactNode } from 'react';\nimport { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';\n\nimport { IntlContext, IntlProvider, appLocales, getIntl, getLocale, setLocale, setLocaleMessages } from '@creekjs/i18n/react';\n\nimport enUS from '../locales/en_US';\nimport zhCN from '../locales/zh_CN';\n\nconst DEFAULT_LOCALE = 'zh_CN';\n\nexport type LocaleCode = 'en_US' | 'zh_CN';\n\nconst SUPPORTED_LOCALES: LocaleCode[] = ['zh_CN', 'en_US'];\n\nconst toUnderscoreLocale = (input?: string): LocaleCode => {\n  if (!input) return DEFAULT_LOCALE;\n  const normalized = input.replace('-', '_') as LocaleCode;\n  return SUPPORTED_LOCALES.includes(normalized) ? normalized : DEFAULT_LOCALE;\n};\n\nexport interface CreekI18nProviderProps {\n  children?: ReactNode;\n  /**\n   * 语言标识\n   * @default 'zh_CN'\n   */\n  locale?: LocaleCode;\n  /**\n   * 国际化语言包，透传给 react-intl\n   */\n  messages?: Record<string, string>;\n}\n\nconst MESSAGES_MAP: Record<LocaleCode, Record<string, string>> = {\n  zh_CN: zhCN,\n  en_US: enUS,\n};\n\nexport const LocaleContext = createContext({\n  locale: toUnderscoreLocale(getLocale()),\n  changeLocale: (lang: string) => {},\n});\n\nexport const useAppLocale = () => useContext(LocaleContext);\n\nexport const CreekI18nProvider = (props: CreekI18nProviderProps) => {\n  const { children, locale, messages } = props;\n\n  // 获取父级 intl context\n  const parentIntl = useContext(IntlContext);\n\n  // 内部维护的 locale 状态，仅在调用 changeLocale 时更新\n  const [internalLocale, setInternalLocale] = useState<string>();\n\n  const changeLocale = useCallback((lang: string) => {\n    const underscore = toUnderscoreLocale(lang);\n    setLocale(underscore, false);\n    setInternalLocale(underscore);\n  }, []);\n\n  // 1. 确定最终生效的 locale\n  // 优先级：当前组件内部的 state > props.locale > parentIntl.locale > 全局默认\n  const currentLocale = useMemo(() => {\n    const rawLocale = internalLocale || locale || parentIntl?.locale || getIntl()?.locale || DEFAULT_LOCALE;\n    return toUnderscoreLocale(rawLocale);\n  }, [internalLocale, locale, parentIntl?.locale]);\n\n  // 2. 提取父级上下文的安全配置 (避免将 IntlShape 的内部方法直接传给 IntlProvider)\n  const safeConfig = useMemo(() => {\n    const intlConfig = parentIntl || getIntl() || {};\n    return {\n      formats: intlConfig.formats,\n      defaultLocale: intlConfig.defaultLocale,\n      defaultFormats: intlConfig.defaultFormats,\n      onError: intlConfig.onError,\n    };\n  }, [parentIntl]);\n\n  // 3. 确定最终的 messages\n  // 避免使用 stale 的 parentIntl.messages\n  const finalMessages = useMemo(() => {\n    let baseMessages: Record<string, any> = {};\n    if (parentIntl && parentIntl.locale === currentLocale.replace('_', '-')) {\n      baseMessages = parentIntl.messages;\n    } else {\n      // 优先从 appLocales 中获取对应语言的 messages\n      baseMessages = appLocales?.[currentLocale] || getIntl()?.messages || {};\n    }\n\n    return {\n      ...baseMessages,\n      ...(MESSAGES_MAP[currentLocale] || zhCN),\n      ...(messages || {}),\n    };\n  }, [parentIntl, currentLocale, messages]);\n\n  // 4. 同步给全局 globalIntl，确保非 React 组件能够拿到\n  useEffect(() => {\n    setLocaleMessages(currentLocale, finalMessages);\n  }, [currentLocale, finalMessages]);\n\n  const contextValue = useMemo(\n    () => ({\n      locale: currentLocale,\n      changeLocale,\n    }),\n    [currentLocale, changeLocale],\n  );\n\n  return (\n    <IntlProvider {...safeConfig} locale={currentLocale.replace('_', '-')} messages={finalMessages}>\n      <LocaleContext.Provider value={contextValue}>{children}</LocaleContext.Provider>\n    </IntlProvider>\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAAqF;AAErF,IAAAA,gBAAwG;AAExG,mBAAiB;AACjB,mBAAiB;AAyGX;AAvGN,IAAM,iBAAiB;AAIvB,IAAM,oBAAkC,CAAC,SAAS,OAAO;AAEzD,IAAM,qBAAqB,CAAC,UAA+B;AACzD,MAAI,CAAC;AAAO,WAAO;AACnB,QAAM,aAAa,MAAM,QAAQ,KAAK,GAAG;AACzC,SAAO,kBAAkB,SAAS,UAAU,IAAI,aAAa;AAC/D;AAeA,IAAM,eAA2D;AAAA,EAC/D,OAAO,aAAAC;AAAA,EACP,OAAO,aAAAC;AACT;AAEO,IAAM,oBAAgB,4BAAc;AAAA,EACzC,QAAQ,uBAAmB,yBAAU,CAAC;AAAA,EACtC,cAAc,CAAC,SAAiB;AAAA,EAAC;AACnC,CAAC;AAEM,IAAM,eAAe,UAAM,yBAAW,aAAa;AAEnD,IAAM,oBAAoB,CAAC,UAAkC;AAClE,QAAM,EAAE,UAAU,QAAQ,SAAS,IAAI;AAGvC,QAAM,iBAAa,yBAAW,yBAAW;AAGzC,QAAM,CAAC,gBAAgB,iBAAiB,QAAI,uBAAiB;AAE7D,QAAM,mBAAe,0BAAY,CAAC,SAAiB;AACjD,UAAM,aAAa,mBAAmB,IAAI;AAC1C,iCAAU,YAAY,KAAK;AAC3B,sBAAkB,UAAU;AAAA,EAC9B,GAAG,CAAC,CAAC;AAIL,QAAM,oBAAgB,sBAAQ,MAAM;AA9DtC;AA+DI,UAAM,YAAY,kBAAkB,WAAU,yCAAY,aAAU,gCAAQ,MAAR,mBAAW,WAAU;AACzF,WAAO,mBAAmB,SAAS;AAAA,EACrC,GAAG,CAAC,gBAAgB,QAAQ,yCAAY,MAAM,CAAC;AAG/C,QAAM,iBAAa,sBAAQ,MAAM;AAC/B,UAAM,aAAa,kBAAc,uBAAQ,KAAK,CAAC;AAC/C,WAAO;AAAA,MACL,SAAS,WAAW;AAAA,MACpB,eAAe,WAAW;AAAA,MAC1B,gBAAgB,WAAW;AAAA,MAC3B,SAAS,WAAW;AAAA,IACtB;AAAA,EACF,GAAG,CAAC,UAAU,CAAC;AAIf,QAAM,oBAAgB,sBAAQ,MAAM;AAhFtC;AAiFI,QAAI,eAAoC,CAAC;AACzC,QAAI,cAAc,WAAW,WAAW,cAAc,QAAQ,KAAK,GAAG,GAAG;AACvE,qBAAe,WAAW;AAAA,IAC5B,OAAO;AAEL,uBAAe,qDAAa,qBAAkB,gCAAQ,MAAR,mBAAW,aAAY,CAAC;AAAA,IACxE;AAEA,WAAO;AAAA,MACL,GAAG;AAAA,MACH,GAAI,aAAa,aAAa,KAAK,aAAAD;AAAA,MACnC,GAAI,YAAY,CAAC;AAAA,IACnB;AAAA,EACF,GAAG,CAAC,YAAY,eAAe,QAAQ,CAAC;AAGxC,8BAAU,MAAM;AACd,yCAAkB,eAAe,aAAa;AAAA,EAChD,GAAG,CAAC,eAAe,aAAa,CAAC;AAEjC,QAAM,mBAAe;AAAA,IACnB,OAAO;AAAA,MACL,QAAQ;AAAA,MACR;AAAA,IACF;AAAA,IACA,CAAC,eAAe,YAAY;AAAA,EAC9B;AAEA,SACE,4CAAC,8BAAc,GAAG,YAAY,QAAQ,cAAc,QAAQ,KAAK,GAAG,GAAG,UAAU,eAC/E,sDAAC,cAAc,UAAd,EAAuB,OAAO,cAAe,UAAS,GACzD;AAEJ;",
   "names": ["import_react", "zhCN", "enUS"]
 }

package/dist/creek-config-provider/index.js

@@ -44,6 +44,10 @@ var import_useLayoutSettingsStore = require("../creek-layout/useLayoutSettingsSt
 var import_CreekConfigContext = require("./CreekConfigContext");
 var import_CreekI18nProvider = require("./CreekI18nProvider");
 var import_jsx_runtime = require("react/jsx-runtime");
+var ANTD_LOCALE_MAP = {
+  zh_CN: import_zh_CN.default,
+  en_US: import_en_US.default
+};
 var InnerConfigProvider = (props) => {
   var _a;
   const { children, theme, ...more } = props;
@@ -62,7 +66,7 @@ var InnerConfigProvider = (props) => {
       }
     } : {}
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd.ConfigProvider, { locale: locale === "en-US" ? import_en_US.default : import_zh_CN.default, theme: finalTheme, ...more, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_CreekConfigContext.CreekConfigContext.Provider, { value: more, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd.App, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_creek_hooks.AppProvider, { children }) }) }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd.ConfigProvider, { locale: ANTD_LOCALE_MAP[locale] || import_zh_CN.default, theme: finalTheme, ...more, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_CreekConfigContext.CreekConfigContext.Provider, { value: more, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd.App, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_creek_hooks.AppProvider, { children }) }) }) });
 };
 var CreekConfigProvider = (props) => {
   const { children, locale, messages, ...more } = props;

package/dist/creek-config-provider/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/creek-config-provider/index.tsx"],
-  "sourcesContent": ["import type { ConfigProviderProps } from 'antd';\nimport { App, ConfigProvider } from 'antd';\nimport enUS_antd from 'antd/locale/en_US';\nimport zhCN_antd from 'antd/locale/zh_CN';\nimport merge from 'lodash/merge';\n\nimport { AppProvider } from '../creek-hooks';\nimport { useLayoutSettingsStore } from '../creek-layout/useLayoutSettingsStore';\nimport { CreekConfigContext, CreekConfigContextProps } from './CreekConfigContext';\nimport { CreekI18nProvider, CreekI18nProviderProps, LocaleContext, useAppLocale } from './CreekI18nProvider';\n\nexport type CreekConfigProviderProps = CreekConfigContextProps & Omit<ConfigProviderProps, 'locale'> & CreekI18nProviderProps;\n\nexport { CreekI18nProvider, LocaleContext, useAppLocale };\nexport type { CreekI18nProviderProps };\n\nconst InnerConfigProvider = (props: Omit<CreekConfigProviderProps, 'locale' | 'messages'>) => {\n  const { children, theme, ...more } = props;\n  const { locale } = useAppLocale();\n  const settingsStore = useLayoutSettingsStore();\n\n  const activeColorPrimary = settingsStore.colorPrimary || theme?.token?.colorPrimary;\n\n  let finalTheme = merge(\n    {},\n    theme,\n    activeColorPrimary\n      ? {\n          token: {\n            colorPrimary: activeColorPrimary,\n            colorLink: activeColorPrimary,\n            colorLinkHover: activeColorPrimary,\n            colorLinkActive: activeColorPrimary,\n          },\n        }\n      : {}\n  );\n\n\n  return (\n    <ConfigProvider locale={locale === 'en-US' ? enUS_antd : zhCN_antd} theme={finalTheme} {...more}>\n      <CreekConfigContext.Provider value={more as any}>\n        <App>\n          <AppProvider>{children}</AppProvider>\n        </App>\n      </CreekConfigContext.Provider>\n    </ConfigProvider>\n  );\n};\n\nexport const CreekConfigProvider = (props: CreekConfigProviderProps) => {\n  const { children, locale, messages, ...more } = props;\n\n  return (\n    <CreekI18nProvider locale={locale} messages={messages}>\n      <InnerConfigProvider {...more}>{children}</InnerConfigProvider>\n    </CreekI18nProvider>\n  );\n};\n\nCreekConfigProvider.CreekConfigContext = CreekConfigContext;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAoC;AACpC,mBAAsB;AACtB,mBAAsB;AACtB,mBAAkB;AAElB,yBAA4B;AAC5B,oCAAuC;AACvC,gCAA4D;AAC5D,+BAAuF;AAkC7E;AA3BV,IAAM,sBAAsB,CAAC,UAAiE;AAhB9F;AAiBE,QAAM,EAAE,UAAU,OAAO,GAAG,KAAK,IAAI;AACrC,QAAM,EAAE,OAAO,QAAI,uCAAa;AAChC,QAAM,oBAAgB,sDAAuB;AAE7C,QAAM,qBAAqB,cAAc,kBAAgB,oCAAO,UAAP,mBAAc;AAEvE,MAAI,iBAAa,aAAAA;AAAA,IACf,CAAC;AAAA,IACD;AAAA,IACA,qBACI;AAAA,MACE,OAAO;AAAA,QACL,cAAc;AAAA,QACd,WAAW;AAAA,QACX,gBAAgB;AAAA,QAChB,iBAAiB;AAAA,MACnB;AAAA,IACF,IACA,CAAC;AAAA,EACP;AAGA,SACE,4CAAC,8BAAe,QAAQ,WAAW,UAAU,aAAAC,UAAY,aAAAC,SAAW,OAAO,YAAa,GAAG,MACzF,sDAAC,6CAAmB,UAAnB,EAA4B,OAAO,MAClC,sDAAC,mBACC,sDAAC,kCAAa,UAAS,GACzB,GACF,GACF;AAEJ;AAEO,IAAM,sBAAsB,CAAC,UAAoC;AACtE,QAAM,EAAE,UAAU,QAAQ,UAAU,GAAG,KAAK,IAAI;AAEhD,SACE,4CAAC,8CAAkB,QAAgB,UACjC,sDAAC,uBAAqB,GAAG,MAAO,UAAS,GAC3C;AAEJ;AAEA,oBAAoB,qBAAqB;",
-  "names": ["merge", "enUS_antd", "zhCN_antd"]
+  "sourcesContent": ["import type { ConfigProviderProps } from 'antd';\nimport { App, ConfigProvider } from 'antd';\nimport enUS_antd from 'antd/locale/en_US';\nimport zhCN_antd from 'antd/locale/zh_CN';\nimport merge from 'lodash/merge';\n\nimport { AppProvider } from '../creek-hooks';\nimport { useLayoutSettingsStore } from '../creek-layout/useLayoutSettingsStore';\nimport { CreekConfigContext, CreekConfigContextProps } from './CreekConfigContext';\nimport { CreekI18nProvider, CreekI18nProviderProps, LocaleCode, LocaleContext, useAppLocale } from './CreekI18nProvider';\n\nconst ANTD_LOCALE_MAP: Record<LocaleCode, any> = {\n  zh_CN: zhCN_antd,\n  en_US: enUS_antd,\n};\n\nexport type CreekConfigProviderProps = CreekConfigContextProps & Omit<ConfigProviderProps, 'locale'> & CreekI18nProviderProps;\n\nexport { CreekI18nProvider, LocaleContext, useAppLocale };\nexport type { CreekI18nProviderProps };\n\nconst InnerConfigProvider = (props: Omit<CreekConfigProviderProps, 'locale' | 'messages'>) => {\n  const { children, theme, ...more } = props;\n  const { locale } = useAppLocale();\n  const settingsStore = useLayoutSettingsStore();\n\n  const activeColorPrimary = settingsStore.colorPrimary || theme?.token?.colorPrimary;\n\n  let finalTheme = merge(\n    {},\n    theme,\n    activeColorPrimary\n      ? {\n          token: {\n            colorPrimary: activeColorPrimary,\n            colorLink: activeColorPrimary,\n            colorLinkHover: activeColorPrimary,\n            colorLinkActive: activeColorPrimary,\n          },\n        }\n      : {},\n  );\n\n  return (\n    <ConfigProvider locale={ANTD_LOCALE_MAP[locale] || zhCN_antd} theme={finalTheme} {...more}>\n      <CreekConfigContext.Provider value={more as any}>\n        <App>\n          <AppProvider>{children}</AppProvider>\n        </App>\n      </CreekConfigContext.Provider>\n    </ConfigProvider>\n  );\n};\n\nexport const CreekConfigProvider = (props: CreekConfigProviderProps) => {\n  const { children, locale, messages, ...more } = props;\n\n  return (\n    <CreekI18nProvider locale={locale} messages={messages}>\n      <InnerConfigProvider {...more}>{children}</InnerConfigProvider>\n    </CreekI18nProvider>\n  );\n};\n\nCreekConfigProvider.CreekConfigContext = CreekConfigContext;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAoC;AACpC,mBAAsB;AACtB,mBAAsB;AACtB,mBAAkB;AAElB,yBAA4B;AAC5B,oCAAuC;AACvC,gCAA4D;AAC5D,+BAAmG;AAsCzF;AApCV,IAAM,kBAA2C;AAAA,EAC/C,OAAO,aAAAA;AAAA,EACP,OAAO,aAAAC;AACT;AAOA,IAAM,sBAAsB,CAAC,UAAiE;AArB9F;AAsBE,QAAM,EAAE,UAAU,OAAO,GAAG,KAAK,IAAI;AACrC,QAAM,EAAE,OAAO,QAAI,uCAAa;AAChC,QAAM,oBAAgB,sDAAuB;AAE7C,QAAM,qBAAqB,cAAc,kBAAgB,oCAAO,UAAP,mBAAc;AAEvE,MAAI,iBAAa,aAAAC;AAAA,IACf,CAAC;AAAA,IACD;AAAA,IACA,qBACI;AAAA,MACE,OAAO;AAAA,QACL,cAAc;AAAA,QACd,WAAW;AAAA,QACX,gBAAgB;AAAA,QAChB,iBAAiB;AAAA,MACnB;AAAA,IACF,IACA,CAAC;AAAA,EACP;AAEA,SACE,4CAAC,8BAAe,QAAQ,gBAAgB,MAAM,KAAK,aAAAC,SAAW,OAAO,YAAa,GAAG,MACnF,sDAAC,6CAAmB,UAAnB,EAA4B,OAAO,MAClC,sDAAC,mBACC,sDAAC,kCAAa,UAAS,GACzB,GACF,GACF;AAEJ;AAEO,IAAM,sBAAsB,CAAC,UAAoC;AACtE,QAAM,EAAE,UAAU,QAAQ,UAAU,GAAG,KAAK,IAAI;AAEhD,SACE,4CAAC,8CAAkB,QAAgB,UACjC,sDAAC,uBAAqB,GAAG,MAAO,UAAS,GAC3C;AAEJ;AAEA,oBAAoB,qBAAqB;",
+  "names": ["zhCN_antd", "enUS_antd", "merge", "zhCN_antd"]
 }

package/dist/creek-layout/index.js

@@ -37,8 +37,9 @@ var import_pro_components = require("@ant-design/pro-components");
 var import_ahooks = require("ahooks");
 var import_antd = require("antd");
 var import_lodash = __toESM(require("lodash"));
+var import_react = require("react");
 var import_classnames = __toESM(require("classnames"));
-var import_react = require("@creekjs/i18n/react");
+var import_react2 = require("@creekjs/i18n/react");
 var import_creek_keep_alive = require("../creek-keep-alive");
 var import_creek_locale_button = require("../creek-locale-button");
 var import_scrollbar = require("../creek-style/scrollbar");
@@ -49,9 +50,9 @@ var import_useLayoutSettingsStore = require("./useLayoutSettingsStore");
 __reExport(creek_layout_exports, require("./Exception"), module.exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var MenuName = ({ name, path }) => {
-  const t = (0, import_react.useT)();
+  const t = (0, import_react2.useT)();
   const key = !path || path === "/" ? "menu.home" : `menu${path.replace(/\//g, ".")}`;
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: t(key, name) });
+  return t(key, name);
 };
 var CreekLayout = (props) => {
   const {
@@ -77,9 +78,10 @@ var CreekLayout = (props) => {
   const colorPrimary = settingsStore.colorPrimary || token.colorPrimary;
   const actualKeepAlive = settingsStore.keepAlive ?? keepAlive;
   const _userConfig = { ...userConfig, ...runtimeConfig };
+  const intlContext = (0, import_react.useContext)(import_react2.IntlContext);
+  const hasI18n = !!intlContext && actualShowLocaleButton;
   const menuDataRender = (0, import_ahooks.useMemoizedFn)((menuData) => {
-    var _a, _b;
-    const isLocaleEnabled = ((_a = more.menu) == null ? void 0 : _a.locale) !== false && ((_b = _userConfig.menu) == null ? void 0 : _b.locale) !== false;
+    const isLocaleEnabled = hasI18n;
     const mapMenu = (items) => {
       return items.map((item) => {
         return {
@@ -117,7 +119,11 @@ var CreekLayout = (props) => {
       }
       return void 0;
     };
-    return findTitle((route == null ? void 0 : route.routes) || []) || pathname;
+    const title = findTitle((route == null ? void 0 : route.routes) || []) || pathname;
+    if (hasI18n && typeof title === "string") {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MenuName, { name: title, path: pathname });
+    }
+    return title;
   });
   const actions = [...extraActions];
   if (actualShowFullScreen) {

package/dist/creek-layout/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/creek-layout/index.tsx"],
-  "sourcesContent": ["import { ProLayout, ProLayoutProps } from '@ant-design/pro-components';\nimport { useMemoizedFn } from 'ahooks';\nimport { theme } from 'antd';\nimport _ from 'lodash';\n\nimport classnames from 'classnames';\n\nimport { useT } from '@creekjs/i18n/react';\n\nimport { CreekKeepAlive, CreekKeepAliveProps } from '../creek-keep-alive';\nimport { CreekLocaleButton } from '../creek-locale-button';\nimport { GlobalScrollbarStyle } from '../creek-style/scrollbar';\nimport { FullScreen, LayoutSettings } from './ActionRender';\nimport { CollapsedButton, useCollapsedStore } from './CollapseButton';\nimport { Exception } from './Exception';\nimport { useLayoutSettingsStore } from './useLayoutSettingsStore';\n\nexport type LayoutProps = ProLayoutProps & {\n  runtimeConfig: ProLayoutProps;\n  userConfig?: ProLayoutProps;\n  navigate?: (path?: string | number) => void;\n  showFullScreen?: boolean;\n  showLocaleButton?: boolean;\n  showSettingsButton?: boolean;\n  initialInfo?: {\n    initialState: any;\n    loading: boolean;\n    setInitialState: () => void;\n  };\n  keepAlive?: boolean | CreekKeepAliveProps;\n  extraActions?: React.ReactNode[];\n};\n\nconst MenuName = ({ name, path }: { name: string; path?: string }) => {\n  const t = useT();\n  const key = !path || path === '/' ? 'menu.home' : `menu${path.replace(/\\//g, '.')}`;\n  return <>{t(key, name)}</>;\n};\n\nexport const CreekLayout = (props: LayoutProps) => {\n  const {\n    route,\n    userConfig,\n    runtimeConfig,\n    children,\n    location,\n    navigate,\n    showFullScreen = false,\n    showLocaleButton = false,\n    showSettingsButton = false,\n    keepAlive = false,\n    extraActions = [],\n    ...more\n  } = props;\n\n  const { useToken } = theme;\n  const { token } = useToken();\n\n  const { collapsed } = useCollapsedStore();\n  const settingsStore = useLayoutSettingsStore();\n\n  const actualShowFullScreen = settingsStore.showFullScreen ?? showFullScreen;\n  const actualShowLocaleButton = settingsStore.showLocaleButton ?? showLocaleButton;\n  const colorPrimary = settingsStore.colorPrimary || token.colorPrimary;\n  const actualKeepAlive = settingsStore.keepAlive ?? keepAlive;\n\n  const _userConfig = { ...userConfig, ...runtimeConfig };\n\n  const menuDataRender = useMemoizedFn((menuData: any[]) => {\n    const isLocaleEnabled = more.menu?.locale !== false && _userConfig.menu?.locale !== false;\n\n    const mapMenu = (items: any[]): any[] => {\n      return items.map((item) => {\n        return {\n          ...item,\n          name: isLocaleEnabled ? <MenuName name={item.name} path={item.path} /> : item.name,\n          children: item.children ? mapMenu(item.children) : undefined,\n        };\n      });\n    };\n    return mapMenu(menuData);\n  });\n\n  const menuItemRender: ProLayoutProps['menuItemRender'] = useMemoizedFn((itemProps, defaultDom) => {\n    return (\n      <span\n        onClick={() => {\n          if (navigate) {\n            navigate(itemProps.path);\n          }\n        }}\n      >\n        {defaultDom}\n      </span>\n    );\n  });\n\n  const getTabTitle = useMemoizedFn((pathname: string) => {\n    const findTitle = (routes: any[]): string | React.ReactNode | undefined => {\n      for (const r of routes) {\n        if (r.path === pathname) return r.name || r.title;\n        if (r.children) {\n          const found = findTitle(r.children);\n          if (found) return found;\n        }\n      }\n      return undefined;\n    };\n    return findTitle(route?.routes || []) || pathname;\n  });\n\n  const actions: React.ReactNode[] = [...extraActions];\n\n  if (actualShowFullScreen) {\n    actions.push(<FullScreen key=\"full-screen\" />);\n  }\n\n  if (actualShowLocaleButton) {\n    actions.push(<CreekLocaleButton key=\"locale-button\" />);\n  }\n\n  if (showSettingsButton) {\n    actions.push(<LayoutSettings key=\"settings\" defaultShowFullScreen={showFullScreen} defaultShowLocaleButton={showLocaleButton} defaultKeepAlive={_.isBoolean(keepAlive) ? keepAlive : true} />);\n  }\n\n  const keepAliveProps = _.isBoolean(keepAlive) ? {} : keepAlive;\n\n  const layoutContent = (\n    <ProLayout\n      className={classnames('creek-layout-container', _userConfig?.className)}\n      route={route}\n      title={_userConfig?.title}\n      siderWidth={200}\n      location={location}\n      menuDataRender={menuDataRender}\n      menuItemRender={menuItemRender}\n      actionsRender={() => actions}\n      token={{\n        header: {\n          colorBgHeader: '#fff',\n          colorHeaderTitle: 'rgba(0, 0, 0, 0.80);',\n          colorTextMenuSelected: colorPrimary,\n          heightLayoutHeader: 48,\n        },\n        sider: {\n          colorMenuBackground: '#f7f8fa',\n          colorBgMenuItemSelected: 'transparent',\n          colorTextMenuActive: colorPrimary,\n          colorTextMenuSelected: colorPrimary,\n          colorTextMenuItemHover: colorPrimary,\n          colorTextMenu: '#333',\n        },\n        pageContainer: {\n          paddingBlockPageContainerContent: 0,\n          paddingInlinePageContainerContent: 0,\n          colorBgPageContainer: 'linear-gradient(180deg, #F7F9FF 0%, #FFF 45.59%);',\n        },\n      }}\n      fixSiderbar\n      fixedHeader\n      collapsed={collapsed}\n      collapsedButtonRender={(collapsed) => {\n        return <CollapsedButton collapsed={collapsed} />;\n      }}\n      {...more}\n    >\n      <GlobalScrollbarStyle />\n      <Exception>{actualKeepAlive ? <CreekKeepAlive getTabTitle={getTabTitle} {...keepAliveProps} /> : children}</Exception>\n    </ProLayout>\n  );\n\n  return layoutContent;\n};\n\nexport * from './Exception';\n"],
-  "mappings": "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",
-  "names": ["_", "classnames", "collapsed"]
+  "sourcesContent": ["import { MenuDataItem, ProLayout, ProLayoutProps } from '@ant-design/pro-components';\nimport { useMemoizedFn } from 'ahooks';\nimport { theme } from 'antd';\nimport _ from 'lodash';\nimport { useContext } from 'react';\n\nimport classnames from 'classnames';\n\nimport { IntlContext, useT } from '@creekjs/i18n/react';\n\nimport { CreekKeepAlive, CreekKeepAliveProps } from '../creek-keep-alive';\nimport { CreekLocaleButton } from '../creek-locale-button';\nimport { GlobalScrollbarStyle } from '../creek-style/scrollbar';\nimport { FullScreen, LayoutSettings } from './ActionRender';\nimport { CollapsedButton, useCollapsedStore } from './CollapseButton';\nimport { Exception } from './Exception';\nimport { useLayoutSettingsStore } from './useLayoutSettingsStore';\n\nexport type LayoutProps = ProLayoutProps & {\n  runtimeConfig: ProLayoutProps;\n  userConfig?: ProLayoutProps;\n  navigate?: (path?: string | number) => void;\n  showFullScreen?: boolean;\n  showLocaleButton?: boolean;\n  showSettingsButton?: boolean;\n  initialInfo?: {\n    initialState: any;\n    loading: boolean;\n    setInitialState: () => void;\n  };\n  keepAlive?: boolean | CreekKeepAliveProps;\n  extraActions?: React.ReactNode[];\n};\n\nconst MenuName = ({ name, path }: { name?: string; path?: string }) => {\n  const t = useT();\n  const key = !path || path === '/' ? 'menu.home' : `menu${path.replace(/\\//g, '.')}`;\n  return t(key, name);\n};\n\nexport const CreekLayout = (props: LayoutProps) => {\n  const {\n    route,\n    userConfig,\n    runtimeConfig,\n    children,\n    location,\n    navigate,\n    showFullScreen = false,\n    showLocaleButton = false,\n    showSettingsButton = false,\n    keepAlive = false,\n    extraActions = [],\n    ...more\n  } = props;\n\n  const { useToken } = theme;\n  const { token } = useToken();\n\n  const { collapsed } = useCollapsedStore();\n  const settingsStore = useLayoutSettingsStore();\n\n  const actualShowFullScreen = settingsStore.showFullScreen ?? showFullScreen;\n  const actualShowLocaleButton = settingsStore.showLocaleButton ?? showLocaleButton;\n  const colorPrimary = settingsStore.colorPrimary || token.colorPrimary;\n  const actualKeepAlive = settingsStore.keepAlive ?? keepAlive;\n\n  const _userConfig = { ...userConfig, ...runtimeConfig };\n\n  const intlContext = useContext(IntlContext);\n  const hasI18n = !!intlContext && actualShowLocaleButton;\n\n  const menuDataRender = useMemoizedFn((menuData: MenuDataItem[]) => {\n    // 根据当前是否开启了国际化（上下文是否存在）以及用户配置来判断是否包裹菜单翻译\n    const isLocaleEnabled = hasI18n;\n\n    const mapMenu = (items: MenuDataItem[]): MenuDataItem[] => {\n      return items.map((item) => {\n        return {\n          ...item,\n          name: (isLocaleEnabled ? <MenuName name={item.name} path={item.path} /> : item.name) as string,\n          children: item.children ? mapMenu(item.children) : undefined,\n        };\n      });\n    };\n    return mapMenu(menuData);\n  });\n\n  const menuItemRender: ProLayoutProps['menuItemRender'] = useMemoizedFn((itemProps, defaultDom) => {\n    return (\n      <span\n        onClick={() => {\n          if (navigate) {\n            navigate(itemProps.path);\n          }\n        }}\n      >\n        {defaultDom}\n      </span>\n    );\n  });\n\n  const getTabTitle = useMemoizedFn((pathname: string) => {\n    const findTitle = (routes: any[]): string | React.ReactNode | undefined => {\n      for (const r of routes) {\n        if (r.path === pathname) return r.name || r.title;\n        if (r.children) {\n          const found = findTitle(r.children);\n          if (found) return found;\n        }\n      }\n      return undefined;\n    };\n    const title = findTitle(route?.routes || []) || pathname;\n    \n    if (hasI18n && typeof title === 'string') {\n      return <MenuName name={title} path={pathname} />;\n    }\n    \n    return title;\n  });\n\n  const actions: React.ReactNode[] = [...extraActions];\n\n  if (actualShowFullScreen) {\n    actions.push(<FullScreen key=\"full-screen\" />);\n  }\n\n  if (actualShowLocaleButton) {\n    actions.push(<CreekLocaleButton key=\"locale-button\" />);\n  }\n\n  if (showSettingsButton) {\n    actions.push(<LayoutSettings key=\"settings\" defaultShowFullScreen={showFullScreen} defaultShowLocaleButton={showLocaleButton} defaultKeepAlive={_.isBoolean(keepAlive) ? keepAlive : true} />);\n  }\n\n  const keepAliveProps = _.isBoolean(keepAlive) ? {} : keepAlive;\n\n  const layoutContent = (\n    <ProLayout\n      className={classnames('creek-layout-container', _userConfig?.className)}\n      route={route}\n      title={_userConfig?.title}\n      siderWidth={200}\n      location={location}\n      menuDataRender={menuDataRender}\n      menuItemRender={menuItemRender}\n      actionsRender={() => actions}\n      token={{\n        header: {\n          colorBgHeader: '#fff',\n          colorHeaderTitle: 'rgba(0, 0, 0, 0.80);',\n          colorTextMenuSelected: colorPrimary,\n          heightLayoutHeader: 48,\n        },\n        sider: {\n          colorMenuBackground: '#f7f8fa',\n          colorBgMenuItemSelected: 'transparent',\n          colorTextMenuActive: colorPrimary,\n          colorTextMenuSelected: colorPrimary,\n          colorTextMenuItemHover: colorPrimary,\n          colorTextMenu: '#333',\n        },\n        pageContainer: {\n          paddingBlockPageContainerContent: 0,\n          paddingInlinePageContainerContent: 0,\n          colorBgPageContainer: 'linear-gradient(180deg, #F7F9FF 0%, #FFF 45.59%);',\n        },\n      }}\n      fixSiderbar\n      fixedHeader\n      collapsed={collapsed}\n      collapsedButtonRender={(collapsed) => {\n        return <CollapsedButton collapsed={collapsed} />;\n      }}\n      {...more}\n    >\n      <GlobalScrollbarStyle />\n      <Exception>{actualKeepAlive ? <CreekKeepAlive getTabTitle={getTabTitle} {...keepAliveProps} /> : children}</Exception>\n    </ProLayout>\n  );\n\n  return layoutContent;\n};\n\nexport * from './Exception';\n"],
+  "mappings": "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",
+  "names": ["import_react", "_", "classnames", "collapsed"]
 }

package/dist/creek-locale-button/index.js

@@ -33,14 +33,14 @@ var CreekLocaleButton = () => {
   const { locale, changeLocale } = (0, import_creek_config_provider.useAppLocale)();
   const items = [
     {
-      key: "zh-CN",
+      key: "zh_CN",
       label: t("creek-locale-button.index.jianTiZhongWen", "简体中文"),
-      disabled: locale === "zh-CN"
+      disabled: locale === "zh_CN"
     },
     {
-      key: "en-US",
+      key: "en_US",
       label: "English",
-      disabled: locale === "en-US"
+      disabled: locale === "en_US"
     }
   ];
   const currentLabel = ((_a = items.find((item) => item.key === locale)) == null ? void 0 : _a.label) || "Language";

package/dist/creek-locale-button/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/creek-locale-button/index.tsx"],
-  "sourcesContent": ["import { GlobalOutlined } from '@ant-design/icons';\nimport { Dropdown, Space, Typography } from 'antd';\n\nimport { useT } from '@creekjs/i18n/react';\n\nimport { useAppLocale } from '../creek-config-provider';\n\nexport const CreekLocaleButton = () => {\n  const t = useT();\n\n  const { locale, changeLocale } = useAppLocale();\n\n  const items = [\n    {\n      key: 'zh-CN',\n      label: t('creek-locale-button.index.jianTiZhongWen', '简体中文'),\n      disabled: locale === 'zh-CN',\n    },\n    {\n      key: 'en-US',\n      label: 'English',\n      disabled: locale === 'en-US',\n    },\n  ];\n\n  const currentLabel = items.find((item) => item.key === locale)?.label || 'Language';\n\n  return (\n    <Dropdown\n      menu={{\n        items,\n        onClick: (e) => changeLocale(e.key),\n      }}\n      placement=\"bottomRight\"\n    >\n      <Space size=\"small\" align=\"center\">\n        <GlobalOutlined />\n        <Typography.Text>{currentLabel}</Typography.Text>\n      </Space>\n    </Dropdown>\n  );\n};\n"],
+  "sourcesContent": ["import { GlobalOutlined } from '@ant-design/icons';\nimport { Dropdown, Space, Typography } from 'antd';\n\nimport { useT } from '@creekjs/i18n/react';\n\nimport { useAppLocale } from '../creek-config-provider';\n\nexport const CreekLocaleButton = () => {\n  const t = useT();\n\n  const { locale, changeLocale } = useAppLocale();\n\n  const items = [\n    {\n      key: 'zh_CN',\n      label: t('creek-locale-button.index.jianTiZhongWen', '简体中文'),\n      disabled: locale === 'zh_CN',\n    },\n    {\n      key: 'en_US',\n      label: 'English',\n      disabled: locale === 'en_US',\n    },\n  ];\n\n  const currentLabel = items.find((item) => item.key === locale)?.label || 'Language';\n\n  return (\n    <Dropdown\n      menu={{\n        items,\n        onClick: (e) => changeLocale(e.key),\n      }}\n      placement=\"bottomRight\"\n    >\n      <Space size=\"small\" align=\"center\">\n        <GlobalOutlined />\n        <Typography.Text>{currentLabel}</Typography.Text>\n      </Space>\n    </Dropdown>\n  );\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAC/B,kBAA4C;AAE5C,mBAAqB;AAErB,mCAA6B;AA8BvB;AA5BC,IAAM,oBAAoB,MAAM;AAPvC;AAQE,QAAM,QAAI,mBAAK;AAEf,QAAM,EAAE,QAAQ,aAAa,QAAI,2CAAa;AAE9C,QAAM,QAAQ;AAAA,IACZ;AAAA,MACE,KAAK;AAAA,MACL,OAAO,EAAE,4CAA4C,MAAM;AAAA,MAC3D,UAAU,WAAW;AAAA,IACvB;AAAA,IACA;AAAA,MACE,KAAK;AAAA,MACL,OAAO;AAAA,MACP,UAAU,WAAW;AAAA,IACvB;AAAA,EACF;AAEA,QAAM,iBAAe,WAAM,KAAK,CAAC,SAAS,KAAK,QAAQ,MAAM,MAAxC,mBAA2C,UAAS;AAEzE,SACE;AAAA,IAAC;AAAA;AAAA,MACC,MAAM;AAAA,QACJ;AAAA,QACA,SAAS,CAAC,MAAM,aAAa,EAAE,GAAG;AAAA,MACpC;AAAA,MACA,WAAU;AAAA,MAEV,uDAAC,qBAAM,MAAK,SAAQ,OAAM,UACxB;AAAA,oDAAC,+BAAe;AAAA,QAChB,4CAAC,uBAAW,MAAX,EAAiB,wBAAa;AAAA,SACjC;AAAA;AAAA,EACF;AAEJ;",
   "names": []
 }

package/dist/locales/{en-US.js → en_US.js}

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/locales/en-US.ts
+// src/locales/en_US.ts
 var en_US_exports = {};
 __export(en_US_exports, {
   default: () => en_US_default
@@ -46,4 +46,4 @@ var en_US_default = {
   "creek-locale-button.index.jianTiZhongWen": "Simplified Chinese",
   "creek-layout.ActionRender.LayoutSettings.keepAlive": "Enable Page Cache (Keep Alive)"
 };
-//# sourceMappingURL=en-US.js.map
+//# sourceMappingURL=en_US.js.map

package/dist/locales/{en-US.js.map → en_US.js.map}

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../../src/locales/en-US.ts"],
+  "sources": ["../../src/locales/en_US.ts"],
   "sourcesContent": ["export default {\n  'creek-keep-alive.index.guanBiDangQian': 'Close Current',\n  'creek-keep-alive.index.guanBiQiTa': 'Close Others',\n  'creek-keep-alive.index.guanBiYouCe': 'Close Right',\n  'creek-layout.ActionRender.FullScreen.tuiChuQuanPing': 'Exit Full Screen',\n  'creek-layout.ActionRender.FullScreen.quanPing': 'Full Screen',\n  'creek-table.components.DensityIcon.kuanSong': 'Loose',\n  'creek-table.components.DensityIcon.zhongDeng': 'Medium',\n  'creek-table.components.DensityIcon.jinCou': 'Compact',\n  'creek-table.components.DensityIcon.biaoGeMiDu(KuanSong)': 'Table Density (Loose)',\n  'creek-table.components.DensityIcon.biaoGeMiDu(ZhongDeng)': 'Table Density (Medium)',\n  'creek-table.components.DensityIcon.biaoGeMiDu(JinCou)': 'Table Density (Compact)',\n  'creek-table.components.DensityIcon.biaoGeMiDu': 'Table Density',\n  'creek-table.components.EllipsisTooltip.fuZhiChengGong': 'Copied Successfully',\n  'creek-table.components.EllipsisTooltip.fuZhiShiBai': 'Copy Failed',\n  'creek-table.components.EllipsisTooltip.fuZhi': 'Copy',\n  'creek-table.hooks.useIndexColumn.xuHao': 'No.',\n  'creek-layout.ActionRender.LayoutSettings.title': 'System Settings',\n  'creek-layout.ActionRender.LayoutSettings.themeColor': 'Theme Color',\n  'creek-layout.ActionRender.LayoutSettings.showFullScreen': 'Show Full Screen Button',\n  'creek-layout.ActionRender.LayoutSettings.showLocaleButton': 'Show Locale Button',\n  'creek-locale-button.index.jianTiZhongWen': 'Simplified Chinese',\n  'creek-layout.ActionRender.LayoutSettings.keepAlive': 'Enable Page Cache (Keep Alive)',\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAAO,gBAAQ;AAAA,EACb,yCAAyC;AAAA,EACzC,qCAAqC;AAAA,EACrC,sCAAsC;AAAA,EACtC,uDAAuD;AAAA,EACvD,iDAAiD;AAAA,EACjD,+CAA+C;AAAA,EAC/C,gDAAgD;AAAA,EAChD,6CAA6C;AAAA,EAC7C,2DAA2D;AAAA,EAC3D,4DAA4D;AAAA,EAC5D,yDAAyD;AAAA,EACzD,iDAAiD;AAAA,EACjD,yDAAyD;AAAA,EACzD,sDAAsD;AAAA,EACtD,gDAAgD;AAAA,EAChD,0CAA0C;AAAA,EAC1C,kDAAkD;AAAA,EAClD,uDAAuD;AAAA,EACvD,2DAA2D;AAAA,EAC3D,6DAA6D;AAAA,EAC7D,4CAA4C;AAAA,EAC5C,sDAAsD;AACxD;",
   "names": []

package/dist/locales/{zh-CN.js → zh_CN.js}

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/locales/zh-CN.ts
+// src/locales/zh_CN.ts
 var zh_CN_exports = {};
 __export(zh_CN_exports, {
   default: () => zh_CN_default
@@ -46,4 +46,4 @@ var zh_CN_default = {
   "creek-locale-button.index.jianTiZhongWen": "简体中文",
   "creek-layout.ActionRender.LayoutSettings.keepAlive": "开启页面缓存 (Keep Alive)"
 };
-//# sourceMappingURL=zh-CN.js.map
+//# sourceMappingURL=zh_CN.js.map

package/dist/locales/{zh-CN.js.map → zh_CN.js.map}

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../../src/locales/zh-CN.ts"],
+  "sources": ["../../src/locales/zh_CN.ts"],
   "sourcesContent": ["export default {\n  \"creek-keep-alive.index.guanBiDangQian\": \"关闭当前\",\n  \"creek-keep-alive.index.guanBiQiTa\": \"关闭其他\",\n  \"creek-keep-alive.index.guanBiYouCe\": \"关闭右侧\",\n  \"creek-layout.ActionRender.FullScreen.tuiChuQuanPing\": \"退出全屏\",\n  \"creek-layout.ActionRender.FullScreen.quanPing\": \"全屏\",\n  \"creek-table.components.DensityIcon.kuanSong\": \"宽松\",\n  \"creek-table.components.DensityIcon.zhongDeng\": \"中等\",\n  \"creek-table.components.DensityIcon.jinCou\": \"紧凑\",\n  \"creek-table.components.DensityIcon.biaoGeMiDu(KuanSong)\": \"表格密度 (宽松)\",\n  \"creek-table.components.DensityIcon.biaoGeMiDu(ZhongDeng)\": \"表格密度 (中等)\",\n  \"creek-table.components.DensityIcon.biaoGeMiDu(JinCou)\": \"表格密度 (紧凑)\",\n  \"creek-table.components.DensityIcon.biaoGeMiDu\": \"表格密度\",\n  \"creek-table.components.EllipsisTooltip.fuZhiChengGong\": \"复制成功\",\n  \"creek-table.components.EllipsisTooltip.fuZhiShiBai\": \"复制失败\",\n  \"creek-table.components.EllipsisTooltip.fuZhi\": \"复制\",\n  \"creek-table.hooks.useIndexColumn.xuHao\": \"序号\",\n  \"creek-layout.ActionRender.LayoutSettings.title\": \"系统设置\",\n  \"creek-layout.ActionRender.LayoutSettings.themeColor\": \"主题色\",\n  \"creek-layout.ActionRender.LayoutSettings.showFullScreen\": \"展示全屏按钮\",\n  \"creek-layout.ActionRender.LayoutSettings.showLocaleButton\": \"展示国际化按钮\",\n  \"creek-locale-button.index.jianTiZhongWen\": \"简体中文\",\n  \"creek-layout.ActionRender.LayoutSettings.keepAlive\": \"开启页面缓存 (Keep Alive)\"\n};"],
   "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAAO,gBAAQ;AAAA,EACb,yCAAyC;AAAA,EACzC,qCAAqC;AAAA,EACrC,sCAAsC;AAAA,EACtC,uDAAuD;AAAA,EACvD,iDAAiD;AAAA,EACjD,+CAA+C;AAAA,EAC/C,gDAAgD;AAAA,EAChD,6CAA6C;AAAA,EAC7C,2DAA2D;AAAA,EAC3D,4DAA4D;AAAA,EAC5D,yDAAyD;AAAA,EACzD,iDAAiD;AAAA,EACjD,yDAAyD;AAAA,EACzD,sDAAsD;AAAA,EACtD,gDAAgD;AAAA,EAChD,0CAA0C;AAAA,EAC1C,kDAAkD;AAAA,EAClD,uDAAuD;AAAA,EACvD,2DAA2D;AAAA,EAC3D,6DAA6D;AAAA,EAC7D,4CAA4C;AAAA,EAC5C,sDAAsD;AACxD;",
   "names": []

package/i18n.config.ts

@@ -4,8 +4,8 @@ module.exports = {
   
   // 语言包输出的主入口文件路径
   // 注意：实际生成的翻译文件会存放在该文件同级目录下以文件名命名的文件夹中
-  // 例如：src/locales/zh-CN.ts -> 生成的文件在 src/locales/zh-CN/ 目录下
-  localePath: './src/locales/zh-CN.ts',
+  // 例如：src/locales/zh_CN.ts -> 生成的文件在 src/locales/zh_CN/ 目录下
+  localePath: './src/locales/zh_CN.ts',
   
   // 要扫描的文件路径 (Glob)
   path: 'src/**/*.{ts,tsx,js,jsx}',
@@ -24,4 +24,7 @@ module.exports = {
   
   // 开启 React Hooks 模式 (useT)
   useT: true,
+  
+  // useT 的导入语句
+  useTImportStatement: "import { useT } from '@creekjs/i18n/react'",
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@creekjs/web-components",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "",
   "main": "dist/index.js",
   "keywords": [],
@@ -14,13 +14,13 @@
     "react-resizable": "^3.1.3",
     "react-router-dom": "^7.13.0",
     "zustand": "^5.0.1",
-    "@creekjs/i18n": "^1.0.1"
+    "@creekjs/i18n": "^1.0.2"
   },
   "devDependencies": {
     "@types/lodash": "^4.17.20",
     "@types/react-resizable": "^3.0.8",
     "react-intl": "^6.0.0",
-    "@creekjs/i18n-extract": "^1.0.0"
+    "@creekjs/i18n-extract": "^1.0.1"
   },
   "peerDependencies": {
     "react-intl": ">=3.0.0"

package/src/creek-config-provider/CreekConfigContext.tsx

@@ -2,10 +2,6 @@ import { createContext } from 'react';
 
 export type CreekConfigContextProps = {
   iconFontCNs?: string[];
-  /**
-   * 国际化语言包
-   */
-  locale?: Record<string, string>;
 };
 
 export const CreekConfigContext = createContext<CreekConfigContextProps>({});

package/src/creek-config-provider/CreekI18nProvider.tsx

@@ -1,33 +1,43 @@
 import type { ReactNode } from 'react';
-import { createContext, useCallback, useContext, useEffect, useState } from 'react';
+import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 
-import { IntlContext, IntlProvider, getIntl, getLocale, setLocale, setLocaleMessages } from '@creekjs/i18n/react';
+import { IntlContext, IntlProvider, appLocales, getIntl, getLocale, setLocale, setLocaleMessages } from '@creekjs/i18n/react';
 
-import enUS from '../locales/en-US';
-import zhCN from '../locales/zh-CN';
+import enUS from '../locales/en_US';
+import zhCN from '../locales/zh_CN';
 
-const DEFAULT_LOCALE = 'zh-CN';
+const DEFAULT_LOCALE = 'zh_CN';
+
+export type LocaleCode = 'en_US' | 'zh_CN';
+
+const SUPPORTED_LOCALES: LocaleCode[] = ['zh_CN', 'en_US'];
+
+const toUnderscoreLocale = (input?: string): LocaleCode => {
+  if (!input) return DEFAULT_LOCALE;
+  const normalized = input.replace('-', '_') as LocaleCode;
+  return SUPPORTED_LOCALES.includes(normalized) ? normalized : DEFAULT_LOCALE;
+};
 
 export interface CreekI18nProviderProps {
   children?: ReactNode;
   /**
    * 语言标识
-   * @default 'zh-CN'
+   * @default 'zh_CN'
    */
-  locale?: string;
+  locale?: LocaleCode;
   /**
    * 国际化语言包，透传给 react-intl
    */
   messages?: Record<string, string>;
 }
 
-const MESSAGES_MAP: Record<string, Record<string, string>> = {
-  [DEFAULT_LOCALE]: zhCN,
-  'en-US': enUS,
+const MESSAGES_MAP: Record<LocaleCode, Record<string, string>> = {
+  zh_CN: zhCN,
+  en_US: enUS,
 };
 
 export const LocaleContext = createContext({
-  locale: getLocale() || DEFAULT_LOCALE,
+  locale: toUnderscoreLocale(getLocale()),
   changeLocale: (lang: string) => {},
 });
 
@@ -36,52 +46,70 @@ export const useAppLocale = () => useContext(LocaleContext);
 export const CreekI18nProvider = (props: CreekI18nProviderProps) => {
   const { children, locale, messages } = props;
 
-  // Try to get parent intl context
+  // 获取父级 intl context
   const parentIntl = useContext(IntlContext);
 
-  const [intl, setIntl] = useState(() => getIntl());
+  // 内部维护的 locale 状态，仅在调用 changeLocale 时更新
+  const [internalLocale, setInternalLocale] = useState<string>();
 
   const changeLocale = useCallback((lang: string) => {
-    setLocale(lang, false);
-    setIntl(getIntl());
+    const underscore = toUnderscoreLocale(lang);
+    setLocale(underscore, false);
+    setInternalLocale(underscore);
   }, []);
 
   // 1. 确定最终生效的 locale
   // 优先级：当前组件内部的 state > props.locale > parentIntl.locale > 全局默认
-  const currentLocale = intl?.locale || locale || parentIntl?.locale || DEFAULT_LOCALE;
+  const currentLocale = useMemo(() => {
+    const rawLocale = internalLocale || locale || parentIntl?.locale || getIntl()?.locale || DEFAULT_LOCALE;
+    return toUnderscoreLocale(rawLocale);
+  }, [internalLocale, locale, parentIntl?.locale]);
 
   // 2. 提取父级上下文的安全配置 (避免将 IntlShape 的内部方法直接传给 IntlProvider)
-  const intlConfig = parentIntl || intl || {};
-  const safeConfig = {
-    formats: intlConfig.formats,
-    defaultLocale: intlConfig.defaultLocale,
-    defaultFormats: intlConfig.defaultFormats,
-    onError: intlConfig.onError,
-  };
+  const safeConfig = useMemo(() => {
+    const intlConfig = parentIntl || getIntl() || {};
+    return {
+      formats: intlConfig.formats,
+      defaultLocale: intlConfig.defaultLocale,
+      defaultFormats: intlConfig.defaultFormats,
+      onError: intlConfig.onError,
+    };
+  }, [parentIntl]);
 
   // 3. 确定最终的 messages
   // 避免使用 stale 的 parentIntl.messages
-  let baseMessages = {};
-  if (parentIntl && parentIntl.locale === currentLocale) {
-    baseMessages = parentIntl.messages;
-  } else {
-    baseMessages = getIntl()?.messages || {};
-  }
-
-  const finalMessages = {
-    ...baseMessages,
-    ...(MESSAGES_MAP[currentLocale] || zhCN),
-    ...(messages || {}),
-  };
+  const finalMessages = useMemo(() => {
+    let baseMessages: Record<string, any> = {};
+    if (parentIntl && parentIntl.locale === currentLocale.replace('_', '-')) {
+      baseMessages = parentIntl.messages;
+    } else {
+      // 优先从 appLocales 中获取对应语言的 messages
+      baseMessages = appLocales?.[currentLocale] || getIntl()?.messages || {};
+    }
+
+    return {
+      ...baseMessages,
+      ...(MESSAGES_MAP[currentLocale] || zhCN),
+      ...(messages || {}),
+    };
+  }, [parentIntl, currentLocale, messages]);
 
   // 4. 同步给全局 globalIntl，确保非 React 组件能够拿到
   useEffect(() => {
     setLocaleMessages(currentLocale, finalMessages);
   }, [currentLocale, finalMessages]);
 
+  const contextValue = useMemo(
+    () => ({
+      locale: currentLocale,
+      changeLocale,
+    }),
+    [currentLocale, changeLocale],
+  );
+
   return (
-    <IntlProvider {...safeConfig} locale={currentLocale} messages={finalMessages}>
-      <LocaleContext.Provider value={{ locale: currentLocale, changeLocale }}>{children}</LocaleContext.Provider>
+    <IntlProvider {...safeConfig} locale={currentLocale.replace('_', '-')} messages={finalMessages}>
+      <LocaleContext.Provider value={contextValue}>{children}</LocaleContext.Provider>
     </IntlProvider>
   );
 };

package/src/creek-config-provider/index.tsx

@@ -7,7 +7,12 @@ import merge from 'lodash/merge';
 import { AppProvider } from '../creek-hooks';
 import { useLayoutSettingsStore } from '../creek-layout/useLayoutSettingsStore';
 import { CreekConfigContext, CreekConfigContextProps } from './CreekConfigContext';
-import { CreekI18nProvider, CreekI18nProviderProps, LocaleContext, useAppLocale } from './CreekI18nProvider';
+import { CreekI18nProvider, CreekI18nProviderProps, LocaleCode, LocaleContext, useAppLocale } from './CreekI18nProvider';
+
+const ANTD_LOCALE_MAP: Record<LocaleCode, any> = {
+  zh_CN: zhCN_antd,
+  en_US: enUS_antd,
+};
 
 export type CreekConfigProviderProps = CreekConfigContextProps & Omit<ConfigProviderProps, 'locale'> & CreekI18nProviderProps;
 
@@ -33,12 +38,11 @@ const InnerConfigProvider = (props: Omit<CreekConfigProviderProps, 'locale' | 'm
             colorLinkActive: activeColorPrimary,
           },
         }
-      : {}
+      : {},
   );
 
-
   return (
-    <ConfigProvider locale={locale === 'en-US' ? enUS_antd : zhCN_antd} theme={finalTheme} {...more}>
+    <ConfigProvider locale={ANTD_LOCALE_MAP[locale] || zhCN_antd} theme={finalTheme} {...more}>
       <CreekConfigContext.Provider value={more as any}>
         <App>
           <AppProvider>{children}</AppProvider>

package/src/creek-layout/index.tsx

@@ -1,11 +1,12 @@
-import { ProLayout, ProLayoutProps } from '@ant-design/pro-components';
+import { MenuDataItem, ProLayout, ProLayoutProps } from '@ant-design/pro-components';
 import { useMemoizedFn } from 'ahooks';
 import { theme } from 'antd';
 import _ from 'lodash';
+import { useContext } from 'react';
 
 import classnames from 'classnames';
 
-import { useT } from '@creekjs/i18n/react';
+import { IntlContext, useT } from '@creekjs/i18n/react';
 
 import { CreekKeepAlive, CreekKeepAliveProps } from '../creek-keep-alive';
 import { CreekLocaleButton } from '../creek-locale-button';
@@ -31,10 +32,10 @@ export type LayoutProps = ProLayoutProps & {
   extraActions?: React.ReactNode[];
 };
 
-const MenuName = ({ name, path }: { name: string; path?: string }) => {
+const MenuName = ({ name, path }: { name?: string; path?: string }) => {
   const t = useT();
   const key = !path || path === '/' ? 'menu.home' : `menu${path.replace(/\//g, '.')}`;
-  return <>{t(key, name)}</>;
+  return t(key, name);
 };
 
 export const CreekLayout = (props: LayoutProps) => {
@@ -66,14 +67,18 @@ export const CreekLayout = (props: LayoutProps) => {
 
   const _userConfig = { ...userConfig, ...runtimeConfig };
 
-  const menuDataRender = useMemoizedFn((menuData: any[]) => {
-    const isLocaleEnabled = more.menu?.locale !== false && _userConfig.menu?.locale !== false;
+  const intlContext = useContext(IntlContext);
+  const hasI18n = !!intlContext && actualShowLocaleButton;
 
-    const mapMenu = (items: any[]): any[] => {
+  const menuDataRender = useMemoizedFn((menuData: MenuDataItem[]) => {
+    // 根据当前是否开启了国际化（上下文是否存在）以及用户配置来判断是否包裹菜单翻译
+    const isLocaleEnabled = hasI18n;
+
+    const mapMenu = (items: MenuDataItem[]): MenuDataItem[] => {
       return items.map((item) => {
         return {
           ...item,
-          name: isLocaleEnabled ? <MenuName name={item.name} path={item.path} /> : item.name,
+          name: (isLocaleEnabled ? <MenuName name={item.name} path={item.path} /> : item.name) as string,
           children: item.children ? mapMenu(item.children) : undefined,
         };
       });
@@ -106,7 +111,13 @@ export const CreekLayout = (props: LayoutProps) => {
       }
       return undefined;
     };
-    return findTitle(route?.routes || []) || pathname;
+    const title = findTitle(route?.routes || []) || pathname;
+    
+    if (hasI18n && typeof title === 'string') {
+      return <MenuName name={title} path={pathname} />;
+    }
+    
+    return title;
   });
 
   const actions: React.ReactNode[] = [...extraActions];

package/src/creek-locale-button/index.tsx

@@ -12,14 +12,14 @@ export const CreekLocaleButton = () => {
 
   const items = [
     {
-      key: 'zh-CN',
+      key: 'zh_CN',
       label: t('creek-locale-button.index.jianTiZhongWen', '简体中文'),
-      disabled: locale === 'zh-CN',
+      disabled: locale === 'zh_CN',
     },
     {
-      key: 'en-US',
+      key: 'en_US',
       label: 'English',
-      disabled: locale === 'en-US',
+      disabled: locale === 'en_US',
     },
   ];