Merge branch 'main' into release

DouyinFE · Aug 20, 2024 · bf9815b · bf9815b
2 parents 46f67b4 + d25c51d
commit bf9815b
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 163 deletions.
diff --git a/cypress/e2e/datePicker.spec.js b/cypress/e2e/datePicker.spec.js
@@ -859,6 +859,21 @@ describe('DatePicker', () => {
         cy.get('.semi-input').eq(1).should('have.value', '2024-02-26');
     });
 
+    it('fixed selected status bug when double click', () => {
+        cy.visit('http://localhost:6006/iframe.html?id=datepicker--fixed-selected-status&viewMode=story');
+        cy.get('.semi-input').eq(0).click();
+        cy.get('.semi-datepicker-month-grid-left .semi-datepicker-day').contains('15')
+            .then($day => {
+                $day.trigger('click');
+            });
+        cy.get('.semi-datepicker-day-selected').contains("15");
+        cy.get('.semi-datepicker-month-grid-left .semi-datepicker-day').contains('15')
+            .then($day => {
+                $day.trigger('click');
+            });
+        cy.get('.semi-datepicker-day-selected').contains("15");
+    })
+
     it('fixed selected is not update when close panel', () => {
         cy.visit('http://localhost:6006/iframe.html?id=datepicker--fixed-controlled&viewMode=story');
         cy.get('.semi-input').eq(1).click();

diff --git a/packages/semi-foundation/datePicker/monthsGridFoundation.ts b/packages/semi-foundation/datePicker/monthsGridFoundation.ts
@@ -613,11 +613,11 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
         const multiple = this._isMultiple();
         const { selected } = this.getStates();
         const monthDetail = this._getPanelDetail(panelType);
-        const newSelected = new Set(multiple ? [...selected] : []);
+        const newSelected = new Set<string>(multiple ? [...selected] : []);
 
         const { fullDate } = day;
         const time = monthDetail.pickerDate;
-        const dateStr = type === 'dateTime' ? this._mergeDateAndTime(fullDate, time) : fullDate;
+        const dateStr = fullDate;
 
         if (!multiple) {
             newSelected.add(dateStr);
@@ -631,9 +631,8 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
             }
         }
 
-        const dateFormat = this.getValidDateFormat();
         // When passed to the upper layer, it is converted into a Date object to ensure that the input parameter format of initFormDefaultValue is consistent
-        const newSelectedDates = [...newSelected].map(_dateStr => compatibleParse(_dateStr, dateFormat, undefined, dateFnsLocale));
+        const newSelectedDates = [...newSelected].map(_dateStr => type === 'dateTime' ? this._mergeDateAndTime(_dateStr, time) : compatibleParse(_dateStr, strings.FORMAT_FULL_DATE, undefined, dateFnsLocale));
 
         this.handleShowDateAndTime(panelType, time);
 

diff --git a/packages/semi-ui/datePicker/_story/datePicker.stories.jsx b/packages/semi-ui/datePicker/_story/datePicker.stories.jsx
@@ -73,6 +73,7 @@ export {
     FixNeedConfirmControlled,
     FixedNaN,
     PresetsFunctionType,
+    FixedSelectedStatus,
     FixedControlled
 } from './v2';
 

diff --git a/packages/semi-ui/datePicker/_story/v2/FixedSelectedStatus.jsx b/packages/semi-ui/datePicker/_story/v2/FixedSelectedStatus.jsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import { DatePicker } from '@douyinfe/semi-ui';
+
+const App = () => (
+    <DatePicker type="dateTime" defaultPickerValue="2022-07-01" />
+);
+
+export default App;
diff --git a/packages/semi-ui/datePicker/_story/v2/index.js b/packages/semi-ui/datePicker/_story/v2/index.js
@@ -30,4 +30,5 @@ export { default as AutoSplitInput } from './AutoSplitInput';
 export { default as FixNeedConfirmControlled } from './FixNeedConfirmControlled';
 export { default as PresetsFunctionType } from './PresetsFunctionType';
 export { default as FixedNaN } from './FixedNaN';
+export { default as FixedSelectedStatus } from './FixedSelectedStatus';
 export { default as FixedControlled } from './FixedControlled';
diff --git a/packages/semi-ui/table/Body/BaseRow.tsx b/packages/semi-ui/table/Body/BaseRow.tsx
@@ -245,8 +245,11 @@ export default class TableRow extends BaseComponent<BaseRowProps, Record<string,
                 // Only the first data row will be indented
                 if (level != null && columnIndex === firstIndex) {
                     expandableProps.indent = level;
+                    const isBool = typeof expandIcon === 'boolean';
+                    const hasExpandIcon = expandIcon !== false || !isBool && expandIcon !== null;
 
-                    if (!expandableRow && hideExpandedColumn) {
+                    // 如果 expandIcon 为空，不需要 indent
+                    if (!expandableRow && hideExpandedColumn && hasExpandIcon) {
                         expandableProps.indent = level + 1;
                     }
                 }

diff --git a/packages/semi-ui/table/_story/table.stories.jsx b/packages/semi-ui/table/_story/table.stories.jsx
@@ -118,7 +118,8 @@ export {
     DndKitDrag,
     FixedOnGroupedRowClassName,
     FixedVirtualizedRef,
-    RowSelectionOnCell
+    RowSelectionOnCell,
+    FixedIndent
 } from './v2';
 export { default as FixSelectAll325 } from './Demos/rowSelection';
 

diff --git a/packages/semi-ui/table/_story/v2/FixedIndent/index.tsx b/packages/semi-ui/table/_story/v2/FixedIndent/index.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { Table } from '@douyinfe/semi-ui';
+
+export default function App() {
+    const columns = [
+        {
+            title: 'Key',
+            dataIndex: 'dataKey',
+            key: 'dataKey',
+        },
+        {
+            title: '名称',
+            dataIndex: 'name',
+            key: 'name',
+            width: 200,
+        },
+        {
+            title: '数据类型',
+            dataIndex: 'type',
+            key: 'type',
+            width: 400,
+        },
+    ];
+    const data = [
+        {
+            key: 99,
+            dataKey: 99,
+            name: 'row 99',
+            children: [],
+        },
+        {
+            key: 2,
+            dataKey: 'text_info',
+            name: '文本信息',
+            type: 'Object 对象',
+            description: '视频的元信息',
+            default: '无',
+            children: [
+                {
+                    key: 21,
+                    dataKey: 'title',
+                    name: '视频标题',
+                    type: 'String 字符串',
+                    description: '视频的标题',
+                    default: '无',
+                },
+            ],
+        },
+    ];
+    return <div>
+        <Table expandIcon={false} defaultExpandAllRows columns={columns} dataSource={data} />
+        <Table defaultExpandAllRows columns={columns} dataSource={data} />
+    </div>;
+}
diff --git a/packages/semi-ui/table/_story/v2/index.js b/packages/semi-ui/table/_story/v2/index.js
@@ -38,3 +38,4 @@ export { default as DndKitDrag } from './DndKitDrag';
 export { default as FixedOnGroupedRowClassName } from './FixedOnGroupedRowClassName';
 export { default as FixedVirtualizedRef } from './FixedVirtualizedRef';
 export { default as RowSelectionOnCell } from './RowSelectionOnCell';
+export { default as FixedIndent } from './FixedIndent';