@douyinfe/semi-foundation 2.2.0-beta.0 → 2.2.2

package/datePicker/_utils/parser.ts

@@ -2,7 +2,7 @@
  * @file
  * Various date-related analysis methods
  */
-import { isValid, parseISO, parse } from 'date-fns';
+import { isValid, parseISO, parse, Locale } from 'date-fns';
 
 /**
  * Parsing value to Date object
@@ -11,7 +11,7 @@ export function compatiableParse(
     value: string,
     formatToken?: string,
     baseDate?: Date,
-    locale?: any
+    locale?: Locale
 ): Date | null {
     let result = null;
     if (value) {
@@ -25,7 +25,8 @@ export function compatiableParse(
         if (!isValid(result)) {
             result = new Date(Date.parse(value));
         }
-        if (!isValid(result)) {
+        const yearInvalid = isValid(result) && String(result.getFullYear()).length > 4;
+        if (!isValid(result) || yearInvalid) {
             result = null;
         }
     }

package/datePicker/datePicker.scss

@@ -140,6 +140,17 @@ $module: #{$prefix}-datepicker;
         padding-bottom: $spacing-datepicker_footer-paddingBottom;
         text-align: right;
         background-color: $color-datepicker_footer-bg-default;
+
+        .#{$prefix}-button {
+            // cancel button
+            &:first-of-type {
+                margin-right: $spacing-datepicker_footer_cancel_button-marginRight;
+            }
+            // confirm button
+            &:nth-of-type(2) {
+                margin-right: $spacing-datepicker_footer_confirm_button-marginRight;
+            }
+        }
     }
 
     // 年月选择

package/datePicker/foundation.ts

@@ -323,10 +323,8 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
      *   2. set cachedSelectedValue using given dates(in needConfirm mode)
      *      - directly closePanel without click confirm will set cachedSelectedValue to state value
      *      - select one date(which means that the selection value is incomplete) and click confirm also set cachedSelectedValue to state value
-     * @param {String} inputValue
-     * @param {Date[]} dates
      */
