shineout 3.8.9 → 3.8.10-beta.10

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.8.9'
+  version: '3.8.10-beta.10'
 };

package/cjs/modal/modal.type.d.ts

@@ -8,13 +8,13 @@ export type ModalFunctionOptions = Omit<ModalOptions, 'jssStyle'>;
  * @title ModalMethods
  * @cn Modal 提供了一组方法供全局调用，这些方法生成的元素，会在关闭后销毁。
  * 该组方法应仅供展示所用, 如果需要数据交互, 请使用 Modal。
- * Modal.info(options) // 提示信息
- * Modal.success(options) // 成功信息
- * Modal.warning(options) // 警告信息
- * Modal.error(options) // 错误信息
- * Modal.confirm(options) // 确认信息
- * Modal.show(options) // 普通信息
- * Modal.closeAll // 关闭所有Modal
+ * - `Modal.info(options)` 提示信息
+ * - `Modal.success(options)` 成功信息
+ * - `Modal.warn(options)` 警告信息
+ * - `Modal.error(options)` 错误信息
+ * - `Modal.confirm(options)` 确认信息
+ * - `Modal.show(options)` 普通信息
+ * - `Modal.closeAll` 关闭所有Modal
  * options 支持 Modal除了 destory, visible 的其他任何属性, 此外还有如下的额外属性:
  */
 export type ModalFunctionExternalOptions = Omit<ModalFunctionOptions, keyof ModalProps>;

package/dist/shineout.js

