shineout 3.9.3-beta.1 → 3.9.3-beta.11

package/dist/shineout.js

@@ -4548,15 +4548,14 @@ const figma = [
   {
     name: 'Shadow-4',
     value: '0px -2px 10px rgba(232, 235, 240, 0.8)',
-    describe: '详情页底部按钮模块阴影',
+    describe: '详情页底部按钮模块阴影（向上）',
     token: 'Shadow-4',
     locked: true,
   },
   {
     name: 'Shadow-5',
-    value:
-      'rgba(0, 0, 0, 0.2) 0px 2px 1px -1px, rgba(0, 0, 0, 0.14) 0px 1px 1px 0px, rgba(0, 0, 0, 0.12) 0px 1px 3px 0px',
-    describe: 'Switch圆圈阴影',
+    value: '0px 2px 10px rgba(232, 235, 240, 0.8)',
+    describe: '详情页底部按钮模块阴影（向下）',
     token: 'Shadow-5',
     locked: true,
   },
@@ -12402,17 +12401,21 @@ 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.1');
+/* harmony default export */ var version = ('3.9.3-beta.11');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
 
 
+
 var jss_style_prefix = 'soui';
 var jss_style_config = {};
 var setJssConfig = function setJssConfig(newConfig) {
   Object.assign(jss_style_config, newConfig);
 };
+var getJssConfig = function getJssConfig() {
+  return jss_style_config;
+};
 var stringToHash = function stringToHash(str) {
   var hash = 0;
   if (str.length === 0) return '';
@@ -12446,12 +12449,27 @@ var createClassname = function createClassname(rule, sheet) {
 // };
 
 var styled = function styled(style, ns) {
+  var styleElement = typeof window !== 'undefined' ? document.createElement('style') : undefined;
   var hoc = createUseStyles(jss_style_handleStyle(style), {
     name: ns,
-    generateId: createClassname
+    generateId: createClassname,
+    element: styleElement
   });
   var styledCacheMap = {};
+  var attributesApplied = false;
   var getClassName = function getClassName() {
+    if (!attributesApplied && styleElement) {
+      var jssConfig = getJssConfig();
+      if (jssConfig.styleAttributes) {
+        Object.entries(jssConfig.styleAttributes).forEach(function (_ref) {
+          var _ref2 = slicedToArray_default()(_ref, 2),
+            key = _ref2[0],
+            value = _ref2[1];
+          styleElement.setAttribute(key, value);
+        });
+      }
+      attributesApplied = true;
+    }
     var classes = hoc();
     if (styledCacheMap[ns]) {
       return styledCacheMap[ns];
@@ -12793,7 +12811,7 @@ var Token = {
   'Shadow-2': '0px 4px 10px rgba(2, 11, 24, 0.1)',
   'Shadow-3': '0px 8px 20px rgba(2, 11, 24, 0.1)',
   'Shadow-4': '0px -2px 10px rgba(232, 235, 240, 0.8)',
-  'Shadow-5': 'rgba(0, 0, 0, 0.2) 0px 2px 1px -1px, rgba(0, 0, 0, 0.14) 0px 1px 1px 0px, rgba(0, 0, 0, 0.12) 0px 1px 3px 0px',
+  'Shadow-5': '0px 2px 10px rgba(232, 235, 240, 0.8)',
   'Line-height-dynamic': 'calc( 1em + 8px )',
   'Line-height-dynamic-min': 'calc( max(1em, 14px) + 8px )',
   Transparent: 'transparent',
@@ -14774,7 +14792,7 @@ var switchTokens = {
   switchPaddingY: 'Spacing-2',
   switchCircleSize: 'Size-9',
   switchCircleFill: 'Neutral-text-1',
-  switchCircleShadow: 'Shadow-5',
+  switchCircleShadow: 'Shadow-3',
   switchWidth: 'Size-21',
   switchTextPaddingLeft: 'Spacing-8',
   switchTextPaddingRight: 'Spacing-4',
@@ -24114,7 +24132,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
       fontSize: src.selectSmallFontSize
     },
     '& $optionGroupTitle': {
-      padding: "".concat(src.selectGroupTitleSmallTop, " ").concat(src.selectGroupTitlePaddingX, " 0 ").concat(src.selectGroupTitlePaddingX)
+      padding: "calc(".concat(src.selectFontSize, " - 10px) ").concat(src.selectGroupTitlePaddingX, " 0 ").concat(src.selectGroupTitlePaddingX)
     }
   },
   pickerLarge: {
@@ -24126,7 +24144,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
       fontSize: src.selectLargeFontSize
     },
     '& $optionGroupTitle': {
-      padding: "".concat(src.selectGroupTitleLargeTop, " ").concat(src.selectGroupTitlePaddingX, " ").concat(src.selectGroupTitleLargeBottom, " ").concat(src.selectGroupTitlePaddingX)
+      padding: "calc(".concat(src.selectFontSize, " + 2px) ").concat(src.selectGroupTitlePaddingX, " ").concat(src.selectGroupTitleLargeBottom, " ").concat(src.selectGroupTitlePaddingX)
     }
   },
   iconWrapper: {
@@ -24343,7 +24361,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
   optionGroupTitle: {
     fontSize: src.selectGroupTitleFontSize,
     lineHeight: src.lineHeightDynamic,
-    padding: "calc(".concat(src.selectGroupTitleFontSize, " - 4px) ").concat(src.selectGroupTitlePaddingX, " ").concat(src.selectGroupTitlePaddingBottom, " ").concat(src.selectGroupTitlePaddingX),
+    padding: "calc(".concat(src.selectFontSize, " - 4px) ").concat(src.selectGroupTitlePaddingX, " ").concat(src.selectGroupTitlePaddingBottom, " ").concat(src.selectGroupTitlePaddingX),
     color: src.selectGroupTitleFontColor,
     fontWeight: src.selectGroupTitleFontWeight
   },
@@ -26541,12 +26559,13 @@ var switchStyle = objectSpread2_default()(objectSpread2_default()({
       backgroundColor: src.switchDisabledCircleCheckedFill
     },
     '$wrapperDisabled &': {
+      boxShadow: 'none',
       backgroundColor: src.switchCheckedDisabledCircleFill
     },
     borderRadius: '50%',
     position: 'absolute',
     backgroundColor: src.switchCircleFill,
-    // boxShadow: token.switchCircleShadow,
+    boxShadow: src.switchCircleShadow,
     transition: "left ".concat(switch_transition, ", right ").concat(switch_transition)
   },
   content: {
@@ -40998,13 +41017,32 @@ var useTree = function useTree(props) {
       }
     });
   };
+  var getChildrenFromTiledData = function getChildrenFromTiledData(id) {
+    if (!props.tiledData) return undefined;
+    var findById = function findById(data, targetId) {
+      for (var i = 0; i < data.length; i++) {
+        var current = data[i];
+        var currentId = getKey(current, '', i);
+        if (currentId === targetId) return current;
+        if (current[childrenKey]) {
+          var found = findById(current[childrenKey], targetId);
+          if (found) return found;
+        }
+      }
+      return undefined;
+    };
+    var item = findById(props.tiledData, id);
+    return item === null || item === void 0 ? void 0 : item[childrenKey];
+  };
   var insertFlat = function insertFlat(id) {
     var item = getDataById(id);
     if (isUnMatchedData(item)) return;
     if (!item) return;
     var status = context.dataFlatStatusMap.get(id);
     if (!status) return;
-    var childrenData = item[childrenKey];
+
+    // 优先从 tiledData 中获取子节点数据,如果不存在则使用原始数据
+    var childrenData = props.tiledData ? getChildrenFromTiledData(id) || [] : item[childrenKey];
     var insertStartNode = dataFlat.find(function (item) {
       return item.id === id;
     });
@@ -41122,6 +41160,7 @@ var useTree = function useTree(props) {
     if (!props.tiledData) return;
     var tiledFlatData = initFlatData(props.tiledData, [], 1);
     setDataFlat(tiledFlatData);
+    // context.dataFlatStatusMap = new Map();
   }, [props.tiledData]);
   var datum = use_latest_obj({
     get: get,
@@ -52140,6 +52179,7 @@ function use_previous_usePrevious(value) {
 
 
 
+
 var form_schema_builder_excluded = ["required"],
   form_schema_builder_excluded2 = ["required"];
 var SchemaBuilder = /*#__PURE__*/function () {
@@ -52181,7 +52221,6 @@ var SchemaBuilder = /*#__PURE__*/function () {
   }, {
     key: "buildSchemaFromComponent",
     value: function buildSchemaFromComponent(params) {
-      var _componentElement$pro;
       var componentElement = params.componentElement,
         rules = params.rules,
         label = params.label,
@@ -52280,65 +52319,69 @@ var SchemaBuilder = /*#__PURE__*/function () {
               if (componentElement.props.data.length > 0) {
                 fieldSchemaInfo.description += "enumData: ".concat(JSON.stringify(componentElement.props.data), ";");
               }
+              fieldSchemaInfo.props = objectSpread2_default()({}, componentElement.props);
               break;
             }
           case 'ShineoutDatePicker':
-            if (componentElement.props.range) {
-              if (finalFieldId !== null && finalFieldId !== void 0 && finalFieldId.includes(separator || '')) {
+            {
+              var _componentElement$pro;
+              if (componentElement.props.range) {
+                if (finalFieldId !== null && finalFieldId !== void 0 && finalFieldId.includes(separator || '')) {
+                  fieldSchemaInfo.type = 'string';
+                  fieldSchemaInfo.format = 'date';
+                } else {
+                  fieldSchemaInfo.type = 'array';
+                  fieldSchemaInfo.items = {
+                    type: 'string',
+                    format: 'date'
+                  };
+                }
+              } else {
                 fieldSchemaInfo.type = 'string';
                 fieldSchemaInfo.format = 'date';
-              } else {
-                fieldSchemaInfo.type = 'array';
-                fieldSchemaInfo.items = {
-                  type: 'string',
-                  format: 'date'
-                };
               }
-            } else {
-              fieldSchemaInfo.type = 'string';
-              fieldSchemaInfo.format = 'date';
-            }
-            var defaultTime = ((_componentElement$pro = componentElement.props.defaultTime) === null || _componentElement$pro === void 0 ? void 0 : _componentElement$pro.toString()) || '';
-            if (defaultTime) {
-              fieldSchemaInfo.description += "\u9ED8\u8BA4\u65F6\u95F4\uFF1A".concat(defaultTime, " ");
-            }
-            var dateformat = componentElement.props.format || '';
-            if (!dateformat) {
-              switch (componentElement.props.type) {
-                case 'date':
-                  dateformat = 'YYYY-MM-DD';
-                  break;
-                case 'time':
-                  dateformat = 'HH:mm:ss';
-                  break;
-                case 'datetime':
-                  dateformat = 'YYYY-MM-DD HH:mm:ss';
-                  break;
-                case 'week':
-                  dateformat = 'GGGG WW';
-                  break;
-                case 'month':
-                  dateformat = 'YYYY-MM';
-                  break;
-                case 'quarter':
-                  dateformat = 'YYYY-\[Q]Q';
-                  break;
-                case 'year':
-                  dateformat = 'YYYY';
-                  break;
-                default:
-                  dateformat = 'YYYY-MM-DD';
-                  break;
+              var defaultTime = ((_componentElement$pro = componentElement.props.defaultTime) === null || _componentElement$pro === void 0 ? void 0 : _componentElement$pro.toString()) || '';
+              if (defaultTime) {
+                fieldSchemaInfo.description += "\u9ED8\u8BA4\u65F6\u95F4\uFF1A".concat(defaultTime, " ");
               }
+              var dateformat = componentElement.props.format || '';
+              if (!dateformat) {
+                switch (componentElement.props.type) {
+                  case 'date':
+                    dateformat = 'YYYY-MM-DD';
+                    break;
+                  case 'time':
+                    dateformat = 'HH:mm:ss';
+                    break;
+                  case 'datetime':
+                    dateformat = 'YYYY-MM-DD HH:mm:ss';
+                    break;
+                  case 'week':
+                    dateformat = 'GGGG WW';
+                    break;
+                  case 'month':
+                    dateformat = 'YYYY-MM';
+                    break;
+                  case 'quarter':
+                    dateformat = 'YYYY-[Q]Q';
+                    break;
+                  case 'year':
+                    dateformat = 'YYYY';
+                    break;
+                  default:
+                    dateformat = 'YYYY-MM-DD';
+                    break;
+                }
+              }
+              fieldSchemaInfo.description += "\u683C\u5F0F\uFF1A".concat(dateformat, " ");
+              if (componentElement.props.max) {
+                fieldSchemaInfo.description += "\u6700\u5927\u65F6\u95F4\uFF1A".concat(componentElement.props.max, " ");
+              }
+              if (componentElement.props.min) {
+                fieldSchemaInfo.description += "\u6700\u5C0F\u65F6\u95F4\uFF1A".concat(componentElement.props.min, " ");
+              }
+              break;
             }
-            fieldSchemaInfo.description += "\u683C\u5F0F\uFF1A".concat(dateformat, " ");
-            if (componentElement.props.max) {
-              fieldSchemaInfo.description += "\u6700\u5927\u65F6\u95F4\uFF1A".concat(componentElement.props.max, " ");
-            }
-            if (componentElement.props.min) {
-              fieldSchemaInfo.description += "\u6700\u5C0F\u65F6\u95F4\uFF1A".concat(componentElement.props.min, " ");
-            }
-            break;
           case 'ShineoutCheckbox':
           case 'ShineoutCheckboxGroup':
             {
@@ -52504,7 +52547,7 @@ var SchemaBuilder = /*#__PURE__*/function () {
       }
 
       // 过滤掉 required 属性，items 对象不应该包含 required
-      var required = meta.required,
+      var _required = meta.required,
         itemsMeta = objectWithoutProperties_default()(meta, form_schema_builder_excluded);
       this.mergeSchema(currentSchema.items, remainingSegments, itemsMeta);
     }
@@ -57766,7 +57809,7 @@ var TreeVirtual = function TreeVirtual(props) {
 
 
 
-var tree_excluded = ["jssStyle", "line", "childrenKey", "data", "value", "mode", "keygen", "virtual", "expanded", "expandIcons", "iconClass", "leafClass", "nodeClass", "contentClass", "rootStyle", "renderItem", "defaultValue", "dataUpdate", "childrenClass", "defaultExpandAll", "defaultExpanded", "parentClickExpand", "doubleClickExpand", "dragImageSelector", "dragImageStyle", "dragSibling", "unmatch", "ignoreSetFlat", "dragHoverExpand", "active", "setActive", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart", "datum", "rowsInView", "actionOnClick", "tiledData", "height"];
+var tree_excluded = ["jssStyle", "line", "childrenKey", "data", "value", "mode", "keygen", "virtual", "expanded", "expandIcons", "iconClass", "leafClass", "nodeClass", "contentClass", "rootStyle", "renderItem", "defaultValue", "dataUpdate", "childrenClass", "defaultExpandAll", "defaultExpanded", "parentClickExpand", "doubleClickExpand", "dragImageSelector", "dragImageStyle", "dragSibling", "unmatch", "ignoreSetFlat", "dragHoverExpand", "active", "setActive", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart", "datum", "rowsInView", "actionOnClick", "tiledData", "height", "leafIcon"];
 
 
 
@@ -57833,6 +57876,7 @@ var Tree = function Tree(props) {
     actionOnClick = props.actionOnClick,
     tiledData = props.tiledData,
     height = props.height,
+    leafIcon = props.leafIcon,
     rest = objectWithoutProperties_default()(props, tree_excluded);
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(propActive),
     _useState2 = slicedToArray_default()(_useState, 2),
@@ -57867,7 +57911,8 @@ var Tree = function Tree(props) {
       keygen: keygen,
       virtual: virtual,
       onExpand: onExpandProp,
-      datum: propsDatum
+      datum: propsDatum,
+      tiledData: props.filteredData
     }),
     datum = _useTree.datum,
     expanded = _useTree.expanded,
@@ -57995,7 +58040,7 @@ var Tree = function Tree(props) {
       rootStyle: rootStyle,
       isControlled: 'expanded' in props,
       jssStyle: jssStyle,
-      data: data,
+      data: props.filteredData || data,
       mode: mode,
       line: line,
       keygen: keygen,
@@ -58046,6 +58091,12 @@ var Tree = function Tree(props) {
     if (getDatum) getDatum(datum);
     context.mounted = true;
   }, []);
+  var providerValue = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    return objectSpread2_default()(objectSpread2_default()({}, datum), {}, {
+      size: props.size,
+      leafIcon: leafIcon
+    });
+  }, [datum, props.size, leafIcon]);
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(FormFieldContext),
     fieldId = _useContext.fieldId;
   return /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({
@@ -58054,10 +58105,7 @@ var Tree = function Tree(props) {
     id: fieldId
   }, rest), {}, {
     children: /*#__PURE__*/(0,jsx_runtime.jsx)(tree_context_Provider, {
-      value: objectSpread2_default()(objectSpread2_default()({}, datum), {}, {
-        size: props.size,
-        leafIcon: props.leafIcon
-      }),
+      value: providerValue,
       children: renderList()
     })
   }));
@@ -64429,6 +64477,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
 
 
@@ -64489,9 +64541,10 @@ var getHideExpandCol = function getHideExpandCol() {
   }
   return null;
 };
-// 缓冲区列数：左右各2列
-var BUFFER_COUNT = 2;
+// 默认 overscan 值：可视区域两侧各额外渲染2列
+var DEFAULT_OVERSCAN = 2;
 var useColumns = function useColumns(props) {
+  var _props$data;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
     _useState2 = slicedToArray_default()(_useState, 2),
     startIndex = _useState2[0],
@@ -64502,6 +64555,14 @@ var useColumns = function useColumns(props) {
     setRenderedCount = _useState4[1];
   var _props$columns = props.columns,
     propsColumns = _props$columns === void 0 ? [] : _props$columns;
+
+  // 获取 overscan 配置，支持布尔值和对象两种格式
+  var overscan = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    var _props$virtualColumn$;
+    if (!props.virtualColumn) return DEFAULT_OVERSCAN;
+    if (typeof props.virtualColumn === 'boolean') return DEFAULT_OVERSCAN;
+    return (_props$virtualColumn$ = props.virtualColumn.overscan) !== null && _props$virtualColumn$ !== void 0 ? _props$virtualColumn$ : DEFAULT_OVERSCAN;
+  }, [props.virtualColumn]);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       cachedColumns: null,
       oldColumns: null,
@@ -64588,13 +64649,13 @@ var useColumns = function useColumns(props) {
           if (props.scrollRef.current && sum - scrollLeft >= ((_props$scrollRef$curr = props.scrollRef.current) === null || _props$scrollRef$curr === void 0 ? void 0 : _props$scrollRef$curr.clientWidth)) {
             // 在原有基础上，右侧增加缓冲列
             var visibleCount = j - i;
-            setRenderedCount(Math.min(visibleCount + BUFFER_COUNT * 2, len));
+            setRenderedCount(Math.min(visibleCount + overscan * 2, len));
             break;
           }
         }
 
         // 左侧也增加缓冲列，但不能小于0
-        var bufferedStartIndex = Math.max(0, i - BUFFER_COUNT);
+        var bufferedStartIndex = Math.max(0, i - overscan);
         currentIndex = bufferedStartIndex;
         break;
       }
@@ -64607,6 +64668,15 @@ var useColumns = function useColumns(props) {
       scrollLeft: 0
     });
   }, []);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    var _props$scrollRef$curr2;
+    if (!props.virtualColumn) return;
+    if (((_props$scrollRef$curr2 = props.scrollRef.current) === null || _props$scrollRef$curr2 === void 0 ? void 0 : _props$scrollRef$curr2.scrollLeft) === 0) {
+      handleScroll({
+        scrollLeft: 0
+      });
+    }
+  }, [(_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.length]);
   var processedColumns = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     if (!props.virtualColumn) return columns;
     return columns.map(function (col, index) {
@@ -64641,6 +64711,7 @@ var useColumns = function useColumns(props) {
     columnInfo: {
       handleScroll: handleScroll
     },
+    currentColIndex: startIndex,
     expandHideCol: context.expandHideCol
   };
 };
@@ -64801,6 +64872,7 @@ var useTableLayout = function useTableLayout(props) {
     });
   };
   var changeColGroup = function changeColGroup(cols, adjust) {
+    if (props.scrolling) return;
     // 修改`Table`被display:none时，表格头样式错乱的问题
     if (cols && cols.every(function (v) {
       return v === 0;
@@ -66754,7 +66826,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 +66833,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 +66849,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 +67157,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 +67168,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 +67250,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 +67265,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 +67277,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 +67329,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 +67346,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 +67506,10 @@ 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 isVirtualColumnEnabled = !!props.virtualColumn;
   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);
@@ -67522,13 +67590,15 @@ function Table(props) {
   });
   var _useTableColumns = use_table_columns({
       columns: props.columns,
+      data: props.data,
       virtualColumn: props.virtualColumn,
       scrollRef: scrollRef,
       showCheckbox: typeof props.onRowSelect === 'function'
     }),
     columns = _useTableColumns.columns,
     expandHideCol = _useTableColumns.expandHideCol,
-    columnInfo = _useTableColumns.columnInfo;
+    columnInfo = _useTableColumns.columnInfo,
+    currentColIndex = _useTableColumns.currentColIndex;
   var _useTableLayout = use_table_layout({
       theadRef: theadRef,
       tbodyRef: tbodyRef,
@@ -67539,7 +67609,8 @@ function Table(props) {
       columnResizable: props.columnResizable,
       onColumnResize: props.onColumnResize,
       width: props.width,
-      isRtl: isRtl
+      isRtl: isRtl,
+      scrolling: isVirtualColumnEnabled && scrolling
     }),
     layoutFunc = _useTableLayout.func,
     colgroup = _useTableLayout.colgroup,
@@ -67698,7 +67769,7 @@ function Table(props) {
     var target = e.currentTarget;
     if (!target) return;
     layoutFunc.checkFloat();
-    if (props.virtualColumn) columnInfo.handleScroll({
+    if (isVirtualColumnEnabled) columnInfo.handleScroll({
       scrollLeft: target.scrollLeft
     });
     if (headMirrorScrollRef.current) {
@@ -67720,7 +67791,7 @@ function Table(props) {
   // 虚拟表格的滚动事件
   var handleVirtualScroll = usePersistFn(function (info) {
     virtualInfo.handleScroll(info);
-    if (props.virtualColumn) columnInfo.handleScroll(info);
+    if (isVirtualColumnEnabled) columnInfo.handleScroll(info);
     layoutFunc.checkFloat();
     if (headMirrorScrollRef.current) {
       headMirrorScrollRef.current.scrollLeft = info.scrollLeft;
@@ -67760,10 +67831,13 @@ function Table(props) {
     return null;
   };
   var $empty = renderEmpty();
-  var tableStyle = {
-    width: width,
-    borderSpacing: 0
-  };
+  var tableStyle = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    return {
+      width: width,
+      borderSpacing: 0,
+      tableLayout: isVirtualColumnEnabled ? 'initial' : 'fixed'
+    };
+  }, [width, isVirtualColumnEnabled]);
   var renderTable = function renderTable() {
     var _props$summary, _sticky$top, _props$data2;
     var Group = /*#__PURE__*/(0,jsx_runtime.jsx)(table_colgroup, {
@@ -67802,7 +67876,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 +68048,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 +68160,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 +68188,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,
@@ -68112,7 +68199,6 @@ function Table(props) {
     })), renderPagination()]
   });
 }
-;
 ;// CONCATENATED MODULE: ./src/table/table.tsx
 
 
@@ -74634,7 +74720,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.3-beta.1'
+  version: '3.9.3-beta.11'
 });
 }();
 /******/ 	return __webpack_exports__;