Merge branch 'main' into release

DouyinFE · Nov 29, 2024 · 90d852b · 90d852b
2 parents fa2f361 + ee43498
commit 90d852b
Show file tree

Hide file tree

Showing 24 changed files with 244 additions and 184 deletions.
diff --git a/content/start/changelog/index-en-US.md b/content/start/changelog/index-en-US.md
@@ -15,9 +15,19 @@ Version：Major.Minor.Patch (follow the **Semver** specification)
 -   **Patch version**: Only include bug fix, the release time is not limited
 
 ---
+
+
+#### 🎉 2.70.1 (2024-11-25)
+- 【Fix】
+    - Fixed the problem that the URL of the file attachment in the Chat component's dialog box was incorrect, causing the file to fail to open when clicking on the file [#2589](https://github.com/DouyinFE/semi-design/pull/2589)
+
+#### 🎉 2.70.0 (2024-11-22)
+- 【Fix】
+    - Fixed an issue where the placement area was incorrectly displayed when dragging the internal files of the Chat component [#2569](https://github.com/DouyinFE/semi-design/issues/2569)
+
 #### 🎉 2.70.0-beta.0 (2024-11-18)
 - 【Fix】
-    - When all items except the disabled item in the left panel of transfer are selected, the operation button should display Cancel all selections  [#2575 ](https://github.com/DouyinFE/semi-design/issues/2575)
+    - When all items except the disabled item in the left panel of transfer are selected, the operation button should display Cancel all selections  [#2575](https://github.com/DouyinFE/semi-design/issues/2575)
     - fix resizeItem size offset caused by float，invalid min/max setting caused by browser resizing and incorrect behavior in react strictMode  [@Nathon2Y](https://github.com/Nathon2Y)
     - Fix the problem that the placeholder of TreeSelect is blocked when single selection and search box are in trigger,  affecting versions v2.61.0 - 2.69.0
 - 【Feat】

diff --git a/content/start/changelog/index.md b/content/start/changelog/index.md
@@ -13,9 +13,18 @@ Semi 版本号遵循 **Semver** 规范（主版本号-次版本号-修订版本
 -   修订版本号（patch）：仅会进行 bugfix，发布时间不限
 -   不同版本间的详细关系，可查阅 [FAQ](/zh-CN/start/faq)
 
+
+#### 🎉 2.70.1 (2024-11-25)
+- 【Fix】
+    - 修复 Chat 组件对话框中的文件 url 错误导致点击文件无法正确打开文件问题 [#2589](https://github.com/DouyinFE/semi-design/pull/2589)
+
+#### 🎉 2.70.0 (2024-11-22)
+- 【Fix】
+    - 修复拖动 Chat 组件内部文件时候，错误显示放置区域问题 [#2569](https://github.com/DouyinFE/semi-design/issues/2569)
+
 #### 🎉 2.70.0-beta.0 (2024-11-18)
 - 【Fix】
-    - 当 Transfer 的左侧面板中除去被禁用项外的其他项目都被选中时，操作按钮应当显示取消全选  [#2575 ](https://github.com/DouyinFE/semi-design/issues/2575) [#2574](https://github.com/DouyinFE/semi-design/pull/2574)
+    - 当 Transfer 的左侧面板中除去被禁用项外的其他项目都被选中时，操作按钮应当显示取消全选  [#2575](https://github.com/DouyinFE/semi-design/issues/2575) [#2574](https://github.com/DouyinFE/semi-design/pull/2574)
     - 修复计算中浮点数导致伸缩框组件尺寸的误差，浏览器拖动导致的最大最小值失效的问题，以及strictMode引起的问题 [@Nathon2Y](https://github.com/Nathon2Y) [#2551](https://github.com/DouyinFE/semi-design/pull/2551)
     - 修复当单选，搜索框在 trigger 时，TreeSelect 的 placeholder被遮挡问题 ，影响版本 2.61.0-2.69.0 [#2566](https://github.com/DouyinFE/semi-design/pull/2566)
 - 【Feat】

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
     "useWorkspaces": true,
     "npmClient": "yarn",
-    "version": "2.70.0-beta.0"
+    "version": "2.70.1"
 }
diff --git a/packages/semi-animation-react/package.json b/packages/semi-animation-react/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-animation-react",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "motion library for semi-ui-react",
     "keywords": [
         "motion",
@@ -25,8 +25,8 @@
         "prepublishOnly": "npm run build:lib"
     },
     "dependencies": {
-        "@douyinfe/semi-animation": "2.70.0-beta.0",
-        "@douyinfe/semi-animation-styled": "2.70.0-beta.0",
+        "@douyinfe/semi-animation": "2.70.1",
+        "@douyinfe/semi-animation-styled": "2.70.1",
         "classnames": "^2.2.6"
     },
     "devDependencies": {

diff --git a/packages/semi-animation-styled/package.json b/packages/semi-animation-styled/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-animation-styled",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "semi styled animation",
     "keywords": [
         "semi",

diff --git a/packages/semi-animation/package.json b/packages/semi-animation/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-animation",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "animation base library for semi-ui",
     "keywords": [
         "animation",

diff --git a/packages/semi-eslint-plugin/package.json b/packages/semi-eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "eslint-plugin-semi-design",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "semi ui eslint plugin",
     "keywords": [
         "semi",

diff --git a/packages/semi-foundation/chat/foundation.ts b/packages/semi-foundation/chat/foundation.ts
@@ -53,7 +53,9 @@ export interface ChatAdapter<P = Record<string, any>, S = Record<string, any>> e
     notifyHintClick: (hint: string) => void;
     setUploadAreaVisible: (visible: boolean) => void;
     manualUpload: (e: any) => void;
-    getDropAreaElement: () => HTMLDivElement
+    getDropAreaElement: () => HTMLDivElement;
+    getDragStatus: () => boolean;
+    setDragStatus: (status: boolean) => void
 }
 
 
@@ -265,7 +267,19 @@ export default class ChatFoundation <P = Record<string, any>, S = Record<string,
     }
 
     handleDragOver = (e: any) => {
+        const dragStatus = this._adapter.getDragStatus();
+        if (dragStatus) {
+            return;
+        }
         this._adapter.setUploadAreaVisible(true);
+    };
+
+    handleDragStart = (e: any) => {
+        this._adapter.setDragStatus(true);
+    }
+
+    handleDragEnd = (e: any) => {
+        this._adapter.setDragStatus(false);
     }
 
     handleContainerDragOver = (e: any) => {
@@ -285,7 +299,8 @@ export default class ChatFoundation <P = Record<string, any>, S = Record<string,
         // 鼠标移动至 container 的子元素，则不做任何操作
         // If the mouse moves to the child element of container, no operation will be performed.
         const dropAreaElement = this._adapter.getDropAreaElement();
-        if (dropAreaElement !== e.target && dropAreaElement.contains(e.target)) {
+        const enterTarget = e.relatedTarget;
+        if (dropAreaElement.contains(enterTarget)) {
             return;
         }
         /**

diff --git a/packages/semi-foundation/lottie/foundation.ts b/packages/semi-foundation/lottie/foundation.ts
@@ -10,7 +10,7 @@ export interface LottieAdapter<P = Record<string, any>, S = Record<string, any>>
 export interface LottieBaseProps {
     width?: string;
     height?: string;
-    params: ArgsType<typeof lottie.loadAnimation>[0];
+    params: Partial<ArgsType<typeof lottie.loadAnimation>[0]>;
     getAnimationInstance?: (instance: AnimationItem|null) => void;
     getLottie?: (lottiePKG: typeof lottie) => void
 
@@ -57,4 +57,4 @@ class LottieFoundation <P = Record<string, any>, S = Record<string, any>> extend
 
 }
 
-export default LottieFoundation;
+export default LottieFoundation;
diff --git a/packages/semi-foundation/package.json b/packages/semi-foundation/package.json
@@ -1,13 +1,13 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
         "prepublishOnly": "npm run build:lib"
     },
     "dependencies": {
-        "@douyinfe/semi-animation": "2.70.0-beta.0",
+        "@douyinfe/semi-animation": "2.70.1",
         "@mdx-js/mdx": "^3.0.1",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",

diff --git a/packages/semi-icons-lab/package.json b/packages/semi-icons-lab/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@douyinfe/semi-icons-lab",
-  "version": "2.70.0-beta.0",
+  "version": "2.70.1",
   "description": "semi icons lab",
   "keywords": [
     "semi",

diff --git a/packages/semi-icons/package.json b/packages/semi-icons/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-icons",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "semi icons",
     "keywords": [
         "semi",

diff --git a/packages/semi-illustrations/package.json b/packages/semi-illustrations/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-illustrations",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "semi illustrations",
     "keywords": [
         "semi",

diff --git a/packages/semi-next/package.json b/packages/semi-next/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-next",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "Plugin that support Semi Design in Next.js",
     "author": "伍浩威 <[email protected]>",
     "homepage": "",
@@ -22,7 +22,7 @@
         "typescript": "^4"
     },
     "dependencies": {
-        "@douyinfe/semi-webpack-plugin": "2.70.0-beta.0"
+        "@douyinfe/semi-webpack-plugin": "2.70.1"
     },
     "gitHead": "eb34a4f25f002bb4cbcfa51f3df93bed868c831a"
 }
diff --git a/packages/semi-rspack/package.json b/packages/semi-rspack/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-rspack-plugin",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "",
     "homepage": "",
     "license": "MIT",

diff --git a/packages/semi-scss-compile/package.json b/packages/semi-scss-compile/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-scss-compile",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "compile semi scss to css",
     "author": "[email protected]",
     "license": "MIT",

diff --git a/packages/semi-theme-default/package.json b/packages/semi-theme-default/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-theme-default",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "semi-theme-default",
     "keywords": [
         "semi-theme",

diff --git a/packages/semi-ui/chat/chatBox/chatBoxContent.tsx b/packages/semi-ui/chat/chatBox/chatBoxContent.tsx
@@ -68,7 +68,7 @@ const ChatBoxContent = (props: ChatBoxContentProps) => {
                     } else if (item.type === 'file_url') {
                         const { name, size, url, type } = item.file_url;
                         const realType = name.split('.').pop() ?? type?.split('/').pop();
-                        return <FileAttachment key={`index`} url={name} name={name} size={size} type={realType}></FileAttachment>;
+                        return <FileAttachment key={`index`} url={url} name={name} size={size} type={realType}></FileAttachment>;
                     }
                     return null;
                 });

diff --git a/packages/semi-ui/chat/index.tsx b/packages/semi-ui/chat/index.tsx
@@ -22,6 +22,8 @@ const { CHAT_ALIGN, MODE, SEND_HOT_KEY, MESSAGE_STATUS } = strings;
 class Chat extends BaseComponent<ChatProps, ChatState> {
 
     static __SemiComponentName__ = "Chat";
+    // dragStatus: Whether the component contains the dragged object  
+    dragStatus = false;
 
     containerRef: React.RefObject<HTMLDivElement>;
     animation: any;
@@ -192,7 +194,9 @@ class Chat extends BaseComponent<ChatProps, ChatState> {
             },
             getDropAreaElement: () => {
                 return this.dropAreaRef?.current;
-            }
+            },
+            getDragStatus: () => this.dragStatus,
+            setDragStatus: (status: boolean) => { this.dragStatus = status; },
         };
     }
 
@@ -301,6 +305,8 @@ class Chat extends BaseComponent<ChatProps, ChatState> {
                 className={cls(`${prefixCls}`, className)}
                 style={style}
                 onDragOver={this.foundation.handleDragOver}
+                onDragStart={this.foundation.handleDragStart}
+                onDragEnd={this.foundation.handleDragEnd}
             >
                 {uploadAreaVisible && <div
                     ref={this.dropAreaRef}

diff --git a/packages/semi-ui/package.json b/packages/semi-ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "A modern, comprehensive, flexible design system and UI library. Connect DesignOps & DevOps. Quickly build beautiful React apps. Maintained by Douyin-fe team.",
     "main": "lib/cjs/index.js",
     "module": "lib/es/index.js",
@@ -20,12 +20,12 @@
         "@dnd-kit/core": "^6.0.8",
         "@dnd-kit/sortable": "^7.0.2",
         "@dnd-kit/utilities": "^3.2.1",
-        "@douyinfe/semi-animation": "2.70.0-beta.0",
-        "@douyinfe/semi-animation-react": "2.70.0-beta.0",
-        "@douyinfe/semi-foundation": "2.70.0-beta.0",
-        "@douyinfe/semi-icons": "2.70.0-beta.0",
-        "@douyinfe/semi-illustrations": "2.70.0-beta.0",
-        "@douyinfe/semi-theme-default": "2.70.0-beta.0",
+        "@douyinfe/semi-animation": "2.70.1",
+        "@douyinfe/semi-animation-react": "2.70.1",
+        "@douyinfe/semi-foundation": "2.70.1",
+        "@douyinfe/semi-icons": "2.70.1",
+        "@douyinfe/semi-illustrations": "2.70.1",
+        "@douyinfe/semi-theme-default": "2.70.1",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "copy-text-to-clipboard": "^2.1.1",

diff --git a/packages/semi-ui/tree/_story/tree.stories.jsx b/packages/semi-ui/tree/_story/tree.stories.jsx
@@ -207,6 +207,17 @@ const treeDataWithIcon = [
   },
 ];
 
+const OneLevelData = [
+  {
+    label: '亚洲',
+    key: 'yazhou',
+  },
+  {
+    label: '北美洲',
+    key: 'beimeizhou',
+  },
+]
+
 let opts = {
   content: 'Hi, Bytedance dance dance',
   duration: 3,
@@ -3078,6 +3089,14 @@ export const ShowLine = () => {
       defaultExpandAll
       disableStrictly
     />
+    <>单选，单层节点</>
+    <Tree
+      showLine={showLine}
+      treeData={OneLevelData}
+      // value="meiguo"
+      defaultExpandAll
+      onChange={(...args) => console.log(args)}
+    />
   </div>
   )
 }

diff --git a/packages/semi-ui/tree/treeNode.tsx b/packages/semi-ui/tree/treeNode.tsx
@@ -203,7 +203,7 @@ export default class TreeNode extends PureComponent<TreeNodeProps, TreeNodeState
 
     renderArrow() {
         const showIcon = !this.isLeaf();
-        const { loading, expanded, showLine } = this.props;
+        const { loading, expanded, showLine, level } = this.props;
         if (loading) {
             return <Spin wrapperClassName={`${prefixcls}-spin-icon`} />;
         }
@@ -218,7 +218,8 @@ export default class TreeNode extends PureComponent<TreeNodeProps, TreeNodeState
                 />
             );
         }
-        if (showLine) {
+        // when leaf node 's level is 0, no switcher
+        if (showLine && level) {
             return this.renderSwitcher();
         }
         return (

diff --git a/packages/semi-webpack/package.json b/packages/semi-webpack/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-webpack-plugin",
-    "version": "2.70.0-beta.0",
+    "version": "2.70.1",
     "description": "",
     "author": "伍浩威 <[email protected]>",
     "homepage": "",