shineout 3.9.0-beta.27 → 3.9.0-beta.28

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.0-beta.27'
+  version: '3.9.0-beta.28'
 };

package/dist/shineout.js

@@ -12400,7 +12400,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.0-beta.27');
+/* harmony default export */ var version = ('3.9.0-beta.28');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -18822,13 +18822,13 @@ var datePickerStyle = objectSpread2_default()(objectSpread2_default()(objectSpre
       color: src.datePickerCellOtherColor
     },
     '&:not($pickerCellDisabled):not($pickerCellActive):hover': {
-      '&  span': {
+      '& $pickerCellContent > span': {
         backgroundColor: src.datePickerCellHoverBackgroundColor,
         color: src.datePickerCellHoverColor
       }
     },
     '&$pickerCellInRange:not($pickerCellActive):not($pickerCellDisabled):hover': {
-      '&  span': {
+      '& $pickerCellContent > span': {
         backgroundColor: src.datePickerCellActiveHoverBackgroundColor
       }
     },
@@ -18842,7 +18842,7 @@ var datePickerStyle = objectSpread2_default()(objectSpread2_default()(objectSpre
     position: 'relative',
     height: src.datePickerCellHeight,
     lineHeight: src.datePickerCellHeight,
-    '& span': {
+    '& > span': {
       display: 'inline-block',
       minWidth: src.datePickerCellHotHeight,
       height: src.datePickerCellHotHeight,
@@ -41108,7 +41108,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
@@ -41133,7 +41135,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,
@@ -41422,6 +41426,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,
@@ -47138,17 +47143,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);
@@ -47170,19 +47175,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);
@@ -47789,8 +47794,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,
@@ -47822,7 +47827,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) {
@@ -47852,7 +47857,16 @@ var Day = function Day(props) {
       onMouseLeave: isDisabled ? undefined : function () {
         props.setTarget(undefined);
       },
-      children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      children: props.renderDate ? props.renderDate({
+        date: item,
+        isDisabled: isDisabled,
+        isInRange: isInRange,
+        isToday: isToday,
+        isCurrentMonth: isCurrentMonth,
+        isActive: isActive,
+        position: props.position,
+        className: styles === null || styles === void 0 ? void 0 : styles.pickerCellContent
+      }) : /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: styles === null || styles === void 0 ? void 0 : styles.pickerCellContent,
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
           children: func.getDayStr(item)
@@ -48053,15 +48067,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);
@@ -48083,11 +48097,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,
@@ -48164,8 +48178,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,
@@ -48286,15 +48300,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);
@@ -48316,11 +48330,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,
@@ -48399,8 +48413,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,
@@ -48524,15 +48538,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);
@@ -48553,11 +48567,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,
@@ -48629,8 +48643,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,
@@ -48846,11 +48860,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;
@@ -48876,19 +48887,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);
@@ -49139,6 +49144,7 @@ var Picker = function Picker(props) {
     }
     if (mode === 'day') {
       return /*#__PURE__*/(0,jsx_runtime.jsx)(day, objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, commonProps), timeProps), {}, {
+        renderDate: props.renderDate,
         onDoubleClick: function onDoubleClick(item, type) {
           // 双击同时设置开始和结束日期
           if (props.range && props.type === 'datetime') {
@@ -49527,6 +49533,7 @@ var DatePicker = function DatePicker(props0) {
           registerModeDisabled: func.registerModeDisabled,
           isDisabledDate: func.isDisabledDate,
           needConfirm: props.needConfirm,
+          renderDate: props.renderDate,
           children: props.children
         })
       })
@@ -59947,7 +59954,8 @@ var list_list_List = function List(props) {
             minWidth: 0,
             overflow: 'auto'
           },
-          dynamicVirtual: props.dynamicHeight
+          dynamicVirtual: props.dynamicHeight,
+          keepScrollTop: !!props.scrollLoading
         }), renderFooter()]
       });
     }
@@ -66068,7 +66076,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", {
@@ -74227,7 +74235,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.0-beta.27'
+  version: '3.9.0-beta.28'
 });
 }();
 /******/ 	return __webpack_exports__;