shineout 3.9.3-beta.10 → 3.9.3-beta.11

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.10'
+  version: '3.9.3-beta.11'
 };

package/dist/shineout.js

@@ -12401,7 +12401,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.10');
+/* harmony default export */ var version = ('3.9.3-beta.11');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -57809,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"];
 
 
 
@@ -57876,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),
@@ -58090,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()({
@@ -58098,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()
     })
   }));
@@ -64537,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],
@@ -64550,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,
@@ -64636,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;
       }
@@ -64655,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) {
@@ -64850,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;
@@ -67484,6 +67507,9 @@ function Table(props) {
     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);
@@ -67564,6 +67590,7 @@ function Table(props) {
   });
   var _useTableColumns = use_table_columns({
       columns: props.columns,
+      data: props.data,
       virtualColumn: props.virtualColumn,
       scrollRef: scrollRef,
       showCheckbox: typeof props.onRowSelect === 'function'
@@ -67582,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,
@@ -67741,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) {
@@ -67763,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;
@@ -67803,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, {
@@ -68168,7 +68199,6 @@ function Table(props) {
     })), renderPagination()]
   });
 }
-;
 ;// CONCATENATED MODULE: ./src/table/table.tsx
 
 
@@ -74690,7 +74720,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.3-beta.10'
+  version: '3.9.3-beta.11'
 });
 }();
 /******/ 	return __webpack_exports__;