-    rangeTypeSideEffectsWhenClosePanel(inputValue: string, dates: Date[]) {
+    rangeTypeSideEffectsWhenClosePanel(inputValue: string, willUpdateDates: Date[]) {
         if (this._isRangeType()) {
             this._adapter.setRangeInputFocus(false);
             /**
@@ -334,11 +332,29 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
              * when inputValue is null, picker value will back to last selected value
              */
             this.handleInputBlur(inputValue);
-            const { value, cachedSelectedValue } = this._adapter.getStates();
-            const newCachedSelectedValue = Array.isArray(dates) && dates.length ? dates : value;
-            if (!isEqual(newCachedSelectedValue, cachedSelectedValue)) {
-                this._adapter.updateCachedSelectedValue(newCachedSelectedValue);
-            }
+            this.resetCachedSelectedValue(willUpdateDates);
+        }
+    }
+
+    /**
+     * clear input value when selected date is not confirmed
+     */
+    needConfirmSideEffectsWhenClosePanel(willUpdateDates: Date[] | null | undefined) {
+        if (this._adapter.needConfirm() && !this._isRangeType()) {
+            /**
+             * if `null` input element will show `cachedSelectedValue` formatted value（format in DateInput render）
+             * if `` input element will show `` directly
+             */
+            this._adapter.updateInputValue(null);
+            this.resetCachedSelectedValue(willUpdateDates);
+        }
+    }
+
+    resetCachedSelectedValue(willUpdateDates?: Date[]) {
+        const { value, cachedSelectedValue } = this._adapter.getStates();
+        const newCachedSelectedValue = Array.isArray(willUpdateDates) ? willUpdateDates : value;
+        if (!isEqual(newCachedSelectedValue, cachedSelectedValue)) {
+            this._adapter.updateCachedSelectedValue(newCachedSelectedValue);
         }
     }
 
@@ -354,13 +370,16 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
      * @param {String} inputValue
      * @param {Date[]} dates
      */
-    closePanel(e?: any, inputValue: string = null, dates: Date[] = []) {
+    closePanel(e?: any, inputValue: string = null, dates?: Date[]) {
+        const { value, cachedSelectedValue } = this._adapter.getStates();
+        const willUpdateDates = isNullOrUndefined(dates) ? this._adapter.needConfirm() ? value : cachedSelectedValue : dates;
         if (!this._isControlledComponent('open')) {
             this._adapter.togglePanel(false);
             this._adapter.unregisterClickOutSide();
         }
         // range type picker, closing panel requires the following side effects
-        this.rangeTypeSideEffectsWhenClosePanel(inputValue, dates);
+        this.rangeTypeSideEffectsWhenClosePanel(inputValue, willUpdateDates as Date[]);
+        this.needConfirmSideEffectsWhenClosePanel(willUpdateDates as Date[]);
         this._adapter.notifyOpenChange(false);
         this._adapter.notifyBlur(e);
     }
@@ -416,7 +435,8 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
         if (parsedResult && parsedResult.length) {
             this._updateValueAndInput(parsedResult, input === '');
         } else if (input === '') {
-            this._updateValueAndInput('' as any, true);
+            // if clear input, set input to `''`
+            this._updateValueAndInput('' as any, true, '');
         } else {
             this._updateValueAndInput(stateValue);
         }
@@ -725,7 +745,7 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
         let inputValue;
         if (!this._someDateDisabled(changedDates)) {
             inputValue = this._isMultiple() ? this.formatMultipleDates(dates) : this.formatDates(dates);
-            const isRangeTypeAndInputIncomplete = this._isRangeType() && (isNullOrUndefined(dates[0]) || isNullOrUndefined(dates[1]));
+            const isRangeTypeAndInputIncomplete = this._isRangeType() && !this._isRangeValueComplete(dates);
             /**
              * If the input is incomplete when under control, the notifyChange is not triggered because
              * You need to update the value of the input box, otherwise there will be a problem that a date is selected but the input box does not show the date #1357
@@ -1004,11 +1024,9 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
     };
 
     _isRangeValueComplete = (value: Date[] | Date) => {
-        let result = true;
+        let result = false;
         if (Array.isArray(value)) {
             result = !value.some(date => isNullOrUndefined(date));
-        } else {
-            result = false;
         }
         return result;
     };

package/datePicker/inputFoundation.ts

@@ -89,6 +89,8 @@ export default class InputFoundation extends BaseFoundation<DateInputAdapter> {
     }
 
     handleRangeInputClear(e: any) {
+        // prevent trigger click outside
+        this.stopPropagation(e);
         this._adapter.notifyRangeInputClear(e);
     }
 

package/datePicker/monthsGridFoundation.ts

@@ -16,7 +16,7 @@ import {
 import { isBefore, isValidDate, getDefaultFormatToken, getFullDateOffset } from './_utils/index';
 import { formatFullDate, WeekStartNumber } from './_utils/getMonthTable';
 import { compatiableParse } from './_utils/parser';
-import { includes, isSet, isEqual } from 'lodash';
+import { includes, isSet, isEqual, isFunction } from 'lodash';
 import { zonedTimeToUtc } from '../utils/date-fns-extra';
 import { getDefaultFormatTokenByType } from './_utils/getDefaultFormatToken';
 import isNullOrUndefined from '../utils/isNullOrUndefined';
@@ -85,6 +85,7 @@ export interface MonthsGridFoundationProps extends MonthsGridElementProps {
     setRangeInputFocus?: (rangeInputFocus: 'rangeStart' | 'rangeEnd') => void;
     isAnotherPanelHasOpened?: (currentRangeInput: 'rangeStart' | 'rangeEnd') => boolean;
     focusRecordsRef?: any;
+    triggerRender?: (props: Record<string, any>) => any;
 }
 
 export interface MonthInfo {
@@ -636,7 +637,7 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
 
     handleRangeSelected(day: MonthDayInfo) {
         let { rangeStart, rangeEnd } = this.getStates();
-        const { startDateOffset, endDateOffset, type, dateFnsLocale, rangeInputFocus } = this.getProps();
+        const { startDateOffset, endDateOffset, type, dateFnsLocale, rangeInputFocus, triggerRender } = this._adapter.getProps();
         const { fullDate } = day;
         let rangeStartReset = false;
         let rangeEndReset = false;
@@ -712,7 +713,13 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
                     date = [start, end];
                 }
             }
-            this._adapter.notifySelectedChange(date, { needCheckFocusRecord: !(type === 'dateRange' && isDateRangeAndHasOffset) });
+            /**
+             * no need to check focus then
+             *  - dateRange and isDateRangeAndHasOffset
+             *  - dateRange and triggerRender
+             */
+            const needCheckFocusRecord = !(type === 'dateRange' && (isDateRangeAndHasOffset || isFunction(triggerRender)));
+            this._adapter.notifySelectedChange(date, { needCheckFocusRecord });
         }
     }
 

package/datePicker/rtl.scss

@@ -9,6 +9,18 @@ $module: #{$prefix}-datepicker;
             padding-right: 0;
             padding-left: $spacing-datepicker_footer-paddingRight;
             text-align: left;
+
+            .#{$prefix}-button {
+                &:first-of-type {
+                    margin-left: 0;
+                    margin-right: 0;
+                }
+                // confirm button
+                &:nth-of-type(2) {
+                    margin-right: $spacing-datepicker_footer_cancel_button-marginRight;
+                    margin-left: 0;
+                }
+            }
         }
 
         &-day {
@@ -66,7 +78,9 @@ $module: #{$prefix}-datepicker;
         &-yam {
             // rtl 对箭头进行翻转
             .#{$prefix}-icon-chevron_left,
-            .#{$prefix}-icon-chevron_right {
+            .#{$prefix}-icon-chevron_right,
+            .#{$prefix}-icon-double_chevron_left,
+            .#{$prefix}-icon-double_chevron_right {
                 transform: scaleX(-1);
             }
         }

