shineout 3.7.7-beta.9 → 3.7.8-alpha.1

package/README-zh_CN.md

@@ -11,7 +11,7 @@
 <p align="center">
   <a href="https://www.npmjs.com/package/shineout"><img src="https://img.shields.io/npm/v/shineout.svg?style=flat-square"></a>
   <a href="https://www.npmjs.com/package/shineout"><img src="https://img.shields.io/npm/dm/shineout.svg?style=flat-square"></a>
-  <img src="https://img.shields.io/badge/React-%3E%3D16.8.0-green.svg?style=flat-square">
+  <img src="https://img.shields.io/badge/React-%3E%3D16.14.0-green.svg?style=flat-square">
 </p>
 
 ## ✨ 特性

package/README.md

@@ -11,7 +11,7 @@ English | [简体中文](./README-zh_CN.md)
 <p align="center">
   <a href="https://www.npmjs.com/package/shineout"><img src="https://img.shields.io/npm/v/shineout.svg?style=flat-square"></a>
   <a href="https://www.npmjs.com/package/shineout"><img src="https://img.shields.io/npm/dm/shineout.svg?style=flat-square"></a>
-  <img src="https://img.shields.io/badge/React-%3E%3D16.8.0-green.svg?style=flat-square">
+  <img src="https://img.shields.io/badge/React-%3E%3D16.14.0-green.svg?style=flat-square">
 </p>
 
 ## ✨ Features

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.7.7-beta.9'
+  version: '3.7.8-alpha.1'
 };

package/dist/shineout.js

