shineout 3.5.4-beta.2 → 3.5.4-beta.4

package/cjs/form/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import IForm from './form';
-import { useFormRef as useForm, useFromInstance } from '@sheinx/hooks';
+import { useFormRef as useForm, useFormInstance } from '@sheinx/hooks';
 type RefForm = typeof IForm;
 declare const Button: ((props: import("./interface").SubmitProps) => JSX.Element) & {
     displayName: string;
@@ -32,7 +32,7 @@ export interface FormComponent extends RefForm {
     Reset: typeof Reset;
     Flow: typeof FormFlow;
     useForm: typeof useForm;
-    useFromInstance: typeof useFromInstance;
+    useFormInstance: typeof useFormInstance;
 }
 declare const FormComp: FormComponent;
 export default FormComp;

package/cjs/form/index.js

@@ -36,5 +36,5 @@ FormComp.Submit = Submit;
 FormComp.Reset = Reset;
 FormComp.Flow = FormFlow;
 FormComp.useForm = _hooks.useFormRef;
-FormComp.useFromInstance = _hooks.useFromInstance;
+FormComp.useFormInstance = _hooks.useFormInstance;
 var _default = exports.default = FormComp;

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.2'
+  version: '3.5.4-beta.4'
 };

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.2');
+/* harmony default export */ var version = ('3.5.4-beta.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -48036,7 +48036,7 @@ function useFormRef() {
   };
   return [ref.current, setFormRef];
 }
-function useFromInstance() {
+function useFormInstance() {
   var formCtx = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useContext(FormContext);
   return formCtx;
 }
@@ -48132,10 +48132,25 @@ var Form = function Form(props) {
     handleFormModalInfo();
   }, [props.disabled, props.pending]);
   var rootClass = classnames_default()([formClasses === null || formClasses === void 0 ? void 0 : formClasses.rootClass, formClasses === null || formClasses === void 0 ? void 0 : formClasses.wrapper, className, props.inline && (formClasses === null || formClasses === void 0 ? void 0 : formClasses.wrapperInline)]);
-  return /*#__PURE__*/(0,jsx_runtime.jsx)("form", objectSpread2_default()(objectSpread2_default()({}, getFormProps({
+  var formProps = getFormProps({
     className: rootClass,
     style: style
+  });
+  var formElRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (formElRef.current instanceof HTMLFormElement) {
+      formElRef.current.addEventListener('submit', formProps.onSubmit);
+    }
+    return function () {
+      if (formElRef.current instanceof HTMLFormElement) {
+        formElRef.current.removeEventListener('submit', formProps.onSubmit);
+      }
+    };
+  }, [formProps.onSubmit]);
+  return /*#__PURE__*/(0,jsx_runtime.jsx)("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,
@@ -48691,6 +48706,11 @@ var FormButton = function FormButton(props) {
     if (formFunc && props.htmlType === 'button') {
       formFunc.submit();
     }
+    if (formFunc && props.htmlType === 'reset') {
+      // 阻止默认的form reset，改用formFunc.reset。处理嵌套form的reset问题。
+      e.preventDefault();
+      formFunc.reset();
+    }
     if (props.onClick) {
       props.onClick(e);
     }
@@ -48763,7 +48783,7 @@ FormComp.Submit = form_Submit;
 FormComp.Reset = form_Reset;
 FormComp.Flow = form_FormFlow;
 FormComp.useForm = useFormRef;
-FormComp.useFromInstance = useFromInstance;
+FormComp.useFormInstance = useFormInstance;
 /* harmony default export */ var src_form_0 = (FormComp);
 ;// CONCATENATED MODULE: ../base/src/gap/support.ts
 function support_flexGapSupport() {
@@ -58606,7 +58626,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),
@@ -58639,7 +58658,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;
@@ -58655,7 +58674,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);
@@ -58681,10 +58700,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)({
@@ -58741,32 +58762,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) {
@@ -58940,6 +58960,10 @@ var useTableVirtual = function useTableVirtual(props) {
   }, [scrollHeight]);
   var finalRowsInView = rowsInView + context.rowSpanRows + context.autoAddRows;
   var renderData = props.disabled ? props.data : toConsumableArray_default()(props.data).slice(startIndex, startIndex + finalRowsInView);
+  console.log('======================');
+  console.log('startIndex: >>', startIndex);
+  console.log('finalRowsInView: >>', finalRowsInView);
+  console.log('======================');
   return {
     scrollHeight: scrollHeight,
     startIndex: startIndex,
@@ -59974,23 +59998,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;
@@ -66970,7 +67001,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.4-beta.2'
+  version: '3.5.4-beta.4'
 });
 }();
 /******/ 	return __webpack_exports__;