package/datePicker/variables.scss

@@ -33,6 +33,8 @@ $spacing-datepicker_scrolllist_body-padding: 0; // 时间选择滚动菜单内
 $spacing-datepicker_footer-paddingTop: 10px; // 确认选择 footer 顶部内边距
 $spacing-datepicker_footer-paddingBottom: 10px; // 确认选择 footer 底部内边距
 $spacing-datepicker_footer-paddingRight: 8px; // 确认选择 footer 右侧内边距
+$spacing-datepicker_footer_cancel_button-marginRight: 12px; // 确认选择 footer 取消按钮右外边距
+$spacing-datepicker_footer_confirm_button-marginRight: 8px; // 确认选择 footer 确认按钮右外边距
 $spacing-datepicker_navigation-paddingY: $spacing-base-tight; // 年月切换 header 垂直内边距
 $spacing-datepicker_navigation-paddingX: $spacing-base; // 年月切换 header 水平内边距
 $spacing-datepicker_month-padding: $spacing-base; 

package/gulpfile.js

@@ -52,7 +52,9 @@ gulp.task('compileScss', function compileScss() {
                 cb(null, chunk);
             }
         ))
-        .pipe(sass().on('error', sass.logError))
+        .pipe(sass({
+            charset: false
+        }).on('error', sass.logError))
         .pipe(gulp.dest('lib/es'))
         .pipe(gulp.dest('lib/cjs'));
 });

package/inputNumber/foundation.ts

@@ -126,6 +126,7 @@ class InputNumberFoundation extends BaseFoundation<InputNumberAdapter> {
         }
         this._adapter.recordCursorPosition();
         this._adapter.setFocusing(true, null);
+        this._adapter.setClickUpOrDown(false);
         this._adapter.notifyFocus(e);
     }
 
