shineout 3.3.0-beta.5 → 3.3.0-beta.6

package/cjs/index.js

@@ -476,5 +476,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.3.0-beta.5'
+  version: '3.3.0-beta.6'
 };

package/dist/shineout.js

@@ -11960,7 +11960,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.3.0-beta.5');
+/* harmony default export */ var version = ('3.3.0-beta.6');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -12524,7 +12524,7 @@ var alertTokens = {
 var breadcrumbTokens = {
   breadcrumbFontSize: 'Font-14',
   breadcrumbFontColor: 'Neutral-text-5',
-  breadcrumbFontWieght: 'Weight-regular',
+  breadcrumbFontWeight: 'Weight-regular',
   breadcrumbLinkColor: 'Neutral-text-3',
   breadcrumbLinkHoverColor: 'Brand-5',
   breadcrumbDefaultLinkColor: 'Brand-6',
@@ -13357,6 +13357,7 @@ var dropdownTokens = {
   dropdownListPaddingX: 'Spacing-4',
   dropdownListPaddingY: 'Spacing-4',
   dropdownListFontSize: 'Font-14',
+  dropdownListFontWeight: 'Weight-regular',
   dropdownListSmallBorderRadius: 'Radius-default',
   dropdownListSmallPaddingX: 'Spacing-4',
   dropdownListSmallPaddingY: 'Spacing-4',
@@ -13395,6 +13396,7 @@ var dropdownTokens = {
   dropdownOptionGroupPaddingBottom: 'Spacing-2',
   dropdownOptionGroupFontSize: 'Font-12',
   dropdownOptionGroupFontColor: 'Neutral-text-3',
+  dropdownOptionGroupFontWeight: 'Weight-regular',
   dropdownOptionGroupSmallX: 'Spacing-8',
   dropdownOptionGroupSmallTop: 'Spacing-4',
   dropdownOptionGroupLargeX: 'Spacing-12',
@@ -13633,6 +13635,7 @@ var menuTokens = {
   menuPopoverPaddingY: 'Spacing-4',
   menuItemBackgroundColor: 'Neutral-fill-1',
   menuItemFontColor: 'Neutral-text-5',
+  menuItemFontWeight: 'Weight-regular',
   menuItemHoverBackgroundColor: 'Neutral-fill-2',
   menuItemHoverFontColor: 'Neutral-text-5',
   menuItemActiveBackgroundColor: 'Brand-1',
@@ -13730,7 +13733,7 @@ var modalTokens = {
   modalPanelRadius: 'Radius-default',
   modalPanelFontSize: 'Font-14',
   modalHeaderIconMarginEnd: 'Spacing-8',
-  modalHeaderIconMarginTop: 'Size-2',
+  modalHeaderIconMarginTop: 'Spacing-2',
   modalHeaderIconSize: 'Size-8',
   modalHeaderCloseMarginXStart: 'Spacing-16',
   modalHeaderCloseSize: 'Size-8',
@@ -13738,6 +13741,11 @@ var modalTokens = {
   modalHeaderCloseColor: 'Neutral-text-4',
   modalHeaderCloseBackgroundColor: 'Neutral-fill-2',
   modalHeaderFontSize: 'Font-16',
+  modalHeaderFontWeight: 'Weight-medium',
+  modalHeaderFontColor: 'Neutral-text-5',
+  modalBodyFontColor: 'Neutral-text-5',
+  modalBodyFontWeight: 'Weight-regular',
+  modalBodyFontSize: 'Font-14',
   modalDrawerTitlePaddingY: 'Spacing-12',
   modalDrawerTitlePaddingX: 'Spacing-16',
   modalDrawerTitleBackgroundColor: 'Neutral-fill-2',
@@ -14160,14 +14168,16 @@ var switchTokens = {
   switchLargeWidth: 'Size-27',
   switchBackgroundColor: 'Neutral-fill-4',
   switchDisabledBackgroundColor: 'Neutral-fill-2',
-  switchDisabledCircleFill: 'Neutral-text-2',
+  switchDisabledCircleFill: 'Neutral-fill-1',
   switchDisabledFontColor: 'Neutral-text-2',
   switchLoadingBackgroundColor: 'Neutral-fill-2',
   switchLoadingCircleFill: 'Neutral-text-2',
   switchLoadingFontColor: 'Neutral-text-2',
   switchCheckedBackgroundColor: 'Brand-6',
+  switchCheckedCircleFill: 'Neutral-fill-1',
   switchCheckedFontColor: 'Neutral-text-1',
   switchCheckedDisabledBackgroundColor: 'Brand-3',
+  switchCheckedDisabledCircleFill: 'Neutral-fill-1',
   switchCheckedDisabledFontColor: 'Neutral-text-1',
   switchCheckedLoadingBackgroundColor: 'Brand-3',
   switchCheckedLoadingFontColor: 'Neutral-text-1'
@@ -15152,7 +15162,7 @@ var breadcrumbStyle = {
   wrapper: {
     lineHeight: src.lineHeightDynamic,
     fontSize: src.breadcrumbFontSize,
-    fontWeight: src.breadcrumbFontWieght,
+    fontWeight: src.breadcrumbFontWeight,
     display: 'flex',
     alignItems: 'center',
     color: src.breadcrumbFontColor,
@@ -15227,7 +15237,7 @@ var breadcrumbStyle = {
   dropdownItem: {
     lineHeight: src.lineHeightDynamic,
     fontSize: src.dropdownListFontSize,
-    fontWeight: src.breadcrumbFontWieght,
+    fontWeight: src.breadcrumbFontWeight,
     cursor: 'pointer',
     color: src.dropdownOptionFontColor,
     borderRadius: src.dropdownOptionBorderRadius,
@@ -16282,7 +16292,7 @@ var useCarouselStyle = styled(carousel_carousel, 'carousel');
     }, "&:not($".concat(name, "Disabled):not($").concat(name, "Error)"), {
       backgroundColor: token.hoverBackgroundColor
     }),
-    '[data-soui-role="input-group"] &': {
+    '[data-soui-role="input-group"] &&&, [data-soui-role="input-group"] &&&:hover': {
       borderWidth: 0,
       borderRadius: 0,
       boxShadow: 'none',
@@ -17841,6 +17851,10 @@ var datePickerStyle = objectSpread2_default()(objectSpread2_default()({
       visibility: 'visible'
     }
   },
+  datetimeHide: {
+    opacity: '0',
+    pointerEvents: 'none'
+  },
   quickPicker: {
     padding: "".concat(src.datePickerQuickPanelPaddingY, " ").concat(src.datePickerQuickPanelPaddingX),
     display: 'flex',
@@ -18153,7 +18167,7 @@ var dropdown_dropdown = {
   },
   list: {
     position: 'absolute',
-    fontWeight: 400,
+    fontWeight: src.dropdownListFontWeight,
     minWidth: '100%',
     zIndex: 1000,
     textAlign: 'left',
@@ -18172,12 +18186,12 @@ var dropdown_dropdown = {
   },
   listSmall: {
     fontSize: src.dropdownListSmallFontSize,
-    borderRadius: src.dropdownListSmallBorderRadius,
+    borderRadius: src.dropdownListBorderRadius,
     padding: "".concat(src.dropdownListSmallPaddingY, " ").concat(src.dropdownListSmallPaddingX)
   },
   listLarge: {
     fontSize: src.dropdownListLargeFontSize,
-    borderRadius: src.dropdownListLargeBorderRadius,
+    borderRadius: src.dropdownListBorderRadius,
     padding: "".concat(src.dropdownListLargePaddingY, " ").concat(src.dropdownListLargePaddingX)
   },
   listHasChildren: {
@@ -18300,6 +18314,7 @@ var dropdown_dropdown = {
   optionGroup: {
     padding: "".concat(src.dropdownOptionGroupPaddingTop, " ").concat(src.dropdownOptionGroupPaddingX, " ").concat(src.dropdownOptionGroupPaddingBottom, " ").concat(src.dropdownOptionGroupPaddingX),
     fontSize: src.dropdownOptionGroupFontSize,
+    fontWeight: src.dropdownOptionGroupFontWeight,
     color: src.dropdownOptionGroupFontColor,
     '$listSmall &': {
       padding: "".concat(src.dropdownOptionGroupSmallTop, " ").concat(src.dropdownOptionGroupSmallX, " 0 ").concat(src.dropdownOptionGroupSmallX)
@@ -19327,9 +19342,14 @@ var input_input = objectSpread2_default()(objectSpread2_default()(objectSpread2_
     backgroundColor: 'transparent',
     boxSizing: 'border-box',
     fontWeight: 'inherit',
+    '$wrapper:not($wrapperDisabled) &::placeholder': {
+      color: src.inputPlaceholderColor
+    },
+    '$wrapperDisabled &::placeholder': {
+      color: src.inputDisabledPlaceholderColor
+    },
     '&::placeholder': {
       fontWeight: src.inputPlaceholderFontWeight,
-      color: src.inputPlaceholderColor,
       fontSize: 'inherit'
     }
   },
@@ -20029,7 +20049,11 @@ var menuStyle = {
     display: 'inline-flex'
   },
   titleContent: {
-    whiteSpace: 'pre-wrap'
+    whiteSpace: 'pre-wrap',
+    display: 'flex',
+    minWidth: 0,
+    alignItems: 'center',
+    fontWeight: src.menuItemFontWeight
     // '$wrapperCollpase &': {
     //   transition: `opacity ${animationDuration} ${transitionFunc}`,
     // },
@@ -20650,7 +20674,8 @@ var modalStyle = objectSpread2_default()(objectSpread2_default()({}, animationSt
     flex: '1',
     minWidth: 0,
     textAlign: 'left',
-    fontWeight: 'bold',
+    color: src.modalHeaderFontColor,
+    fontWeight: src.modalHeaderFontWeight,
     fontSize: src.modalHeaderFontSize
   },
   headerClose: {
@@ -20680,8 +20705,12 @@ var modalStyle = objectSpread2_default()(objectSpread2_default()({}, animationSt
   },
   body: {
     flex: '1 1 auto',
-    minHeight: '1px'
+    minHeight: '1px',
     // overflow: 'auto',
+    color: src.modalBodyFontColor,
+    fontSize: src.modalBodyFontSize,
+    fontWeight: src.modalBodyFontWeight,
+    lineHeight: src.lineHeightDynamic
   },
   bodyWithIcon: {
     paddingLeft: "calc(".concat(src.modalHeaderIconMarginEnd, " + ").concat(src.modalHeaderIconSize, ")")
@@ -23960,6 +23989,7 @@ var switchStyle = objectSpread2_default()(objectSpread2_default()({}, switch_ani
     justifyContent: 'center',
     color: 'red',
     '$wrapperChecked &': {
+      backgroundColor: src.switchCheckedCircleFill,
       '&[dir=ltr]': {
         right: src.switchPaddingX,
         left: "calc(100% - ".concat(src.switchCircleSize, " - ").concat(src.switchPaddingX, ")")
@@ -24001,6 +24031,12 @@ var switchStyle = objectSpread2_default()(objectSpread2_default()({}, switch_ani
       left: src.switchLargePaddingX,
       top: src.switchLargePaddingY
     },
+    '$wrapperDisabled:not($wrapperChecked) &': {
+      backgroundColor: src.switchDisabledCircleFill
+    },
+    '$wrapperDisabled &': {
+      backgroundColor: src.switchCheckedDisabledCircleFill
+    },
     borderRadius: '50%',
     position: 'absolute',
     backgroundColor: src.switchCircleFill,
@@ -28124,7 +28160,7 @@ var horizontalPosition = ['left-bottom', 'left-top', 'right-bottom', 'right-top'
 var verticalPosition = ['bottom-left', 'bottom-right', 'top-left', 'top-right', 'bottom', 'top'];
 var hideStyle = {
   pointerEvents: 'none',
-  position: 'absolute',
+  position: 'fixed',
   zIndex: -1000,
   opacity: 0
 };
@@ -32744,7 +32780,6 @@ function removeProtocol(url) {
     short: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
     long: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
   },
-  pickerTitle: ['开始时间', '结束时间'],
   timeOfDayValues: ['上午', '下午'],
   ok: '确定',
   cancel: '取消',
@@ -32810,7 +32845,6 @@ function removeProtocol(url) {
     short: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
     long: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
   },
-  pickerTitle: ['Start Time', 'End Time'],
   timeOfDayValues: ['a.m.', 'p.m.'],
   ok: 'Ok',
   cancel: 'Cancel',
@@ -40027,6 +40061,19 @@ function formatted(date, fmt, options) {
 function getStartYear(date, options) {
   return Math.floor(getDateInfo(date, 'year', options) / 10) * 10;
 }
+
+// 如果有 value  取 value 的 time 否则取 defaultTime
+var getDateWithTime = function getDateWithTime(date, value, defaultTime, min, max, options) {
+  var timeDate = value || defaultTime && cloneTime(date, defaultTime, TIME_FORMAT, options);
+  var newDate = util_toDate(date);
+  if (timeDate) {
+    newDate = setTime(newDate, timeDate, options);
+  }
+  // only can select day with the same day of min/max
+  if (min && compareAsc(newDate, min) < 0) newDate = setTime(newDate, min, options);
+  if (max && compareAsc(newDate, max) > 0) newDate = setTime(newDate, max, options);
+  return newDate;
+};
 /* harmony default export */ var util = ({
   clearHMS: clearHMS,
   addDays: addDays,
@@ -40063,7 +40110,8 @@ function getStartYear(date, options) {
   compatibleFmt: compatibleFmt,
   transDateWithZone: transDateWithZone,
   getStartYear: getStartYear,
-  isValidString: isValidString
+  isValidString: isValidString,
+  getDateWithTime: getDateWithTime
 });
 ;// CONCATENATED MODULE: ../hooks/src/components/use-datepicker/use-datepicker-format.ts
 
@@ -40194,6 +40242,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
   });
   var setCurrentArrWithParams = usePersistFn(function (arg, type, quick) {
     setCurrentArr(arg);
+    if (!type && !quick) return;
     setParams({
       type: type,
       quick: quick
@@ -40453,17 +40502,7 @@ var useDate = function useDate(props) {
     return util.getDateInfo(date, 'week', options);
   };
   var getDateWithTime = function getDateWithTime(date) {
-    var min = props.min,
-      max = props.max;
-    var timeDate = props.value || props.defaultTime && util.cloneTime(date, props.defaultTime, util.TIME_FORMAT, options);
-    var newDate = util.toDate(date);
-    if (timeDate) {
-      newDate = util.setTime(newDate, timeDate, options);
-    }
-    // only can select day with the same day of min/max
-    if (min && util.compareAsc(newDate, min) < 0) newDate = util.setTime(newDate, min, options);
-    if (max && util.compareAsc(newDate, max) > 0) newDate = util.setTime(newDate, max, options);
-    return newDate;
+    return util.getDateWithTime(date, props.value, props.defaultTime, props.min, props.max, options);
   };
   var handleDayClick = function handleDayClick(date) {
     var _props$onChange;
@@ -41041,8 +41080,8 @@ var Day = function Day(props) {
       className: styles === null || styles === void 0 ? void 0 : styles.pickerFooter,
       dir: direction,
       children: [props.type === 'datetime' && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-        className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.pickerFooterLeft, styles === null || styles === void 0 ? void 0 : styles.datetime),
-        children: timeStr && /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+        className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.pickerFooterLeft, styles === null || styles === void 0 ? void 0 : styles.datetime, !timeStr && (styles === null || styles === void 0 ? void 0 : styles.datetimeHide)),
+        children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
           children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
             children: icons_config.datepicker.Time
           }), /*#__PURE__*/(0,jsx_runtime.jsx)(time, objectSpread2_default()(objectSpread2_default()({}, props), {}, {
@@ -41050,7 +41089,7 @@ var Day = function Day(props) {
             showTitle: false,
             format: format
           })), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-            children: func.getTimeStr()
+            children: timeStr
           })]
         })
       }), showRight && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
@@ -41923,7 +41962,7 @@ var useRangePick = function useRangePick(props) {
             newArr[1] = rangeMax;
           }
         } else if (date.getTime() > newArr[1].getTime()) {
-          var a = util.cloneTime(new Date(date), defaultTimeArr[1], 'HH:mm:ss', options);
+          var a = util.cloneTime(new Date(date), arr[1] || defaultTimeArr[1], 'HH:mm:ss', options);
           newArr[1] = a.getTime() > date.getTime() ? a : new Date(date);
         }
       }
@@ -41991,6 +42030,14 @@ var useRangePick = function useRangePick(props) {
   var setTargetStart = usePersistFn(function (date) {
     setTargetArr([date, undefined]);
   });
+  var getStartDobule = usePersistFn(function (date) {
+    var end = util.getDateWithTime(date, props.dateArr[1], defaultTimeArr[1], endMin, endMax, options);
+    return end;
+  });
+  var getEndDobule = usePersistFn(function (date) {
+    var start = util.getDateWithTime(date, props.dateArr[1], defaultTimeArr[1], startMin, startMax, options);
+    return start;
+  });
   var setTargetEnd = usePersistFn(function (date) {
     setTargetArr([undefined, date]);
   });
@@ -42047,7 +42094,9 @@ var useRangePick = function useRangePick(props) {
     setTargetStart: setTargetStart,
     setTargetEnd: setTargetEnd,
     startDisabled: startDisabled,
-    endDisabled: endDisabled
+    endDisabled: endDisabled,
+    getStartDobule: getStartDobule,
+    getEndDobule: getEndDobule
   });
   var minDate = min ? util.toDate(min, options) : undefined;
   var maxDate = max ? util.toDate(max, options) : undefined;
@@ -42191,12 +42240,18 @@ var Picker = function Picker(props) {
         onDoubleClick: function onDoubleClick(item, type) {
           // 双击同时设置开始和结束日期
           if (props.range && props.type === 'datetime') {
-            if (position === 'start' && !isDisabledDate(item, 'end')) {
-              func.setCurrentEnd(item, type);
-              func.setDateEnd(item, true);
-            } else if (!isDisabledDate(item, 'start')) {
-              func.setCurrentStart(item, type);
-              func.setDateStart(item, true);
+            if (position === 'start') {
+              var end = func.getStartDobule(item);
+              if (!isDisabledDate(end, 'end')) {
+                func.setCurrentEnd(end, type);
+                func.setDateEnd(end, true);
+              }
+            } else if (position === 'end') {
+              var start = func.getEndDobule(item);
+              if (!isDisabledDate(start, 'start')) {
+                func.setCurrentStart(start, type);
+                func.setDateStart(start, true);
+              }
             }
           }
         }
@@ -43042,15 +43097,17 @@ var Modal = function Modal(props) {
     defaultHeight: height,
     panelRef: panelRef
   });
+  var rerender = useRender();
   var handleMaskVisible = function handleMaskVisible() {
     // 多个moal 只有第一个显示的时候才显示遮罩
     // context.isMask 用来判断是否是第一个显示的modal
     if (visible && !hasMask) {
       context.isMask = true;
       hasMask = true;
+      rerender();
     }
   };
-  handleMaskVisible();
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(handleMaskVisible, [visible]);
   var updateOrigin = function updateOrigin() {
     // 更新transform-origin
     if (props.position || props.moveable || !props.zoom) return;
@@ -47494,7 +47551,7 @@ var useNumberFormat = function useNumberFormat(props) {
 ;// CONCATENATED MODULE: ../base/src/input/input-number.tsx
 
 
-var input_number_excluded = ["jssStyle", "hideArrow"],
+var input_number_excluded = ["jssStyle", "hideArrow", "numType", "integerLimit", "digits", "min", "max", "step", "allowNull"],
   input_number_excluded2 = ["onMinus", "onPlus"];
 
 
@@ -47509,18 +47566,25 @@ var InputNumber = function InputNumber(props) {
   var commonProps = use_input_common(props);
   var jssStyle = commonProps.jssStyle,
     hideArrow = commonProps.hideArrow,
+    numType = commonProps.numType,
+    integerLimit = commonProps.integerLimit,
+    digits = commonProps.digits,
+    min = commonProps.min,
+    max = commonProps.max,
+    step = commonProps.step,
+    allowNull = commonProps.allowNull,
     restProps = objectWithoutProperties_default()(commonProps, input_number_excluded);
   var inputStyle = jssStyle === null || jssStyle === void 0 || (_jssStyle$input = jssStyle.input) === null || _jssStyle$input === void 0 ? void 0 : _jssStyle$input.call(jssStyle);
   var numberFormatParams = {
     onBlur: restProps.onBlur,
     onFocus: restProps.onFocus,
-    digits: restProps.digits,
-    integerLimit: restProps.integerLimit,
-    numType: restProps.numType,
-    min: restProps.min,
-    max: restProps.max,
-    step: restProps.step,
-    allowNull: restProps.allowNull
+    digits: digits,
+    integerLimit: integerLimit,
+    numType: numType,
+    min: min,
+    max: max,
+    step: step,
+    allowNull: allowNull
   };
   var _useInputNumber = use_input_number(objectSpread2_default()({
       value: commonProps.value,
@@ -47530,7 +47594,9 @@ var InputNumber = function InputNumber(props) {
     onMinus = _useInputNumber.onMinus,
     onPlus = _useInputNumber.onPlus,
     numberFormatProps = objectWithoutProperties_default()(_useInputNumber, input_number_excluded2);
-  var forwardProps = removeProps(commonProps, objectSpread2_default()({}, numberFormatParams));
+  var forwardProps = removeProps(commonProps, objectSpread2_default()(objectSpread2_default()({}, numberFormatParams), {}, {
+    hideArrow: hideArrow
+  }));
   var addEnd = hideArrow ? null : /*#__PURE__*/(0,jsx_runtime.jsx)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
     children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.numberStep,
@@ -47671,17 +47737,20 @@ var Scroll = function Scroll(props) {
       isMouseDown: false
     }),
     context = _useRef.current;
+  var _props$scrollHeight = props.scrollHeight,
+    scrollHeight = _props$scrollHeight === void 0 ? 0 : _props$scrollHeight,
+    _props$scrollWidth = props.scrollWidth,
+    scrollWidth = _props$scrollWidth === void 0 ? 0 : _props$scrollWidth,
+    _props$defaultHeight = props.defaultHeight,
+    defaultHeight = _props$defaultHeight === void 0 ? 0 : _props$defaultHeight;
   var _useResize = useResize({
       targetRef: containerRef
     }),
     width = _useResize.width,
-    height = _useResize.height;
+    h = _useResize.height;
+  var height = h || defaultHeight;
   var config = useConfig();
   var isRtl = config.direction === 'rtl';
-  var _props$scrollHeight = props.scrollHeight,
-    scrollHeight = _props$scrollHeight === void 0 ? 0 : _props$scrollHeight,
-    _props$scrollWidth = props.scrollWidth,
-    scrollWidth = _props$scrollWidth === void 0 ? 0 : _props$scrollWidth;
   var scrollerStyle = props.scrollerStyle || {
     height: '100%',
     width: '100%',
@@ -49244,7 +49313,7 @@ var Tree = function Tree(props) {
     handleUpdateExpanded(expanded);
   }, [expanded]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (!active) return;
+    // if (!active) return;
     handleUpdateActive(active);
   }, [active]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
@@ -50855,6 +50924,7 @@ var PaginationSimple = function PaginationSimple(props) {
 
 
 
+
 var usePagination = function usePagination(props) {
   var totalProp = props.total,
     pageSizeProp = props.pageSize,
@@ -50875,14 +50945,15 @@ var usePagination = function usePagination(props) {
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (pageSizeProp !== pageSize) setPageSize(pageSizeProp);
   }, [pageSizeProp]);
-  var handleChange = function handleChange(current, size) {
-    setCurrent(current);
+  var handleChange = usePersistFn(function (c, size) {
+    if (c === current && size === undefined) return;
+    setCurrent(c);
     setPageSize(size || pageSizeProp);
     if (onChange) {
-      var sizeChange = pageSize !== size;
-      onChange(current, size || pageSize, sizeChange);
+      var sizeChange = size !== undefined && pageSize !== size;
+      onChange(c, size || pageSize, sizeChange);
     }
-  };
+  });
   var getRootProps = function getRootProps() {
     var externalProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var externalEventHandlers = extractEventHandlers(externalProps);
@@ -56398,8 +56469,8 @@ var Tr = function Tr(props) {
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (props.setRowHeight && trRef.current) {
-      var expandHeight = expandRef.current ? expandRef.current.offsetHeight : 0;
-      props.setRowHeight(props.rowIndex, trRef.current.offsetHeight + expandHeight);
+      var expandHeight = expandRef.current ? expandRef.current.getBoundingClientRect().height : 0;
+      props.setRowHeight(props.rowIndex, trRef.current.getBoundingClientRect().height + expandHeight);
     }
   }, [props.expanded, props.rowIndex, props.bodyScrollWidth, props.resizeFlag]);
   var renderTreeExpand = function renderTreeExpand(content) {
@@ -56832,6 +56903,10 @@ var emptyRef = {
   var tfootRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var scrollRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var tableRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
+  var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
+      emptyHeight: 0
+    }),
+    context = _useRef.current;
   var virtual = ((_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.length) && props.rowsInView !== 0 && (!!props.virtual || props.fixed === 'both' || props.fixed === 'y' || props.fixed === 'auto');
 
   // 虚拟列表高度另外计算
@@ -57001,6 +57076,9 @@ var emptyRef = {
     if ((_props$data2 = props.data) !== null && _props$data2 !== void 0 && _props$data2.length) return null;
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.emptyWrapper,
+      ref: function ref(el) {
+        context.emptyHeight = (el === null || el === void 0 ? void 0 : el.clientHeight) || 0;
+      },
       children: props.empty || /*#__PURE__*/(0,jsx_runtime.jsx)(src_empty_empty, {
         jssStyle: props.jssStyle
       })
@@ -57117,6 +57195,7 @@ var emptyRef = {
         scrollWidth: width || 1,
         scrollHeight: virtual ? virtualInfo.scrollHeight : tbodyHeight,
         onScroll: handleVirtualScroll,
+        defaultHeight: context.emptyHeight,
         children: /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
           style: {
             width: width,
@@ -59683,7 +59762,7 @@ var TreeSelect = function TreeSelect(props0) {
         keygen: keygen,
         unmatch: unmatch,
         value: value,
-        highlight: true,
+        highlight: !multiple,
         loader: loader,
         onExpand: onExpandTree,
         expanded: controlExpanded,
@@ -63319,7 +63398,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.0-beta.5'
+  version: '3.3.0-beta.6'
 });
 }();
 /******/ 	return __webpack_exports__;