shineout 3.2.2 → 3.2.3

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.2.2'
+  version: '3.2.3'
 };

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.2.2');
+/* harmony default export */ var version = ('3.2.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -16137,7 +16137,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',
@@ -17691,6 +17691,10 @@ var datePickerStyle = objectSpread2_default()(objectSpread2_default()({
       visibility: 'visible'
     }
   },
+  datetimeHide: {
+    opacity: '0',
+    pointerEvents: 'none'
+  },
   quickPicker: {
     padding: "".concat(src.datePickerQuickPanelPaddingY, " ").concat(src.datePickerQuickPanelPaddingX),
     display: 'flex',
@@ -39749,6 +39753,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,
@@ -39785,7 +39802,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
 
@@ -39916,6 +39934,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
   });
   var setCurrentArrWithParams = usePersistFn(function (arg, type, quick) {
     setCurrentArr(arg);
+    if (!type && !quick) return;
     setParams({
       type: type,
       quick: quick
@@ -40175,17 +40194,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;
@@ -40763,8 +40772,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), {}, {
@@ -40772,7 +40781,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", {
@@ -41645,7 +41654,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);
         }
       }
@@ -41713,6 +41722,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]);
   });
@@ -41769,7 +41786,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;
@@ -41913,12 +41932,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);
+              }
             }
           }
         }
@@ -42764,12 +42789,14 @@ 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();
     }
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(handleMaskVisible, [visible]);
@@ -48971,7 +48998,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 () {
@@ -50581,6 +50608,7 @@ var PaginationSimple = function PaginationSimple(props) {
 
 
 
+
 var usePagination = function usePagination(props) {
   var totalProp = props.total,
     pageSizeProp = props.pageSize,
@@ -50601,14 +50629,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);
@@ -59412,7 +59441,7 @@ var TreeSelect = function TreeSelect(props0) {
         keygen: keygen,
         unmatch: unmatch,
         value: value,
-        highlight: true,
+        highlight: !multiple,
         loader: loader,
         onExpand: onExpandTree,
         expanded: controlExpanded,
@@ -63048,7 +63077,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.2.2'
+  version: '3.2.3'
 });
 }();
 /******/ 	return __webpack_exports__;