@@ -425,11 +426,11 @@ class InputNumberFoundation extends BaseFoundation<InputNumberAdapter> {
 
     /**
      * format number to string
-     * @param {number} value
+     * @param {string|number} value
      * @param {boolean} needAdjustPrec
      * @returns {string}
      */
-    doFormat(value = 0, needAdjustPrec = true): string {
+    doFormat(value: string | number = 0, needAdjustPrec = true): string {
         // if (typeof value === 'string') {
         //     return value;
         // }

package/lib/cjs/datePicker/_utils/parser.d.ts

@@ -1,4 +1,9 @@
+/**
+ * @file
+ * Various date-related analysis methods
+ */
+import { Locale } from 'date-fns';
 /**
  * Parsing value to Date object
  */
-export declare function compatiableParse(value: string, formatToken?: string, baseDate?: Date, locale?: any): Date | null;
+export declare function compatiableParse(value: string, formatToken?: string, baseDate?: Date, locale?: Locale): Date | null;

package/lib/cjs/datePicker/_utils/parser.js

@@ -37,7 +37,9 @@ function compatiableParse(value, formatToken, baseDate, locale) {
       result = new Date(Date.parse(value));
     }
 
-    if (!(0, _dateFns.isValid)(result)) {
+    const yearInvalid = (0, _dateFns.isValid)(result) && String(result.getFullYear()).length > 4;
+
+    if (!(0, _dateFns.isValid)(result) || yearInvalid) {
       result = null;
     }
   }

package/lib/cjs/datePicker/datePicker.css

@@ -1,4 +1,3 @@
-@charset "UTF-8";
 /* shadow */
 /* sizing */
 /* spacing */
@@ -99,6 +98,12 @@
   text-align: right;
   background-color: var(--semi-color-fill-0);
 }
+.semi-datepicker-footer .semi-button:first-of-type {
+  margin-right: 12px;
+}
+.semi-datepicker-footer .semi-button:nth-of-type(2) {
+  margin-right: 8px;
+}
 .semi-datepicker-yam {
   position: absolute;
   top: 0;
@@ -706,6 +711,16 @@
   padding-left: 8px;
   text-align: left;
 }
+.semi-rtl .semi-datepicker-footer .semi-button:first-of-type,
+.semi-portal-rtl .semi-datepicker-footer .semi-button:first-of-type {
+  margin-left: 0;
+  margin-right: 0;
+}
+.semi-rtl .semi-datepicker-footer .semi-button:nth-of-type(2),
+.semi-portal-rtl .semi-datepicker-footer .semi-button:nth-of-type(2) {
+  margin-right: 12px;
+  margin-left: 0;
+}
 .semi-rtl .semi-datepicker-day-offsetrange-start .semi-datepicker-day-main,
 .semi-portal-rtl .semi-datepicker-day-offsetrange-start .semi-datepicker-day-main {
   border-radius: 0 var(--semi-border-radius-small) var(--semi-border-radius-small) 0;
@@ -741,12 +756,20 @@
   margin-right: 8px;
 }
 .semi-rtl .semi-datepicker-navigation .semi-icon-chevron_left,
-.semi-rtl .semi-datepicker-navigation .semi-icon-chevron_right, .semi-rtl .semi-datepicker-yam .semi-icon-chevron_left,
+.semi-rtl .semi-datepicker-navigation .semi-icon-chevron_right,
+.semi-rtl .semi-datepicker-navigation .semi-icon-double_chevron_left,
+.semi-rtl .semi-datepicker-navigation .semi-icon-double_chevron_right, .semi-rtl .semi-datepicker-yam .semi-icon-chevron_left,
 .semi-rtl .semi-datepicker-yam .semi-icon-chevron_right,
+.semi-rtl .semi-datepicker-yam .semi-icon-double_chevron_left,
+.semi-rtl .semi-datepicker-yam .semi-icon-double_chevron_right,
 .semi-portal-rtl .semi-datepicker-navigation .semi-icon-chevron_left,
 .semi-portal-rtl .semi-datepicker-navigation .semi-icon-chevron_right,
+.semi-portal-rtl .semi-datepicker-navigation .semi-icon-double_chevron_left,
+.semi-portal-rtl .semi-datepicker-navigation .semi-icon-double_chevron_right,
 .semi-portal-rtl .semi-datepicker-yam .semi-icon-chevron_left,
-.semi-portal-rtl .semi-datepicker-yam .semi-icon-chevron_right {
+.semi-portal-rtl .semi-datepicker-yam .semi-icon-chevron_right,
+.semi-portal-rtl .semi-datepicker-yam .semi-icon-double_chevron_left,
+.semi-portal-rtl .semi-datepicker-yam .semi-icon-double_chevron_right {
   transform: scaleX(-1);
 }
 .semi-rtl .semi-datepicker-range-input-prefix,

package/lib/cjs/datePicker/datePicker.scss

@@ -140,6 +140,17 @@ $module: #{$prefix}-datepicker;
         padding-bottom: $spacing-datepicker_footer-paddingBottom;
         text-align: right;
         background-color: $color-datepicker_footer-bg-default;
+
+        .#{$prefix}-button {
+            // cancel button
+            &:first-of-type {
+                margin-right: $spacing-datepicker_footer_cancel_button-marginRight;
+            }
+            // confirm button
+            &:nth-of-type(2) {
+                margin-right: $spacing-datepicker_footer_confirm_button-marginRight;
+            }
+        }
     }
 
     // 年月选择

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

@@ -201,10 +201,13 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
      *   2. set cachedSelectedValue using given dates(in needConfirm mode)
      *      - directly closePanel without click confirm will set cachedSelectedValue to state value
      *      - select one date(which means that the selection value is incomplete) and click confirm also set cachedSelectedValue to state value
-     * @param {String} inputValue
-     * @param {Date[]} dates
      */
-    rangeTypeSideEffectsWhenClosePanel(inputValue: string, dates: Date[]): void;
+    rangeTypeSideEffectsWhenClosePanel(inputValue: string, willUpdateDates: Date[]): void;
+    /**
+     * clear input value when selected date is not confirmed
+     */
+    needConfirmSideEffectsWhenClosePanel(willUpdateDates: Date[] | null | undefined): void;
+    resetCachedSelectedValue(willUpdateDates?: Date[]): void;
     /**
      * timing to call closePanel
      *  1. click confirm button

package/lib/cjs/datePicker/foundation.js

@@ -96,12 +96,10 @@ class DatePickerFoundation extends _foundation.default {
     };
 
     this._isRangeValueComplete = value => {
-      let result = true;
+      let result = false;
 
       if ((0, _isArray.default)(value)) {
         result = !(0, _some.default)(value).call(value, date => (0, _isNullOrUndefined.default)(date));
-      } else {
-        result = false;
       }
 
       return result;
@@ -250,12 +248,10 @@ class DatePickerFoundation extends _foundation.default {
    *   2. set cachedSelectedValue using given dates(in needConfirm mode)
    *      - directly closePanel without click confirm will set cachedSelectedValue to state value
    *      - select one date(which means that the selection value is incomplete) and click confirm also set cachedSelectedValue to state value
-   * @param {String} inputValue
-   * @param {Date[]} dates
    */
 
 
-  rangeTypeSideEffectsWhenClosePanel(inputValue, dates) {
+  rangeTypeSideEffectsWhenClosePanel(inputValue, willUpdateDates) {
     if (this._isRangeType()) {
       this._adapter.setRangeInputFocus(false);
       /**
@@ -265,17 +261,36 @@ class DatePickerFoundation extends _foundation.default {
 
 
       this.handleInputBlur(inputValue);
+      this.resetCachedSelectedValue(willUpdateDates);
+    }
+  }
+  /**
+   * clear input value when selected date is not confirmed
+   */
 
-      const {
-        value,
-        cachedSelectedValue
-      } = this._adapter.getStates();
 
-      const newCachedSelectedValue = (0, _isArray.default)(dates) && dates.length ? dates : value;
+  needConfirmSideEffectsWhenClosePanel(willUpdateDates) {
+    if (this._adapter.needConfirm() && !this._isRangeType()) {
+      /**
+       * if `null` input element will show `cachedSelectedValue` formatted value（format in DateInput render）
+       * if `` input element will show `` directly
+       */
+      this._adapter.updateInputValue(null);
 
-      if (!(0, _isEqual2.default)(newCachedSelectedValue, cachedSelectedValue)) {
-        this._adapter.updateCachedSelectedValue(newCachedSelectedValue);
-      }
+      this.resetCachedSelectedValue(willUpdateDates);
+    }
+  }
+
+  resetCachedSelectedValue(willUpdateDates) {
+    const {
+      value,
+      cachedSelectedValue
+    } = this._adapter.getStates();
+
+    const newCachedSelectedValue = (0, _isArray.default)(willUpdateDates) ? willUpdateDates : value;
+
+    if (!(0, _isEqual2.default)(newCachedSelectedValue, cachedSelectedValue)) {
+      this._adapter.updateCachedSelectedValue(newCachedSelectedValue);
     }
   }
   /**
@@ -294,7 +309,14 @@ class DatePickerFoundation extends _foundation.default {
 
   closePanel(e) {
     let inputValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-    let dates = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+    let dates = arguments.length > 2 ? arguments[2] : undefined;
+
+    const {
+      value,
+      cachedSelectedValue
+    } = this._adapter.getStates();
+
+    const willUpdateDates = (0, _isNullOrUndefined.default)(dates) ? this._adapter.needConfirm() ? value : cachedSelectedValue : dates;
 
     if (!this._isControlledComponent('open')) {
       this._adapter.togglePanel(false);
@@ -303,7 +325,8 @@ class DatePickerFoundation extends _foundation.default {
     } // range type picker, closing panel requires the following side effects
 
 
-    this.rangeTypeSideEffectsWhenClosePanel(inputValue, dates);
+    this.rangeTypeSideEffectsWhenClosePanel(inputValue, willUpdateDates);
+    this.needConfirmSideEffectsWhenClosePanel(willUpdateDates);
 
     this._adapter.notifyOpenChange(false);
 
@@ -365,7 +388,8 @@ class DatePickerFoundation extends _foundation.default {
     if (parsedResult && parsedResult.length) {
       this._updateValueAndInput(parsedResult, input === '');
     } else if (input === '') {
-      this._updateValueAndInput('', true);
+      // if clear input, set input to `''`
+      this._updateValueAndInput('', true, '');
     } else {
       this._updateValueAndInput(stateValue);
     }
@@ -729,7 +753,7 @@ class DatePickerFoundation extends _foundation.default {
 
     if (!this._someDateDisabled(changedDates)) {
       inputValue = this._isMultiple() ? this.formatMultipleDates(dates) : this.formatDates(dates);
-      const isRangeTypeAndInputIncomplete = this._isRangeType() && ((0, _isNullOrUndefined.default)(dates[0]) || (0, _isNullOrUndefined.default)(dates[1]));
+      const isRangeTypeAndInputIncomplete = this._isRangeType() && !this._isRangeValueComplete(dates);
       /**
        * If the input is incomplete when under control, the notifyChange is not triggered because
        * You need to update the value of the input box, otherwise there will be a problem that a date is selected but the input box does not show the date #1357

package/lib/cjs/datePicker/inputFoundation.js

@@ -56,6 +56,9 @@ class InputFoundation extends _foundation.default {
   }
 
   handleRangeInputClear(e) {
+    // prevent trigger click outside
+    this.stopPropagation(e);
+
     this._adapter.notifyRangeInputClear(e);
   }
 

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

@@ -53,6 +53,7 @@ export interface MonthsGridFoundationProps extends MonthsGridElementProps {
     setRangeInputFocus?: (rangeInputFocus: 'rangeStart' | 'rangeEnd') => void;
     isAnotherPanelHasOpened?: (currentRangeInput: 'rangeStart' | 'rangeEnd') => boolean;
     focusRecordsRef?: any;
+    triggerRender?: (props: Record<string, any>) => any;
 }
 export interface MonthInfo {
     pickerDate: Date;

package/lib/cjs/datePicker/monthsGridFoundation.js

@@ -28,6 +28,8 @@ var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
 
 var _trim = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/trim"));
 
+var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
+
 var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
 
 var _isSet2 = _interopRequireDefault(require("lodash/isSet"));
@@ -731,13 +733,16 @@ class MonthsGridFoundation extends _foundation.default {
       rangeStart,
       rangeEnd
     } = this.getStates();
+
     const {
       startDateOffset,
       endDateOffset,
       type,
       dateFnsLocale,
-      rangeInputFocus
-    } = this.getProps();
+      rangeInputFocus,
+      triggerRender
+    } = this._adapter.getProps();
+
     const {
       fullDate
     } = day;
@@ -818,9 +823,17 @@ class MonthsGridFoundation extends _foundation.default {
           date = [start, end];
         }
       }
+      /**
+       * no need to check focus then
+       *  - dateRange and isDateRangeAndHasOffset
+       *  - dateRange and triggerRender
+       */
+
+
+      const needCheckFocusRecord = !(type === 'dateRange' && (isDateRangeAndHasOffset || (0, _isFunction2.default)(triggerRender)));
 
       this._adapter.notifySelectedChange(date, {
-        needCheckFocusRecord: !(type === 'dateRange' && isDateRangeAndHasOffset)
+        needCheckFocusRecord
       });
     }
   }

package/lib/cjs/datePicker/rtl.scss

@@ -9,6 +9,18 @@ $module: #{$prefix}-datepicker;
             padding-right: 0;
             padding-left: $spacing-datepicker_footer-paddingRight;
             text-align: left;
+
+            .#{$prefix}-button {
+                &:first-of-type {
+                    margin-left: 0;
+                    margin-right: 0;
+                }
+                // confirm button
+                &:nth-of-type(2) {
+                    margin-right: $spacing-datepicker_footer_cancel_button-marginRight;
+                    margin-left: 0;
+                }
+            }
         }
 
         &-day {
@@ -66,7 +78,9 @@ $module: #{$prefix}-datepicker;
         &-yam {
             // rtl 对箭头进行翻转
             .#{$prefix}-icon-chevron_left,
-            .#{$prefix}-icon-chevron_right {
+            .#{$prefix}-icon-chevron_right,
+            .#{$prefix}-icon-double_chevron_left,
+            .#{$prefix}-icon-double_chevron_right {
                 transform: scaleX(-1);
             }
         }

