shineout 3.9.0-beta.24 → 3.9.0-beta.26

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.24'
+  version: '3.9.0-beta.26'
 };

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.24');
+/* harmony default export */ var version = ('3.9.0-beta.26');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -63961,6 +63961,25 @@ var scroll_table_Scroll = function Scroll(props) {
     }
   });
 
+  // 组件元素隐藏时，设置定高，解决恢复显示时滚动条位置未保持住的问题
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (!props.tableRef.current) return;
+    var isVisible = props.tableRef.current.offsetParent !== null;
+    var wasHidden = props.tableRef.current.getAttribute('data-was-hidden') === 'true';
+    var h = context.lastTableHeight || props.tableRef.current.clientHeight;
+    if (h > 0) {
+      context.lastTableHeight = h;
+    }
+    if (isVisible && wasHidden) {
+      props.tableRef.current.style.height = '100%';
+      props.tableRef.current.removeAttribute('data-was-hidden');
+    } else if (!isVisible && props.tableRef.current.style.height === '100%') {
+      // 加height === '100%'判断是因为：多层父级flex嵌套才有这个问题
+      props.tableRef.current.style.height = "".concat(context.lastTableHeight, "px");
+      props.tableRef.current.setAttribute('data-was-hidden', 'true');
+    }
+  }, [paddingTop]);
+
   // 非定高的Table但依旧采用了virtual渲染方式，需要渲染出全部的data
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     if (!props.tableRef.current || !props.setFakeVirtual) return;
@@ -66108,7 +66127,7 @@ var thead_toNum = toNum;
     trs[level].push( /*#__PURE__*/(0,jsx_runtime.jsx)("th", {
       className: classnames_default()(cellClassName, tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellGroup, colTemp2 === null || colTemp2 === void 0 || (_colTemp2$groupProps2 = colTemp2.groupProps) === null || _colTemp2$groupProps2 === void 0 ? void 0 : _colTemp2$groupProps2.className),
       style: style,
-      colSpan: colTemp2.colSpan,
+      colSpan: props.virtualColumn && typeof colTemp2.colSpan === 'function' ? undefined : colTemp2.colSpan,
       dir: config.direction,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         children: colTemp2.name
@@ -67386,7 +67405,8 @@ function Table(props) {
       renderSorter: props.renderSorter,
       radio: props.radio,
       treeColumnsName: treeColumnsName,
-      treeCheckAll: props.treeCheckAll
+      treeCheckAll: props.treeCheckAll,
+      virtualColumn: props.virtualColumn
     };
     var showFoot = (_props$summary = props.summary) === null || _props$summary === void 0 ? void 0 : _props$summary.length;
     var footCommonProps = {
@@ -74195,7 +74215,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.0-beta.24'
+  version: '3.9.0-beta.26'
 });
 }();
 /******/ 	return __webpack_exports__;