@@ -12398,7 +12398,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.8.9');
+/* harmony default export */ var version = ('3.8.10-beta.10');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -19158,6 +19158,9 @@ var descriptionsStyle = {
   horizontal: {
     '& $label': {
       width: '1px'
+    },
+    '& $value:empty': {
+      width: '1px'
     }
   },
   vertical: {
@@ -36396,19 +36399,18 @@ function useInputAble(props) {
   var render = useRender(syncValue);
   var shouldUseState = delay || !control;
   var value = shouldUseState ? stateValue : valuePo;
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (context.timer) {
-      clearTimeout(context.timer);
-      context.timer = null;
-    }
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     if (delay && control && props.value !== stateValue) {
       changeStateValue(props.value);
+    } else if (context.timer) {
+      clearTimeout(context.timer);
+      context.timer = null;
     }
   }, [props.value, delay, control]);
   var forceDelayChange = use_persist_fn(function () {
-    if (context.timer && context.delayChange) {
+    if (context.delayChange) context.delayChange();
+    if (context.timer) {
       clearTimeout(context.timer);
-      context.delayChange();
       context.timer = null;
       context.delayChange = null;
     }
@@ -40518,7 +40520,9 @@ var Scroll = function Scroll(props) {
     _props$scrollWidth = props.scrollWidth,
     scrollWidth = _props$scrollWidth === void 0 ? 0 : _props$scrollWidth,
     _props$defaultHeight = props.defaultHeight,
-    defaultHeight = _props$defaultHeight === void 0 ? 0 : _props$defaultHeight;
+    defaultHeight = _props$defaultHeight === void 0 ? 0 : _props$defaultHeight,
+    _props$keepScrollTop = props.keepScrollTop,
+    keepScrollTop = _props$keepScrollTop === void 0 ? false : _props$keepScrollTop;
   var _useResize = useResize({
       targetRef: containerRef,
       timer: 100
@@ -40543,7 +40547,9 @@ var Scroll = function Scroll(props) {
 
   // 当滚动容器的高度为 0 时，paddingTop 为 0，避免滚动条抖动现象
   var paddingTop = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
-    return height === 0 ? 0 : Math.max(0, Math.floor(scrollHeight - height));
+    var maxHeight = Math.max(0, scrollHeight - height);
+    if (keepScrollTop) return maxHeight;
+    return height === 0 ? 0 : maxHeight;
   }, [scrollHeight, height]);
   var placeStyle = {
     paddingTop: paddingTop,
@@ -40832,6 +40838,7 @@ var VirtualList = function VirtualList(props) {
       wrapperRef: wrapperRef,
       onScroll: handleScroll,
       onMouseMove: handleMouseMove,
+      keepScrollTop: keepScrollTop,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(Tag, {
         className: tagClassName,
         style: innerStyle,
@@ -41052,6 +41059,8 @@ var CascaderNode = function CascaderNode(props) {
         handleSelect(e);
       };
       hasHandleSelectRef.current = true;
+    } else {
+      hasHandleSelectRef.current = false;
     }
     return events;
   };
@@ -42340,7 +42349,7 @@ var result_Result = function Result(props) {
       handleResultItemClick(e, item);
     };
     var content = renderResultContent(item, index, nodes);
-    if (!content) return null;
+    if (!content && content !== 0) return null;
     if (renderResultContentProp) {
       // cascader 不渲染tag
       return renderResultContentProp(objectSpread2_default()({
@@ -46538,17 +46547,17 @@ var useDate = function useDate(props) {
     }),
     context = _useRef.current;
   var current = props.current === undefined || !props.current ? currentState : props.current;
-  var setCurrent = function setCurrent(date) {
+  var setCurrent = function setCurrent(date, type) {
     var _props$onCurrentChang2;
     if (props.current !== undefined) {
       var _props$onCurrentChang;
-      (_props$onCurrentChang = props.onCurrentChange) === null || _props$onCurrentChang === void 0 || _props$onCurrentChang.call(props, date);
+      (_props$onCurrentChang = props.onCurrentChange) === null || _props$onCurrentChang === void 0 || _props$onCurrentChang.call(props, date, type);
     } else {
       if (date) {
         setCurrentState(date);
       }
     }
-    (_props$onCurrentChang2 = props.onCurrentChange) === null || _props$onCurrentChang2 === void 0 || _props$onCurrentChang2.call(props, date);
+    (_props$onCurrentChang2 = props.onCurrentChange) === null || _props$onCurrentChang2 === void 0 || _props$onCurrentChang2.call(props, date, type);
   };
   var isToday = function isToday(date) {
     var today = util.newDate(undefined, options);
@@ -46570,19 +46579,19 @@ var useDate = function useDate(props) {
   }, [options.weekStartsOn]);
   var handleNextYear = use_persist_fn(function () {
     var date = util.addYears(current, 1, options);
-    setCurrent(date);
+    setCurrent(date, 'year');
   });
   var handlePrevYear = use_persist_fn(function () {
     var date = util.addYears(current, -1, options);
-    setCurrent(date);
+    setCurrent(date, 'year');
   });
   var handleNextMonth = use_persist_fn(function () {
     var date = util.addMonths(current, 1, options);
-    setCurrent(date);
+    setCurrent(date, 'month');
   });
   var handlePrevMonth = use_persist_fn(function () {
     var date = util.addMonths(current, -1, options);
-    setCurrent(date);
+    setCurrent(date, 'month');
   });
   var isCurrentMonth = function isCurrentMonth(date) {
     return util.isSameMonth(date, current, options);
@@ -47189,8 +47198,8 @@ var Day = function Day(props) {
     props.onChange(date, noClose || props.type === 'datetime');
     props.setTarget(undefined);
   });
-  var setCurrent = usePersistFn(function (date) {
-    props.setCurrent(date, areaType);
+  var setCurrent = usePersistFn(function (date, type) {
+    props.setCurrent(date, type || areaType);
   });
   var _useDatePick = use_date({
       current: props.current,
@@ -47222,7 +47231,7 @@ var Day = function Day(props) {
     props.setCurrent(new Date(), areaType);
     props.onChange(new Date(), props.needConfirm || props.type === 'datetime');
     setTimeout(function () {
-      if (props.closeByConfirm && !props.range) props.closeByConfirm();
+      if (props.needConfirm && props.closeByConfirm && !props.range) props.closeByConfirm();
     }, 0);
   };
   var renderDay = function renderDay(item, index) {
@@ -47453,15 +47462,15 @@ var useMonth = function useMonth(props) {
     context = _useRef.current;
   var current = props.current === undefined ? currentState : props.current;
   var startYear = util.getDateInfo(current, 'year', options);
-  var setCurrent = function setCurrent(date) {
+  var setCurrent = function setCurrent(date, type) {
     var _props$onCurrentChang2;
     if (props.current !== undefined) {
       var _props$onCurrentChang;
-      (_props$onCurrentChang = props.onCurrentChange) === null || _props$onCurrentChang === void 0 || _props$onCurrentChang.call(props, date);
+      (_props$onCurrentChang = props.onCurrentChange) === null || _props$onCurrentChang === void 0 || _props$onCurrentChang.call(props, date, type);
     } else {
       setCurrentState(date);
     }
-    (_props$onCurrentChang2 = props.onCurrentChange) === null || _props$onCurrentChang2 === void 0 || _props$onCurrentChang2.call(props, date);
+    (_props$onCurrentChang2 = props.onCurrentChange) === null || _props$onCurrentChang2 === void 0 || _props$onCurrentChang2.call(props, date, type);
   };
   var isNow = function isNow(date) {
     var today = util.newDate(undefined, options);
@@ -47483,11 +47492,11 @@ var useMonth = function useMonth(props) {
   };
   var handleNext = use_persist_fn(function () {
     var date = util.addYears(current, 1, options);
-    setCurrent(date);
+    setCurrent(date, 'year');
   });
   var handlePrev = use_persist_fn(function () {
     var date = util.addYears(current, -1, options);
-    setCurrent(date);
+    setCurrent(date, 'year');
   });
   var isDisabled = function isDisabled(date) {
     var min = props.min,
@@ -47564,8 +47573,8 @@ var Month = function Month(props) {
   var changeMode = usePersistFn(function () {
     props.setMode('day');
   });
-  var setCurrent = usePersistFn(function (date) {
-    props.setCurrent(date, 'month');
+  var setCurrent = usePersistFn(function (date, type) {
+    props.setCurrent(date, type || 'month');
   });
   var _useMonthPick = use_month({
       current: props.current,
@@ -47686,15 +47695,15 @@ var useYear = function useYear(props) {
     context = _useRef.current;
   var current = props.current === undefined ? currentState : props.current;
   var startYear = util.getStartYear(current, options);
-  var setCurrent = function setCurrent(date) {
+  var setCurrent = function setCurrent(date, type) {
     var _props$onCurrentChang2;
     if (props.current !== undefined) {
       var _props$onCurrentChang;
-      (_props$onCurrentChang = props.onCurrentChange) === null || _props$onCurrentChang === void 0 || _props$onCurrentChang.call(props, date);
+      (_props$onCurrentChang = props.onCurrentChange) === null || _props$onCurrentChang === void 0 || _props$onCurrentChang.call(props, date, type);
     } else {
       setCurrentState(date);
     }
-    (_props$onCurrentChang2 = props.onCurrentChange) === null || _props$onCurrentChang2 === void 0 || _props$onCurrentChang2.call(props, date);
+    (_props$onCurrentChang2 = props.onCurrentChange) === null || _props$onCurrentChang2 === void 0 || _props$onCurrentChang2.call(props, date, type);
   };
   var isNow = function isNow(date) {
     var today = util.newDate(undefined, options);
@@ -47716,11 +47725,11 @@ var useYear = function useYear(props) {
   };
   var handleNext = use_persist_fn(function () {
     var date = util.addYears(current, 10, options);
-    setCurrent(date);
+    setCurrent(date, 'year');
   });
   var handlePrev = use_persist_fn(function () {
     var date = util.addYears(current, -10, options);
-    setCurrent(date);
+    setCurrent(date, 'year');
   });
   var isDisabled = function isDisabled(date) {
     var min = props.min,
@@ -47799,8 +47808,8 @@ var Year = function Year(props) {
   var changeMode = usePersistFn(function () {
     props.setMode('month');
   });
-  var setCurrent = usePersistFn(function (date) {
-    props.setCurrent(date, 'year');
+  var setCurrent = usePersistFn(function (date, type) {
+    props.setCurrent(date, type || 'year');
   });
   var _useYearPick = use_year({
       current: props.current,
@@ -47924,15 +47933,15 @@ var useQuarter = function useQuarter(props) {
     context = _useRef.current;
   var current = props.current === undefined ? currentState : props.current;
   var startYear = util.getDateInfo(current, 'year', options);
-  var setCurrent = function setCurrent(date) {
+  var setCurrent = function setCurrent(date, type) {
     var _props$onCurrentChang2;
     if (props.current !== undefined) {
       var _props$onCurrentChang;
-      (_props$onCurrentChang = props.onCurrentChange) === null || _props$onCurrentChang === void 0 || _props$onCurrentChang.call(props, date);
+      (_props$onCurrentChang = props.onCurrentChange) === null || _props$onCurrentChang === void 0 || _props$onCurrentChang.call(props, date, type);
     } else {
       setCurrentState(date);
     }
-    (_props$onCurrentChang2 = props.onCurrentChange) === null || _props$onCurrentChang2 === void 0 || _props$onCurrentChang2.call(props, date);
+    (_props$onCurrentChang2 = props.onCurrentChange) === null || _props$onCurrentChang2 === void 0 || _props$onCurrentChang2.call(props, date, type);
   };
   var isNow = function isNow(date) {
     var today = util.newDate(undefined, options);
@@ -47953,11 +47962,11 @@ var useQuarter = function useQuarter(props) {
   };
   var handleNext = use_persist_fn(function () {
     var date = util.addYears(current, 1, options);
-    setCurrent(date);
+    setCurrent(date, 'year');
   });
   var handlePrev = use_persist_fn(function () {
     var date = util.addYears(current, -1, options);
-    setCurrent(date);
+    setCurrent(date, 'year');
   });
   var isDisabled = function isDisabled(date) {
     var min = props.min,
@@ -48029,8 +48038,8 @@ var Quarter = function Quarter(props) {
   var jssStyle = props.jssStyle;
   var config = useConfig();
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
-  var setCurrent = usePersistFn(function (date) {
-    props.setCurrent(date, 'quarter');
+  var setCurrent = usePersistFn(function (date, type) {
+    props.setCurrent(date, type || 'quarter');
   });
   var _useQuarterPick = use_quarter({
       current: props.current,
@@ -48246,11 +48255,8 @@ var useRangePick = function useRangePick(props) {
       return newArr;
     });
   };
-  var setCurrent = usePersistFn(function (index, date) {
-    for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-      args[_key - 2] = arguments[_key];
-    }
-    props.setCurrentArr.apply(props, [function (arr) {
+  var setCurrent = usePersistFn(function (index, date, type) {
+    props.setCurrentArr(function (arr) {
       var newArr = toConsumableArray_default()(arr);
       newArr[index] = date;
       var modeCache = context.modeCache;
@@ -48276,19 +48282,13 @@ var useRangePick = function useRangePick(props) {
         }
       }
       return newArr;
-    }].concat(args));
+    }, type, undefined);
   });
-  var setCurrentStart = usePersistFn(function (date) {
-    for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-      args[_key2 - 1] = arguments[_key2];
-    }
-    setCurrent.apply(void 0, [0, date].concat(args));
+  var setCurrentStart = usePersistFn(function (date, type) {
+    setCurrent(0, date, type);
   });
-  var setCurrentEnd = usePersistFn(function (date) {
-    for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-      args[_key3 - 1] = arguments[_key3];
-    }
-    setCurrent.apply(void 0, [1, date].concat(args));
+  var setCurrentEnd = usePersistFn(function (date, type) {
+    setCurrent(1, date, type);
   });
   var setDateStart = usePersistFn(function (date, noClose) {
     setDate(0, date, noClose);
@@ -49136,7 +49136,7 @@ var useDescriptions = function useDescriptions(props) {
 
 
 var Descriptions = function Descriptions(props) {
-  var _jssStyleProps$descri, _renderItem$;
+  var _jssStyleProps$descri;
   var className = props.className,
     jssStyleProps = props.jssStyle,
     style = props.style,
@@ -49164,6 +49164,11 @@ var Descriptions = function Descriptions(props) {
       labelStyle: labelStyle
     }),
     renderItem = _useDescriptions.renderItem;
+  var longestItem = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    return renderItem.reduce(function (prev, curr) {
+      return prev.length >= curr.length ? prev : curr;
+    }, []);
+  }, [renderItem]);
   var jssStyle = (jssStyleProps === null || jssStyleProps === void 0 || (_jssStyleProps$descri = jssStyleProps.descriptions) === null || _jssStyleProps$descri === void 0 ? void 0 : _jssStyleProps$descri.call(jssStyleProps)) || {};
   var Header = function Header() {
     if (!title && !extra) return null;
@@ -49260,7 +49265,7 @@ var Descriptions = function Descriptions(props) {
         cellPadding: 0,
         cellSpacing: 0,
         children: [layout === 'inlineHorizontal' && typeof column === 'number' && column > 1 && /*#__PURE__*/(0,jsx_runtime.jsx)("colgroup", {
-          children: (_renderItem$ = renderItem[0]) === null || _renderItem$ === void 0 ? void 0 : _renderItem$.map(function (_, index, arr) {
+          children: longestItem === null || longestItem === void 0 ? void 0 : longestItem.map(function (_, index, arr) {
             return /*#__PURE__*/(0,jsx_runtime.jsx)("col", {
               style: {
                 width: "".concat(1 / arr.length * 100, "%")
@@ -55539,6 +55544,9 @@ var ListOption = function ListOption(props) {
 
 
 
+var list_defaultRenderItem = function defaultRenderItem(d) {
+  return d;
+};
 var list_List = function List(props) {
   var _jssStyle$select;
   var jssStyle = props.jssStyle,
@@ -55558,9 +55566,7 @@ var list_List = function List(props) {
     optionListRef = props.optionListRef,
     isAnimationFinish = props.isAnimationFinish,
     _props$renderItem = props.renderItem,
-    renderItemProp = _props$renderItem === void 0 ? function (d) {
-      return d;
-    } : _props$renderItem,
+    renderItemProp = _props$renderItem === void 0 ? list_defaultRenderItem : _props$renderItem,
     closePop = props.closePop,
     onControlTypeChange = props.onControlTypeChange,
     onOptionClick = props.onOptionClick;
@@ -57687,9 +57693,7 @@ function Select(props0) {
     autoAdapt = props.autoAdapt,
     groupBy = props.groupBy,
     _props$renderItem = props.renderItem,
-    renderItemProp = _props$renderItem === void 0 ? function (d) {
-      return d;
-    } : _props$renderItem,
+    renderItemProp = _props$renderItem === void 0 ? list_defaultRenderItem : _props$renderItem,
     renderResultProp = props.renderResult,
     renderUnmatched = props.renderUnmatched,
     resultClassName = props.resultClassName,
@@ -57910,7 +57914,8 @@ function Select(props0) {
   });
   var rootClass = classnames_default()(className, styles === null || styles === void 0 ? void 0 : styles.rootClass, styles === null || styles === void 0 ? void 0 : styles.wrapper, isEmpty && styles.wrapperEmpty, open && (styles === null || styles === void 0 ? void 0 : styles.wrapperOpen), open && trigger === 'hover' && (styles === null || styles === void 0 ? void 0 : styles.triggerHover), disabled === true && (styles === null || styles === void 0 ? void 0 : styles.wrapperDisabled), disabled !== true && focused && (styles === null || styles === void 0 ? void 0 : styles.wrapperFocus), innerTitle && (styles === null || styles === void 0 ? void 0 : styles.wrapperInnerTitle), size === 'small' && (styles === null || styles === void 0 ? void 0 : styles.wrapperSmall), size === 'large' && (styles === null || styles === void 0 ? void 0 : styles.wrapperLarge), (!!props.error || props.status === 'error') && (styles === null || styles === void 0 ? void 0 : styles.wrapperError), clearable && (styles === null || styles === void 0 ? void 0 : styles.clearable), !border && (styles === null || styles === void 0 ? void 0 : styles.wrapperNoBorder), !!underline && (styles === null || styles === void 0 ? void 0 : styles.wrapperUnderline), defineProperty_default()({}, styles === null || styles === void 0 ? void 0 : styles.multiple, multiple));
   var getRenderItem = function getRenderItem(data, index) {
-    return typeof renderItemProp === 'function' ? renderItemProp(data, index) : (data === null || data === void 0 ? void 0 : data[renderItemProp]) || '';
+    var _data$renderItemProp;
+    return typeof renderItemProp === 'function' ? renderItemProp(data, index) : (_data$renderItemProp = data === null || data === void 0 ? void 0 : data[renderItemProp]) !== null && _data$renderItemProp !== void 0 ? _data$renderItemProp : '';
   };
   var renderItem = getRenderItem;
   var handleFocus = usePersistFn(function (e) {
@@ -59275,7 +59280,8 @@ var list_list_List = function List(props) {
             minWidth: 0,
             overflow: 'auto'
           },
-          dynamicVirtual: props.dynamicHeight
+          dynamicVirtual: props.dynamicHeight,
+          keepScrollTop: !!props.scrollLoading
         }), renderFooter()]
       });
     }
@@ -65257,7 +65263,7 @@ var thead_toNum = toNum;
     var fixedStyle = getFixedStyle(col.fixed, col.index, level);
     var cellClassName = classnames_default()(colTemp.className, colTemp.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), colTemp.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), colTemp.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), colTemp.align !== 'right' && colTemp.align !== 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignLeft), (col.lastFixed || col.firstFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), isLast && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), colTemp.sorter && props.cellSortable && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellSortable));
     var isExpand = colTemp.type === 'expand' || colTemp.type === 'row-expand';
-    if (colTemp.title || isExpand) {
+    if (colTemp.title !== undefined || isExpand) {
       var sorter = renderSort(colTemp);
       var filter = renderFilter(colTemp, columnIndex);
       trs[level].push( /*#__PURE__*/(0,jsx_runtime.jsx)("th", {
@@ -73394,7 +73400,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.9'
+  version: '3.8.10-beta.10'
 });
 }();
 /******/ 	return __webpack_exports__;