Feat merge 4.x (#593)

LuckyFBB · haiminovo · liuxy0551 · web-flow · commit 014295abe2ee · 2025-08-07T20:00:42.000+08:00
* change question mark size to 16px in component blockHeader (#417) * change afterTitle question mark to 16px at blockheader component * change question mark size to 16px in blockTitle component * add parameter 'clearData' to useList mutate function (#418) * optimized useList clear data before mutate request * add unit testing and desc * add demo to mutate options * feat: blockHeader title support ReactNode (#432) * docs: blockHeader docs use size (#468) * fix: using ref to solve closure problems (#497) * refactor: add copyTypes and remove showCopyWithHeader 4.x (#545) * feat(SpreadSheet): add copyTypes and remove showCopyWithHeader * docs: demo and changelog * fix: copy events compatible with old browsers * fix(ellipsisText): ellipsisRef.current may be null (#572) * feat(configprovider): 4.x support locale provider for RC (#548) * feat(configprovider): support provider for RC * feat(configprovider): migrate locale type to useLocale * fix(configprovider): fix unit test error * fix(configprovier): update ConfigProvider ts and en locale text * feat(configprovider): change localeFromContext * feat(configprovider): update ConfigProvider ts and en locale text --------- Co-authored-by: haiminovo <85284863+haiminovo@users.noreply.github.com> Co-authored-by: 琉易 <liuxy0551@qq.com> Co-authored-by: lalala <56628290+jin-sir@users.noreply.github.com>
diff --git a/src/blockHeader/__tests__/blockHeader.test.tsx b/src/blockHeader/__tests__/blockHeader.test.tsx
@@ -37,7 +37,7 @@ describe('test BlockHeader render', () => {
     });
     test('should render BlockHeader default BlockHeader render', () => {
         const { getByText, rerender } = render(<BlockHeader {...props} />);
-        expect(getByText(props.title)).toBeTruthy();
+        expect(getByText(props.title as any)).toBeTruthy();
         rerender(<BlockHeader title="标题2" />);
         expect(getByText('标题2')).toBeTruthy();
     });
diff --git a/src/blockHeader/demos/title.tsx b/src/blockHeader/demos/title.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { BlockHeader, EllipsisText } from 'dt-react-component';
+
+export default () => {
+    return (
+        <BlockHeader
+            title={
+                <EllipsisText
+                    maxWidth={200}
+                    value="标题超长标题超长标题超长标题超长标题超长标题超长标题超长标题超长标题超长标题超长标题超长标题超长标题超长标题超长标题超长标题超长标题超长"
+                />
+            }
+        />
+    );
+};
diff --git a/src/blockHeader/index.md b/src/blockHeader/index.md
@@ -20,6 +20,7 @@ demo:
 <code src="./demos/addonBefore.tsx" description="通过 `addonBefore` 可以设置标题前的图标，不设置时默认是一个色块，设置为假值(`undefined` 除外)不展示图标">自定义 icon</code>
 <code src="./demos/addonAfter.tsx" description="通过 `addonAfter` 可以设置后缀自定义内容块">带提示信息的标题</code>
 <code src="./demos/expand.tsx" description="通过配置 expand/defaultExpand 控制展开/收起">支持 `children` 做为内容展示</code>
+<code src="./demos/title.tsx" description="title 支持 ReactNode">标题超长</code>
 
 ## API
 
@@ -38,8 +39,8 @@ demo:
 | contentClassName | 展示内容的样式类名                 | `string`                                | -        |
 | contentStyle     | 展示内容的样式                     | `React.CSSProperties`                   | -        |
 | background       | 是否显示背景                       | `boolean`                               | `true`   |
-| defaultExpand    | 是否默认展开内容                   | `boolean`                               | `-`   |
+| defaultExpand    | 是否默认展开内容                   | `boolean`                               | `-`      |
 | expand           | 当前展开状态                       | `boolean`                               |          |
-| spaceBottom      | 自定义下边距，优先级高于 hasBottom | `number`                                | `16`      |
+| spaceBottom      | 自定义下边距，优先级高于 hasBottom | `number`                                | `16`     |
 | children         | 展开/收起的内容                    | `React.ReactNode`                       | -        |
 | onExpand         | 展开/收起时的回调                  | `(expand: boolean) => void`             | -        |
diff --git a/src/blockHeader/index.tsx b/src/blockHeader/index.tsx
@@ -3,6 +3,7 @@ import { QuestionOutlined, UpOutlined } from '@dtinsight/react-icons';
 import { Tooltip } from 'antd';
 import classNames from 'classnames';
 
+import useLocale from '../locale/useLocale';
 import { LabelTooltipType, toTooltipProps } from '../utils';
 import './style.scss';
 
@@ -14,7 +15,7 @@ function isControlled(props: IBlockHeaderProps) {
 
 export interface IBlockHeaderProps {
     /** 标题 */
-    title: string;
+    title: ReactNode;
     /** 标题前的图标，默认是一个色块 */
     addonBefore?: ReactNode;
     /** 标题后的提示说明文字 */
@@ -76,6 +77,7 @@ const BlockHeader: React.FC<IBlockHeaderProps> = function (props) {
     } = props;
 
     const [internalExpand, setInternalExpand] = useState(defaultExpand);
+    const locale = useLocale('BlockHeader');
 
     const currentExpand = isControlled(props) ? expand : internalExpand;
 
@@ -124,7 +126,9 @@ const BlockHeader: React.FC<IBlockHeaderProps> = function (props) {
                 {addonAfter && <div className={`title__addon-after`}>{addonAfter}</div>}
                 {showCollapse && (
                     <div className={`title__collapse`}>
-                        <div className="collapse__text">{currentExpand ? '收起' : '展开'}</div>
+                        <div className="collapse__text">
+                            {currentExpand ? locale.collapse : locale.expand}
+                        </div>
                         <UpOutlined
                             className={classNames('collapse__icon', {
                                 'collapse__icon--up': currentExpand,
diff --git a/src/configProvider/index.tsx b/src/configProvider/index.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+
+import { Locale, LocaleContext } from '../locale/useLocale';
+
+const ConfigProvider = ({ locale, children }: { locale: Locale; children: React.ReactNode }) => {
+    return <LocaleContext.Provider value={{ locale }}>{children}</LocaleContext.Provider>;
+};
+
+export default ConfigProvider;
diff --git a/src/copy/index.tsx b/src/copy/index.tsx
@@ -4,6 +4,7 @@ import { CopyOutlined } from '@dtinsight/react-icons';
 import { message, Tooltip } from 'antd';
 import classNames from 'classnames';
 
+import useLocale from '../locale/useLocale';
 import { LabelTooltipType, toTooltipProps } from '../utils';
 import './style.scss';
 
@@ -18,14 +19,15 @@ export interface ICopyProps {
 }
 
 const Copy: React.FC<ICopyProps> = (props) => {
+    const locale = useLocale('Copy');
     const {
         button = <CopyOutlined className="dtc-copy__default-icon" />,
         text,
-        tooltip = '复制',
+        tooltip = locale.copy,
         style,
         className,
         disabled = false,
-        onCopy = () => message.success('复制成功'),
+        onCopy = () => message.success(locale.copied),
     } = props;
 
     const handleCopy = () => {
diff --git a/src/dropdown/select.tsx b/src/dropdown/select.tsx
@@ -10,6 +10,7 @@ import classNames from 'classnames';
 import { isEqual } from 'lodash-es';
 import List from 'rc-virtual-list';
 
+import useLocale from '../locale/useLocale';
 import './style.scss';
 
 interface IDropdownSelectProps
@@ -35,6 +36,8 @@ export default function Select({
     const [visible, setVisible] = useState(false);
     const [selected, setSelected] = useState<CheckboxValueType[]>(value || defaultValue || []);
 
+    const locale = useLocale('Dropdown');
+
     const handleCheckedAll = (e: CheckboxChangeEvent) => {
         if (e.target.checked) {
             setSelected(options?.map((i) => i.value) || []);
@@ -130,7 +133,7 @@ export default function Select({
                         checked={checkAll}
                         indeterminate={indeterminate}
                     >
-                        全选
+                        {locale.selectAll}
                     </Checkbox>
                 </Col>
                 <Col span={24} className={`${prefix}__menu`}>
@@ -169,10 +172,10 @@ export default function Select({
             </Row>
             <Space size={8} className={`${prefix}__btns`}>
                 <Button size="small" disabled={resetDisabled} onClick={handleReset}>
-                    重置
+                    {locale.resetText}
                 </Button>
                 <Button size="small" type="primary" onClick={handleSubmit}>
-                    确定
+                    {locale.okText}
                 </Button>
             </Space>
         </>
diff --git a/src/ellipsisText/index.tsx b/src/ellipsisText/index.tsx
@@ -78,6 +78,9 @@ const EllipsisText = (props: IEllipsisTextProps) => {
      * @return {*}
      */
     const getStyle = (dom: NewHTMLElement, attr: string) => {
+        if (!dom) {
+            return null;
+        }
         // Compatible width IE8
         // @ts-ignore
         return window.getComputedStyle(dom)[attr] || dom.currentStyle[attr];
@@ -203,7 +206,11 @@ const EllipsisText = (props: IEllipsisTextProps) => {
      * @return {*}
      */
     const onResize = () => {
-        const ellipsisNode = ellipsisRef.current!;
+        if (!ellipsisRef.current) {
+            return;
+        }
+
+        const ellipsisNode = ellipsisRef.current;
         const parentElement = ellipsisNode.parentElement!;
         const rangeWidth = getRangeWidth(ellipsisNode);
         const containerWidth = getContainerWidth(parentElement);
diff --git a/src/errorBoundary/loadError.tsx b/src/errorBoundary/loadError.tsx
@@ -1,22 +1,24 @@
 import React from 'react';
 
+import useLocale from '../locale/useLocale';
+
 const LoadError: React.FC = function () {
+    const locale = useLocale('LoadError');
     return (
         <div className="dtc-error" data-testid="test-error">
             <div>
-                
                 <h2 style={{ textAlign: 'center' }} data-testid="test-error">
-                    发现新版本，请
+                    {locale.please}
                     <a
                         onClick={() => {
                             location.reload();
                         }}
                     >
-                        刷新
+                        {locale.refresh}
                     </a>
-                    获取新版本。
+                    {locale.get}
                 </h2>
-                <h4 style={{ textAlign: 'center' }}>若该提示长时间存在，请联系管理员。</h4>
+                <h4 style={{ textAlign: 'center' }}>{locale.title}</h4>
             </div>
         </div>
     );
diff --git a/src/fullscreen/index.tsx b/src/fullscreen/index.tsx
@@ -2,6 +2,7 @@ import React, { CSSProperties, HTMLAttributes, ReactNode, useEffect, useState }
 import { Button } from 'antd';
 
 import KeyEventListener from '../keyEventListener';
+import useLocale from '../locale/useLocale';
 import MyIcon from './icon';
 
 const { KeyCombiner } = KeyEventListener;
@@ -44,7 +45,11 @@ export default function Fullscreen({
     ...other
 }: IFullscreenProps) {
     const [isFullScreen, setIsFullScreen] = useState(false);
+
+    const locale = useLocale('Fullscreen');
+
     const customIcon = isFullScreen ? exitFullIcon : fullIcon;
+
     useEffect(() => {
         const propsDom = document.getElementById(target);
         const domEle = propsDom || document.body;
@@ -188,7 +193,7 @@ export default function Fullscreen({
             ) : (
                 <Button onClick={handleFullScreen}>
                     <MyIcon style={iconStyle} type={isFullScreen} themeDark={themeDark} />
-                    {isFullScreen ? '退出全屏' : '全屏'}
+                    {isFullScreen ? locale.exitFull : locale.full}
                 </Button>
             )}
         </KeyCombiner>
diff --git a/src/globalLoading/index.tsx b/src/globalLoading/index.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 
+import useLocale from '../locale/useLocale';
 import './style.scss';
 
 export interface IGlobalLoadingProps {
@@ -13,8 +14,10 @@ export interface IGlobalLoadingProps {
 }
 
 const GlobalLoading: React.FC<IGlobalLoadingProps> = function (props) {
+    const locale = useLocale('GlobalLoading');
+
     const {
-        loadingTitle = '应用加载中，请等候～',
+        loadingTitle = locale.loading,
         mainBackground = '#F2F7FA',
         circleBackground = '#1D78FF',
         titleColor = '#3D446E',
diff --git a/src/index.ts b/src/index.ts
@@ -5,6 +5,7 @@ export { default as Button } from './button';
 export { default as Catalogue } from './catalogue';
 export { default as Chat } from './chat';
 export { default as CollapsibleActionItems } from './collapsibleActionItems';
+export { default as ConfigProvider } from './configProvider';
 export { default as ContentLayout } from './contentLayout';
 export { default as ContextMenu } from './contextMenu';
 export { default as Copy } from './copy';
@@ -24,6 +25,8 @@ export { default as GlobalLoading } from './globalLoading';
 export { default as Image } from './image';
 export { default as Input } from './input';
 export { default as KeyEventListener } from './keyEventListener';
+export { default as enUS } from './locale/en-US';
+export { default as zhCN } from './locale/zh-CN';
 export { default as MarkdownRender } from './markdownRender';
 export { default as Modal } from './modal/modal';
 export { default as NotFound } from './notFound';
diff --git a/src/input/match.tsx b/src/input/match.tsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import { Input, type InputProps, Tooltip } from 'antd';
 import classNames from 'classnames';
 
+import useLocale from '../locale/useLocale';
 import { CaseSensitiveIcon, FrontIcon, PreciseIcon, TailIcon } from './icons';
 import './match.scss';
 
@@ -29,30 +30,11 @@ interface IMatchProps extends Omit<InputProps, 'suffix'> {
     onSearch?: (value: string, searchType: SearchType) => void;
 }
 
-const searchTypeList = [
-    {
-        key: 'caseSensitive',
-        tip: '区分大小写匹配',
-    },
-    {
-        key: 'precise',
-        tip: '精确匹配',
-    },
-    {
-        key: 'front',
-        tip: '头部匹配',
-    },
-    {
-        key: 'tail',
-        tip: '尾部匹配',
-    },
-] as const;
-
 export default function Match({
     className,
     value,
     searchType,
-    filterOptions = searchTypeList.map((i) => i.key),
+    filterOptions: propFilterOptions,
     onTypeChange,
     onSearch,
     onChange,
@@ -62,12 +44,35 @@ export default function Match({
     const [internalValue, setValue] = useState<string>('');
     const [internalSearchType, setSearchType] = useState<SearchType>('fuzzy');
 
+    const locale = useLocale('Input');
+
     const handleTypeChange = (key: SearchType) => {
         const next = realSearchType === key ? 'fuzzy' : key;
         onTypeChange?.(next);
         setSearchType(next);
     };
 
+    const searchTypeList = [
+        {
+            key: 'caseSensitive',
+            tip: locale.case,
+        },
+        {
+            key: 'precise',
+            tip: locale.precise,
+        },
+        {
+            key: 'front',
+            tip: locale.front,
+        },
+        {
+            key: 'tail',
+            tip: locale.tail,
+        },
+    ] as const;
+
+    const filterOptions = propFilterOptions || searchTypeList.map((i) => i.key);
+
     const options = searchTypeList.filter((i) => filterOptions.includes(i.key));
 
     const realSearchType = searchType || internalSearchType;
diff --git a/src/locale/en-US.ts b/src/locale/en-US.ts
diff --git a/src/locale/useLocale.tsx b/src/locale/useLocale.tsx
diff --git a/src/locale/zh-CN.ts b/src/locale/zh-CN.ts
diff --git a/src/notFound/index.tsx b/src/notFound/index.tsx
diff --git a/src/spreadSheet/index.tsx b/src/spreadSheet/index.tsx
