shineout 3.6.0-beta.14 → 3.6.0-beta.16

package/cjs/index.js

@@ -514,5 +514,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.6.0-beta.14'
+  version: '3.6.0-beta.16'
 };

package/dist/shineout.js

@@ -12130,7 +12130,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.6.0-beta.14');
+/* harmony default export */ var version = ('3.6.0-beta.16');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -29718,13 +29718,15 @@ function getClosestScrollContainer(element) {
   // 如果没有找到可滚动的祖先，返回 body 或 documentElement
   return document.scrollingElement || document.documentElement;
 }
-function getClosestFixedContainer(element) {
+function getClosestPositionedContainer(element) {
+  var positions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['fixed', 'absolute'];
   if (!element) {
     return null;
   }
   var isFixable = function isFixable(el) {
     var style = window.getComputedStyle(el);
-    return style.position === 'fixed';
+    var position = style.position;
+    return positions.includes(position);
   };
 
   // 遍历父元素
@@ -33724,7 +33726,6 @@ var getRect = function getRect(el) {
     if (el) {
       devUseWarning.error("the ".concat(el, " is not a element"));
     }
-    ;
     return {
       top: 0,
       bottom: winHeight
@@ -33780,13 +33781,14 @@ function getObserver(obj, id) {
     render = obj.render,
     offscreen = obj.offscreen,
     noRemove = obj.noRemove;
-  var fixedContainer = getClosestFixedContainer(element);
+  var fixedContainer = getClosestPositionedContainer(element, ['fixed', 'absolute']);
   var observer = new IntersectionObserver(function (entries) {
     entries.forEach(function (en) {
       if (en.isIntersecting || en.intersectionRatio > 0) {
         render();
         if (!noRemove) removeStack(id);
       } else {
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         offscreen && offscreen();
       }
     });
@@ -37919,6 +37921,34 @@ var useTree = function useTree(props) {
     }
     return ids;
   };
+  var initFlatData = function initFlatData(data, path) {
+    var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+    var pid = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+    var result = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+    for (var i = 0; i < data.length; i++) {
+      var item = data[i];
+      var id = getKey(item, path[path.length - 1], i);
+      var node = {
+        id: id,
+        level: level,
+        data: item,
+        pid: pid
+      };
+      if (defaultExpandAll) {
+        result.push(node);
+      } else {
+        if (level === 1) {
+          result.push(node);
+        } else if (expanded && pid !== null && expanded.indexOf(pid) >= 0) {
+          result.push(node);
+        }
+      }
+      if (Array.isArray(item[childrenKey])) {
+        initFlatData(item[childrenKey], [].concat(toConsumableArray_default()(path), [id]), level + 1, id, result);
+      }
+    }
+    return result;
+  };
   var initValue = function initValue(ids_outer, forceCheck) {
     var ids = ids_outer;
     if (!context.data || !context.value) {
@@ -38166,7 +38196,7 @@ var useTree = function useTree(props) {
         expanded: true
       }));
     });
-    var _getExpandVirtualData = getExpandVirtualData(context.data, expanded, getKey, childrenKey),
+    var _getExpandVirtualData = getExpandVirtualData(props.tiledData || context.data, expanded, getKey, childrenKey),
       treeDataInfo = _getExpandVirtualData.treeDataInfo;
     if (!treeDataInfo) {
       return;
@@ -38196,6 +38226,12 @@ var useTree = function useTree(props) {
     if (props.datum) return;
     setValue(value);
   }, [value]);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (!virtual) return;
+    if (!props.tiledData) return;
+    var tiledFlatData = initFlatData(props.tiledData, [], 1);
+    setDataFlat(tiledFlatData);
+  }, [props.tiledData]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     setInited(true);
   }, []);
@@ -53930,7 +53966,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", "dragHoverExpand", "active", "setActive", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart", "datum"];
+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"];
 
 
 
@@ -53972,6 +54008,8 @@ var Tree = function Tree(props) {
     dragImageStyle = props.dragImageStyle,
     dragSibling = props.dragSibling,
     unmatch = props.unmatch,
+    _props$ignoreSetFlat = props.ignoreSetFlat,
+    ignoreSetFlat = _props$ignoreSetFlat === void 0 ? false : _props$ignoreSetFlat,
     dragHoverExpand = props.dragHoverExpand,
     propActive = props.active,
     propSetActive = props.setActive,
@@ -54081,10 +54119,10 @@ var Tree = function Tree(props) {
       newExpanded = expandedArr.filter(function (e) {
         return e !== id;
       });
-      if (virtual) datum.removeFlat(id);
+      if (virtual && !ignoreSetFlat) datum.removeFlat(id);
     } else {
       newExpanded = [].concat(toConsumableArray_default()(expandedArr), [id]);
-      if (virtual) datum.insertFlat(id);
+      if (virtual && !ignoreSetFlat) datum.insertFlat(id);
     }
     if (onExpand) onExpand(newExpanded);
   };
@@ -54156,6 +54194,7 @@ var Tree = function Tree(props) {
         onToggle: handleToggle
       }));
     }
+    console.log('data', data);
     return /*#__PURE__*/(0,jsx_runtime.jsx)(tree_root, {
       rootStyle: rootStyle,
       isControlled: 'expanded' in props,
@@ -64854,8 +64893,9 @@ var TreeSelect = function TreeSelect(props0) {
   var _useTree = use_tree({
       mode: mode,
       value: value,
-      data: tiledData,
+      data: data,
       unmatch: unmatch,
+      tiledData: tiledData,
       virtual: virtual,
       disabled: disabled,
       active: multiple ? undefined : value[0],
@@ -65073,9 +65113,14 @@ var TreeSelect = function TreeSelect(props0) {
     if (from !== 'blur') {
       focusAndOpen();
     }
-    setVirtualExpanded([]);
     onTiledFilter === null || onTiledFilter === void 0 || onTiledFilter(trim ? text.trim() : text);
   };
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (virtual && expanded) {
+      console.log(expanded);
+      setVirtualExpanded(expanded);
+    }
+  }, [expanded]);
   var handleChange = function handleChange(item, id) {
     if (disabled === true || datum !== null && datum !== void 0 && datum.isDisabled(id)) return;
     var currentData = datum.getDataById(id);
@@ -65249,16 +65294,18 @@ var TreeSelect = function TreeSelect(props0) {
         virtual: virtual,
         childrenKey: props.childrenKey,
         line: line,
+        ignoreSetFlat: true,
         mode: mode,
         height: height,
         data: tiledData,
+        tiledData: tiledData,
         keygen: keygen,
         unmatch: unmatch,
         value: value,
         highlight: !multiple,
         loader: loader,
         onExpand: handleExpanded,
-        expanded: virtualExpanded.length > 0 ? virtualExpanded : controlExpanded || unControlExpanded,
+        expanded: virtual ? virtualExpanded : controlExpanded || unControlExpanded,
         defaultExpandAll: defaultExpandAll,
         expandIcons: tiledExpandIcons,
         disabled: disabled,
@@ -68928,7 +68975,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.0-beta.14'
+  version: '3.6.0-beta.16'
 });
 }();
 /******/ 	return __webpack_exports__;