shineout 3.9.3-beta.9 → 3.9.3

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

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.9');
+/* harmony default export */ var version = ('3.9.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -41017,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;
     });
@@ -41141,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,
@@ -44172,7 +44192,12 @@ var useFieldSetConsumer = function useFieldSetConsumer(props) {
     path = _React$useContext.path,
     validateFieldSet = _React$useContext.validateFieldSet;
   var bind = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useMemo(function () {
-    return path ? (props.bind || []).concat(path) : props.bind;
+    var _bind = path ? (props.bind || []).concat(path) : props.bind;
+    // 只有当路径中包含超过1个索引时才需要去掉最后一个索引
+    return _bind === null || _bind === void 0 ? void 0 : _bind.map(function (b) {
+      var indexCount = (b.match(/\[\d+\]/g) || []).length;
+      return indexCount > 1 ? b.replace(/\[\d+\]$/, '') : b;
+    });
   }, [path, props.bind]);
   var name = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useMemo(function () {
     return extendName(path, props.name);
@@ -47428,15 +47453,24 @@ var useDate = function useDate(props) {
   var getTimeStr = function getTimeStr() {
     var format = props.format,
       type = props.type;
-    if (!props.value) return '';
     if (type !== 'datetime' || !format) return '';
-    if (/^[X|x]$/.test(format)) {
+    if (/^[X|x]$/.test(util.compatibleFmt(format))) {
       format = 'HH:mm:ss';
     } else {
       var match = format.match(/[H|h].*/);
       // eslint-disable-next-line
       if (match) format = match[0];
     }
+
+    // 当不存在 props.value 时,根据 format 格式返回默认时间字符串
+    if (!props.value) {
+      return format.replace(/[Hh]+/g, '00') // HH/hh -> 00
+      .replace(/m+/g, '00') // mm -> 00
+      .replace(/s+/g, '00') // ss -> 00
+      .replace(/S+/g, '0') // SSS -> 0
+      .replace(/A/g, 'AM') // A -> AM
+      .replace(/a/g, 'am'); // a -> am
+    }
     return util.format(props.value, format, options);
   };
   var isInRange = function isInRange(date) {
@@ -57789,7 +57823,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"];
 
 
 
@@ -57856,6 +57890,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),
@@ -57890,7 +57925,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,
@@ -58001,7 +58037,7 @@ var Tree = function Tree(props) {
       var realHeight = getHeight();
       if (!realHeight) return null;
       return /*#__PURE__*/(0,jsx_runtime.jsx)(tree_virtual, objectSpread2_default()(objectSpread2_default()({}, props), {}, {
-        data: props.filteredData || data,
+        data: data,
         line: line,
         rowsInView: rowsInView,
         expanded: expanded,
@@ -58079,7 +58115,7 @@ var Tree = function Tree(props) {
     children: /*#__PURE__*/(0,jsx_runtime.jsx)(tree_context_Provider, {
       value: objectSpread2_default()(objectSpread2_default()({}, datum), {}, {
         size: props.size,
-        leafIcon: props.leafIcon
+        leafIcon: leafIcon
       }),
       children: renderList()
     })
@@ -64516,9 +64552,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],
@@ -64529,6 +64566,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,
@@ -64608,20 +64653,25 @@ var useColumns = function useColumns(props) {
       sum += curCol.width || 100;
       if (scrollLeft < sum) {
         // 计算可视区域内需要渲染的列数
-        for (var j = i + 1; j < len; j++) {
+        for (var j = i + 1; j <= len; j++) {
           var _props$scrollRef$curr;
           var nextCol = middleColumns[j];
           sum += nextCol.width || 100;
           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;
+          } else if (j === len) {
+            // 到达最后一列
+            var _visibleCount = j - i + 1;
+            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;
       }
@@ -64634,6 +64684,15 @@ var useColumns = function useColumns(props) {
       scrollLeft: 0
     });
   }, []);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (!props.virtualColumn) return;
+    if (props.scrollRef.current) {
+      var _props$scrollRef$curr2;
+      handleScroll({
+        scrollLeft: (_props$scrollRef$curr2 = props.scrollRef.current) === null || _props$scrollRef$curr2 === void 0 ? void 0 : _props$scrollRef$curr2.scrollLeft
+      });
+    }
+  }, [(_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.length, columns]);
   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) {
@@ -64642,14 +64701,21 @@ var useColumns = function useColumns(props) {
       }
       if (index < startIndex || index > startIndex + renderedCount) {
         var colSpan;
+        var colSpanWidth;
         if (index > startIndex + renderedCount && index === startIndex + renderedCount + 1) {
           colSpan = function colSpan() {
-            return middleColumns.length - (startIndex + renderedCount) + 1;
+            return middleColumns.length - index;
           };
+          colSpanWidth = middleColumns.slice(index).reduce(function (sum, c) {
+            return sum + (c.width || 0);
+          }, 0);
         } else if (index < startIndex && index === leftFixedColumns.length && startIndex > 0) {
           colSpan = function colSpan() {
             return startIndex;
           };
+          colSpanWidth = middleColumns.slice(0, startIndex).reduce(function (sum, c) {
+            return sum + (c.width || 0);
+          }, 0);
         }
         var hiddenTitle = context.groupLevel > 0 ? col.title : null;
         return objectSpread2_default()(objectSpread2_default()({}, col), {}, {
@@ -64657,7 +64723,10 @@ var useColumns = function useColumns(props) {
           render: function render() {
             return null;
           },
-          title: hiddenTitle
+          title: hiddenTitle,
+          style: {
+            width: colSpanWidth
+          }
         });
       }
       return col;
@@ -64829,6 +64898,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;
@@ -67463,6 +67533,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);
@@ -67543,6 +67616,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'
@@ -67561,7 +67635,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,
@@ -67720,7 +67795,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) {
@@ -67742,7 +67817,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;
@@ -67782,10 +67857,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: 'fixed'
+    };
+  }, [width]);
   var renderTable = function renderTable() {
     var _props$summary, _sticky$top, _props$data2;
     var Group = /*#__PURE__*/(0,jsx_runtime.jsx)(table_colgroup, {
@@ -68147,7 +68225,6 @@ function Table(props) {
     })), renderPagination()]
   });
 }
-;
 ;// CONCATENATED MODULE: ./src/table/table.tsx
 
 
@@ -74669,7 +74746,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.3-beta.9'
+  version: '3.9.3'
 });
 }();
 /******/ 	return __webpack_exports__;