shineout 3.9.3-beta.2 → 3.9.3-beta.4

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

package/dist/shineout.js

@@ -12402,7 +12402,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.3-beta.2');
+/* harmony default export */ var version = ('3.9.3-beta.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -64429,6 +64429,10 @@ var scroll_table_Scroll = function Scroll(props) {
   });
 };
 /* harmony default export */ var scroll_table = (scroll_table_Scroll);
+;// CONCATENATED MODULE: ../hooks/src/components/use-table/table-nested-context.tsx
+
+var TableContext = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createContext)({});
+/* harmony default export */ var table_nested_context = (TableContext);
 ;// CONCATENATED MODULE: ../hooks/src/common/use-scrollbar-width/index.ts
 
 
@@ -64641,6 +64645,7 @@ var useColumns = function useColumns(props) {
     columnInfo: {
       handleScroll: handleScroll
     },
+    currentColIndex: startIndex,
     expandHideCol: context.expandHideCol
   };
 };
@@ -66754,7 +66759,6 @@ function useComponentMemo(getValue, condition, shouldUpdate) {
 ;// CONCATENATED MODULE: ../base/src/table/td.tsx
 
 
-
 function Td(props) {
   var col = props.col,
     colSpan = props.colSpan,
@@ -66762,12 +66766,11 @@ function Td(props) {
     className = props.className,
     direction = props.direction,
     role = props.role,
-    data = props.data,
     onClick = props.onClick,
     onMouseEnter = props.onMouseEnter,
     onMouseLeave = props.onMouseLeave,
     renderContent = props.renderContent;
-  var $td = /*#__PURE__*/(0,jsx_runtime.jsx)("td", {
+  return /*#__PURE__*/(0,jsx_runtime.jsx)("td", {
     colSpan: colSpan,
     rowSpan: rowSpan,
     onMouseEnter: onMouseEnter,
@@ -66779,20 +66782,6 @@ function Td(props) {
     onClick: onClick,
     children: renderContent(props.col, props.data)
   }, col.key);
-  if (props.virtual === 'lazy') {
-    var _props$style, _props$style2;
-    return useComponentMemo(function () {
-      return $td;
-    }, [data, className, (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.left, (_props$style2 = props.style) === null || _props$style2 === void 0 ? void 0 : _props$style2.right, col.type, col.treeColumnsName], function (prev, next) {
-      if (col.type || col.treeColumnsName) {
-        return true;
-      }
-      return prev.some(function (_, index) {
-        return !shallowEqual(prev === null || prev === void 0 ? void 0 : prev[index], next === null || next === void 0 ? void 0 : next[index]);
-      }) || !props.scrolling;
-    });
-  }
-  return $td;
 }
 ;// CONCATENATED MODULE: ../base/src/table/tr.tsx
 
@@ -67101,6 +67090,7 @@ var Tr = function Tr(props) {
     if (expandCol && typeof expandCol.render === 'function') {
       var renderFunc = expandCol.render(props.rawData, props.rowIndex);
       if (typeof renderFunc === 'function') {
+        var _props$scrollRef;
         return /*#__PURE__*/(0,jsx_runtime.jsx)("tr", {
           className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowExpand,
           ref: expandRef,
@@ -67111,7 +67101,12 @@ var Tr = function Tr(props) {
             style: {
               padding: 0
             },
-            children: renderFunc()
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)(table_nested_context.Provider, {
+              value: {
+                parentTableWidth: (_props$scrollRef = props.scrollRef) === null || _props$scrollRef === void 0 || (_props$scrollRef = _props$scrollRef.current) === null || _props$scrollRef === void 0 ? void 0 : _props$scrollRef.clientWidth
+              },
+              children: renderFunc()
+            })
           })
         });
       }
@@ -67188,8 +67183,9 @@ var Tr = function Tr(props) {
 /* harmony default export */ var tbody = (function (props) {
   var _props$columns = props.columns,
     columns = _props$columns === void 0 ? [] : _props$columns,
-    _props$currentIndex = props.currentIndex,
-    currentIndex = _props$currentIndex === void 0 ? 0 : _props$currentIndex,
+    _props$currentRowInde = props.currentRowIndex,
+    currentRowIndex = _props$currentRowInde === void 0 ? 0 : _props$currentRowInde,
+    currentColIndex = props.currentColIndex,
     _props$hover = props.hover,
     hover = _props$hover === void 0 ? true : _props$hover;
   var _useTableExpand = use_table_expand({
@@ -67202,7 +67198,7 @@ var Tr = function Tr(props) {
   var _useTableRow = use_table_row({
       columns: props.columns,
       data: props.data,
-      currentIndex: currentIndex,
+      currentIndex: currentRowIndex,
       hover: hover
     }),
     rowData = _useTableRow.rowData,
@@ -67214,7 +67210,7 @@ var Tr = function Tr(props) {
   });
   var renderRow = function renderRow(item, index) {
     var _props$rowEvents;
-    var rowIndex = index + currentIndex;
+    var rowIndex = index + currentRowIndex;
     var originKey = getKey(props.keygen, item, rowIndex);
     var trRenderKey = props.loader || (_props$rowEvents = props.rowEvents) !== null && _props$rowEvents !== void 0 && _props$rowEvents.draggable ? originKey : "".concat(originKey, "-").concat(rowIndex);
 
@@ -67266,6 +67262,7 @@ var Tr = function Tr(props) {
       rowEvents: props.rowEvents,
       disabled: props.datum.disabledCheck(item),
       bodyScrollWidth: props.bodyScrollWidth,
+      scrollRef: props.scrollRef,
       resizeFlag: props.resizeFlag,
       treeCheckAll: props.treeCheckAll,
       onCellClick: props.onCellClick,
@@ -67282,7 +67279,7 @@ var Tr = function Tr(props) {
   if (props.virtual === 'lazy') {
     return useComponentMemo(function () {
       return $tbody;
-    }, [props.data, currentIndex], function (prev, next) {
+    }, [currentRowIndex, currentColIndex, props.data], function (prev, next) {
       return prev.some(function (_, index) {
         return !shallowEqual(prev === null || prev === void 0 ? void 0 : prev[index], next === null || next === void 0 ? void 0 : next[index]);
       }) || !props.scrolling;
@@ -67442,6 +67439,7 @@ function Table(props) {
     _props$pagination = props.pagination,
     pagination = _props$pagination === void 0 ? {} : _props$pagination;
   var config = useConfig();
+  var nestedContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(table_nested_context);
   var isRtl = config.direction === 'rtl';
   var tableClasses = props === null || props === void 0 || (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$table = _props$jssStyle.table) === null || _props$jssStyle$table === void 0 ? void 0 : _props$jssStyle$table.call(_props$jssStyle);
   var tbodyRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
@@ -67528,7 +67526,8 @@ function Table(props) {
     }),
     columns = _useTableColumns.columns,
     expandHideCol = _useTableColumns.expandHideCol,
-    columnInfo = _useTableColumns.columnInfo;
+    columnInfo = _useTableColumns.columnInfo,
+    currentColIndex = _useTableColumns.currentColIndex;
   var _useTableLayout = use_table_layout({
       theadRef: theadRef,
       tbodyRef: tbodyRef,
@@ -67802,7 +67801,8 @@ function Table(props) {
       resizeFlag: resizeFlag,
       treeCheckAll: props.treeCheckAll,
       onCellClick: props.onCellClick,
-      strictRowHeight: props.strictRowHeight
+      strictRowHeight: props.strictRowHeight,
+      scrollRef: scrollRef
     };
     var headCommonProps = {
       disabled: props.disabled,
@@ -67973,7 +67973,8 @@ function Table(props) {
             }),
             ref: tbodyRef,
             children: [Group, /*#__PURE__*/(0,jsx_runtime.jsx)(tbody, objectSpread2_default()(objectSpread2_default()({}, bodyCommonProps), {}, {
-              currentIndex: virtualInfo.startIndex,
+              currentRowIndex: virtualInfo.startIndex,
+              currentColIndex: currentColIndex,
               data: virtualInfo.data,
               setRowHeight: virtualInfo.setRowHeight,
               scrolling: scrolling,
@@ -68084,6 +68085,19 @@ function Table(props) {
       scrollElRef: scrollRef
     };
   }, [scrollRef]);
+  var tableWrapperStyle = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    if (nestedContext.parentTableWidth && props.width) {
+      return objectSpread2_default()({
+        width: nestedContext.parentTableWidth,
+        position: 'sticky',
+        left: 0,
+        height: defaultHeight
+      }, props.style);
+    }
+    return objectSpread2_default()({
+      height: defaultHeight
+    }, props.style);
+  }, [nestedContext.parentTableWidth, defaultHeight, props.style, props.width]);
   var tableWrapperClass = classnames_default()(props.className, tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rootClass, tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.wrapper, props.bordered && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.bordered), verticalAlign === 'top' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.verticalAlignTop), verticalAlign === 'middle' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.verticalAlignMiddle), size === 'small' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.small), size === 'large' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.large), size === 'default' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.default));
   if (!props.columns || columns.length === 0) return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
     className: classnames_default()(tableWrapperClass, tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.simple, props.striped && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.striped)),
@@ -68099,9 +68113,7 @@ function Table(props) {
   return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({
       className: classnames_default()(tableWrapperClass, defineProperty_default()(defineProperty_default()(defineProperty_default()({}, tableClasses.sticky, props.sticky), tableClasses.floatLeft, floatLeft), tableClasses.floatRight, floatRight)),
-      style: objectSpread2_default()({
-        height: defaultHeight
-      }, props.style)
+      style: tableWrapperStyle
     }, selection.getTableProps()), {}, {
       ref: tableRef,
       dir: config.direction,
@@ -74634,7 +74646,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.3-beta.2'
+  version: '3.9.3-beta.4'
 });
 }();
 /******/ 	return __webpack_exports__;