shineout 3.9.8-beta.9 → 3.9.9-beta.1

package/dist/shineout.js

@@ -6613,7 +6613,7 @@ __webpack_require__.r(strings_namespaceObject);
 __webpack_require__.d(strings_namespaceObject, {
   capitalize: function() { return capitalize; },
   getDirectionIconName: function() { return getDirectionIconName; },
-  getRTLPosition: function() { return getRTLPosition; },
+  getRTLPosition: function() { return strings_getRTLPosition; },
   removeProtocol: function() { return strings_removeProtocol; },
   substitute: function() { return strings_substitute; }
 });
@@ -7299,7 +7299,7 @@ var config = {
     InfoLine: icons.InfoCircleFill,
     WarningLine: icons.WarningCircleFill,
     SuccessLine: icons.CheckCircleFill,
-    DangerLine: icons.Close
+    DangerLine: icons.CloseFill
   },
   rate: {
     Star: icons.StarFill
@@ -12402,7 +12402,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.9.8-beta.9');
+/* harmony default export */ var version = ('3.9.9-beta.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -13828,7 +13828,7 @@ var datePickerTokens = {
   datePickerCellHeaderColor: 'Neutral-text-4',
   datePickerCellMarginY: 'Spacing-4',
   datePickerTimePanelPaddingX: 'Spacing-12',
-  datePickerTimePanelPaddingY: 'Spacing-7',
+  datePickerTimePanelPaddingY: 'Spacing-6',
   datePickerTimeListGap: 'Spacing-8',
   datePickerTimeItemHeight: 'Size-15',
   datePickerTimeItemBorderRadius: 'Radius-default',
@@ -14121,7 +14121,7 @@ var inputTokens = {
   inputBackgroundColor: 'Neutral-fill-1',
   inputClearColor: 'Neutral-text-3',
   inputToggleColor: 'Neutral-text-4',
-  inputHoverBorderColor: 'Brand-6',
+  inputHoverBorderColor: 'Brand-5',
   inputHoverBackgroundColor: 'Neutral-fill-1',
   inputHoverClearColor: 'Neutral-text-4',
   inputHoverToggleColor: 'Neutral-text-5',
@@ -14576,6 +14576,8 @@ var selectTokens = {
   selectLargeOptionInnerPaddingY: 'Spacing-8',
   selectLargeClearIconSize: 'Font-16',
   selectLargePlaceholderMarginY: 'Spacing-4',
+  selectLargeColumnPadding: 'Spacing-12',
+  selectLargeHeaderPaddingX: 'Spacing-12',
   selectInnerPaddingX: 'Spacing-8',
   selectInnerPaddingY: 'Spacing-5',
   selectInnerTitleMarginY: 'Spacing-2',
@@ -14690,6 +14692,7 @@ var sliderTokens = {
   sliderIndicatorBackgroundColor: 'Neutral-fill-1',
   sliderIndicatorBorderColor: 'Brand-6',
   sliderIndicatorBorderSize: 'Border-2',
+  sliderIndicatorHoverBoderColor: 'Brand-5',
   sliderIndicatorActiveBackgroundColor: 'Brand-6',
   sliderIndicatorActiveShadow: 'Shadow-1',
   sliderIndicatorDisabledBorderColor: 'Brand-3',
@@ -14736,6 +14739,7 @@ var spinTokens = {
 
 var stepsTokens = {
   stepsDescriptionFontColor: 'Neutral-text-3',
+  stepsDescriptionFontSize: 'Font-14',
   stepsDescriptionTitleMarginX: 'Spacing-4',
   stepsIconWidth: 'Size-14',
   stepsIconHeight: 'Size-14',
@@ -14750,7 +14754,7 @@ var stepsTokens = {
   stepsSmallTitleFontSize: 'Font-14',
   stepsSmallDescriptionFontSize: 'Font-12',
   stepsLargeTitleFontSize: 'Font-18',
-  stepsLargeDescriptionFontSize: 'Font-12',
+  stepsLargeDescriptionFontSize: 'Font-14',
   stepsWaitFontColor: 'Neutral-text-4',
   stepsWaitBackgroundColor: 'Neutral-fill-2',
   stepsWaitHoverFontColor: 'Brand-6',
@@ -15371,12 +15375,14 @@ var textareaTokens = {
   textareaSmallFontSize: 'Font-12',
   textareaSmallPaddingX: 'Spacing-8',
   textareaSmallPaddingY: 'Spacing-1',
+  textareaSmallClearSize: 'Font-12',
   textareaLargeFontSize: 'Font-16',
   textareaLargePaddingX: 'Spacing-12',
   textareaLargePaddingY: 'Spacing-7',
+  textareaLargeClearSize: 'Font-16',
   textareaPlaceholderColor: 'Neutral-text-2',
   textareaBackgroundColor: 'Neutral-fill-1',
-  textareaHoverBorderColor: 'Brand-6',
+  textareaHoverBorderColor: 'Brand-5',
   textareaFocusBorderColor: 'Brand-7',
   textareaFocusShadow: 'Brand-2',
   textareaDisabledFontColor: 'Neutral-text-2',
@@ -17379,6 +17385,7 @@ var useCarouselStyle = styled(carousel_carousel, 'carousel');
 ;// CONCATENATED MODULE: ../shineout-style/src/input/input-border.ts
 
 
+
 var supportsHas = function supportsHas() {
   if (typeof CSS === 'undefined' || typeof CSS.supports === 'undefined') {
     return false;
@@ -17512,13 +17519,13 @@ var supportsHas = function supportsHas() {
     // '[data-soui-role="input-group-separate"]&': {
     //   boxShadow: 'none',
     // }
-  })), "".concat(name, "Disabled"), defineProperty_default()(defineProperty_default()({
+  })), "".concat(name, "Disabled"), defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({
     color: token.disabledFontColor,
     backgroundColor: token.disabledBackgroundColor,
     borderColor: token.disabledBorderColor,
     boxShadow: 'none',
     cursor: 'not-allowed'
-  }, "&:not($".concat(name, "Error):hover"), {
+  }, getTokenName('inputInnerPlaceFontColor'), token.disabledFontColor), getTokenName('inputInnerFontColor'), token.disabledFontColor), "&:not($".concat(name, "Error):hover"), {
     borderColor: token.disabledBorderColor
   }), '& *', {
     cursor: 'not-allowed'
@@ -18373,6 +18380,10 @@ var collapseItemStyle = {
       }
     }
   },
+  iconRight: {
+    marginRight: 0,
+    marginLeft: src.collapseHeaderGap
+  },
   title: {
     flex: 1,
     lineHeight: src.lineHeightDynamic
@@ -20994,6 +21005,9 @@ var input_input = objectSpread2_default()(objectSpread2_default()(objectSpread2_
     height: src.inputIconSize,
     color: src.inputToggleColor,
     cursor: 'pointer',
+    '$wrapperDisabled &': {
+      color: src.inputDisabledFontColor
+    },
     '$wrapperSmall &': {
       width: src.inputSmallIconSize,
       height: src.inputSmallIconSize
@@ -21738,6 +21752,9 @@ var menuStyle = {
       '$wrapper:not($wrapperVertical) $itemClosing > $itemContent &': {
         transform: 'rotate(0deg)'
       }
+    },
+    '&$expandFront > $icon': {
+      minHeight: src.lineHeightDynamic
     }
   },
   expandVertical: {
@@ -22386,9 +22403,17 @@ var modalStyle = objectSpread2_default()(objectSpread2_default()({
     top: 12,
     right: 12,
     marginTop: 0,
+    '[dir="rtl"] &': {
+      right: 'auto',
+      left: 12
+    },
     '$wrapperDrawer &': {
       top: 4,
-      right: 4
+      right: 4,
+      '[dir="rtl"] &': {
+        right: 'auto',
+        left: 4
+      }
     }
   },
   body: {
@@ -24475,6 +24500,10 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
       marginRight: 0,
       marginLeft: 4,
       width: 'auto'
+    },
+    '$pickerLarge &': {
+      paddingLeft: src.selectLargeHeaderPaddingX,
+      paddingRight: src.selectLargeHeaderPaddingX
     }
   },
   footer: {},
@@ -24498,6 +24527,10 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     height: '100%',
     display: 'flex',
     alignItems: 'center',
+    '$pickerLarge &': {
+      paddingLeft: src.selectLargeColumnPadding,
+      paddingRight: src.selectLargeColumnPadding
+    },
     '& $columnsCheckbox': {
       marginRight: 0
     },
@@ -24713,6 +24746,12 @@ var sliderStyle = {
   indicator: {
     position: 'absolute',
     zIndex: 100,
+    '&:hover::after': {
+      borderColor: src.sliderIndicatorHoverBoderColor
+    },
+    '&:active::after': {
+      borderColor: src.sliderIndicatorBorderColor
+    },
     '&::after': {
       content: '""',
       display: 'block',
@@ -25554,7 +25593,8 @@ var spinStyle = objectSpread2_default()(objectSpread2_default()({
   chasingRing: chasing_ring,
   fade: {},
   spin: {
-    margin: 'auto'
+    margin: 'auto',
+    flexShrink: 0
   },
   content: {
     margin: 'auto',
@@ -25736,6 +25776,9 @@ var stepsStyle = {
     '& $title': {
       fontSize: src.stepsSmallTitleFontSize
     },
+    '& $content  $description': {
+      fontSize: src.stepsSmallDescriptionFontSize
+    },
     '&$default $iconWrapper': {
       fontSize: src.stepsSmallTitleFontSize,
       lineHeight: src.stepsSmallIconHeight,
@@ -25879,6 +25922,9 @@ var stepsStyle = {
     '& $title': {
       fontSize: src.stepsLargeTitleFontSize
     },
+    '& $content $description': {
+      fontSize: src.stepsLargeDescriptionFontSize
+    },
     '&$default $iconWrapper': {
       fontSize: src.stepsLargeTitleFontSize,
       width: "calc(".concat(src.stepsLargeIconFontSize, " + 14px)"),
@@ -26479,7 +26525,7 @@ var stepsStyle = {
       lineHeight: src.stepsIconHeight
     },
     '& $description': {
-      fontSize: src.stepsSmallDescriptionFontSize
+      fontSize: src.stepsDescriptionFontSize
     },
     '& $icon svg': {
       padding: 6,
@@ -28514,7 +28560,7 @@ var textarea_wrapper = textarea_inputBorder.wrapper,
 var textarea_input = objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({
   rootClass: {}
 }, textarea_inputBorder), {}, {
-  wrapper: objectSpread2_default()({
+  wrapper: objectSpread2_default()(objectSpread2_default()({
     display: 'inline-flex',
     flexDirection: 'column',
     width: '100%',
@@ -28522,7 +28568,14 @@ var textarea_input = objectSpread2_default()(objectSpread2_default()(objectSprea
     position: 'relative',
     flexWrap: 'wrap',
     minHeight: "calc(".concat(src.lineHeightDynamic, " + ").concat(src.inputPaddingY, " * 2)")
-  }, textarea_wrapper)
+  }, textarea_wrapper), {}, {
+    '$wrapperSmall&': {
+      minHeight: "calc(".concat(src.lineHeightDynamic, " + ").concat(src.inputSmallPaddingY, " * 2)")
+    },
+    '$wrapperLarge&': {
+      minHeight: "calc(".concat(src.lineHeightDynamic, " + ").concat(src.inputLargePaddingY, " * 2)")
+    }
+  })
 }, textarea_resetWrapper), {}, {
   textarea: {
     padding: 0,
@@ -28594,13 +28647,27 @@ var textarea_input = objectSpread2_default()(objectSpread2_default()(objectSprea
     cursor: 'pointer',
     padding: 4,
     color: src.textareaClearColor,
+    '$wrapperSmall &': {
+      top: src.textareaSmallPaddingY
+    },
+    '$wrapperLarge &': {
+      top: src.textareaLargePaddingY
+    },
     '&:hover': {
       color: src.textareaClearHoverColor
     },
     '& > svg': {
       display: 'block',
       width: src.textareaClearSize,
-      height: src.textareaClearSize
+      height: src.textareaClearSize,
+      '$wrapperSmall &': {
+        width: src.textareaSmallClearSize,
+        height: src.textareaSmallClearSize
+      },
+      '$wrapperLarge &': {
+        width: src.textareaLargeClearSize,
+        height: src.textareaLargeClearSize
+      }
     },
     '[dir="rtl"] &': {
       right: 'auto',
@@ -28609,7 +28676,13 @@ var textarea_input = objectSpread2_default()(objectSpread2_default()(objectSprea
   },
   wrapperWithClear: {
     '&& $textarea': {
-      paddingRight: "calc(".concat(src.textareaPaddingX, " * 4)")
+      paddingRight: "calc(".concat(src.textareaPaddingX, " + ").concat(src.textareaClearSize, " + 12px)")
+    },
+    '&&$wrapperSmall > $textarea': {
+      paddingRight: "calc(".concat(src.textareaSmallPaddingX, " + ").concat(src.textareaSmallClearSize, " + 12px)")
+    },
+    '&&$wrapperLarge > $textarea': {
+      paddingRight: "calc(".concat(src.textareaLargePaddingX, " + ").concat(src.textareaLargeClearSize, " + 12px)")
     }
   }
 });
@@ -28690,7 +28763,7 @@ var TransferStyle = {
     '& $target': {
       borderRadius: "0 ".concat(src.transferBorderRadius, " ").concat(src.transferBorderRadius, " 0"),
       '& $header': {
-        paddingRight: 6,
+        paddingRight: 8,
         borderRadius: "0 ".concat(src.transferBorderRadius, " 0 0")
       }
     }
@@ -28707,7 +28780,7 @@ var TransferStyle = {
   target: {},
   simpleTarget: {
     display: 'flex',
-    padding: '5px 3px',
+    padding: '5px 4px',
     paddingLeft: 8,
     fontSize: src.transferFontSize,
     justifyContent: 'space-between',
@@ -28724,7 +28797,7 @@ var TransferStyle = {
     display: 'flex',
     alignItems: 'center',
     justifyContent: 'center',
-    marginLeft: 3,
+    marginLeft: 4,
     '& svg': {
       width: src.transferFontSize,
       color: src.transferRemoveIconColor
@@ -31100,6 +31173,26 @@ var usePopup = function usePopup(props) {
   };
 };
 /* harmony default export */ var use_popup = (usePopup);
+;// CONCATENATED MODULE: ../hooks/src/utils/rtl.ts
+var oppositeMap = {
+  left: 'right',
+  right: 'left',
+  'left-top': 'right-top',
+  'left-bottom': 'right-bottom',
+  'right-top': 'left-top',
+  'right-bottom': 'left-bottom',
+  'top-left': 'top-right',
+  'top-right': 'top-left',
+  'bottom-left': 'bottom-right',
+  'bottom-right': 'bottom-left',
+  top: 'top',
+  bottom: 'bottom',
+  auto: 'auto'
+};
+var getRTLPosition = function getRTLPosition(position, isRTL) {
+  if (!isRTL || !position) return position;
+  return oppositeMap[position] || position;
+};
 ;// CONCATENATED MODULE: ../hooks/src/utils/func.ts
 // 节流函数
 var throttle = function throttle(func, wait) {
@@ -33446,7 +33539,7 @@ var Popover = function Popover(props) {
       open: props.visible,
       defaultOpen: props.defaultVisible,
       onCollapse: onVisibleChange,
-      position: props.position,
+      position: getRTLPosition(props.position, config.direction === 'rtl'),
       trigger: trigger,
       autoMode: 'popover',
       priorityDirection: priorityDirection,
@@ -33897,7 +33990,7 @@ function useForkRef() {
 
 
 
-var animation_list_excluded = ["display", "children", "style", "onRef", "show", "duration", "type", "className", "animation", "onAnimationAfterEnter"];
+var animation_list_excluded = ["display", "children", "style", "onRef", "show", "duration", "type", "className", "animation", "onAnimationAfterEnter", "dir"];
 
 
 
@@ -33949,6 +34042,7 @@ var AnimationList = function AnimationList(props) {
     _props$animation = props.animation,
     animation = _props$animation === void 0 ? true : _props$animation,
     onAnimationAfterEnter = props.onAnimationAfterEnter,
+    dir = props.dir,
     forwardProps = objectWithoutProperties_default()(props, animation_list_excluded);
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(undefined),
     _useState2 = slicedToArray_default()(_useState, 2),
@@ -34239,7 +34333,8 @@ var AnimationList = function AnimationList(props) {
     className: classNamePo,
     "data-sheinx-animation-type": type.join(' '),
     "data-sheinx-animation-duration": duration,
-    style: wrapperStyle
+    style: wrapperStyle,
+    dir: dir
   }, forwardProps), {}, {
     children: children
   }));
@@ -34369,7 +34464,7 @@ var Tooltip = function Tooltip(props) {
   var delay = props.delay || props.mouseEnterDelay || defaultDelay;
   var mouseLeaveDelay = props.mouseLeaveDelay || defaultDelay;
   var _usePopup = use_popup({
-      position: popsitionProps,
+      position: getRTLPosition(popsitionProps, config.direction === 'rtl'),
       trigger: trigger,
       autoMode: 'popover',
       priorityDirection: priorityDirection,
@@ -38366,7 +38461,8 @@ var input_Input = function Input(props) {
     digits: commonProps.digits,
     integerLimit: commonProps.integerLimit,
     numType: commonProps.numType,
-    trim: (_ref = (_commonProps$trim = commonProps.trim) !== null && _commonProps$trim !== void 0 ? _commonProps$trim : config.trim) !== null && _ref !== void 0 ? _ref : false
+    trim: (_ref = (_commonProps$trim = commonProps.trim) !== null && _commonProps$trim !== void 0 ? _commonProps$trim : config.trim) !== null && _ref !== void 0 ? _ref : false,
+    required: false
   };
   var inputFormatProps = use_input_format(objectSpread2_default()({
     value: commonProps.value,
@@ -42429,6 +42525,7 @@ var Result = function Result(props) {
     disabledRight = props.disabledRight,
     _props$activeIndex = props.activeIndex,
     activeIndex = _props$activeIndex === void 0 ? -1 : _props$activeIndex,
+    weekShort = props.weekShort,
     onClickProps = props.onClick;
   var _useConfig = useConfig(),
     locale = _useConfig.locale;
@@ -42490,7 +42587,7 @@ var Result = function Result(props) {
     var className = classnames_default()(styles === null || styles === void 0 ? void 0 : styles.resultText, info.target && (styles === null || styles === void 0 ? void 0 : styles.placeholder), dis && (styles === null || styles === void 0 ? void 0 : styles.resultTextDisabled), info.index === activeIndex && (styles === null || styles === void 0 ? void 0 : styles.resultTextActive));
     var formFieldId = (fieldId === null || fieldId === void 0 ? void 0 : fieldId.split(separator)) || [];
     var inputValue = info.target || info.value || '';
-    var displayValue = props.type === 'week' && inputValue ? "".concat(inputValue).concat(getLocale(locale, 'weekShort')) : inputValue;
+    var displayValue = props.type === 'week' && inputValue && weekShort !== null ? "".concat(inputValue).concat(weekShort === undefined ? getLocale(locale, 'weekShort') : weekShort) : inputValue;
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: className,
       id: formFieldId[info.index],
@@ -43562,7 +43659,6 @@ var Cascader = function Cascader(props0) {
   var _useConfig = useConfig(),
     locale = _useConfig.locale,
     direction = _useConfig.direction;
-  var isRtl = direction === 'rtl';
   var jssStyle = props.jssStyle,
     style = props.style,
     _props$adjust = props.adjust,
@@ -43615,7 +43711,7 @@ var Cascader = function Cascader(props0) {
     compressed = props.compressed,
     compressedBound = props.compressedBound,
     _props$position = props.position,
-    positionProp = _props$position === void 0 ? isRtl ? 'bottom-right' : 'bottom-left' : _props$position,
+    positionProp = _props$position === void 0 ? 'bottom-left' : _props$position,
     absolute = props.absolute,
     zIndex = props.zIndex,
     emptyText = props.emptyText,
@@ -43706,7 +43802,7 @@ var Cascader = function Cascader(props0) {
       onCollapse: onCollapse,
       disabled: false,
       trigger: 'click',
-      position: positionProp
+      position: getRTLPosition(positionProp, direction === 'rtl')
     }),
     open = _usePopup.open,
     position = _usePopup.position,
@@ -44244,6 +44340,7 @@ var Cascader = function Cascader(props0) {
           type: "scale-y",
           duration: 'fast',
           style: pickerWrapperStyle,
+          dir: direction,
           children: renderPanel()
         })
       })]
@@ -45844,8 +45941,9 @@ var CollapseItem = function CollapseItem(props) {
     getHeaderIconProps = _useCollapseItem.getHeaderIconProps,
     getTitleProps = _useCollapseItem.getTitleProps,
     getExtraProps = _useCollapseItem.getExtraProps;
-  var headerIconItem = function headerIconItem() {
-    var collapseItemIconClassName = classnames_default()(jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.collapseItem.icon, jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.collapseItem.activeTransform // expandIconPosition === 'right'
+  var headerIconItem = function headerIconItem(direction) {
+    var collapseItemIconClassName = classnames_default()(jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.collapseItem.icon, jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.collapseItem.activeTransform, direction === 'right' && (jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.collapseItem.iconRight)
+    // expandIconPosition === 'right'
     //   ? jssStyle?.collapseItem.activeTransformRight
     //   : jssStyle?.collapseItem.activeTransform,
     );
@@ -45894,11 +45992,11 @@ var CollapseItem = function CollapseItem(props) {
     children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({}, getItemContentProps({
       className: collapseItemHeaderClassName
     })), {}, {
-      children: [expandIconPosition === 'left' && headerIconItem(), extraPosition === 'left' && extraItem(), /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({}, getTitleProps({
+      children: [expandIconPosition === 'left' && headerIconItem('left'), extraPosition === 'left' && extraItem(), /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({}, getTitleProps({
         className: classnames_default()(jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.collapseItem.title, triggerRegion === 'header' && (jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.collapseItem.region))
       })), {}, {
         children: title
-      })), extraPosition === 'right' && extraItem(), expandIconPosition === 'right' && headerIconItem()]
+      })), extraPosition === 'right' && extraItem(), expandIconPosition === 'right' && headerIconItem('right')]
     })), renderContent()]
   });
 };
@@ -47340,7 +47438,36 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
         return item;
       });
       var isDis = isDisabledInputDate(inputValue);
+
+      // Check min/max constraints for inputValue
+      var isOutOfRange = false;
       if (!isDis) {
+        for (var i = 0; i < inputValue.length; i++) {
+          var _date = inputValue[i];
+          if (_date) {
+            if (type === 'week') {
+              if (props.min && util.compareWeek(_date, props.min, 0, options) < 0) {
+                isOutOfRange = true;
+                break;
+              }
+              if (props.max && util.compareWeek(_date, props.max, 0, options) > 0) {
+                isOutOfRange = true;
+                break;
+              }
+            } else {
+              if (props.min && util.compareDay(_date, props.min, 0, options) < 0) {
+                isOutOfRange = true;
+                break;
+              }
+              if (props.max && util.compareDay(_date, props.max, 0, options) > 0) {
+                isOutOfRange = true;
+                break;
+              }
+            }
+          }
+        }
+      }
+      if (!isDis && !isOutOfRange) {
         formatValue = getFormatValueArr(inputValue);
       }
     }
@@ -49617,7 +49744,9 @@ var DatePicker = function DatePicker(props0) {
     disabled = props.disabled,
     size = props.size,
     _props$adjust = props.adjust,
-    adjust = _props$adjust === void 0 ? true : _props$adjust;
+    adjust = _props$adjust === void 0 ? true : _props$adjust,
+    startOfWeek = props.startOfWeek,
+    weekShort = props.weekShort;
   var _React$useState = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(-1),
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
     activeIndex = _React$useState2[0],
@@ -49639,7 +49768,6 @@ var DatePicker = function DatePicker(props0) {
     inputRefs: []
   });
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
-  var isRTL = direction === 'rtl';
   var dfp = 'bottom-left';
   var _React$useState9 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(false),
     _React$useState10 = slicedToArray_default()(_React$useState9, 2),
@@ -49651,13 +49779,10 @@ var DatePicker = function DatePicker(props0) {
   } else if (!date_picker_verticalPosition.includes(listPosition)) {
     listPosition = dfp;
   }
-  if (isRTL) {
-    if (listPosition === 'bottom-left') listPosition = 'bottom-right';else if (listPosition === 'bottom-right') listPosition = 'bottom-left';else if (listPosition === 'top-left') listPosition = 'top-right';else if (listPosition === 'top-right') listPosition = 'top-left';
-  }
   var options = {
     timeZone: props.timeZone,
     // 需要确保 weekStartsOn 是 number，否则后续的星期顺序计算都会出错
-    weekStartsOn: Number(getLocale(locale, 'startOfWeek'))
+    weekStartsOn: startOfWeek === null || startOfWeek === undefined ? Number(getLocale(locale, 'startOfWeek')) : startOfWeek
   };
   var inputAbleResult = useInputAble({
     value: props.value,
@@ -49681,7 +49806,9 @@ var DatePicker = function DatePicker(props0) {
       allowSingle: props.allowSingle,
       defaultCurrent: props.defaultPickerValue || props.defaultRangeMonth,
       formatResult: props.formatResult,
-      onPickerChange: props.onPickerChange
+      onPickerChange: props.onPickerChange,
+      min: props.min,
+      max: props.max
     }),
     inputArr = _useDatePickerFormat.inputArr,
     resultArr = _useDatePickerFormat.resultArr,
@@ -49730,7 +49857,7 @@ var DatePicker = function DatePicker(props0) {
       onCollapse: onCollapse,
       disabled: disabledStatus === 'all',
       trigger: 'click',
-      position: listPosition
+      position: getRTLPosition(listPosition, direction === 'rtl')
     }),
     open = _usePopup.open,
     position = _usePopup.position,
@@ -49804,6 +49931,7 @@ var DatePicker = function DatePicker(props0) {
         disabledLeft: disabledStatus === 'left',
         disabledRight: disabledStatus === 'right',
         placeholder: props.placeholder,
+        weekShort: weekShort,
         focused: focused,
         open: open,
         onFocus: handleFocus,
@@ -50455,6 +50583,8 @@ function _ReactUnmount() {
 
 
 
+
+
 var hasMask = false;
 var modal_content_config = {
   instanceIds: [],
@@ -50513,6 +50643,8 @@ var Modal = function Modal(props) {
   var _props$jssStyle, _props$jssStyle$modal;
   var modalClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$modal = _props$jssStyle.modal) === null || _props$jssStyle$modal === void 0 ? void 0 : _props$jssStyle$modal.call(_props$jssStyle);
   var panelRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
+  var wrapperRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
+  var popupCtx = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(popup_context);
   var isPositionX = ['left', 'right'].includes(props.position || '');
   var isPositionY = ['top', 'bottom'].includes(props.position || '');
   var defaultWidth = isPositionX ? 'auto' : 500;
@@ -50526,6 +50658,7 @@ var Modal = function Modal(props) {
     top = _props$top === void 0 ? '10vh' : _props$top,
     _props$style = props.style,
     style = _props$style === void 0 ? {} : _props$style;
+  var globalConfig = useConfig();
   var width = style.width || props.width || defaultWidth;
   var height = style.height || props.height;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(''),
@@ -50726,6 +50859,22 @@ var Modal = function Modal(props) {
     }
   }, [props.setInnerClose]);
 
+  // 将 Modal 的 ref 注册到父 Popover 的 chain 中，防止点击 Modal 时关闭 Popover
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
+    // Modal 显示或关闭动画播放期间，都需要在 chain 中
+    if (wrapperRef.current) {
+      if (visible) {
+        popupCtx.bindChild(wrapperRef);
+      } else {
+        popupCtx.removeChild(wrapperRef);
+      }
+    }
+    return function () {
+      // 确保清理时移除
+      popupCtx.removeChild(wrapperRef);
+    };
+  }, [visible]);
+
   // render
   var renderIcon = function renderIcon(isEmptyTitle) {
     var iconRoot = classnames_default()(modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.headerIcon, isEmptyTitle && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.emptyIcon));
@@ -50854,6 +51003,7 @@ var Modal = function Modal(props) {
   context.content = content;
   return /*#__PURE__*/(0,jsx_runtime.jsx)(FormFooterProvider, {
     children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      ref: wrapperRef,
       onClick: function onClick(e) {
         e.stopPropagation();
       },
@@ -50864,6 +51014,7 @@ var Modal = function Modal(props) {
         zIndex: props.zIndex,
         display: !visible && !animation ? 'none' : undefined
       },
+      dir: globalConfig.direction,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({
         className: modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.mask
       }, events), {}, {
@@ -51262,7 +51413,7 @@ var Dropdown = function Dropdown(props) {
   var dropdownClasses = jssStyle === null || jssStyle === void 0 || (_jssStyle$dropdown = jssStyle.dropdown) === null || _jssStyle$dropdown === void 0 ? void 0 : _jssStyle$dropdown.call(jssStyle);
   var config = useConfig();
   var isRtl = config.direction === 'rtl';
-  var dfp = isRtl ? 'bottom-right' : 'bottom-left';
+  var dfp = 'bottom-left';
   var positionMap = {
     'left-top': 'left-top',
     'left-bottom': 'left-bottom',
@@ -51283,7 +51434,7 @@ var Dropdown = function Dropdown(props) {
       onCollapse: props.onCollapse,
       disabled: disabled,
       trigger: trigger,
-      position: props.position || dfp,
+      position: getRTLPosition(props.position || dfp, isRtl),
       autoMode: 'menu',
       priorityDirection: 'vertical',
       mouseLeaveDelay: 200
@@ -56800,6 +56951,9 @@ var list_List = function List(props) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: styles.optionGroupTitle,
       title: typeof title === 'string' ? title : undefined,
+      style: {
+        height: 'var(--group-title-height)'
+      },
       children: title
     });
   };
@@ -56834,6 +56988,9 @@ var list_List = function List(props) {
   }, []);
   return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
     className: rootClass,
+    style: {
+      '--group-title-height': "".concat(lineHeight - 2, "px")
+    },
     children: renderList()
   });
 };
@@ -58635,6 +58792,9 @@ var ColumnsList = function ColumnsList(props) {
       return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: styles.optionGroupTitle,
         title: typeof title === 'string' ? title : undefined,
+        style: {
+          height: 'var(--group-title-height)'
+        },
         children: title
       }, key);
     }
@@ -58845,7 +59005,7 @@ function Select(props0) {
     createOnBlur = _props$createOnBlur === void 0 ? true : _props$createOnBlur;
   var hasFilter = isFunc(props.onAdvancedFilter || onFilterProp);
   var showInput = hasFilter || isFunc(onCreateProp) || onCreateProp === true;
-  var positionProp = props.position || (direction === 'rtl' ? 'bottom-right' : 'bottom-left');
+  var positionProp = props.position || 'bottom-left';
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$select = jssStyle.select) === null || _jssStyle$select === void 0 ? void 0 : _jssStyle$select.call(jssStyle);
   var rootStyle = Object.assign({
     width: width
@@ -58920,7 +59080,7 @@ function Select(props0) {
       onCollapse: onCollapse,
       disabled: false,
       trigger: trigger,
-      position: positionProp
+      position: getRTLPosition(positionProp, direction === 'rtl')
     }),
     open = _usePopup.open,
     position = _usePopup.position,
@@ -61193,6 +61353,21 @@ var MenuItem = function MenuItem(props) {
         flexShrink: 0
       }
     }) : null;
+    var frontCaret = null;
+    if (props.frontCaret) {
+      frontCaret = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        style: {
+          color: props.caretColor
+        },
+        className: classnames_default()(classes === null || classes === void 0 ? void 0 : classes.expand, classes === null || classes === void 0 ? void 0 : classes.expandFront, (isVertical || isSubHorizontal) && (classes === null || classes === void 0 ? void 0 : classes.expandVertical), props.parentSelectable && (classes === null || classes === void 0 ? void 0 : classes.expandHover)),
+        onClick: handleExpandClick,
+        dir: config.direction,
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+          className: classes === null || classes === void 0 ? void 0 : classes.icon,
+          children: frontCaretType === 'hollow' ? icons_config.menu.CollapseArrow : icons_config.menu.FrontSolidArrowDown
+        })
+      });
+    }
     var item = render_render(props.renderItem, props.dataItem, props.index);
     var link = props.linkKey ? getKey(props.linkKey, props.dataItem, props.index, true) : undefined;
     var title = null;
@@ -61201,7 +61376,7 @@ var MenuItem = function MenuItem(props) {
       title = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement)(item, {
         className: mergeClass,
         children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
-          children: [indent, iconEl, /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+          children: [indent, frontCaret, iconEl, /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
             className: classes === null || classes === void 0 ? void 0 : classes.titleContent,
             children: item.props.children
           })]
@@ -61213,28 +61388,17 @@ var MenuItem = function MenuItem(props) {
         href: link
       };
       title = /*#__PURE__*/(0,jsx_runtime.jsxs)("a", objectSpread2_default()(objectSpread2_default()({}, linkProps), {}, {
-        children: [indent, iconEl, /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        children: [indent, frontCaret, iconEl, /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           className: classes === null || classes === void 0 ? void 0 : classes.titleContent,
           children: wrapSpan(item)
         })]
       }));
     }
     if (props.frontCaret) {
-      return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({}, expandAble ? customAttributes : undefined), {}, {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({}, expandAble ? customAttributes : undefined), {}, {
         className: classnames_default()(classes === null || classes === void 0 ? void 0 : classes.itemContent, classes === null || classes === void 0 ? void 0 : classes.itemContentFront),
         onClick: handleItemClick,
-        children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-          style: {
-            color: props.caretColor
-          },
-          className: classnames_default()(classes === null || classes === void 0 ? void 0 : classes.expand, classes === null || classes === void 0 ? void 0 : classes.expandFront, (isVertical || isSubHorizontal) && (classes === null || classes === void 0 ? void 0 : classes.expandVertical), props.parentSelectable && (classes === null || classes === void 0 ? void 0 : classes.expandHover)),
-          onClick: handleExpandClick,
-          dir: config.direction,
-          children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-            className: classes === null || classes === void 0 ? void 0 : classes.icon,
-            children: frontCaretType === 'hollow' ? icons_config.menu.CollapseArrow : icons_config.menu.FrontSolidArrowDown
-          })
-        }), title]
+        children: title
       }));
     } else {
       return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({}, expandAble ? customAttributes : undefined), {}, {
@@ -65008,21 +65172,21 @@ var useColumns = function useColumns(props) {
     var scrollLeft = scrollInfo.scrollLeft;
     var sum = 0;
     var currentIndex = 0;
-    for (var i = 0, len = middleColumns.length - 1; i < len; i++) {
+    for (var i = 0, len = middleColumns.length; i < len; i++) {
       var curCol = middleColumns[i];
       sum += curCol.width || 100;
       if (scrollLeft < sum) {
         // 计算可视区域内需要渲染的列数
-        for (var j = i + 1; j <= len; j++) {
+        for (var j = i + 1; j < len; j++) {
           var _props$scrollRef$curr;
           var nextCol = middleColumns[j];
           sum += nextCol.width || 100;
           if (props.scrollRef.current && sum - scrollLeft >= ((_props$scrollRef$curr = props.scrollRef.current) === null || _props$scrollRef$curr === void 0 ? void 0 : _props$scrollRef$curr.clientWidth)) {
             // 在原有基础上，右侧增加缓冲列
-            var visibleCount = j - i;
+            var visibleCount = j - i + 1;
             setRenderedCount(Math.min(visibleCount + overscan * 2, len));
             break;
-          } else if (j === len) {
+          } else if (j === len - 1) {
             // 到达最后一列
             var _visibleCount = j - i + 1;
             setRenderedCount(Math.min(_visibleCount + overscan * 2, len));
@@ -65059,17 +65223,24 @@ var useColumns = function useColumns(props) {
       if (col.fixed) {
         return col;
       }
-      if (index < startIndex || index > startIndex + renderedCount) {
+      // 计算当前列在 middleColumns 中的索引
+      var middleIndex = index - leftFixedColumns.length;
+
+      // 如果不在可渲染范围内
+      if (middleIndex < startIndex || middleIndex >= startIndex + renderedCount) {
         var colSpan;
         var colSpanWidth;
-        if (index > startIndex + renderedCount && index === startIndex + renderedCount + 1) {
+        // 如果是可见范围后的第一列，合并后面所有隐藏的列
+        if (middleIndex >= startIndex + renderedCount && middleIndex === startIndex + renderedCount) {
           colSpan = function colSpan() {
-            return middleColumns.length - index;
+            return middleColumns.length - middleIndex;
           };
-          colSpanWidth = middleColumns.slice(index).reduce(function (sum, c) {
+          colSpanWidth = middleColumns.slice(middleIndex).reduce(function (sum, c) {
             return sum + (c.width || 0);
           }, 0);
-        } else if (index < startIndex && index === leftFixedColumns.length && startIndex > 0) {
+        }
+        // 如果是第一个中间列且前面有隐藏列，合并前面所有隐藏的列
+        else if (middleIndex < startIndex && middleIndex === 0 && startIndex > 0) {
           colSpan = function colSpan() {
             return startIndex;
           };
@@ -70738,8 +70909,6 @@ var TreeSelect = function TreeSelect(props0) {
   var _useConfig = useConfig(),
     locale = _useConfig.locale,
     direction = _useConfig.direction;
-  var isRtl = direction === 'rtl';
-  var dfp = isRtl ? 'bottom-right' : 'bottom-left';
   var jssStyle = props.jssStyle,
     className = props.className,
     size = props.size,
@@ -70767,7 +70936,7 @@ var TreeSelect = function TreeSelect(props0) {
     _props$focusSelected = props.focusSelected,
     focusSelected = _props$focusSelected === void 0 ? true : _props$focusSelected,
     _props$position = props.position,
-    positionProp = _props$position === void 0 ? dfp : _props$position,
+    positionProp = _props$position === void 0 ? 'bottom-left' : _props$position,
     openProp = props.open,
     onCollapseProp = props.onCollapse,
     disabledProp = props.disabled,
@@ -70928,7 +71097,7 @@ var TreeSelect = function TreeSelect(props0) {
       onCollapse: onCollapse,
       disabled: false,
       trigger: 'click',
-      position: positionProp
+      position: getRTLPosition(positionProp, direction === 'rtl')
     }),
     open = _usePopup.open,
     position = _usePopup.position,
@@ -74189,7 +74358,7 @@ function strings_removeProtocol(url) {
     return url;
   }
 }
-function getRTLPosition(position) {
+function strings_getRTLPosition(position) {
   if (!position) return position;
   // position.replace('left', 'right').replace('right', 'left')
   if (position.indexOf('left') !== -1) {
@@ -75145,7 +75314,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.8-beta.9'
+  version: '3.9.9-beta.1'
 });
 }();
 /******/ 	return __webpack_exports__;