shineout 3.9.0-beta.20 → 3.9.0-beta.22

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

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.20');
+/* harmony default export */ var version = ('3.9.0-beta.22');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -24130,7 +24130,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
   hideTag: {},
   list: {},
   tree: {
-    padding: 4,
+    padding: '0 4px',
     overflow: 'auto'
   },
   treeOption: {
@@ -30979,6 +30979,9 @@ var addResizeObserver = function addResizeObserver(el, handler) {
       lastWidth = el.clientWidth;
       lastHeight = el.clientHeight;
       h = function h(entry) {
+        if ((el === null || el === void 0 ? void 0 : el.offsetParent) === null) {
+          return;
+        }
         var _entry$0$contentRect = entry[0].contentRect,
           width = _entry$0$contentRect.width,
           height = _entry$0$contentRect.height;
@@ -57824,6 +57827,8 @@ var Tree = function Tree(props) {
 
 
 
+
+
 var TreeList = function TreeList(props) {
   var _jssStyle$select;
   var jssStyle = props.jssStyle,
@@ -57867,25 +57872,46 @@ var TreeList = function TreeList(props) {
   var renderItem = function renderItem(item) {
     return renderItemProp(item);
   };
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)([]),
+    _useState2 = slicedToArray_default()(_useState, 2),
+    virtualExpanded = _useState2[0],
+    setVirtualExpanded = _useState2[1];
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (props.virtual && expanded) {
+      setVirtualExpanded(expanded);
+    }
+  }, [expanded]);
+  var handleExpand = function handleExpand(expandedKeys) {
+    if (props.virtual) {
+      setVirtualExpanded(expandedKeys);
+    }
+    onExpand === null || onExpand === void 0 || onExpand(expandedKeys);
+  };
+  var $tree = /*#__PURE__*/(0,jsx_runtime.jsx)(src_tree_tree, {
+    line: false,
+    jssStyle: jssStyle,
+    onClick: handleClick,
+    data: data,
+    expanded: props.virtual ? (virtualExpanded === null || virtualExpanded === void 0 ? void 0 : virtualExpanded.length) > 0 ? virtualExpanded : undefined : expanded,
+    keygen: keygen,
+    defaultExpanded: defaultExpanded,
+    defaultExpandAll: defaultExpandAll,
+    childrenKey: childrenKey,
+    onExpand: handleExpand,
+    nodeClass: classnames_default()(styles.treeOption),
+    contentClass: getContentClass,
+    renderItem: renderItem,
+    expandIcons: props.expandIcons,
+    virtual: props.virtual,
+    height: props.height
+  });
+  if (props.virtual) {
+    return $tree;
+  }
   return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
     className: rootClass,
     style: style,
-    children: /*#__PURE__*/(0,jsx_runtime.jsx)(src_tree_tree, {
-      line: false,
-      jssStyle: jssStyle,
-      onClick: handleClick,
-      data: data,
-      expanded: expanded,
-      keygen: keygen,
-      defaultExpanded: defaultExpanded,
-      defaultExpandAll: defaultExpandAll,
-      childrenKey: childrenKey,
-      onExpand: onExpand,
-      nodeClass: classnames_default()(styles.treeOption),
-      contentClass: getContentClass,
-      renderItem: renderItem,
-      expandIcons: props.expandIcons
-    })
+    children: $tree
   });
 };
 /* harmony default export */ var list_tree = (TreeList);
@@ -58849,7 +58875,8 @@ function Select(props0) {
       childrenKey: childrenKey,
       closePop: closePop,
       renderItem: renderItem,
-      expandIcons: tiledExpandIcons
+      expandIcons: tiledExpandIcons,
+      virtual: props.virtual
     });
   };
   var renderLoading = function renderLoading() {
@@ -64435,7 +64462,7 @@ var useTableLayout = function useTableLayout(props) {
   });
   var checkFloat = use_persist_fn(function () {
     var scrollEl = scrollRef === null || scrollRef === void 0 ? void 0 : scrollRef.current;
-    if (!scrollEl) return;
+    if (!scrollEl || !(scrollEl !== null && scrollEl !== void 0 && scrollEl.offsetParent)) return;
     var max = scrollEl.scrollWidth - scrollEl.clientWidth;
     var min = 0;
     var left = scrollEl.scrollLeft;
@@ -67012,6 +67039,7 @@ function Table(props) {
     setScrollAble(isScrollAble);
   }, [virtual]);
 
+  // TODO: 没用的tbodyHeight，有空移除了
   // 虚拟列表高度另外计算
   var _useResize = useResize({
       targetRef: virtual ? emptyRef : tbodyRef
@@ -74144,7 +74172,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.0-beta.20'
+  version: '3.9.0-beta.22'
 });
 }();
 /******/ 	return __webpack_exports__;