shineout 3.5.4-beta.3 → 3.5.4-beta.5

package/cjs/index.js

@@ -500,5 +500,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.5.4-beta.3'
+  version: '3.5.4-beta.5'
 };

package/dist/shineout.js

@@ -12030,7 +12030,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.5.4-beta.3');
+/* harmony default export */ var version = ('3.5.4-beta.5');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -48043,12 +48043,14 @@ function useFormInstance() {
 ;// CONCATENATED MODULE: ../base/src/form/form.tsx
 
 
+
 var form_excluded = ["jssStyle", "className", "style", "children", "formRef"];
 
 
 
 
 
+
 var Form = function Form(props) {
   var _jssStyle$form;
   var jssStyle = props.jssStyle,
@@ -48089,6 +48091,16 @@ var Form = function Form(props) {
       type: 'withValue'
     });
   });
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
+    _useState2 = slicedToArray_default()(_useState, 2),
+    renderKey = _useState2[0],
+    setRenderKey = _useState2[1];
+  var handleOuterSet = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(function (vals) {
+    formFunc.setValue(vals);
+    setRenderKey(function (prev) {
+      return prev + 1;
+    });
+  }, [formFunc]);
   var formRefObj = useLatestObj({
     clearValidate: formFunc.clearValidate,
     getValue: formFunc.getValue,
@@ -48098,7 +48110,7 @@ var Form = function Form(props) {
     validateFields: validateFields,
     validateFieldsWithValue: validateFieldsWithValue,
     validateFieldsWithError: formFunc.validateFields,
-    set: formFunc.setValue,
+    set: handleOuterSet,
     scrollToField: formFunc.scrollToField
   });
   external_root_React_commonjs2_react_commonjs_react_amd_react_default().useEffect(function () {
@@ -48147,17 +48159,17 @@ var Form = function Form(props) {
       }
     };
   }, [formProps.onSubmit]);
-  return /*#__PURE__*/(0,jsx_runtime.jsx)("form", objectSpread2_default()(objectSpread2_default()({}, removeProps(formProps, {
+  return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createElement)("form", objectSpread2_default()(objectSpread2_default()({}, removeProps(formProps, {
     onSubmit: true
   })), {}, {
     ref: formElRef,
-    children: /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, objectSpread2_default()(objectSpread2_default()({}, ProviderProps), {}, {
-      children: /*#__PURE__*/(0,jsx_runtime.jsx)(FormContext.Provider, {
-        value: formRefObj,
-        children: children
-      })
-    }))
-  }));
+    key: renderKey
+  }), /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, objectSpread2_default()(objectSpread2_default()({}, ProviderProps), {}, {
+    children: /*#__PURE__*/(0,jsx_runtime.jsx)(FormContext.Provider, {
+      value: formRefObj,
+      children: children
+    })
+  })));
 };
 /* harmony default export */ var base_src_form_form = (Form);
 ;// CONCATENATED MODULE: ./src/form/form.tsx
@@ -48589,8 +48601,7 @@ var FormFieldSet = function FormFieldSet(props) {
     });
   }
   valueArr.forEach(function (v, i) {
-    var _context$ids$i;
-    if (context.lastValues[i] !== v) {
+    if (context.lastValues.length !== valueArr.length) {
       context.ids[i] = generateUUID();
     }
     result.push( /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
@@ -48639,7 +48650,7 @@ var FormFieldSet = function FormFieldSet(props) {
           formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
         }
       })
-    }, (_context$ids$i = context.ids[i]) !== null && _context$ids$i !== void 0 ? _context$ids$i : i));
+    }, context.ids[i]));
   });
 
   // 更新 lastValues
