@oceanbase/ui 0.4.5 → 0.4.6

package/es/Action/Group.d.ts

@@ -8,9 +8,9 @@ export interface GroupProps {
     shouldVisible?: (key: string) => boolean;
     shouldDisabled?: (key: string) => boolean;
     enableLoading?: boolean;
-    /** 更多操作的自定义展示 */
     moreText?: React.ReactNode;
+    moreType?: 'button' | 'link';
     buttonSize?: ButtonSize;
 }
-declare const _default: ({ size, children, dropDownPlacement, shouldVisible, shouldDisabled, enableLoading, moreText, buttonSize, }: GroupProps) => import("@emotion/react/types/jsx-namespace").EmotionJSX.Element;
+declare const _default: ({ size, children, dropDownPlacement, shouldVisible, shouldDisabled, enableLoading, moreText, moreType, buttonSize, }: GroupProps) => import("@emotion/react/types/jsx-namespace").EmotionJSX.Element;
 export default _default;

package/es/Action/Group.js

@@ -36,6 +36,7 @@ export default (function (_ref2) {
     shouldDisabled = _ref2.shouldDisabled,
     enableLoading = _ref2.enableLoading,
     moreText = _ref2.moreText,
+    moreType = _ref2.moreType,
     buttonSize = _ref2.buttonSize;
   var visibleActions = Array.isArray(children) ? children.filter(function (c) {
     if (isBoolean(c.props.visible) && shouldVisible) return c.props.visible && shouldVisible(c.key);
@@ -57,19 +58,26 @@ export default (function (_ref2) {
   var ellipsisType = 'link';
 
   // @ts-ignore
-  if (visibleActionsSort.every(function (action) {
+  if (visibleActionsSort.some(function (action) {
     return action.type.__DISPLAY_NAME === 'button';
   })) {
-    ellipsisType = 'default';
+    ellipsisType = 'button';
   }
+
+  // @ts-ignore
+  if (visibleActionsSort.some(function (action) {
+    return action.type.__DISPLAY_NAME === 'link';
+  })) {
+    ellipsisType = 'link';
+  }
+  ellipsisType = moreType !== null && moreType !== void 0 ? moreType : ellipsisType;
   var getDefaultDisabled = function getDefaultDisabled(key) {
     var _shouldDisabled;
     return (_shouldDisabled = shouldDisabled === null || shouldDisabled === void 0 ? void 0 : shouldDisabled(key)) !== null && _shouldDisabled !== void 0 ? _shouldDisabled : false;
   };
   var moreDom;
-  if (ellipsisType === 'default') {
+  if (ellipsisType === 'button') {
     moreDom = /*#__PURE__*/_jsx(Button, {
-      type: ellipsisType,
       size: buttonSize,
       children: moreText !== null && moreText !== void 0 ? moreText : /*#__PURE__*/_jsx(EllipsisOutlined, {
         style: {

package/es/Action/index.d.ts

@@ -1,7 +1,7 @@
 import { ActionButton, ActionLink } from './Item';
 export type { GroupProps as ActionGroupProps } from './Group';
 declare const _default: {
-    Group: ({ size, children, dropDownPlacement, shouldVisible, shouldDisabled, enableLoading, moreText, buttonSize, }: import("./Group").GroupProps) => import("@emotion/react/types/jsx-namespace").EmotionJSX.Element;
+    Group: ({ size, children, dropDownPlacement, shouldVisible, shouldDisabled, enableLoading, moreText, moreType, buttonSize, }: import("./Group").GroupProps) => import("@emotion/react/types/jsx-namespace").EmotionJSX.Element;
     Button: typeof ActionButton;
     Link: typeof ActionLink;
 };

package/es/DateRanger/Ranger.js

@@ -30,7 +30,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var prefix = getPrefix('date-ranger');
 var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var _selects$, _selects$find2, _selects$find3;
+  var _selects$;
   var _props$selects = props.selects,
     selects = _props$selects === void 0 ? [NEAR_1_MINUTES, NEAR_30_MINUTES, NEAR_1_HOURS, NEAR_3_HOURS, NEAR_6_HOURS, TODAY, LAST_3_DAYS] : _props$selects,
     value = props.value,
@@ -72,7 +72,8 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
     rest = _objectWithoutProperties(props, _excluded);
   var _theme$useToken = theme.useToken(),
     token = _theme$useToken.token;
-  var isCn = locale.locale === 'zh_CN';
+  var isCn = locale.antLocale === 'zh-cn';
+  var isEN = locale.antLocale === 'en';
 
   // 是否为 moment 时间对象
   var isMoment = moment.isMoment(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue[0]) || moment.isMoment(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue[1]) || moment.isMoment(value === null || value === void 0 ? void 0 : value[0]) || moment.isMoment(value === null || value === void 0 ? void 0 : value[1]) || isMomentProps;
@@ -193,29 +194,21 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
   };
   var getCustomizeLabel = function getCustomizeLabel() {
     if (differenceYears > 0) {
-      return "\u8FD1 ".concat(differenceYears, " \u5E74");
+      return isEN ? "Nearly ".concat(differenceYears, " years") : "\u8FD1 ".concat(differenceYears, " \u5E74");
     }
-
-    // if (differenceQuarters > 0) {
-    //   return `近 ${differenceQuarters} 季度`;
-    // }
-
     if (differenceMonths > 0) {
-      return "\u8FD1 ".concat(differenceMonths, " \u6708");
+      return isEN ? "Nearly ".concat(differenceMonths, " months") : "\u8FD1 ".concat(differenceMonths, " \u6708");
     }
     if (differenceWeeks > 0) {
-      return "\u8FD1 ".concat(differenceWeeks, " \u5468");
-    }
-    if (differenceDays > 0) {
-      return "\u8FD1 ".concat(differenceDays, " \u5929");
+      return isEN ? "Nearly ".concat(differenceWeeks, " weeks") : "\u8FD1 ".concat(differenceWeeks, " \u5468");
     }
     if (differenceHours > 0) {
-      return "\u8FD1 ".concat(differenceHours, " \u65F6");
+      return isEN ? "Nearly ".concat(differenceHours, " hours") : "\u8FD1 ".concat(differenceHours, " \u5C0F\u65F6");
     }
     if (differenceMinutes > 0) {
-      return "\u8FD1 ".concat(differenceMinutes, " \u5206");
+      return isEN ? "Nearly ".concat(differenceMinutes, " minutes") : "\u8FD1 ".concat(differenceMinutes, " \u5206");
     }
-    return "\u8FD1 ".concat(differenceSeconds, " \u79D2");
+    return isEN ? "Nearly ".concat(differenceSeconds, " seconds") : "\u8FD1 ".concat(differenceSeconds, " \u79D2");
   };
   var setNow = function setNow() {
     var selected = NEAR_TIME_LIST.find(function (item) {
@@ -234,12 +227,11 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
       updateCurrentTime: setNow
     };
   });
-  var rangeLabel = rangeName === CUSTOMIZE ? getCustomizeRangeLabel() : (_selects$find2 = selects.find(function (_item) {
-    return _item.name === rangeName;
-  })) === null || _selects$find2 === void 0 ? void 0 : _selects$find2.rangeLabel;
-  var label = rangeName === CUSTOMIZE ? getCustomizeLabel() : (_selects$find3 = selects.find(function (_item) {
+  var currentRange = selects.find(function (_item) {
     return _item.name === rangeName;
-  })) === null || _selects$find3 === void 0 ? void 0 : _selects$find3.label;
+  });
+  var rangeLabel = rangeName === CUSTOMIZE ? getCustomizeRangeLabel() : currentRange === null || currentRange === void 0 ? void 0 : currentRange.rangeLabel;
+  var label = rangeName === CUSTOMIZE ? getCustomizeLabel() : isEN ? currentRange.enLabel || currentRange.label : currentRange.label;
   var thisYear = new Date().getFullYear();
   var isThisYear = (startTime === null || startTime === void 0 ? void 0 : startTime.year()) === thisYear && (endTime === null || endTime === void 0 ? void 0 : endTime.year()) === thisYear;
   var rangeNameIndex = findIndex(selects, function (item) {
@@ -341,7 +333,7 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
                   children: [hasTagInPicker && /*#__PURE__*/_jsx("span", {
                     className: "".concat(prefix, "-label"),
                     children: item.rangeLabel
-                  }), locale[item.label] || item.label]
+                  }), isEN ? item.enLabel || item.label : item.label]
                 })
               };
             })

package/es/DateRanger/constant/index.js

@@ -19,6 +19,7 @@ export var DATE_TIME_SECOND_FORMAT_CN = 'MM-DD HH:mm:ss';
 export var DATE_TIME_FORMAT_CN = 'MM-DD HH:mm';
 export var NEAR_1_MINUTES = {
   label: '近 1 分钟',
+  enLabel: 'Nearly 1 minute',
   rangeLabel: '1m',
   name: 'NEAR_1_MINUTES',
   range: function range() {
@@ -28,6 +29,7 @@ export var NEAR_1_MINUTES = {
 };
 export var NEAR_5_MINUTES = {
   label: '近 5 分钟',
+  enLabel: 'Nearly 5 minutes',
   rangeLabel: '5m',
   name: 'NEAR_5_MINUTES',
   range: function range() {
@@ -37,6 +39,7 @@ export var NEAR_5_MINUTES = {
 };
 export var NEAR_10_MINUTES = {
   label: '近 10 分钟',
+  enLabel: 'Nearly 10 minutes',
   rangeLabel: '10m',
   name: 'NEAR_10_MINUTES',
   range: function range() {
@@ -46,6 +49,7 @@ export var NEAR_10_MINUTES = {
 };
 export var NEAR_20_MINUTES = {
   label: '近 20 分钟',
+  enLabel: 'Nearly 20 minutes',
   rangeLabel: '20m',
   name: 'NEAR_20_MINUTES',
   range: function range() {
@@ -55,6 +59,7 @@ export var NEAR_20_MINUTES = {
 };
 export var NEAR_30_MINUTES = {
   label: '近 30 分钟',
+  enLabel: 'Nearly 30 minutes',
   rangeLabel: '30m',
   name: 'NEAR_30_MINUTES',
   range: function range() {
@@ -64,6 +69,7 @@ export var NEAR_30_MINUTES = {
 };
 export var NEAR_1_HOURS = {
   label: '近 1 小时',
+  enLabel: 'Nearly 1 hour',
   rangeLabel: '1h',
   name: 'NEAR_1_HOURS',
   range: function range() {
@@ -73,6 +79,7 @@ export var NEAR_1_HOURS = {
 };
 export var NEAR_2_HOURS = {
   label: '近 2 小时',
+  enLabel: 'Nearly 2 hours',
   rangeLabel: '2h',
   name: 'NEAR_2_HOURS',
   range: function range() {
@@ -82,6 +89,7 @@ export var NEAR_2_HOURS = {
 };
 export var NEAR_3_HOURS = {
   label: '近 3 小时',
+  enLabel: 'Nearly 3 hours',
   rangeLabel: '3h',
   name: 'NEAR_3_HOURS',
   range: function range() {
@@ -91,6 +99,7 @@ export var NEAR_3_HOURS = {
 };
 export var NEAR_6_HOURS = {
   label: '近 6 小时',
+  enLabel: 'Nearly 6 hours',
   rangeLabel: '6h',
   name: 'NEAR_6_HOURS',
   range: function range() {
@@ -100,6 +109,7 @@ export var NEAR_6_HOURS = {
 };
 export var TODAY = {
   label: '今天',
+  enLabel: 'Today',
   rangeLabel: '1d',
   name: 'TODAY',
   range: function range() {
@@ -109,6 +119,7 @@ export var TODAY = {
 };
 export var YESTERDAY = {
   label: '昨天',
+  enLabel: 'Yesterday',
   rangeLabel: '1d',
   name: 'YESTERDAY',
   range: function range() {
@@ -118,6 +129,7 @@ export var YESTERDAY = {
 };
 export var LAST_3_DAYS = {
   label: '近 3 天',
+  enLabel: 'Nearly 3 days',
   rangeLabel: '3d',
   name: 'LAST_3_DAYS',
   range: function range() {
@@ -127,6 +139,7 @@ export var LAST_3_DAYS = {
 };
 export var THIS_WEEK = {
   label: '近一周',
+  enLabel: 'Nearly a week',
   rangeLabel: '1w',
   name: 'THIS_WEEK',
   range: function range() {
@@ -136,6 +149,7 @@ export var THIS_WEEK = {
 };
 export var LAST_WEEK = {
   label: '上周',
+  enLabel: 'Last week',
   rangeLabel: 'last week',
   name: 'LAST_WEEK',
   range: function range() {
@@ -145,6 +159,7 @@ export var LAST_WEEK = {
 };
 export var THIS_MONTH = {
   label: '本月',
+  enLabel: 'This month',
   rangeLabel: '1mo',
   name: 'THIS_MONTH',
   range: function range() {
@@ -154,6 +169,7 @@ export var THIS_MONTH = {
 };
 export var LAST_MONTH = {
   label: '上月',
+  enLabel: 'Last month',
   rangeLabel: '1mo',
   name: 'LAST_MONTH',
   range: function range() {
@@ -163,6 +179,7 @@ export var LAST_MONTH = {
 };
 export var THIS_YEAR = {
   label: '今年',
+  enLabel: 'This year',
   rangeLabel: '1y',
   name: 'THIS_YEAR',
   range: function range() {
@@ -172,6 +189,7 @@ export var THIS_YEAR = {
 };
 export var LAST_YEAR = {
   label: '去年',
+  enLabel: 'Last year',
   rangeLabel: '1y',
   name: 'LAST_YEAR',
   range: function range() {
@@ -181,6 +199,7 @@ export var LAST_YEAR = {
 };
 export var NEXT_YEAR = {
   label: '明年',
+  enLabel: 'Next year',
   rangeLabel: '1y',
   name: 'NEXT_YEAR',
   range: function range() {
@@ -188,4 +207,4 @@ export var NEXT_YEAR = {
     return [current.clone().startOf(YEAR_UNIT).add(1, YEAR_UNIT), current.clone().endOf(YEAR_UNIT).add(1, YEAR_UNIT)];
   }
 };
-export var NEAR_TIME_LIST = [NEAR_1_MINUTES, NEAR_5_MINUTES, NEAR_10_MINUTES, NEAR_20_MINUTES, NEAR_30_MINUTES, NEAR_1_HOURS, NEAR_2_HOURS, NEAR_3_HOURS, NEAR_6_HOURS, LAST_3_DAYS, TODAY, YESTERDAY, THIS_MONTH, LAST_MONTH, THIS_YEAR, LAST_YEAR, NEXT_YEAR];
+export var NEAR_TIME_LIST = [NEAR_1_MINUTES, NEAR_5_MINUTES, NEAR_10_MINUTES, NEAR_20_MINUTES, NEAR_30_MINUTES, NEAR_1_HOURS, NEAR_2_HOURS, NEAR_3_HOURS, NEAR_6_HOURS, LAST_3_DAYS, TODAY, YESTERDAY, THIS_WEEK, LAST_WEEK, THIS_MONTH, LAST_MONTH, THIS_YEAR, LAST_YEAR, NEXT_YEAR];

package/es/DateRanger/typing.d.ts

@@ -5,6 +5,10 @@ export interface RangeOption {
      * @description 选项展示名称
      */
     label: string;
+    /**
+     * @description 选项英文展示名称，用来兼容内部国际化，外部传入的选项直接对 label 做国际化即可
+     */
+    enLabel?: string;
     /**
      * @description 选项 key
      */

package/es/Highlight/index.d.ts

@@ -29,7 +29,7 @@ export declare const THEME_DARK = "dark";
 export declare const THEME_LIGHT = "light";
 declare const ThemeTypes: ["dark", "light"];
 export type ThemeType = (typeof ThemeTypes)[number];
-declare const supportedLanguages: ("go" | "ruby" | "css" | "javascript" | "typescript" | "groovy" | "java" | "python" | "bash" | "json" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "yaml" | "solidity" | "tsx" | "jsx")[];
+declare const supportedLanguages: ("ruby" | "go" | "css" | "javascript" | "typescript" | "groovy" | "java" | "python" | "bash" | "json" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "yaml" | "solidity" | "tsx" | "jsx")[];
 export type LanguageType = (typeof supportedLanguages)[number] | 'html';
 export interface HighlightProps extends LocaleWrapperProps {
     /**

package/es/locale/LocaleWrapper.js

@@ -43,7 +43,10 @@ export default (function (_ref) {
           // @ts-ignore
           var antLocale = this.context.locale;
           var localeFromContext = componentName && antLocale ? antLocale[componentName] : {};
-          var localeData = _objectSpread(_objectSpread({}, defaultLocale), localeFromContext || {});
+          var localeData = _objectSpread(_objectSpread(_objectSpread({}, defaultLocale), localeFromContext || {}), {}, {
+            // 这里使用 antLocale，不能直接顶掉 locale 属性，有些组件内部会维护一个 locale 去做特殊判断
+            antLocale: (antLocale === null || antLocale === void 0 ? void 0 : antLocale.locale) || 'zh-cn'
+          });
           return (
             /*#__PURE__*/
             // @ts-ignore

package/lib/Action/Group.d.ts

@@ -8,9 +8,9 @@ export interface GroupProps {
     shouldVisible?: (key: string) => boolean;
     shouldDisabled?: (key: string) => boolean;
     enableLoading?: boolean;
-    /** 更多操作的自定义展示 */
     moreText?: React.ReactNode;
+    moreType?: 'button' | 'link';
     buttonSize?: ButtonSize;
 }
-declare const _default: ({ size, children, dropDownPlacement, shouldVisible, shouldDisabled, enableLoading, moreText, buttonSize, }: GroupProps) => import("@emotion/react/types/jsx-namespace").EmotionJSX.Element;
+declare const _default: ({ size, children, dropDownPlacement, shouldVisible, shouldDisabled, enableLoading, moreText, moreType, buttonSize, }: GroupProps) => import("@emotion/react/types/jsx-namespace").EmotionJSX.Element;
 export default _default;

package/lib/Action/Group.js

@@ -55,6 +55,7 @@ var Group_default = ({
   shouldDisabled,
   enableLoading,
   moreText,
+  moreType,
   buttonSize
 }) => {
   const visibleActions = Array.isArray(children) ? children.filter((c) => {
@@ -79,13 +80,17 @@ var Group_default = ({
   const mainActions = visibleActionsSort.slice(0, realSize);
   const ellipsisActions = visibleActionsSort.slice(realSize);
   let ellipsisType = "link";
-  if (visibleActionsSort.every((action) => action.type.__DISPLAY_NAME === "button")) {
-    ellipsisType = "default";
+  if (visibleActionsSort.some((action) => action.type.__DISPLAY_NAME === "button")) {
+    ellipsisType = "button";
   }
+  if (visibleActionsSort.some((action) => action.type.__DISPLAY_NAME === "link")) {
+    ellipsisType = "link";
+  }
+  ellipsisType = moreType ?? ellipsisType;
   const getDefaultDisabled = (key) => (shouldDisabled == null ? void 0 : shouldDisabled(key)) ?? false;
   let moreDom;
-  if (ellipsisType === "default") {
-    moreDom = /* @__PURE__ */ import_react.default.createElement(import_design.Button, { type: ellipsisType, size: buttonSize }, moreText ?? /* @__PURE__ */ import_react.default.createElement(import_icons.EllipsisOutlined, { style: { cursor: "pointer" } }));
+  if (ellipsisType === "button") {
+    moreDom = /* @__PURE__ */ import_react.default.createElement(import_design.Button, { size: buttonSize }, moreText ?? /* @__PURE__ */ import_react.default.createElement(import_icons.EllipsisOutlined, { style: { cursor: "pointer" } }));
   } else {
     moreDom = /* @__PURE__ */ import_react.default.createElement(import_design.Typography.Link, null, moreText ?? /* @__PURE__ */ import_react.default.createElement(import_icons.EllipsisOutlined, { style: { cursor: "pointer" } }));
   }

package/lib/Action/index.d.ts

@@ -1,7 +1,7 @@
 import { ActionButton, ActionLink } from './Item';
 export type { GroupProps as ActionGroupProps } from './Group';
 declare const _default: {
-    Group: ({ size, children, dropDownPlacement, shouldVisible, shouldDisabled, enableLoading, moreText, buttonSize, }: import("./Group").GroupProps) => import("@emotion/react/types/jsx-namespace").EmotionJSX.Element;
+    Group: ({ size, children, dropDownPlacement, shouldVisible, shouldDisabled, enableLoading, moreText, moreType, buttonSize, }: import("./Group").GroupProps) => import("@emotion/react/types/jsx-namespace").EmotionJSX.Element;
     Button: typeof ActionButton;
     Link: typeof ActionLink;
 };

package/lib/DateRanger/Ranger.js

@@ -47,7 +47,7 @@ var import_zh_CN = __toESM(require("./locale/zh-CN"));
 var import_index = require("./index.less");
 var prefix = (0, import_util.getPrefix)("date-ranger");
 var Ranger = import_react.default.forwardRef((props, ref) => {
-  var _a, _b, _c;
+  var _a;
   const {
     selects = [
       import_constant.NEAR_1_MINUTES,
@@ -85,7 +85,8 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
     ...rest
   } = props;
   const { token } = import_design.theme.useToken();
-  const isCn = locale.locale === "zh_CN";
+  const isCn = locale.antLocale === "zh-cn";
+  const isEN = locale.antLocale === "en";
   const isMoment = import_moment.default.isMoment(defaultValue == null ? void 0 : defaultValue[0]) || import_moment.default.isMoment(defaultValue == null ? void 0 : defaultValue[1]) || import_moment.default.isMoment(value == null ? void 0 : value[0]) || import_moment.default.isMoment(value == null ? void 0 : value[1]) || isMomentProps;
   const defaultRangeName = value || defaultValue ? import_constant.CUSTOMIZE : defaultQuickValue ?? ((_a = selects == null ? void 0 : selects[0]) == null ? void 0 : _a.name);
   const [rangeName, setRangeName] = (0, import_react.useState)(defaultRangeName);
@@ -183,24 +184,21 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
   };
   const getCustomizeLabel = () => {
     if (differenceYears > 0) {
-      return `近 ${differenceYears} 年`;
+      return isEN ? `Nearly ${differenceYears} years` : `近 ${differenceYears} 年`;
     }
     if (differenceMonths > 0) {
-      return `近 ${differenceMonths} 月`;
+      return isEN ? `Nearly ${differenceMonths} months` : `近 ${differenceMonths} 月`;
     }
     if (differenceWeeks > 0) {
-      return `近 ${differenceWeeks} 周`;
-    }
-    if (differenceDays > 0) {
-      return `近 ${differenceDays} 天`;
+      return isEN ? `Nearly ${differenceWeeks} weeks` : `近 ${differenceWeeks} 周`;
     }
     if (differenceHours > 0) {
-      return `近 ${differenceHours} 时`;
+      return isEN ? `Nearly ${differenceHours} hours` : `近 ${differenceHours} 小时`;
     }
     if (differenceMinutes > 0) {
-      return `近 ${differenceMinutes} 分`;
+      return isEN ? `Nearly ${differenceMinutes} minutes` : `近 ${differenceMinutes} 分`;
     }
-    return `近 ${differenceSeconds} 秒`;
+    return isEN ? `Nearly ${differenceSeconds} seconds` : `近 ${differenceSeconds} 秒`;
   };
   const setNow = () => {
     const selected = import_constant.NEAR_TIME_LIST.find((item) => item.name === rangeName);
@@ -215,8 +213,9 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
   (0, import_react.useImperativeHandle)(ref, () => ({
     updateCurrentTime: setNow
   }));
-  const rangeLabel = rangeName === import_constant.CUSTOMIZE ? getCustomizeRangeLabel() : (_b = selects.find((_item) => _item.name === rangeName)) == null ? void 0 : _b.rangeLabel;
-  const label = rangeName === import_constant.CUSTOMIZE ? getCustomizeLabel() : (_c = selects.find((_item) => _item.name === rangeName)) == null ? void 0 : _c.label;
+  const currentRange = selects.find((_item) => _item.name === rangeName);
+  const rangeLabel = rangeName === import_constant.CUSTOMIZE ? getCustomizeRangeLabel() : currentRange == null ? void 0 : currentRange.rangeLabel;
+  const label = rangeName === import_constant.CUSTOMIZE ? getCustomizeLabel() : isEN ? currentRange.enLabel || currentRange.label : currentRange.label;
   const thisYear = (/* @__PURE__ */ new Date()).getFullYear();
   const isThisYear = (startTime == null ? void 0 : startTime.year()) === thisYear && (endTime == null ? void 0 : endTime.year()) === thisYear;
   const rangeNameIndex = (0, import_lodash.findIndex)(selects, (item) => item.name === rangeName);
@@ -301,7 +300,7 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
             }).map((item) => {
               return {
                 key: item.name,
-                label: /* @__PURE__ */ import_react.default.createElement(import_design.Space, { size: 8, style: { minWidth: 100 } }, hasTagInPicker && /* @__PURE__ */ import_react.default.createElement("span", { className: `${prefix}-label` }, item.rangeLabel), locale[item.label] || item.label)
+                label: /* @__PURE__ */ import_react.default.createElement(import_design.Space, { size: 8, style: { minWidth: 100 } }, hasTagInPicker && /* @__PURE__ */ import_react.default.createElement("span", { className: `${prefix}-label` }, item.rangeLabel), isEN ? item.enLabel || item.label : item.label)
               };
             })
           }

package/lib/DateRanger/constant/index.js

@@ -79,6 +79,7 @@ var DATE_TIME_SECOND_FORMAT_CN = "MM-DD HH:mm:ss";
 var DATE_TIME_FORMAT_CN = "MM-DD HH:mm";
 var NEAR_1_MINUTES = {
   label: "近 1 分钟",
+  enLabel: "Nearly 1 minute",
   rangeLabel: "1m",
   name: "NEAR_1_MINUTES",
   range: (current = (0, import_moment.default)()) => [
@@ -88,6 +89,7 @@ var NEAR_1_MINUTES = {
 };
 var NEAR_5_MINUTES = {
   label: "近 5 分钟",
+  enLabel: "Nearly 5 minutes",
   rangeLabel: "5m",
   name: "NEAR_5_MINUTES",
   range: (current = (0, import_moment.default)()) => [
@@ -97,6 +99,7 @@ var NEAR_5_MINUTES = {
 };
 var NEAR_10_MINUTES = {
   label: "近 10 分钟",
+  enLabel: "Nearly 10 minutes",
   rangeLabel: "10m",
   name: "NEAR_10_MINUTES",
   range: (current = (0, import_moment.default)()) => [
@@ -106,6 +109,7 @@ var NEAR_10_MINUTES = {
 };
 var NEAR_20_MINUTES = {
   label: "近 20 分钟",
+  enLabel: "Nearly 20 minutes",
   rangeLabel: "20m",
   name: "NEAR_20_MINUTES",
   range: (current = (0, import_moment.default)()) => [
@@ -115,6 +119,7 @@ var NEAR_20_MINUTES = {
 };
 var NEAR_30_MINUTES = {
   label: "近 30 分钟",
+  enLabel: "Nearly 30 minutes",
   rangeLabel: "30m",
   name: "NEAR_30_MINUTES",
   range: (current = (0, import_moment.default)()) => [
@@ -124,6 +129,7 @@ var NEAR_30_MINUTES = {
 };
 var NEAR_1_HOURS = {
   label: "近 1 小时",
+  enLabel: "Nearly 1 hour",
   rangeLabel: "1h",
   name: "NEAR_1_HOURS",
   range: (current = (0, import_moment.default)()) => [
@@ -133,6 +139,7 @@ var NEAR_1_HOURS = {
 };
 var NEAR_2_HOURS = {
   label: "近 2 小时",
+  enLabel: "Nearly 2 hours",
   rangeLabel: "2h",
   name: "NEAR_2_HOURS",
   range: (current = (0, import_moment.default)()) => [
@@ -142,6 +149,7 @@ var NEAR_2_HOURS = {
 };
 var NEAR_3_HOURS = {
   label: "近 3 小时",
+  enLabel: "Nearly 3 hours",
   rangeLabel: "3h",
   name: "NEAR_3_HOURS",
   range: (current = (0, import_moment.default)()) => [
@@ -151,6 +159,7 @@ var NEAR_3_HOURS = {
 };
 var NEAR_6_HOURS = {
   label: "近 6 小时",
+  enLabel: "Nearly 6 hours",
   rangeLabel: "6h",
   name: "NEAR_6_HOURS",
   range: (current = (0, import_moment.default)()) => [
@@ -160,6 +169,7 @@ var NEAR_6_HOURS = {
 };
 var TODAY = {
   label: "今天",
+  enLabel: "Today",
   rangeLabel: "1d",
   name: "TODAY",
   range: (current = (0, import_moment.default)()) => [
@@ -169,6 +179,7 @@ var TODAY = {
 };
 var YESTERDAY = {
   label: "昨天",
+  enLabel: "Yesterday",
   rangeLabel: "1d",
   name: "YESTERDAY",
   range: (current = (0, import_moment.default)()) => [
@@ -178,6 +189,7 @@ var YESTERDAY = {
 };
 var LAST_3_DAYS = {
   label: "近 3 天",
+  enLabel: "Nearly 3 days",
   rangeLabel: "3d",
   name: "LAST_3_DAYS",
   range: (current = (0, import_moment.default)()) => [
@@ -187,6 +199,7 @@ var LAST_3_DAYS = {
 };
 var THIS_WEEK = {
   label: "近一周",
+  enLabel: "Nearly a week",
   rangeLabel: "1w",
   name: "THIS_WEEK",
   range: (current = (0, import_moment.default)()) => [
@@ -196,6 +209,7 @@ var THIS_WEEK = {
 };
 var LAST_WEEK = {
   label: "上周",
+  enLabel: "Last week",
   rangeLabel: "last week",
   name: "LAST_WEEK",
   range: (current = (0, import_moment.default)()) => [
@@ -205,6 +219,7 @@ var LAST_WEEK = {
 };
 var THIS_MONTH = {
   label: "本月",
+  enLabel: "This month",
   rangeLabel: "1mo",
   name: "THIS_MONTH",
   range: (current = (0, import_moment.default)()) => [
@@ -214,6 +229,7 @@ var THIS_MONTH = {
 };
 var LAST_MONTH = {
   label: "上月",
+  enLabel: "Last month",
   rangeLabel: "1mo",
   name: "LAST_MONTH",
   range: (current = (0, import_moment.default)()) => [
@@ -223,6 +239,7 @@ var LAST_MONTH = {
 };
 var THIS_YEAR = {
   label: "今年",
+  enLabel: "This year",
   rangeLabel: "1y",
   name: "THIS_YEAR",
   range: (current = (0, import_moment.default)()) => [
@@ -232,6 +249,7 @@ var THIS_YEAR = {
 };
 var LAST_YEAR = {
   label: "去年",
+  enLabel: "Last year",
   rangeLabel: "1y",
   name: "LAST_YEAR",
   range: (current = (0, import_moment.default)()) => [
@@ -241,6 +259,7 @@ var LAST_YEAR = {
 };
 var NEXT_YEAR = {
   label: "明年",
+  enLabel: "Next year",
   rangeLabel: "1y",
   name: "NEXT_YEAR",
   range: (current = (0, import_moment.default)()) => [
@@ -261,6 +280,8 @@ var NEAR_TIME_LIST = [
   LAST_3_DAYS,
   TODAY,
   YESTERDAY,
+  THIS_WEEK,
+  LAST_WEEK,
   THIS_MONTH,
   LAST_MONTH,
   THIS_YEAR,

package/lib/DateRanger/typing.d.ts

@@ -5,6 +5,10 @@ export interface RangeOption {
      * @description 选项展示名称
      */
     label: string;
+    /**
+     * @description 选项英文展示名称，用来兼容内部国际化，外部传入的选项直接对 label 做国际化即可
+     */
+    enLabel?: string;
     /**
      * @description 选项 key
      */

package/lib/Highlight/index.d.ts

@@ -29,7 +29,7 @@ export declare const THEME_DARK = "dark";
 export declare const THEME_LIGHT = "light";
 declare const ThemeTypes: ["dark", "light"];
 export type ThemeType = (typeof ThemeTypes)[number];
-declare const supportedLanguages: ("go" | "ruby" | "css" | "javascript" | "typescript" | "groovy" | "java" | "python" | "bash" | "json" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "yaml" | "solidity" | "tsx" | "jsx")[];
+declare const supportedLanguages: ("ruby" | "go" | "css" | "javascript" | "typescript" | "groovy" | "java" | "python" | "bash" | "json" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "yaml" | "solidity" | "tsx" | "jsx")[];
 export type LanguageType = (typeof supportedLanguages)[number] | 'html';
 export interface HighlightProps extends LocaleWrapperProps {
     /**

package/lib/locale/LocaleWrapper.js

@@ -44,7 +44,9 @@ var LocaleWrapper_default = ({ componentName, defaultLocale }) => (BaseComponent
       const localeFromContext = componentName && antLocale ? antLocale[componentName] : {};
       const localeData = {
         ...defaultLocale,
-        ...localeFromContext || {}
+        ...localeFromContext || {},
+        // 这里使用 antLocale，不能直接顶掉 locale 属性，有些组件内部会维护一个 locale 去做特殊判断
+        antLocale: (antLocale == null ? void 0 : antLocale.locale) || "zh-cn"
       };
       return (
         // @ts-ignore