@douyinfe/semi-foundation 2.25.2 → 2.25.3

package/datePicker/monthsGridFoundation.ts

@@ -55,7 +55,8 @@ export type YearMonthChangeType = 'prevMonth' | 'nextMonth' | 'prevYear' | 'next
 
 export interface MonthsGridFoundationProps extends MonthsGridElementProps {
     type?: Type;
-    defaultValue?: ValueType;
+    /** may be null if selection is not complete when type is dateRange or dateTimeRange */
+    defaultValue?: (Date | null)[];
     defaultPickerValue?: ValueType;
     multiple?: boolean;
     max?: number;
@@ -96,7 +97,11 @@ export interface MonthsGridFoundationProps extends MonthsGridElementProps {
 }
 
 export interface MonthInfo {
+    /** The date displayed in the current date panel, update when switching year and month */
     pickerDate: Date;
+    /**
+     * Default date or selected date (when selected)
+     */
     showDate: Date;
     isTimePickerOpen: boolean;
     isYearPickerOpen: boolean
@@ -167,22 +172,22 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
         }
     }
 
-    updateSelectedFromProps(values: ValueType, refreshPicker = true) {
+    updateSelectedFromProps(values: (Date | null)[], refreshPicker = true) {
         const type: Type = this.getProp('type');
         const { selected, rangeStart, rangeEnd } = this.getStates();
-        if (values && (values as BaseValueType[]).length) {
+        if (values && values?.length) {
             switch (type) {
                 case 'date':
-                    this._initDatePickerFromValue(values as BaseValueType[], refreshPicker);
+                    this._initDatePickerFromValue(values, refreshPicker);
                     break;
                 case 'dateRange':
-                    this._initDateRangePickerFromValue(values as BaseValueType[]);
+                    this._initDateRangePickerFromValue(values);
                     break;
                 case 'dateTime':
-                    this._initDateTimePickerFromValue(values as BaseValueType[]);
+                    this._initDateTimePickerFromValue(values);
                     break;
                 case 'dateTimeRange':
-                    this._initDateTimeRangePickerFormValue(values as BaseValueType[]);
+                    this._initDateTimeRangePickerFormValue(values);
                     break;
                 default:
                     break;
@@ -222,7 +227,7 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
         }
     }
 
-    _initDatePickerFromValue(values: BaseValueType[], refreshPicker = true) {
+    _initDatePickerFromValue(values: Date[], refreshPicker = true) {
         const monthLeft = this.getState('monthLeft');
         const newMonthLeft = { ...monthLeft };
         // REMOVE:
@@ -244,16 +249,32 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
         this._adapter.updateDaySelected(newSelected);
     }
 
-    _initDateRangePickerFromValue(values: BaseValueType[], withTime = false) {
+    _initDateRangePickerFromValue(values: (Date | null)[], withTime = false) {
         // init month panel
-        const monthLeft = this.getState('monthLeft');
-        const monthRight = this.getState('monthRight');
+        const monthLeft = this.getState('monthLeft') as MonthsGridFoundationState['monthLeft'];
+        const monthRight = this.getState('monthRight') as MonthsGridFoundationState['monthRight'];
         const adjustResult = this._autoAdjustMonth(
             { ...monthLeft, pickerDate: values[0] || monthLeft.pickerDate },
             { ...monthRight, pickerDate: values[1] || monthRight.pickerDate }
         );
-        this.handleShowDateAndTime(strings.PANEL_TYPE_LEFT, adjustResult.monthLeft.pickerDate);
-        this.handleShowDateAndTime(strings.PANEL_TYPE_RIGHT, adjustResult.monthRight.pickerDate);
+
+        const validValue = Array.isArray(values) && values.filter(item => item).length > 1;
+        if (validValue) {
+            this.handleShowDateAndTime(strings.PANEL_TYPE_LEFT, adjustResult.monthLeft.pickerDate);
+            this.handleShowDateAndTime(strings.PANEL_TYPE_RIGHT, adjustResult.monthRight.pickerDate);
+        } else {
+            const selectedDate = values.find(item => item) as Date;
+            // 如果日期不完整且输入日期不在面板范围内，则更新面板
+            if (selectedDate) {                
+                const notLeftMonth = selectedDate?.getMonth() !== monthLeft.pickerDate.getMonth();
+                const notRightMonth = selectedDate?.getMonth() !== monthRight.pickerDate.getMonth();
+    
+                if (notLeftMonth && notRightMonth) {
+                    this.handleShowDateAndTime(strings.PANEL_TYPE_LEFT, adjustResult.monthLeft.pickerDate);
+                    this.handleShowDateAndTime(strings.PANEL_TYPE_RIGHT, adjustResult.monthRight.pickerDate);
+                }
+            }
+        }
 
         // init range
         const formatToken = withTime ? strings.FORMAT_DATE_TIME : strings.FORMAT_FULL_DATE;
@@ -268,11 +289,11 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
         this._adapter.setHoverDay(rangeEnd);
     }
 
-    _initDateTimePickerFromValue(values: BaseValueType[]) {
+    _initDateTimePickerFromValue(values: Date[]) {
         this._initDatePickerFromValue(values);
     }
 
-    _initDateTimeRangePickerFormValue(values: BaseValueType[]) {
+    _initDateTimeRangePickerFormValue(values: (Date | null)[]) {
         this._initDateRangePickerFromValue(values, true);
     }
 

package/lib/cjs/datePicker/monthsGridFoundation.d.ts

@@ -1,7 +1,7 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 import { strings } from './constants';
 import { WeekStartNumber } from './_utils/getMonthTable';
-import { BaseValueType, PresetPosition, ValueType } from './foundation';
+import { PresetPosition, ValueType } from './foundation';
 import { MonthDayInfo } from './monthFoundation';
 import { ArrayElement } from '../utils/type';
 declare type Type = ArrayElement<typeof strings.TYPE_SET>;
@@ -15,7 +15,8 @@ export declare type PanelType = 'left' | 'right';
 export declare type YearMonthChangeType = 'prevMonth' | 'nextMonth' | 'prevYear' | 'nextYear';
 export interface MonthsGridFoundationProps extends MonthsGridElementProps {
     type?: Type;
-    defaultValue?: ValueType;
+    /** may be null if selection is not complete when type is dateRange or dateTimeRange */
+    defaultValue?: (Date | null)[];
     defaultPickerValue?: ValueType;
     multiple?: boolean;
     max?: number;
@@ -58,7 +59,11 @@ export interface MonthsGridFoundationProps extends MonthsGridElementProps {
     renderDateInput?: any;
 }
 export interface MonthInfo {
+    /** The date displayed in the current date panel, update when switching year and month */
     pickerDate: Date;
+    /**
+     * Default date or selected date (when selected)
+     */
     showDate: Date;
     isTimePickerOpen: boolean;
     isYearPickerOpen: boolean;
@@ -101,12 +106,12 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
     constructor(adapter: MonthsGridAdapter);
     init(): void;
     initDefaultPickerValue(): void;
-    updateSelectedFromProps(values: ValueType, refreshPicker?: boolean): void;
+    updateSelectedFromProps(values: (Date | null)[], refreshPicker?: boolean): void;
     calcDisabledTime(panelType: PanelType): any;
-    _initDatePickerFromValue(values: BaseValueType[], refreshPicker?: boolean): void;
-    _initDateRangePickerFromValue(values: BaseValueType[], withTime?: boolean): void;
-    _initDateTimePickerFromValue(values: BaseValueType[]): void;
-    _initDateTimeRangePickerFormValue(values: BaseValueType[]): void;
+    _initDatePickerFromValue(values: Date[], refreshPicker?: boolean): void;
+    _initDateRangePickerFromValue(values: (Date | null)[], withTime?: boolean): void;
+    _initDateTimePickerFromValue(values: Date[]): void;
+    _initDateTimeRangePickerFormValue(values: (Date | null)[]): void;
     destroy(): void;
     /**
      * sync change another panel month when change months from the else yam panel

package/lib/cjs/datePicker/monthsGridFoundation.js

@@ -79,7 +79,7 @@ class MonthsGridFoundation extends _foundation.default {
       rangeEnd
     } = this.getStates();
 
-    if (values && values.length) {
+    if (values && (values === null || values === void 0 ? void 0 : values.length)) {
       switch (type) {
         case 'date':
           this._initDatePickerFromValue(values, refreshPicker);
@@ -191,8 +191,25 @@ class MonthsGridFoundation extends _foundation.default {
       pickerDate: values[1] || monthRight.pickerDate
     }));
 
-    this.handleShowDateAndTime(_constants.strings.PANEL_TYPE_LEFT, adjustResult.monthLeft.pickerDate);
-    this.handleShowDateAndTime(_constants.strings.PANEL_TYPE_RIGHT, adjustResult.monthRight.pickerDate); // init range
+    const validValue = Array.isArray(values) && values.filter(item => item).length > 1;
+
+    if (validValue) {
+      this.handleShowDateAndTime(_constants.strings.PANEL_TYPE_LEFT, adjustResult.monthLeft.pickerDate);
+      this.handleShowDateAndTime(_constants.strings.PANEL_TYPE_RIGHT, adjustResult.monthRight.pickerDate);
+    } else {
+      const selectedDate = values.find(item => item); // 如果日期不完整且输入日期不在面板范围内，则更新面板
+
+      if (selectedDate) {
+        const notLeftMonth = (selectedDate === null || selectedDate === void 0 ? void 0 : selectedDate.getMonth()) !== monthLeft.pickerDate.getMonth();
+        const notRightMonth = (selectedDate === null || selectedDate === void 0 ? void 0 : selectedDate.getMonth()) !== monthRight.pickerDate.getMonth();
+
+        if (notLeftMonth && notRightMonth) {
+          this.handleShowDateAndTime(_constants.strings.PANEL_TYPE_LEFT, adjustResult.monthLeft.pickerDate);
+          this.handleShowDateAndTime(_constants.strings.PANEL_TYPE_RIGHT, adjustResult.monthRight.pickerDate);
+        }
+      }
+    } // init range
+
 
     const formatToken = withTime ? _constants.strings.FORMAT_DATE_TIME : _constants.strings.FORMAT_FULL_DATE;
     let rangeStart = values[0] && (0, _dateFns.format)(values[0], formatToken);

package/lib/cjs/tree/treeUtil.d.ts

@@ -74,6 +74,6 @@ export declare function getValueOrKey(data: any): any;
 export declare function normalizeValue(value: any, withObject: boolean): any;
 export declare function updateKeys(keySet: Set<string> | string[], keyEntities: KeyEntities): string[];
 export declare function calcDisabledKeys(keyEntities: KeyEntities): Set<string>;
-export declare function calcDropRelativePosition(event: any, treeNode: any): 1 | -1 | 0;
+export declare function calcDropRelativePosition(event: any, treeNode: any): 0 | 1 | -1;
 export declare function getDragNodesKeys(key: string, keyEntities: KeyEntities): string[];
 export declare function calcDropActualPosition(pos: string, relativeDropPos: any): any;

package/lib/es/datePicker/monthsGridFoundation.d.ts

@@ -1,7 +1,7 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 import { strings } from './constants';
 import { WeekStartNumber } from './_utils/getMonthTable';
-import { BaseValueType, PresetPosition, ValueType } from './foundation';
+import { PresetPosition, ValueType } from './foundation';
 import { MonthDayInfo } from './monthFoundation';
 import { ArrayElement } from '../utils/type';
 declare type Type = ArrayElement<typeof strings.TYPE_SET>;
@@ -15,7 +15,8 @@ export declare type PanelType = 'left' | 'right';
 export declare type YearMonthChangeType = 'prevMonth' | 'nextMonth' | 'prevYear' | 'nextYear';
 export interface MonthsGridFoundationProps extends MonthsGridElementProps {
     type?: Type;
-    defaultValue?: ValueType;
+    /** may be null if selection is not complete when type is dateRange or dateTimeRange */
+    defaultValue?: (Date | null)[];
     defaultPickerValue?: ValueType;
     multiple?: boolean;
     max?: number;
@@ -58,7 +59,11 @@ export interface MonthsGridFoundationProps extends MonthsGridElementProps {
     renderDateInput?: any;
 }
 export interface MonthInfo {
+    /** The date displayed in the current date panel, update when switching year and month */
     pickerDate: Date;
+    /**
+     * Default date or selected date (when selected)
+     */
     showDate: Date;
     isTimePickerOpen: boolean;
     isYearPickerOpen: boolean;
@@ -101,12 +106,12 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
     constructor(adapter: MonthsGridAdapter);
     init(): void;
     initDefaultPickerValue(): void;
-    updateSelectedFromProps(values: ValueType, refreshPicker?: boolean): void;
+    updateSelectedFromProps(values: (Date | null)[], refreshPicker?: boolean): void;
     calcDisabledTime(panelType: PanelType): any;
-    _initDatePickerFromValue(values: BaseValueType[], refreshPicker?: boolean): void;
-    _initDateRangePickerFromValue(values: BaseValueType[], withTime?: boolean): void;
-    _initDateTimePickerFromValue(values: BaseValueType[]): void;
-    _initDateTimeRangePickerFormValue(values: BaseValueType[]): void;
+    _initDatePickerFromValue(values: Date[], refreshPicker?: boolean): void;
+    _initDateRangePickerFromValue(values: (Date | null)[], withTime?: boolean): void;
+    _initDateTimePickerFromValue(values: Date[]): void;
+    _initDateTimeRangePickerFormValue(values: (Date | null)[]): void;
     destroy(): void;
     /**
      * sync change another panel month when change months from the else yam panel

package/lib/es/datePicker/monthsGridFoundation.js

@@ -58,7 +58,7 @@ export default class MonthsGridFoundation extends BaseFoundation {
       rangeEnd
     } = this.getStates();
 
-    if (values && values.length) {
+    if (values && (values === null || values === void 0 ? void 0 : values.length)) {
       switch (type) {
         case 'date':
           this._initDatePickerFromValue(values, refreshPicker);
@@ -170,8 +170,25 @@ export default class MonthsGridFoundation extends BaseFoundation {
       pickerDate: values[1] || monthRight.pickerDate
     }));
 
-    this.handleShowDateAndTime(strings.PANEL_TYPE_LEFT, adjustResult.monthLeft.pickerDate);
-    this.handleShowDateAndTime(strings.PANEL_TYPE_RIGHT, adjustResult.monthRight.pickerDate); // init range
+    const validValue = Array.isArray(values) && values.filter(item => item).length > 1;
+
+    if (validValue) {
+      this.handleShowDateAndTime(strings.PANEL_TYPE_LEFT, adjustResult.monthLeft.pickerDate);
+      this.handleShowDateAndTime(strings.PANEL_TYPE_RIGHT, adjustResult.monthRight.pickerDate);
+    } else {
+      const selectedDate = values.find(item => item); // 如果日期不完整且输入日期不在面板范围内，则更新面板
+
+      if (selectedDate) {
+        const notLeftMonth = (selectedDate === null || selectedDate === void 0 ? void 0 : selectedDate.getMonth()) !== monthLeft.pickerDate.getMonth();
+        const notRightMonth = (selectedDate === null || selectedDate === void 0 ? void 0 : selectedDate.getMonth()) !== monthRight.pickerDate.getMonth();
+
+        if (notLeftMonth && notRightMonth) {
+          this.handleShowDateAndTime(strings.PANEL_TYPE_LEFT, adjustResult.monthLeft.pickerDate);
+          this.handleShowDateAndTime(strings.PANEL_TYPE_RIGHT, adjustResult.monthRight.pickerDate);
+        }
+      }
+    } // init range
+
 
     const formatToken = withTime ? strings.FORMAT_DATE_TIME : strings.FORMAT_FULL_DATE;
     let rangeStart = values[0] && format(values[0], formatToken);

package/lib/es/tree/treeUtil.d.ts

@@ -74,6 +74,6 @@ export declare function getValueOrKey(data: any): any;
 export declare function normalizeValue(value: any, withObject: boolean): any;
 export declare function updateKeys(keySet: Set<string> | string[], keyEntities: KeyEntities): string[];
 export declare function calcDisabledKeys(keyEntities: KeyEntities): Set<string>;
-export declare function calcDropRelativePosition(event: any, treeNode: any): 1 | -1 | 0;
+export declare function calcDropRelativePosition(event: any, treeNode: any): 0 | 1 | -1;
 export declare function getDragNodesKeys(key: string, keyEntities: KeyEntities): string[];
 export declare function calcDropActualPosition(pos: string, relativeDropPos: any): any;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.25.2",
+    "version": "2.25.3",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
@@ -23,7 +23,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "d1cdea565d328c70a4de8636aed30c88f60732dd",
+    "gitHead": "45218733f7850d503d11390c9eeb5853e2423fdb",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",