@@ -12234,7 +12234,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.7.7-beta.9');
+/* harmony default export */ var version = ('3.7.8-alpha.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -23692,7 +23692,6 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     height: 32,
     padding: "".concat(src.selectHeaderPaddingY, " ").concat(src.selectHeaderPaddingX),
     borderBottom: "1px solid ".concat(src.selectHeaderBorderColor),
-    marginBottom: 4,
     '& $columnsCheckbox': {
       marginRight: 0,
       marginLeft: 4,
@@ -30411,20 +30410,20 @@ var usePopup = function usePopup(props) {
     }
   };
   var handleMouseEnter = use_persist_fn(function (e) {
-    var _targetEvents$onMouse, _targetRef$current;
+    var _targetEvents$onMouse, _targetRef$current, _popupRef$current2;
     targetEvents === null || targetEvents === void 0 || (_targetEvents$onMouse = targetEvents.onMouseEnter) === null || _targetEvents$onMouse === void 0 || _targetEvents$onMouse.call(targetEvents, e);
     if (trigger !== 'hover') return;
     var isParentContainsCurrent = (_targetRef$current = targetRef.current) === null || _targetRef$current === void 0 ? void 0 : _targetRef$current.contains(e.target);
-    if (isParentContainsCurrent) {
+    if (isParentContainsCurrent || popupRef !== null && popupRef !== void 0 && (_popupRef$current2 = popupRef.current) !== null && _popupRef$current2 !== void 0 && _popupRef$current2.contains(e.target)) {
       handleHoverToggle(true);
     }
   });
   var handleMouseLeave = use_persist_fn(function (e) {
-    var _targetEvents$onMouse2, _popupRef$current2;
+    var _targetEvents$onMouse2, _popupRef$current3;
     targetEvents === null || targetEvents === void 0 || (_targetEvents$onMouse2 = targetEvents.onMouseLeave) === null || _targetEvents$onMouse2 === void 0 || _targetEvents$onMouse2.call(targetEvents, e);
     if (trigger !== 'hover') return;
     // @ts-ignore
-    if (e.relatedTarget instanceof HTMLElement && (_popupRef$current2 = popupRef.current) !== null && _popupRef$current2 !== void 0 && _popupRef$current2.contains(e.relatedTarget)) {
+    if (e.relatedTarget instanceof HTMLElement && (_popupRef$current3 = popupRef.current) !== null && _popupRef$current3 !== void 0 && _popupRef$current3.contains(e.relatedTarget)) {
       return;
     }
     handleHoverToggle(false);
@@ -31081,6 +31080,23 @@ var getCurrentCSSZoom = function getCurrentCSSZoom() {
 //     height: rect.height * zoomRatio,
 //   }
 // }
+
+var getScrollPosition = function getScrollPosition(element) {
+  if (!element) return {
+    scrollTop: 0,
+    scrollLeft: 0
+  };
+  if (element === document.documentElement || element === document.body) {
+    return {
+      scrollTop: document.documentElement.scrollTop || document.body.scrollTop,
+      scrollLeft: document.documentElement.scrollLeft || document.body.scrollLeft
+    };
+  }
+  return {
+    scrollTop: element.scrollTop,
+    scrollLeft: element.scrollLeft
+  };
+};
 ;// CONCATENATED MODULE: ../hooks/src/common/use-position-style/index.ts
 
 
@@ -31324,17 +31340,18 @@ var usePositionStyle = function usePositionStyle(config) {
     };
   };
   var getAbsoluteStyle = function getAbsoluteStyle(position) {
-    var _scrollElRef$current, _scrollElRef$current2, _scrollElRef$current3;
+    var _scrollElRef$current;
     if (!parentElRef.current) return {
       style: hideStyle
     };
     var rect = context.parentRect;
     var needCheck = !show || !shallow_equal(context.prevParentPosition, parentElNewPosition);
-    var scrollTop = (scrollElRef === null || scrollElRef === void 0 || (_scrollElRef$current = scrollElRef.current) === null || _scrollElRef$current === void 0 ? void 0 : _scrollElRef$current.scrollTop) || 0;
-    var scrollLeft = (scrollElRef === null || scrollElRef === void 0 || (_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.scrollLeft) || 0;
-    if (needCheck && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current3 = scrollElRef.current) !== null && _scrollElRef$current3 !== void 0 && _scrollElRef$current3.contains(parentElRef.current)) {
-      var _scrollElRef$current4;
-      var visibleRect = ((_scrollElRef$current4 = scrollElRef.current) === null || _scrollElRef$current4 === void 0 ? void 0 : _scrollElRef$current4.getBoundingClientRect()) || {};
+    var _getScrollPosition = getScrollPosition(scrollElRef === null || scrollElRef === void 0 ? void 0 : scrollElRef.current),
+      scrollTop = _getScrollPosition.scrollTop,
+      scrollLeft = _getScrollPosition.scrollLeft;
+    if (needCheck && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
+      var _scrollElRef$current2;
+      var visibleRect = ((_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.getBoundingClientRect()) || {};
       if (rect.bottom < visibleRect.top || rect.top > visibleRect.bottom + scrollTop || rect.right < visibleRect.left || rect.left > visibleRect.right + scrollLeft) {
         return {
           style: hideStyle
@@ -31408,7 +31425,9 @@ var usePositionStyle = function usePositionStyle(config) {
     }
 
     // 当父元素的滚动容器滚动时，判断是否需要更新弹出层位置，包括是否隐藏弹出层（通过hideStyle隐藏，不是show状态）
-    context.prevParentPosition = parentElNewPosition;
+    if (show) {
+      context.prevParentPosition = parentElNewPosition;
+    }
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(updateStyle, [show, position, absolute, updateKey, fixedWidth, parentElNewPosition, popupElSize]);
   return {
@@ -35799,6 +35818,9 @@ function useInputAble(props) {
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       timer: null,
       delayChange: null
+      // pendingCount: 0,
+      // executedCount: 0,
+      // checkTimer: null,
     }),
     context = _useRef.current;
   var latest = useLatestObj({
@@ -35823,12 +35845,18 @@ function useInputAble(props) {
     }
   }, [props.value, delay, control]);
   var forceDelayChange = use_persist_fn(function () {
+    // if (context.checkTimer) {
+    //   clearTimeout(context.checkTimer);
+    //   context.checkTimer = null;
+    // }
     if (context.timer && context.delayChange) {
       clearTimeout(context.timer);
       context.delayChange();
       context.timer = null;
       context.delayChange = null;
     }
+    // context.pendingCount = 0;
+    // context.executedCount = 0;
   });
   var handleChange = use_persist_fn(function (v) {
     for (var _len = arguments.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -35852,14 +35880,26 @@ function useInputAble(props) {
     context.delayChange = function () {
       context.timer = null;
       context.delayChange = null;
+      // context.executedCount++;
       onChange.apply(void 0, [vv].concat(other));
       render();
     };
-    if (!delay) {
+    if (!delay || props.forceSyncInputValue) {
       onChange.apply(void 0, [vv].concat(other));
     } else {
+      // const currentPendingCount = ++context.pendingCount;
       if (context.timer) clearTimeout(context.timer);
       context.timer = setTimeout(context.delayChange, delay);
+
+      // 设置检查定时器，在 delay 之后检查是否有丢失的 delayChange
+      // if (context.checkTimer) clearTimeout(context.checkTimer);
+      // context.checkTimer = setTimeout(() => {
+      //   const missedCount = currentPendingCount - context.executedCount;
+      //   if (missedCount > 0 && context.delayChange && valuePo !== vv) {
+      //     context.delayChange();
+      //   }
+      //   context.checkTimer = null;
+      // }, delay + 50);
     }
   });
   return {
@@ -36736,12 +36776,14 @@ var useWithFormConfig = function useWithFormConfig(props) {
   var formConfig = useFormConfig();
   var size = (props === null || props === void 0 ? void 0 : props.size) || formConfig.size;
   var disabled = formConfig.disabled || (props === null || props === void 0 ? void 0 : props.disabled);
-  return objectSpread2_default()(objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, props), size !== undefined && {
+  return objectSpread2_default()(objectSpread2_default()(objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, props), size !== undefined && {
     size: size
   }), disabled !== undefined && {
     disabled: disabled
   }), formConfig.formName !== undefined && {
     formName: formConfig.formName
+  }), {}, {
+    forceSyncInputValue: formConfig.forceSyncInputValue
   });
 };
 /* harmony default export */ var use_with_form_config = (useWithFormConfig);
@@ -36820,7 +36862,8 @@ var useInputCommon = function useInputCommon(props0) {
     onChange: onChange,
     defaultValue: defaultValue,
     beforeChange: beforeChange,
-    delay: delay
+    delay: delay,
+    forceSyncInputValue: props.forceSyncInputValue
   });
   var hasValue = function hasValue(value) {
     return isNumber(value) && !isNan(value) || value && value.length;
@@ -39572,9 +39615,9 @@ var useTree = function useTree(props) {
     var _context$value;
     if (mode !== MODE.MODE_0) return;
     (_context$value = context.value) === null || _context$value === void 0 || _context$value.forEach(function (id) {
-      var _ref3 = context.pathMap.get(id),
-        children = _ref3.children;
-      if (children.length) {
+      var node = context.pathMap.get(id);
+      var children = node === null || node === void 0 ? void 0 : node.children;
+      if (children && children.length) {
         var noCheckedChildren = children.filter(function (cid) {
           var _context$value2;
           return !((_context$value2 = context.value) !== null && _context$value2 !== void 0 && _context$value2.includes(cid));
@@ -40058,7 +40101,8 @@ var VirtualList = function VirtualList(props) {
       preIndex: null,
       topTimer: null,
       rateTimer: null,
-      shouldUpdateHeight: true
+      shouldUpdateHeight: true,
+      prevWrapperRefHeight: 0
     }),
     context = _useRef.current;
   var getContentHeight = function getContentHeight(index) {
@@ -40218,11 +40262,14 @@ var VirtualList = function VirtualList(props) {
     context.preIndex = startIndex;
   }, [startIndex]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
-    if (keepScrollHeight) return;
+    var _wrapperRef$current2;
+    var currentWrapperRefHeight = ((_wrapperRef$current2 = wrapperRef.current) === null || _wrapperRef$current2 === void 0 ? void 0 : _wrapperRef$current2.clientHeight) || 0;
+    if (keepScrollHeight && currentWrapperRefHeight === context.prevWrapperRefHeight) return;
     if (keepScrollTop) return;
     // 数据变化的时候清空掉 preIndex, 如果之前有缓存的index, setRowHeight 会有问题
     setTop(0);
     setStartIndex(0);
+    context.prevWrapperRefHeight = currentWrapperRefHeight;
     return function () {
       context.preIndex = null;
     };
@@ -41392,25 +41439,44 @@ function getResetMore(onFilter, container, doms) {
   var hideMargin = parsePxToNumber(hideElStyle.marginLeft) + parsePxToNumber(hideElStyle.marginRight);
   var num = 0;
   var sumWidth = 0;
-  for (var i = 0; i < doms.length; i++) {
-    var _item2 = doms[i];
-    var itemStyle = getComputedStyle(_item2);
-    var itemWidth = _item2.offsetWidth + parsePxToNumber(itemStyle.marginLeft) + parsePxToNumber(itemStyle.marginRight);
-    sumWidth += itemWidth;
-    var moreWidth = 0;
-    var resetNum = items.length - 1 - i;
-    if (resetNum > 0) {
-      var reset = "+".concat(resetNum);
-      hideEl.childNodes[0].innerText = reset;
-      moreWidth = hideEl.offsetWidth + hideMargin;
-    }
-    if (sumWidth > contentWidth - moreWidth) {
-      num = i;
-      break;
-    }
+  var itemWidthArr = items.map(function (item) {
+    var itemStyle = getComputedStyle(item);
+    var itemLen = item.offsetWidth + parsePxToNumber(itemStyle.marginLeft) + parsePxToNumber(itemStyle.marginRight);
+    sumWidth += itemLen;
+    return itemLen;
+  });
+  if (sumWidth <= contentWidth) {
     num = -1;
+  } else {
+    var len = 0;
+    for (var i = 0; i < itemWidthArr.length; i++) {
+      var itemLen = itemWidthArr[i];
+      // number length
+      var resetNum = items.length - 1 - i;
+      var moreWidth = void 0;
+      if (resetNum <= 0) {
+        moreWidth = 0;
+      } else {
+        var reset = "+".concat(resetNum);
+        hideEl.childNodes[0].innerText = reset;
+        // (+num) width
+        moreWidth = hideEl.offsetWidth + hideMargin;
+      }
+      len += itemLen;
+      if (len > contentWidth - moreWidth) {
+        break;
+      }
+      num += 1;
+      if (i === items.length - 1) {
+        // not show more
+        num = -1;
+      }
+    }
+  }
+  // at least show one
+  if (num === 0 && itemWidthArr[0]) {
+    num = 1;
   }
-  ;
   return num;
 }
 var More = function More(props) {
@@ -42522,8 +42588,8 @@ var Cascader = function Cascader(props0) {
     }
   }, [data]);
 
-  // 修复外部受控打开的场景下，从外部修改value导致的面板勾选情况没有及时同步
-  if (openProp && !shallowEqual(value, datum.getValue())) {
+  // 修复外部受控打开或renderOptionList做全选的场景下，从外部修改value导致的面板勾选情况没有及时同步
+  if ((openProp || props.renderOptionList) && !shallowEqual(value, datum.getValue())) {
     datum.setValue(value);
   }
   ;
@@ -42532,9 +42598,6 @@ var Cascader = function Cascader(props0) {
     datum.setValue(value);
     if (!open) return;
     updatePathByValue();
-    if (props.renderOptionList) {
-      updatePath();
-    }
   }, [value, open]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (filterText !== undefined) {
@@ -45939,7 +46002,9 @@ var useTime = function useTime(props) {
     _props$secondStep = props.secondStep,
     secondStep = _props$secondStep === void 0 ? 1 : _props$secondStep,
     staticMin = props.staticMin,
-    staticMax = props.staticMax;
+    staticMax = props.staticMax,
+    position = props.position,
+    rangeDate = props.rangeDate;
   var min = util.resetTimeByFormat(mi, format, options);
   var max = util.resetTimeByFormat(ma, format, options);
   var current = props.value || util.newDate(undefined, options);
@@ -45965,7 +46030,7 @@ var useTime = function useTime(props) {
       disabledTime = props.disabledTime;
     if (disabledTime) {
       var _time = util.format(date, util.TIME_FORMAT, options);
-      if (typeof disabledTime === 'function') return disabledTime(_time);
+      if (typeof disabledTime === 'function') return disabledTime(_time, position, rangeDate === null || rangeDate === void 0 ? void 0 : rangeDate[0], rangeDate === null || rangeDate === void 0 ? void 0 : rangeDate[1]);
       return disabledTime === _time;
     }
     var isDis = disabled && typeof disabled === 'function' ? disabled(date) : false;
@@ -46316,7 +46381,9 @@ var Time = function Time(props) {
       disabledTime: props.disabledTime,
       hourStep: props.hourStep,
       minuteStep: props.minuteStep,
-      secondStep: props.secondStep
+      secondStep: props.secondStep,
+      position: props.position,
+      rangeDate: props.rangeDate
     }),
     func = _useTimePick.func,
     times = _useTimePick.times;
@@ -50644,7 +50711,8 @@ var useForm = function useForm(props) {
     colon = props.colon,
     formName = props.name,
     scrollParent = props.scrollParent,
-    isControl = props.isControl;
+    isControl = props.isControl,
+    forceSyncInputValue = props.forceSyncInputValue;
   var deepSetOptions = {
     removeUndefined: removeUndefined,
     forceSet: true
@@ -50831,7 +50899,7 @@ var useForm = function useForm(props) {
     var _props$onChange;
     var newValue = typeof change === 'function' ? utils_immer_produce(context.value, change) : change;
     context.value = newValue;
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, context.value);
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newValue);
   });
   var scrollToField = use_persist_fn(function (name) {
     var _document;
@@ -51185,7 +51253,8 @@ var useForm = function useForm(props) {
       disabled: disabled,
       size: size,
       formName: formName,
-      colon: colon
+      colon: colon,
+      forceSyncInputValue: !!forceSyncInputValue
     };
   }, [labelWidth, labelAlign, labelVerticalAlign, keepErrorHeight, inline, disabled, size, formName, colon]);
   var updateValue = function updateValue() {
@@ -51211,11 +51280,6 @@ var useForm = function useForm(props) {
   // 默认值更新
   external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect(function () {
     context.removeLock = false;
-    // 内部 onChange 改的 value, 不需要更新
-    if (props.value === context.value) {
-      if (!isControl) update();
-      return;
-    }
     if (initValidate && !context.resetTime) {
       var keys = Object.keys(context.validateMap).filter(function (key) {
         var oldValue = deepGet(preValue || emptyObj, key);
@@ -51225,6 +51289,7 @@ var useForm = function useForm(props) {
       validateFields(keys).catch(function () {});
     }
     update();
+    if (!isControl) return;
     // 默认值上位时会提前触发外部的onChange, 导致外部的多次setFormValue不能合并后生效的问题(ReactDOM.render方式渲染)
     setTimeout(updateDefaultValue);
     context.resetTime = 0;
@@ -55373,7 +55438,8 @@ var VirtualNode = function VirtualNode(props) {
     className: rootClass,
     dir: config.direction,
     style: {
-      paddingLeft: level * indent
+      paddingLeft: level * indent,
+      height: props.lineHeight
     },
     children: [$indents, /*#__PURE__*/(0,jsx_runtime.jsx)(tree_content, {
       virtual: true,
@@ -55657,7 +55723,8 @@ var TreeVirtual = function TreeVirtual(props) {
       onNodeClick: onNodeClick,
       onToggle: onToggle,
       onChange: onChange,
-      size: datum.size
+      size: datum.size,
+      lineHeight: lineHeight
     }, id);
   };
   return /*#__PURE__*/(0,jsx_runtime.jsx)(virtual_scroll_list, {
@@ -56340,7 +56407,8 @@ var ColumnsList = function ColumnsList(props) {
       colNum: columns,
       lineHeight: lineHeight,
       rowsInView: itemsInView,
-      renderItem: renderItem
+      renderItem: renderItem,
+      paddingY: 4
     });
   };
   var renderSelectAll = function renderSelectAll() {
@@ -56741,7 +56809,8 @@ function Select(props0) {
     if (hideCreate) {
       // optionListRef.current?.hoverMove(filterData.length - 1, true);
     }
-    onFilter === null || onFilter === void 0 || onFilter(trim ? text.trim() : text, from);
+    // onFilter?.(trim ? text.trim() : text, from);
+    onFilter === null || onFilter === void 0 || onFilter(text.trim(), from);
   };
   var handleOptionClick = function handleOptionClick() {
     if (multiple) return;
@@ -71838,7 +71907,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.7-beta.9'
+  version: '3.7.8-alpha.1'
 });
 }();
 /******/ 	return __webpack_exports__;