shineout 3.9.8-beta.10 → 3.9.8-beta.12

package/cjs/index.js

@@ -522,5 +522,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.9.8-beta.10'
+  version: '3.9.8-beta.12'
 };

package/dist/shineout.js

@@ -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.10');
+/* harmony default export */ var version = ('3.9.8-beta.12');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -42449,6 +42449,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;
@@ -42510,7 +42511,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],
@@ -49636,7 +49637,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],
@@ -49672,7 +49675,7 @@ var DatePicker = function DatePicker(props0) {
   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,
@@ -49819,6 +49822,7 @@ var DatePicker = function DatePicker(props0) {
         disabledLeft: disabledStatus === 'left',
         disabledRight: disabledStatus === 'right',
         placeholder: props.placeholder,
+        weekShort: weekShort,
         focused: focused,
         open: open,
         onFocus: handleFocus,
@@ -50470,6 +50474,7 @@ function _ReactUnmount() {
 
 
 
+
 var hasMask = false;
 var modal_content_config = {
   instanceIds: [],
@@ -50528,6 +50533,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;
@@ -50741,6 +50748,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));
@@ -50869,6 +50892,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();
       },
@@ -65023,21 +65047,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));
@@ -65074,17 +65098,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 + 1) {
           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;
           };
@@ -75158,7 +75189,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.8-beta.10'
+  version: '3.9.8-beta.12'
 });
 }();
 /******/ 	return __webpack_exports__;