@@ -58492,6 +58503,7 @@ var useTableSort = function useTableSort(props) {
 
 
 
+
 var getExpandData = function getExpandData(_treeData, keys, keygen, treeColumnsName) {
   var expandKeys = keys;
   var expandSet = new Set(expandKeys);
@@ -58592,6 +58604,9 @@ var useTableTree = function useTableTree(props) {
     var newExpandKeys = expandKeysState.filter(function (key) {
       return !unmatchExpandKeys.includes(key);
     });
+    if (shallowEqual(newExpandKeys, expandKeysState)) {
+      return;
+    }
     setExpandKeysState(newExpandKeys);
   }, [unmatchExpandKeys, expandKeysState]);
   return {
@@ -58626,7 +58641,6 @@ function getMaxRowSpanLength(input) {
   }
   return Math.max.apply(Math, toConsumableArray_default()(Array.from(map.values())));
 }
-var MAX_ROW_SPAN = 200;
 var useTableVirtual = function useTableVirtual(props) {
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
     _useState2 = slicedToArray_default()(_useState, 2),
@@ -58659,7 +58673,7 @@ var useTableVirtual = function useTableVirtual(props) {
     var totalLength = props.data.length;
     var _loop = function _loop(i) {
       var startIndex = i;
-      var rowSpanInfo = rowSpanColumns.map(function (col) {
+      var _rowSpanInfo = rowSpanColumns.map(function (col) {
         var rowSpan = col.rowSpan;
         function getRowSpanCount(index, _count) {
           var count = _count;
@@ -58675,7 +58689,7 @@ var useTableVirtual = function useTableVirtual(props) {
         var count = getRowSpanCount(i, 1);
         return [startIndex, startIndex + count - 1];
       });
-      _rowSpanInfos.push(rowSpanInfo);
+      _rowSpanInfos.push(_rowSpanInfo);
     };
     for (var i = 0; i < totalLength; i++) {
       _loop(i);
@@ -58701,10 +58715,12 @@ var useTableVirtual = function useTableVirtual(props) {
       });
       return Math.min.apply(Math, toConsumableArray_default()(startIndexs));
     });
-    var maxRowSpan = getMaxRowSpanLength(resultArr);
-    return maxRowSpan > 1 ? {
+
+    // 根据data计算出实际需要的最大合并行数
+    var _maxRowSpan = getMaxRowSpanLength(resultArr);
+    return _maxRowSpan > 1 ? {
       rowSpanIndexArray: resultArr,
-      maxRowSpan: maxRowSpan
+      maxRowSpan: _maxRowSpan
     } : null;
   }, [props.data, props.columns]);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
@@ -58761,32 +58777,31 @@ var useTableVirtual = function useTableVirtual(props) {
     }
   });
   var updateIndexAndTopFromTop = function updateIndexAndTopFromTop(scrollTop) {
+    var _props$scrollRef$curr;
     if (props.disabled) return;
     var sum = 0;
     var currentIndex = 0;
     var top = 0;
     var maxIndex = Math.max(props.data.length - rowsInView, 0);
-    var maxRowSpanLenth = 0;
-    if (rowSpanInfo) {
-      maxRowSpanLenth = Math.min(rowSpanInfo.rowSpanIndexArray.length,
-      // 根据data计算出实际需要的最大合并行数（rowSpanInfo.maxRowSpan），当rowSpanInfo.maxRowSpan大于外部传的rowsInView时，使用rowSpanInfo.maxRowSpan
-      Math.max(rowSpanInfo.maxRowSpan, props.rowsInView > MAX_ROW_SPAN ? props.rowsInView : props.rowsInView || MAX_ROW_SPAN));
-    }
+    var scrollContainerHeight = Math.max(((_props$scrollRef$curr = props.scrollRef.current) === null || _props$scrollRef$curr === void 0 ? void 0 : _props$scrollRef$curr.clientHeight) || 0, 200);
     for (var i = 0; i <= maxIndex; i++) {
       context.rowSpanRows = 0;
       sum += context.cachedHeight[i] || props.rowHeight;
       var rowSpanHeight = 0;
       if (rowSpanInfo) {
         var siblingsIndexs = [];
-        for (var k = i; k < maxRowSpanLenth + i; k++) {
+        for (var k = i; k < rowSpanInfo.maxRowSpan + i; k++) {
           if (rowSpanInfo.rowSpanIndexArray[k] <= i && k > i) {
             siblingsIndexs.push(k);
           }
         }
         for (var j = 0; j < siblingsIndexs.length; j++) {
-          var index = siblingsIndexs[j];
-          context.rowSpanRows += 1;
-          rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
+          // 在当前滚动容器滚动一屏上方销毁tr，不在可见区域内销毁重建，避免引起可见的单元格（合并的）内容闪烁
+          if (rowSpanHeight < scrollContainerHeight) {
+            var index = siblingsIndexs[j];
+            context.rowSpanRows += 1;
+            rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
+          }
         }
       }
       if (scrollTop < sum + rowSpanHeight || i === maxIndex) {
@@ -59994,23 +60009,30 @@ var Tr = function Tr(props) {
       var col = cols[i];
       if (data[i]) {
         var last = cols[i + (data[i].colSpan || 1) - 1] || {};
+        var isRowSpanTd = data[i].rowSpan > 1;
+        var $tdContent = renderContent(col, data[i].data);
         var td = /*#__PURE__*/(0,jsx_runtime.jsx)("td", {
           colSpan: data[i].colSpan,
           rowSpan: data[i].rowSpan,
-          onMouseEnter: props.hover && hasSiblingRowSpan || data[i].rowSpan > 1 ? function () {
+          onMouseEnter: props.hover && hasSiblingRowSpan || isRowSpanTd ? function () {
             props.handleCellHover(props.rowIndex, data[i].rowSpan);
           } : undefined,
-          onMouseLeave: props.hover && hasSiblingRowSpan || data[i].rowSpan > 1 ? function () {
+          onMouseLeave: props.hover && hasSiblingRowSpan || isRowSpanTd ? function () {
             props.handleCellHover(-1, 0);
           } : undefined,
-          className: classnames_default()(col.className, col.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), col.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), col.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), (col.lastFixed || col.firstFixed || last.lastFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), lastRowIndex === i && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), props.hoverIndex.has(props.rowIndex) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover), data[i].rowSpan > 1 && props.isCellHover(props.rowIndex, data[i].rowSpan) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover)),
+          className: classnames_default()(col.className, col.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), col.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), col.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), (col.lastFixed || col.firstFixed || last.lastFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), lastRowIndex === i && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), props.hoverIndex.has(props.rowIndex) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover), isRowSpanTd && props.isCellHover(props.rowIndex, data[i].rowSpan) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover)),
           style: getTdStyle(col, data[i].colSpan),
           dir: config.direction,
           "data-role": col.type === 'checkbox' ? 'checkbox' : undefined,
           onClick: props.onCellClick ? function () {
             return handleCellClick(data[i].data, i);
           } : undefined,
-          children: renderContent(col, data[i].data)
+          children: isRowSpanTd ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+            style: {
+              height: 0
+            },
+            children: $tdContent
+          }) : $tdContent
         }, col.key);
         tds.push(td);
         if (data[i].colSpan) skip = data[i].colSpan - 1;
@@ -66990,7 +67012,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.4-beta.3'
+  version: '3.5.4-beta.5'
 });
 }();
 /******/ 	return __webpack_exports__;