package/lib/cjs/datePicker/variables.scss

@@ -33,6 +33,8 @@ $spacing-datepicker_scrolllist_body-padding: 0; // 时间选择滚动菜单内
 $spacing-datepicker_footer-paddingTop: 10px; // 确认选择 footer 顶部内边距
 $spacing-datepicker_footer-paddingBottom: 10px; // 确认选择 footer 底部内边距
 $spacing-datepicker_footer-paddingRight: 8px; // 确认选择 footer 右侧内边距
+$spacing-datepicker_footer_cancel_button-marginRight: 12px; // 确认选择 footer 取消按钮右外边距
+$spacing-datepicker_footer_confirm_button-marginRight: 8px; // 确认选择 footer 确认按钮右外边距
 $spacing-datepicker_navigation-paddingY: $spacing-base-tight; // 年月切换 header 垂直内边距
 $spacing-datepicker_navigation-paddingX: $spacing-base; // 年月切换 header 水平内边距
 $spacing-datepicker_month-padding: $spacing-base; 

package/lib/cjs/inputNumber/foundation.d.ts

@@ -63,11 +63,11 @@ declare class InputNumberFoundation extends BaseFoundation<InputNumberAdapter> {
     _adjustPrec(num: string | number): string;
     /**
      * format number to string
-     * @param {number} value
+     * @param {string|number} value
      * @param {boolean} needAdjustPrec
      * @returns {string}
      */
-    doFormat(value?: number, needAdjustPrec?: boolean): string;
+    doFormat(value?: string | number, needAdjustPrec?: boolean): string;
     /**
      *
      * @param {number} current

package/lib/cjs/inputNumber/foundation.js

@@ -140,6 +140,8 @@ class InputNumberFoundation extends _foundation.default {
 
     this._adapter.setFocusing(true, null);
 
+    this._adapter.setClickUpOrDown(false);
+
     this._adapter.notifyFocus(e);
   }
   /**
@@ -476,7 +478,7 @@ class InputNumberFoundation extends _foundation.default {
   }
   /**
    * format number to string
-   * @param {number} value
+   * @param {string|number} value
    * @param {boolean} needAdjustPrec
    * @returns {string}
    */

package/lib/cjs/navigation/navigation.css

@@ -1,4 +1,3 @@
-@charset "UTF-8";
 /* shadow */
 /* sizing */
 /* spacing */