@sheinx/hooks 3.5.3 → 3.5.4-beta.10

package/cjs/components/use-datepicker/use-date.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-date.d.ts","sourceRoot":"","sources":["use-date.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAU/C,QAAA,MAAM,OAAO,UAAW,YAAY;;;;;;;;;;wBAmBX,IAAI;2BAkDD,IAAI;yBAgBN,IAAI;0BAiDH,IAAI;+BArEC,IAAI;+BA+CJ,IAAI,YAAY,OAAO;0BAnB5B,IAAI;2BAIH,IAAI;;gCAIC,IAAI;;CAgFpC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"use-date.d.ts","sourceRoot":"","sources":["use-date.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAU/C,QAAA,MAAM,OAAO,UAAW,YAAY;;;;;;;;;;wBAmBX,IAAI;2BAkDD,IAAI;yBAkBN,IAAI;0BAkDH,IAAI;+BAxEC,IAAI;+BAiDJ,IAAI,YAAY,OAAO;0BAnB5B,IAAI;2BAIH,IAAI;;gCAIC,IAAI;;CAiFpC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/cjs/components/use-datepicker/use-date.js

@@ -17,6 +17,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var useDate = function useDate(props) {
   var options = props.options,
+    position = props.position,
     type = props.type;
   var _useState = (0, _react.useState)(props.defaultCurrent || new Date()),
     _useState2 = _slicedToArray(_useState, 2),
@@ -109,6 +110,7 @@ var useDate = function useDate(props) {
     var _props$onChange;
     if (isDisabled(date)) return;
     var newDate = getDateWithTime(date);
+    props === null || props === void 0 || props.onClearInputArr(position === 'start' ? 0 : 1);
     (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newDate, noClose);
     setCurrent(newDate);
   };

package/cjs/components/use-datepicker/use-date.type.d.ts

@@ -1,12 +1,15 @@
 export interface UseDateProps {
     current?: Date;
+    range?: boolean | number;
     rangeDate?: Array<Date | undefined>;
     defaultCurrent?: Date;
     onCurrentChange?: (date: Date) => void;
+    onClearInputArr: (index?: number | undefined) => void;
     value?: Date;
     onChange?: (date: Date, noClose?: boolean) => void;
     min?: Date;
     max?: Date;
+    position?: 'start' | 'end';
     type?: 'date' | 'week' | 'datetime';
     format?: string;
     disabled?: boolean | ((date: Date) => boolean);

package/cjs/components/use-datepicker/use-date.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-date.type.d.ts","sourceRoot":"","sources":["use-date.type.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,SAAS,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,IAAI,CAAC;IACtB,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACvC,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACnD,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC;IAC/C,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACrC,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACH"}
+{"version":3,"file":"use-date.type.d.ts","sourceRoot":"","sources":["use-date.type.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,IAAI,CAAC;IACtB,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACvC,eAAe,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IACtD,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACnD,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC;IAC/C,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACrC,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACH"}

package/cjs/components/use-datepicker/use-datepicker-format.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { DatePickerModeType, DatePickerValueType, UseDatePickerFormatProps } from './use-datepicker-format.type';
 declare const useDatePickerFormat: <Value extends DatePickerValueType>(props: UseDatePickerFormatProps<Value>) => {
+    inputArr: (Date | undefined)[];
     resultArr: (string | undefined)[];
     targetResultArr: (string | undefined)[];
     dateArr: (Date | undefined)[];
@@ -17,6 +18,7 @@ declare const useDatePickerFormat: <Value extends DatePickerValueType>(props: Us
         setCurrentArr: React.Dispatch<React.SetStateAction<Date[]>>;
         setTargetArr: React.Dispatch<React.SetStateAction<(Date | undefined)[]>>;
         handleClear: (e?: React.MouseEvent) => void;
+        handleClearInputArr: (index?: number) => void;
         handleInputChange: (str: string, index: number) => void;
         registerModeDisabled: (position: 'start' | 'end' | undefined, mode: string, fn: (d: Date) => boolean) => void;
         setCurrentArrWithParams: (arg: React.SetStateAction<Date[]>, type: string, quick: {

package/cjs/components/use-datepicker/use-datepicker-format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-datepicker-format.d.ts","sourceRoot":"","sources":["use-datepicker-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAE3D,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAkEtC,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;0BAmJe,gBAAgB;iCAgCT,MAAM,SAAS,MAAM;yCAjIrD,OAAO,GAAG,KAAK,GAAG,SAAS,QAAQ,MAAM,UAAU,IAAI,KAAK,OAAO;uCAWvE,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC,QAC3B,MAAM;kBACG,MAAM,SAAS;mBAAS,GAAG;;+BASrC,IAAI,YAAY,OAAO,GAAG,KAAK,GAAG,SAAS,gBAAgB,MAAM;;CA+K3E,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"use-datepicker-format.d.ts","sourceRoot":"","sources":["use-datepicker-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAE3D,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAkEtC,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;0BAqMe,gBAAgB;sCAiEJ,MAAM;iCA7BX,MAAM,SAAS,MAAM;yCAtLrD,OAAO,GAAG,KAAK,GAAG,SAAS,QAAQ,MAAM,UAAU,IAAI,KAAK,OAAO;uCAWvE,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC,QAC3B,MAAM;kBACG,MAAM,SAAS;mBAAS,GAAG;;+BA4CrC,IAAI,YAAY,OAAO,GAAG,KAAK,GAAG,SAAS,gBAAgB,MAAM;;CAsN3E,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/cjs/components/use-datepicker/use-datepicker-format.js

@@ -115,13 +115,17 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     targetArr = _useState8[0],
     setTargetArr = _useState8[1];
-  var _useState9 = (0, _react.useState)({
+  var _useState9 = (0, _react.useState)([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    inputArr = _useState10[0],
+    setInputArr = _useState10[1];
+  var _useState11 = (0, _react.useState)({
       type: undefined,
       quick: undefined
     }),
-    _useState10 = _slicedToArray(_useState9, 2),
-    params = _useState10[0],
-    setParams = _useState10[1];
+    _useState12 = _slicedToArray(_useState11, 2),
+    params = _useState12[0],
+    setParams = _useState12[1];
   var _useRef = (0, _react.useRef)({
       cachedDateArr: convertValueToDateArr(value, format, options),
       modeDisabledStart: {},
@@ -129,14 +133,14 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     }),
     context = _useRef.current;
   // 当edit 为true时，stateDate 否则返回 props date
-  var _useState11 = (0, _react.useState)(context.cachedDateArr),
-    _useState12 = _slicedToArray(_useState11, 2),
-    stateDate = _useState12[0],
-    setStateDate = _useState12[1];
-  var _useState13 = (0, _react.useState)(false),
+  var _useState13 = (0, _react.useState)(context.cachedDateArr),
     _useState14 = _slicedToArray(_useState13, 2),
-    edit = _useState14[0],
-    setEdit = _useState14[1];
+    stateDate = _useState14[0],
+    setStateDate = _useState14[1];
+  var _useState15 = (0, _react.useState)(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    edit = _useState16[0],
+    setEdit = _useState16[1];
 
   // 收集所有的disabled
   var registerModeDisabled = (0, _usePersistFn.usePersistFn)(function (position, mode, fn) {
@@ -154,6 +158,39 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
       quick: quick
     });
   });
+  var isDisabledInputDate = function isDisabledInputDate(rangeData) {
+    var start = rangeData[0];
+    var end = rangeData[1];
+    var isDis = false;
+    if (disabled && typeof disabled === 'function') {
+      if (start && disabled(start)) isDis = true;
+      if (end && disabled(end)) isDis = true;
+      if (isDis) return isDis;
+    }
+    if (start && end) {
+      if (_util.default.compareAsc(start, end) > 0) {
+        isDis = true;
+        return isDis;
+      }
+    }
+    if (range && typeof range === 'number') {
+      if (start) {
+        if (!end) return isDis;
+        var rangeDate = _util.default.addSeconds(start, range, options);
+        if (_util.default.compareAsc(end, rangeDate) > 0) {
+          isDis = true;
+        }
+      }
+      if (end) {
+        if (!start) return isDis;
+        var _rangeDate = _util.default.addSeconds(end, -range, options);
+        if (_util.default.compareAsc(start, _rangeDate) < 0) {
+          isDis = true;
+        }
+      }
+    }
+    return isDis;
+  };
   var isDisabledDate = (0, _usePersistFn.usePersistFn)(function (date, position, triggerType) {
     var mode = getTypeMode(type);
     var disabled = position === 'end' ? context.modeDisabledEnd[mode] : context.modeDisabledStart[mode];
@@ -210,6 +247,19 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
   var finishEdit = function finishEdit() {
     setEdit(false);
     var formatValue = getFormatValueArr(stateDate);
+    if (inputArr.length && inputArr.some(function (i) {
+      return i;
+    })) {
+      var inputValue = stateDate.map(function (item, index) {
+        if (inputArr[index]) return inputArr[index];
+        return item;
+      });
+      var isDis = isDisabledInputDate(inputValue);
+      if (!isDis) {
+        formatValue = getFormatValueArr(inputValue);
+      }
+    }
+    // const formatValue = getFormatValueArr(stateDate);
     var v = range ? formatValue : formatValue[0];
     if (range && (!stateDate[0] || !stateDate[1]) && !props.allowSingle) {
       return;
@@ -224,6 +274,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     if (!clearable) return;
     e === null || e === void 0 || e.stopPropagation();
     if (disabledStatus === 'all') return;
+    setInputArr([]);
     if (edit) {
       if (range) {
         if (disabledStatus === 'left') setStateDate(function (arr) {
@@ -259,6 +310,12 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     var isValid = _util.default.isValidString(str, format);
     if (!isValid) return;
     var date = _util.default.toDateWithFormat(str, format, undefined, options);
+    setInputArr(function (prev) {
+      var arr = _toConsumableArray(prev);
+      arr[index] = date;
+      return arr;
+    });
+
     // 此次校验是由输入触发的
     if (date && isDisabledDate(date, index === 1 ? 'end' : 'start', 'input')) {
       return;
@@ -274,6 +331,17 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
       return arr;
     });
   });
+  var handleClearInputArr = (0, _usePersistFn.usePersistFn)(function (index) {
+    if (index !== undefined) {
+      setInputArr(function (prev) {
+        var arr = _toConsumableArray(prev);
+        arr[index] = undefined;
+        return arr;
+      });
+      return;
+    }
+    setInputArr([]);
+  });
   (0, _react.useEffect)(function () {
     handlePropsValueChange(value);
   }, [value]);
@@ -304,12 +372,14 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     setCurrentArr: setCurrentArr,
     setTargetArr: setTargetArr,
     handleClear: handleClear,
+    handleClearInputArr: handleClearInputArr,
     handleInputChange: handleInputChange,
     registerModeDisabled: registerModeDisabled,
     setCurrentArrWithParams: setCurrentArrWithParams,
     isDisabledDate: isDisabledDate
   });
   return {
+    inputArr: inputArr,
     resultArr: resultArr,
     targetResultArr: targetResultArr,
     dateArr: dateArr,

package/cjs/components/use-datepicker/use-datepicker-range.type.d.ts

@@ -8,6 +8,7 @@ export interface useRangeProps {
     min: DateType;
     max: DateType;
     dateArr: Array<Date | undefined>;
+    inputArr: (Date | undefined)[];
     setTargetArr: Dispatch<SetStateAction<Array<Date | undefined>>>;
     setDateArr: Dispatch<SetStateAction<Array<Date | undefined>>>;
     currentArr: Date[];

package/cjs/components/use-datepicker/use-datepicker-range.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-datepicker-range.type.d.ts","sourceRoot":"","sources":["use-datepicker-range.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AACnD,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;IACpC,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,QAAQ,CAAC;IACd,OAAO,EAAE,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;IACjC,YAAY,EAAE,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAChE,UAAU,EAAE,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAC9D,UAAU,EAAE,IAAI,EAAE,CAAC;IACnB,aAAa,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IACrE,IAAI,EAAE,kBAAkB,EAAE,CAAC;IAC3B,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;IACxD,QAAQ,EACJ,OAAO,GACP,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,KAAK,OAAO,CAAC,GACvF,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,GAC1C,SAAS,CAAC;IACd,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB"}
+{"version":3,"file":"use-datepicker-range.type.d.ts","sourceRoot":"","sources":["use-datepicker-range.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AACnD,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;IACpC,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,QAAQ,CAAC;IACd,OAAO,EAAE,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;IACjC,QAAQ,EAAE,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,YAAY,EAAE,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAChE,UAAU,EAAE,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAC9D,UAAU,EAAE,IAAI,EAAE,CAAC;IACnB,aAAa,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IACrE,IAAI,EAAE,kBAAkB,EAAE,CAAC;IAC3B,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;IACxD,QAAQ,EACJ,OAAO,GACP,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,KAAK,OAAO,CAAC,GACvF,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,GAC1C,SAAS,CAAC;IACd,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB"}

package/cjs/components/use-form/use-form-context.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { FormRef } from './use-form-context.type';
 export declare const FormContext: React.Context<any>;
 export declare function useFormRef<V>(): [FormRef<V>, ((formRef: FormRef<V>) => void)];
-export declare function useFromInstance<V>(): FormRef<V>;
+export declare function useFormInstance<V>(): FormRef<V>;
 //# sourceMappingURL=use-form-context.d.ts.map

package/cjs/components/use-form/use-form-context.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FormContext = void 0;
+exports.useFormInstance = useFormInstance;
 exports.useFormRef = useFormRef;
-exports.useFromInstance = useFromInstance;
 var _react = _interopRequireDefault(require("react"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var FormContext = exports.FormContext = /*#__PURE__*/_react.default.createContext({});
@@ -16,7 +16,7 @@ function useFormRef() {
   };
   return [ref.current, setFormRef];
 }
-function useFromInstance() {
+function useFormInstance() {
   var formCtx = _react.default.useContext(FormContext);
   return formCtx;
 }

package/cjs/components/use-table/use-table-tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-table-tree.d.ts","sourceRoot":"","sources":["use-table-tree.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AA8CvD,MAAM,WAAW,iBACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACvC,cAAc,GAAG,gBAAgB,GAAG,uBAAuB,GAAG,QAAQ,CACvE;IACD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED,eAAO,MAAM,YAAY,UAAW,iBAAiB;;;;;;+BA6BR,GAAG,SAAS,MAAM;iCAjBhB,GAAG,SAAS,MAAM;;CAuDhE,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"use-table-tree.d.ts","sourceRoot":"","sources":["use-table-tree.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AA+CvD,MAAM,WAAW,iBACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACvC,cAAc,GAAG,gBAAgB,GAAG,uBAAuB,GAAG,QAAQ,CACvE;IACD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED,eAAO,MAAM,YAAY,UAAW,iBAAiB;;;;;;+BA6BR,GAAG,SAAS,MAAM;iCAjBhB,GAAG,SAAS,MAAM;;CA4DhE,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/cjs/components/use-table/use-table-tree.js

@@ -9,6 +9,7 @@ var _usePersistFn = require("../../common/use-persist-fn");
 var _render = require("../../utils/render");
 var _is = require("../../utils/is");
 var _useLatestObj = require("../../common/use-latest-obj");
+var _ = require("../..");
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
@@ -119,6 +120,9 @@ var useTableTree = exports.useTableTree = function useTableTree(props) {
     var newExpandKeys = expandKeysState.filter(function (key) {
       return !unmatchExpandKeys.includes(key);
     });
+    if (_.util.shallowEqual(newExpandKeys, expandKeysState)) {
+      return;
+    }
     setExpandKeysState(newExpandKeys);
   }, [unmatchExpandKeys, expandKeysState]);
   return {

package/cjs/components/use-table/use-table-virtual.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAYrD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;CAC3C;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;;oBAkMpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BA/FuB,MAAM,UAAU,MAAM;0BAxBtB,MAAM,QAAQ,MAAM;2BA2JnB,MAAM,aAAa,MAAM,IAAI;qCAoBnB,MAAM;mCAWR,MAAM,GAAG,MAAM;CAyFnE,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAWrD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;CAC3C;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;;oBA+LpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BA3FuB,MAAM,UAAU,MAAM;0BAxBtB,MAAM,QAAQ,MAAM;2BAuJnB,MAAM,aAAa,MAAM,IAAI;qCAoBnB,MAAM;mCAWR,MAAM,GAAG,MAAM;CAyFnE,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/cjs/components/use-table/use-table-virtual.js

@@ -34,7 +34,6 @@ function getMaxRowSpanLength(input) {
   }
   return Math.max.apply(Math, _toConsumableArray(Array.from(map.values())));
 }
-var MAX_ROW_SPAN = 200;
 var useTableVirtual = function useTableVirtual(props) {
   var _useState = (0, _react.useState)(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -67,7 +66,7 @@ var useTableVirtual = function useTableVirtual(props) {
     var totalLength = props.data.length;
     var _loop = function _loop(i) {
       var startIndex = i;
-      var rowSpanInfo = rowSpanColumns.map(function (col) {
+      var _rowSpanInfo = rowSpanColumns.map(function (col) {
         var rowSpan = col.rowSpan;
         function getRowSpanCount(index, _count) {
           var count = _count;
@@ -83,7 +82,7 @@ var useTableVirtual = function useTableVirtual(props) {
         var count = getRowSpanCount(i, 1);
         return [startIndex, startIndex + count - 1];
       });
-      _rowSpanInfos.push(rowSpanInfo);
+      _rowSpanInfos.push(_rowSpanInfo);
     };
     for (var i = 0; i < totalLength; i++) {
       _loop(i);
@@ -109,10 +108,12 @@ var useTableVirtual = function useTableVirtual(props) {
       });
       return Math.min.apply(Math, _toConsumableArray(startIndexs));
     });
-    var maxRowSpan = getMaxRowSpanLength(resultArr);
-    return maxRowSpan > 1 ? {
+
+    // 根据data计算出实际需要的最大合并行数
+    var _maxRowSpan = getMaxRowSpanLength(resultArr);
+    return _maxRowSpan > 1 ? {
       rowSpanIndexArray: resultArr,
-      maxRowSpan: maxRowSpan
+      maxRowSpan: _maxRowSpan
     } : null;
   }, [props.data, props.columns]);
   var _useRef = (0, _react.useRef)({
@@ -169,32 +170,32 @@ var useTableVirtual = function useTableVirtual(props) {
     }
   });
   var updateIndexAndTopFromTop = function updateIndexAndTopFromTop(scrollTop) {
+    var _props$scrollRef$curr;
     if (props.disabled) return;
     var sum = 0;
     var currentIndex = 0;
     var top = 0;
     var maxIndex = Math.max(props.data.length - rowsInView, 0);
-    var maxRowSpanLenth = 0;
-    if (rowSpanInfo) {
-      maxRowSpanLenth = Math.min(rowSpanInfo.rowSpanIndexArray.length,
-      // 根据data计算出实际需要的最大合并行数（rowSpanInfo.maxRowSpan），当rowSpanInfo.maxRowSpan大于外部传的rowsInView时，使用rowSpanInfo.maxRowSpan
-      Math.max(rowSpanInfo.maxRowSpan, props.rowsInView > MAX_ROW_SPAN ? props.rowsInView : props.rowsInView || MAX_ROW_SPAN));
-    }
+    var scrollContainerHeight = Math.max(((_props$scrollRef$curr = props.scrollRef.current) === null || _props$scrollRef$curr === void 0 ? void 0 : _props$scrollRef$curr.clientHeight) || 0, 200);
     for (var i = 0; i <= maxIndex; i++) {
       context.rowSpanRows = 0;
-      sum += context.cachedHeight[i] || props.rowHeight;
-      var rowSpanHeight = 0;
+      var currentRowHeight = context.cachedHeight[i] || props.rowHeight;
+      sum += currentRowHeight;
+      var rowSpanHeight = currentRowHeight;
       if (rowSpanInfo) {
         var siblingsIndexs = [];
-        for (var k = i; k < maxRowSpanLenth + i; k++) {
+        for (var k = i; k < rowSpanInfo.maxRowSpan + i; k++) {
           if (rowSpanInfo.rowSpanIndexArray[k] <= i && k > i) {
             siblingsIndexs.push(k);
           }
         }
         for (var j = 0; j < siblingsIndexs.length; j++) {
-          var index = siblingsIndexs[j];
-          context.rowSpanRows += 1;
-          rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
+          // 在当前滚动容器滚动一屏上方销毁tr，不在可见区域内销毁重建，避免引起可见的单元格（合并的）内容闪烁
+          if (rowSpanHeight < scrollContainerHeight) {
+            var index = siblingsIndexs[j];
+            context.rowSpanRows += 1;
+            rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
+          }
         }
       }
       if (scrollTop < sum + rowSpanHeight || i === maxIndex) {

package/esm/components/use-datepicker/use-date.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-date.d.ts","sourceRoot":"","sources":["use-date.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAU/C,QAAA,MAAM,OAAO,UAAW,YAAY;;;;;;;;;;wBAmBX,IAAI;2BAkDD,IAAI;yBAgBN,IAAI;0BAiDH,IAAI;+BArEC,IAAI;+BA+CJ,IAAI,YAAY,OAAO;0BAnB5B,IAAI;2BAIH,IAAI;;gCAIC,IAAI;;CAgFpC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"use-date.d.ts","sourceRoot":"","sources":["use-date.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAU/C,QAAA,MAAM,OAAO,UAAW,YAAY;;;;;;;;;;wBAmBX,IAAI;2BAkDD,IAAI;yBAkBN,IAAI;0BAkDH,IAAI;+BAxEC,IAAI;+BAiDJ,IAAI,YAAY,OAAO;0BAnB5B,IAAI;2BAIH,IAAI;;gCAIC,IAAI;;CAiFpC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/esm/components/use-datepicker/use-date.js

@@ -11,6 +11,7 @@ import dateUtil from "./util";
 import usePersistFn from "../../common/use-persist-fn";
 var useDate = function useDate(props) {
   var options = props.options,
+    position = props.position,
     type = props.type;
   var _useState = useState(props.defaultCurrent || new Date()),
     _useState2 = _slicedToArray(_useState, 2),
@@ -103,6 +104,7 @@ var useDate = function useDate(props) {
     var _props$onChange;
     if (isDisabled(date)) return;
     var newDate = getDateWithTime(date);
+    props === null || props === void 0 || props.onClearInputArr(position === 'start' ? 0 : 1);
     (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newDate, noClose);
     setCurrent(newDate);
   };

package/esm/components/use-datepicker/use-date.type.d.ts

@@ -1,12 +1,15 @@
 export interface UseDateProps {
     current?: Date;
+    range?: boolean | number;
     rangeDate?: Array<Date | undefined>;
     defaultCurrent?: Date;
     onCurrentChange?: (date: Date) => void;
+    onClearInputArr: (index?: number | undefined) => void;
     value?: Date;
     onChange?: (date: Date, noClose?: boolean) => void;
     min?: Date;
     max?: Date;
+    position?: 'start' | 'end';
     type?: 'date' | 'week' | 'datetime';
     format?: string;
     disabled?: boolean | ((date: Date) => boolean);

package/esm/components/use-datepicker/use-date.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-date.type.d.ts","sourceRoot":"","sources":["use-date.type.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,SAAS,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,IAAI,CAAC;IACtB,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACvC,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACnD,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC;IAC/C,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACrC,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACH"}
+{"version":3,"file":"use-date.type.d.ts","sourceRoot":"","sources":["use-date.type.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,IAAI,CAAC;IACtB,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACvC,eAAe,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IACtD,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACnD,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC;IAC/C,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACrC,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACH"}

package/esm/components/use-datepicker/use-datepicker-format.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { DatePickerModeType, DatePickerValueType, UseDatePickerFormatProps } from './use-datepicker-format.type';
 declare const useDatePickerFormat: <Value extends DatePickerValueType>(props: UseDatePickerFormatProps<Value>) => {
+    inputArr: (Date | undefined)[];
     resultArr: (string | undefined)[];
     targetResultArr: (string | undefined)[];
     dateArr: (Date | undefined)[];
@@ -17,6 +18,7 @@ declare const useDatePickerFormat: <Value extends DatePickerValueType>(props: Us
         setCurrentArr: React.Dispatch<React.SetStateAction<Date[]>>;
         setTargetArr: React.Dispatch<React.SetStateAction<(Date | undefined)[]>>;
         handleClear: (e?: React.MouseEvent) => void;
+        handleClearInputArr: (index?: number) => void;
         handleInputChange: (str: string, index: number) => void;
         registerModeDisabled: (position: 'start' | 'end' | undefined, mode: string, fn: (d: Date) => boolean) => void;
         setCurrentArrWithParams: (arg: React.SetStateAction<Date[]>, type: string, quick: {

package/esm/components/use-datepicker/use-datepicker-format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-datepicker-format.d.ts","sourceRoot":"","sources":["use-datepicker-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAE3D,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAkEtC,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;0BAmJe,gBAAgB;iCAgCT,MAAM,SAAS,MAAM;yCAjIrD,OAAO,GAAG,KAAK,GAAG,SAAS,QAAQ,MAAM,UAAU,IAAI,KAAK,OAAO;uCAWvE,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC,QAC3B,MAAM;kBACG,MAAM,SAAS;mBAAS,GAAG;;+BASrC,IAAI,YAAY,OAAO,GAAG,KAAK,GAAG,SAAS,gBAAgB,MAAM;;CA+K3E,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"use-datepicker-format.d.ts","sourceRoot":"","sources":["use-datepicker-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAE3D,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAkEtC,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;0BAqMe,gBAAgB;sCAiEJ,MAAM;iCA7BX,MAAM,SAAS,MAAM;yCAtLrD,OAAO,GAAG,KAAK,GAAG,SAAS,QAAQ,MAAM,UAAU,IAAI,KAAK,OAAO;uCAWvE,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC,QAC3B,MAAM;kBACG,MAAM,SAAS;mBAAS,GAAG;;+BA4CrC,IAAI,YAAY,OAAO,GAAG,KAAK,GAAG,SAAS,gBAAgB,MAAM;;CAsN3E,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/esm/components/use-datepicker/use-datepicker-format.js

@@ -108,13 +108,17 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     targetArr = _useState8[0],
     setTargetArr = _useState8[1];
-  var _useState9 = useState({
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    inputArr = _useState10[0],
+    setInputArr = _useState10[1];
+  var _useState11 = useState({
       type: undefined,
       quick: undefined
     }),
-    _useState10 = _slicedToArray(_useState9, 2),
-    params = _useState10[0],
-    setParams = _useState10[1];
+    _useState12 = _slicedToArray(_useState11, 2),
+    params = _useState12[0],
+    setParams = _useState12[1];
   var _useRef = useRef({
       cachedDateArr: convertValueToDateArr(value, format, options),
       modeDisabledStart: {},
@@ -122,14 +126,14 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     }),
     context = _useRef.current;
   // 当edit 为true时，stateDate 否则返回 props date
-  var _useState11 = useState(context.cachedDateArr),
-    _useState12 = _slicedToArray(_useState11, 2),
-    stateDate = _useState12[0],
-    setStateDate = _useState12[1];
-  var _useState13 = useState(false),
+  var _useState13 = useState(context.cachedDateArr),
     _useState14 = _slicedToArray(_useState13, 2),
-    edit = _useState14[0],
-    setEdit = _useState14[1];
+    stateDate = _useState14[0],
+    setStateDate = _useState14[1];
+  var _useState15 = useState(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    edit = _useState16[0],
+    setEdit = _useState16[1];
 
   // 收集所有的disabled
   var registerModeDisabled = usePersistFn(function (position, mode, fn) {
@@ -147,6 +151,39 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
       quick: quick
     });
   });
+  var isDisabledInputDate = function isDisabledInputDate(rangeData) {
+    var start = rangeData[0];
+    var end = rangeData[1];
+    var isDis = false;
+    if (disabled && typeof disabled === 'function') {
+      if (start && disabled(start)) isDis = true;
+      if (end && disabled(end)) isDis = true;
+      if (isDis) return isDis;
+    }
+    if (start && end) {
+      if (dateUtil.compareAsc(start, end) > 0) {
+        isDis = true;
+        return isDis;
+      }
+    }
+    if (range && typeof range === 'number') {
+      if (start) {
+        if (!end) return isDis;
+        var rangeDate = dateUtil.addSeconds(start, range, options);
+        if (dateUtil.compareAsc(end, rangeDate) > 0) {
+          isDis = true;
+        }
+      }
+      if (end) {
+        if (!start) return isDis;
+        var _rangeDate = dateUtil.addSeconds(end, -range, options);
+        if (dateUtil.compareAsc(start, _rangeDate) < 0) {
+          isDis = true;
+        }
+      }
+    }
+    return isDis;
+  };
   var isDisabledDate = usePersistFn(function (date, position, triggerType) {
     var mode = getTypeMode(type);
     var disabled = position === 'end' ? context.modeDisabledEnd[mode] : context.modeDisabledStart[mode];
@@ -203,6 +240,19 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
   var finishEdit = function finishEdit() {
     setEdit(false);
     var formatValue = getFormatValueArr(stateDate);
+    if (inputArr.length && inputArr.some(function (i) {
+      return i;
+    })) {
+      var inputValue = stateDate.map(function (item, index) {
+        if (inputArr[index]) return inputArr[index];
+        return item;
+      });
+      var isDis = isDisabledInputDate(inputValue);
+      if (!isDis) {
+        formatValue = getFormatValueArr(inputValue);
+      }
+    }
+    // const formatValue = getFormatValueArr(stateDate);
     var v = range ? formatValue : formatValue[0];
     if (range && (!stateDate[0] || !stateDate[1]) && !props.allowSingle) {
       return;
@@ -217,6 +267,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     if (!clearable) return;
     e === null || e === void 0 || e.stopPropagation();
     if (disabledStatus === 'all') return;
+    setInputArr([]);
     if (edit) {
       if (range) {
         if (disabledStatus === 'left') setStateDate(function (arr) {
@@ -252,6 +303,12 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     var isValid = dateUtil.isValidString(str, format);
     if (!isValid) return;
     var date = dateUtil.toDateWithFormat(str, format, undefined, options);
+    setInputArr(function (prev) {
+      var arr = _toConsumableArray(prev);
+      arr[index] = date;
+      return arr;
+    });
+
     // 此次校验是由输入触发的
     if (date && isDisabledDate(date, index === 1 ? 'end' : 'start', 'input')) {
       return;
@@ -267,6 +324,17 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
       return arr;
     });
   });
+  var handleClearInputArr = usePersistFn(function (index) {
+    if (index !== undefined) {
+      setInputArr(function (prev) {
+        var arr = _toConsumableArray(prev);
+        arr[index] = undefined;
+        return arr;
+      });
+      return;
+    }
+    setInputArr([]);
+  });
   useEffect(function () {
     handlePropsValueChange(value);
   }, [value]);
@@ -297,12 +365,14 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     setCurrentArr: setCurrentArr,
     setTargetArr: setTargetArr,
     handleClear: handleClear,
+    handleClearInputArr: handleClearInputArr,
     handleInputChange: handleInputChange,
     registerModeDisabled: registerModeDisabled,
     setCurrentArrWithParams: setCurrentArrWithParams,
     isDisabledDate: isDisabledDate
   });
   return {
+    inputArr: inputArr,
     resultArr: resultArr,
     targetResultArr: targetResultArr,
     dateArr: dateArr,

package/esm/components/use-datepicker/use-datepicker-range.type.d.ts

@@ -8,6 +8,7 @@ export interface useRangeProps {
     min: DateType;
     max: DateType;
     dateArr: Array<Date | undefined>;
+    inputArr: (Date | undefined)[];
     setTargetArr: Dispatch<SetStateAction<Array<Date | undefined>>>;
     setDateArr: Dispatch<SetStateAction<Array<Date | undefined>>>;
     currentArr: Date[];

package/esm/components/use-datepicker/use-datepicker-range.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-datepicker-range.type.d.ts","sourceRoot":"","sources":["use-datepicker-range.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AACnD,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;IACpC,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,QAAQ,CAAC;IACd,OAAO,EAAE,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;IACjC,YAAY,EAAE,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAChE,UAAU,EAAE,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAC9D,UAAU,EAAE,IAAI,EAAE,CAAC;IACnB,aAAa,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IACrE,IAAI,EAAE,kBAAkB,EAAE,CAAC;IAC3B,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;IACxD,QAAQ,EACJ,OAAO,GACP,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,KAAK,OAAO,CAAC,GACvF,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,GAC1C,SAAS,CAAC;IACd,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB"}
+{"version":3,"file":"use-datepicker-range.type.d.ts","sourceRoot":"","sources":["use-datepicker-range.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AACnD,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;IACpC,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,QAAQ,CAAC;IACd,OAAO,EAAE,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;IACjC,QAAQ,EAAE,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,YAAY,EAAE,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAChE,UAAU,EAAE,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAC9D,UAAU,EAAE,IAAI,EAAE,CAAC;IACnB,aAAa,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IACrE,IAAI,EAAE,kBAAkB,EAAE,CAAC;IAC3B,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;IACxD,QAAQ,EACJ,OAAO,GACP,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,KAAK,OAAO,CAAC,GACvF,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,GAC1C,SAAS,CAAC;IACd,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB"}

package/esm/components/use-form/use-form-context.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { FormRef } from './use-form-context.type';
 export declare const FormContext: React.Context<any>;
 export declare function useFormRef<V>(): [FormRef<V>, ((formRef: FormRef<V>) => void)];
-export declare function useFromInstance<V>(): FormRef<V>;
+export declare function useFormInstance<V>(): FormRef<V>;
 //# sourceMappingURL=use-form-context.d.ts.map

package/esm/components/use-form/use-form-context.js

@@ -7,7 +7,7 @@ export function useFormRef() {
   };
   return [ref.current, setFormRef];
 }
-export function useFromInstance() {
+export function useFormInstance() {
   var formCtx = React.useContext(FormContext);
   return formCtx;
 }

package/esm/components/use-table/use-table-tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-table-tree.d.ts","sourceRoot":"","sources":["use-table-tree.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AA8CvD,MAAM,WAAW,iBACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACvC,cAAc,GAAG,gBAAgB,GAAG,uBAAuB,GAAG,QAAQ,CACvE;IACD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED,eAAO,MAAM,YAAY,UAAW,iBAAiB;;;;;;+BA6BR,GAAG,SAAS,MAAM;iCAjBhB,GAAG,SAAS,MAAM;;CAuDhE,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"use-table-tree.d.ts","sourceRoot":"","sources":["use-table-tree.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AA+CvD,MAAM,WAAW,iBACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACvC,cAAc,GAAG,gBAAgB,GAAG,uBAAuB,GAAG,QAAQ,CACvE;IACD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED,eAAO,MAAM,YAAY,UAAW,iBAAiB;;;;;;+BA6BR,GAAG,SAAS,MAAM;iCAjBhB,GAAG,SAAS,MAAM;;CA4DhE,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/esm/components/use-table/use-table-tree.js

@@ -13,6 +13,7 @@ import { usePersistFn } from "../../common/use-persist-fn";
 import { getKey } from "../../utils/render";
 import { isObject } from "../../utils/is";
 import { useLatestObj } from "../../common/use-latest-obj";
+import { util } from "../..";
 var getExpandData = function getExpandData(_treeData, keys, keygen, treeColumnsName) {
   var expandKeys = keys;
   var expandSet = new Set(expandKeys);
@@ -113,6 +114,9 @@ export var useTableTree = function useTableTree(props) {
     var newExpandKeys = expandKeysState.filter(function (key) {
       return !unmatchExpandKeys.includes(key);
     });
+    if (util.shallowEqual(newExpandKeys, expandKeysState)) {
+      return;
+    }
     setExpandKeysState(newExpandKeys);
   }, [unmatchExpandKeys, expandKeysState]);
   return {

package/esm/components/use-table/use-table-virtual.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAYrD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;CAC3C;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;;oBAkMpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BA/FuB,MAAM,UAAU,MAAM;0BAxBtB,MAAM,QAAQ,MAAM;2BA2JnB,MAAM,aAAa,MAAM,IAAI;qCAoBnB,MAAM;mCAWR,MAAM,GAAG,MAAM;CAyFnE,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAWrD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;CAC3C;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;;oBA+LpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BA3FuB,MAAM,UAAU,MAAM;0BAxBtB,MAAM,QAAQ,MAAM;2BAuJnB,MAAM,aAAa,MAAM,IAAI;qCAoBnB,MAAM;mCAWR,MAAM,GAAG,MAAM;CAyFnE,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/esm/components/use-table/use-table-virtual.js

@@ -28,7 +28,6 @@ function getMaxRowSpanLength(input) {
   }
   return Math.max.apply(Math, _toConsumableArray(Array.from(map.values())));
 }
-var MAX_ROW_SPAN = 200;
 var useTableVirtual = function useTableVirtual(props) {
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -61,7 +60,7 @@ var useTableVirtual = function useTableVirtual(props) {
     var totalLength = props.data.length;
     var _loop = function _loop(i) {
       var startIndex = i;
-      var rowSpanInfo = rowSpanColumns.map(function (col) {
+      var _rowSpanInfo = rowSpanColumns.map(function (col) {
         var rowSpan = col.rowSpan;
         function getRowSpanCount(index, _count) {
           var count = _count;
@@ -77,7 +76,7 @@ var useTableVirtual = function useTableVirtual(props) {
         var count = getRowSpanCount(i, 1);
         return [startIndex, startIndex + count - 1];
       });
-      _rowSpanInfos.push(rowSpanInfo);
+      _rowSpanInfos.push(_rowSpanInfo);
     };
     for (var i = 0; i < totalLength; i++) {
       _loop(i);
@@ -103,10 +102,12 @@ var useTableVirtual = function useTableVirtual(props) {
       });
       return Math.min.apply(Math, _toConsumableArray(startIndexs));
     });
-    var maxRowSpan = getMaxRowSpanLength(resultArr);
-    return maxRowSpan > 1 ? {
+
+    // 根据data计算出实际需要的最大合并行数
+    var _maxRowSpan = getMaxRowSpanLength(resultArr);
+    return _maxRowSpan > 1 ? {
       rowSpanIndexArray: resultArr,
-      maxRowSpan: maxRowSpan
+      maxRowSpan: _maxRowSpan
     } : null;
   }, [props.data, props.columns]);
   var _useRef = useRef({
@@ -163,32 +164,32 @@ var useTableVirtual = function useTableVirtual(props) {
     }
   });
   var updateIndexAndTopFromTop = function updateIndexAndTopFromTop(scrollTop) {
+    var _props$scrollRef$curr;
     if (props.disabled) return;
     var sum = 0;
     var currentIndex = 0;
     var top = 0;
     var maxIndex = Math.max(props.data.length - rowsInView, 0);
-    var maxRowSpanLenth = 0;
-    if (rowSpanInfo) {
-      maxRowSpanLenth = Math.min(rowSpanInfo.rowSpanIndexArray.length,
-      // 根据data计算出实际需要的最大合并行数（rowSpanInfo.maxRowSpan），当rowSpanInfo.maxRowSpan大于外部传的rowsInView时，使用rowSpanInfo.maxRowSpan
-      Math.max(rowSpanInfo.maxRowSpan, props.rowsInView > MAX_ROW_SPAN ? props.rowsInView : props.rowsInView || MAX_ROW_SPAN));
-    }
+    var scrollContainerHeight = Math.max(((_props$scrollRef$curr = props.scrollRef.current) === null || _props$scrollRef$curr === void 0 ? void 0 : _props$scrollRef$curr.clientHeight) || 0, 200);
     for (var i = 0; i <= maxIndex; i++) {
       context.rowSpanRows = 0;
-      sum += context.cachedHeight[i] || props.rowHeight;
-      var rowSpanHeight = 0;
+      var currentRowHeight = context.cachedHeight[i] || props.rowHeight;
+      sum += currentRowHeight;
+      var rowSpanHeight = currentRowHeight;
       if (rowSpanInfo) {
         var siblingsIndexs = [];
-        for (var k = i; k < maxRowSpanLenth + i; k++) {
+        for (var k = i; k < rowSpanInfo.maxRowSpan + i; k++) {
           if (rowSpanInfo.rowSpanIndexArray[k] <= i && k > i) {
             siblingsIndexs.push(k);
           }
         }
         for (var j = 0; j < siblingsIndexs.length; j++) {
-          var index = siblingsIndexs[j];
-          context.rowSpanRows += 1;
-          rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
+          // 在当前滚动容器滚动一屏上方销毁tr，不在可见区域内销毁重建，避免引起可见的单元格（合并的）内容闪烁
+          if (rowSpanHeight < scrollContainerHeight) {
+            var index = siblingsIndexs[j];
+            context.rowSpanRows += 1;
+            rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
+          }
         }
       }
       if (scrollTop < sum + rowSpanHeight || i === maxIndex) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/hooks",
-  "version": "3.5.3",
+  "version": "3.5.4-beta.10",
   "description": "",
   "keywords": [],
   "license": "MIT",