shineout 3.6.0-beta.27 → 3.6.0-beta.29

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.27'
+  version: '3.6.0-beta.29'
 };

package/dist/shineout.js

@@ -12139,7 +12139,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.27');
+/* harmony default export */ var version = ('3.6.0-beta.29');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -25654,6 +25654,7 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
     },
     '&::after': {
       position: 'absolute',
+      zIndex: fixedFixedIndex + 3,
       content: '""',
       display: 'block',
       bottom: 0,
@@ -27762,6 +27763,9 @@ var treeStyle = {
   notTree: {
     '&$root > $node$leaf': {
       paddingLeft: 0
+    },
+    '& $content': {
+      marginLeft: 0
     }
   },
   line: {
@@ -27912,14 +27916,16 @@ var treeStyle = {
     flex: 1,
     display: 'flex',
     alignItems: 'center',
+    marginLeft: 4,
     // 'label&': {
     //   cursor: 'pointer',
     //   userSelect: 'none',
     // },
 
-    '$iconWrapper + &': {
-      marginLeft: 4
-    },
+    // '$iconWrapper + &': {
+    //   marginLeft: 4,
+    // },
+
     '$contentDisabled &': {
       '& $text': {
         color: src.treeContentDisabledFontColor
@@ -37896,7 +37902,6 @@ function use_tree_toArray(value) {
   if (!Array.isArray(value)) return [value];
   return value;
 }
-var global_tree_map = new Map();
 var MODE = {
   /**
    * 返回全选数据，包含父节点和子节点
@@ -38299,15 +38304,6 @@ var useTree = function useTree(props) {
     return 2;
   };
   var setData = function setData(data) {
-    // if(data && global_tree_map.get(data)){
-    //   context.cachedValue = global_tree_map.get(data)?.cachedValue || []
-    //   context.pathMap = global_tree_map.get(data)?.pathMap || new Map()
-    //   context.dataMap = global_tree_map.get(data)?.dataMap || new Map()
-    //   context.valueMap = global_tree_map.get(data)?.valueMap || new Map()
-    //   context.unmatchedValueMap = global_tree_map.get(data)?.unmatchedValueMap || new Map()
-    //   return
-    // }
-
     var prevValue = context.value || [];
     context.cachedValue = [];
     context.pathMap = new Map();
@@ -38328,8 +38324,6 @@ var useTree = function useTree(props) {
     }
     initValue();
     setValue(prevValue);
-
-    // global_tree_map.set(data, context)
   };
   var set = function set(id, checked, direction) {
     if (!isDisabled(id)) {
@@ -38371,6 +38365,28 @@ var useTree = function useTree(props) {
     }
     return current;
   };
+  var updateInnerCheckStatus = function updateInnerCheckStatus() {
+    var _context$value;
+    if (mode !== MODE.MODE_0) return;
+    (_context$value = context.value) === null || _context$value === void 0 || _context$value.forEach(function (id) {
+      var _ref3 = context.pathMap.get(id),
+        children = _ref3.children;
+      if (children.length) {
+        var noCheckedChildren = children.filter(function (cid) {
+          var _context$value2;
+          return !((_context$value2 = context.value) !== null && _context$value2 !== void 0 && _context$value2.includes(cid));
+        });
+        if (noCheckedChildren.length > 0) {
+          setTimeout(function () {
+            setValueMap(id, 2);
+            noCheckedChildren.forEach(function (cid) {
+              setValueMap(cid, 0);
+            });
+          }, 0);
+        }
+      }
+    });
+  };
   var appendChildrenExpanded = function appendChildrenExpanded(child, level, pid, insertData) {
     if (!child) return;
     child.forEach(function (item, i) {
@@ -38481,6 +38497,7 @@ var useTree = function useTree(props) {
     if (props.datum) return;
     if (!dataUpdate) return;
     setData(data);
+    updateInnerCheckStatus();
   }, [data]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (props.datum) return;
@@ -38644,7 +38661,9 @@ var Scroll = function Scroll(props) {
     _props$scrollWidth = props.scrollWidth,
     scrollWidth = _props$scrollWidth === void 0 ? 0 : _props$scrollWidth,
     _props$defaultHeight = props.defaultHeight,
-    defaultHeight = _props$defaultHeight === void 0 ? 0 : _props$defaultHeight;
+    defaultHeight = _props$defaultHeight === void 0 ? 0 : _props$defaultHeight,
+    _props$keepScrollTop = props.keepScrollTop,
+    keepScrollTop = _props$keepScrollTop === void 0 ? false : _props$keepScrollTop;
   var _useResize = useResize({
       targetRef: containerRef,
       timer: 100
@@ -38668,7 +38687,10 @@ var Scroll = function Scroll(props) {
   }, isRtl ? 'right' : 'left', 0), "top", 0);
 
   // 当滚动容器的高度为 0 时，paddingTop 为 0，避免滚动条抖动现象
-  var paddingTop = height === 0 ? 0 : Math.max(0, Math.floor(scrollHeight - height));
+  var paddingTop = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    if (keepScrollTop) return Math.max(0, Math.floor(scrollHeight - height));
+    return height === 0 ? 0 : Math.max(0, Math.floor(scrollHeight - height));
+  }, [scrollHeight, height]);
   var placeStyle = {
     paddingTop: paddingTop,
     width: scrollWidth,
@@ -38780,6 +38802,7 @@ var VirtualList = function VirtualList(props) {
     className = props.className,
     lineHeight = props.lineHeight,
     height = props.height,
+    keepScrollTop = props.keepScrollTop,
     keepScrollHeight = props.keepScrollHeight,
     renderItem = props.renderItem,
     customRenderItem = props.customRenderItem,
@@ -38946,6 +38969,7 @@ var VirtualList = function VirtualList(props) {
       style: nextStyle,
       height: height,
       scrollWidth: 0,
+      keepScrollTop: keepScrollTop,
       scrollerStyle: scrollerStyle,
       scrollHeight: scrollHeight,
       childrenStyle: {
@@ -38976,6 +39000,7 @@ var VirtualList = function VirtualList(props) {
   }, [startIndex]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     // 数据变化的时候清空掉 preIndex, 如果之前有缓存的index, setRowHeight 会有问题
+    if (keepScrollTop) return;
     if (keepScrollHeight) return;
     setTop(0);
     setStartIndex(0);
@@ -53020,6 +53045,7 @@ var list_List = function List(props) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)(virtual_scroll_list, {
       virtualRef: virtualRef,
       data: data,
+      keepScrollTop: true,
       keygen: keygen,
       tag: 'ul',
       groupKey: groupKey,
@@ -54111,7 +54137,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", "actionOnClick"];
+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", "actionOnClick", "tiledData"];
 
 
 
@@ -54174,6 +54200,7 @@ var Tree = function Tree(props) {
     onDragStart = props.onDragStart,
     propsDatum = props.datum,
     actionOnClick = props.actionOnClick,
+    tiledData = props.tiledData,
     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),
@@ -54341,7 +54368,6 @@ var Tree = function Tree(props) {
         actionOnClick: actionOnClick
       }));
     }
-    console.log('data', data);
     return /*#__PURE__*/(0,jsx_runtime.jsx)(tree_root, {
       rootStyle: rootStyle,
       isControlled: 'expanded' in props,
@@ -55502,9 +55528,7 @@ function Select(props0) {
         className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.pickerWrapper, size === 'small' && (styles === null || styles === void 0 ? void 0 : styles.pickerSmall), size === 'large' && (styles === null || styles === void 0 ? void 0 : styles.pickerLarge)),
         onAnimationAfterEnter: onAnimationAfterEnter,
         display: 'block',
-        type: "scale-y"
-        // type='fade'
-        ,
+        type: "scale-y",
         duration: 'fast',
         style: getListStyle(),
         children: [renderHeader(), renderOptions(), renderFooter()]
@@ -65440,6 +65464,10 @@ var TreeSelect = function TreeSelect(props0) {
     tiledData = _useTiled.data,
     onTiledFilter = _useTiled.onFilter,
     tiledExpandIcons = _useTiled.expandIcons;
+  var handleExpanded = function handleExpanded(id) {
+    setVirtualExpanded(id);
+    onExpand === null || onExpand === void 0 || onExpand(id);
+  };
   var _useTree = use_tree({
       mode: mode,
       value: value,
@@ -65451,14 +65479,13 @@ var TreeSelect = function TreeSelect(props0) {
       active: multiple ? undefined : value[0],
       childrenKey: childrenKey,
       keygen: keygen,
-      onExpand: onExpand,
+      onExpand: handleExpanded,
       expanded: controlExpanded,
       defaultExpanded: defaultExpanded,
       defaultExpandAll: defaultExpandAll,
       isControlled: controlExpanded !== undefined
     }),
     datum = _useTree.datum,
-    onExpandTree = _useTree.onExpand,
     unControlExpanded = _useTree.expanded;
   var onCollapse = usePersistFn(function (collapse) {
     onCollapseProp === null || onCollapseProp === void 0 || onCollapseProp(collapse);
@@ -65526,10 +65553,6 @@ var TreeSelect = function TreeSelect(props0) {
       openPop();
     }
   });
-  var handleExpanded = function handleExpanded(id) {
-    setVirtualExpanded(id);
-    onExpandTree(id);
-  };
   var focusAndOpen = function focusAndOpen() {
     if (!focused) {
       var _inputRef$current2;
@@ -65667,7 +65690,6 @@ var TreeSelect = function TreeSelect(props0) {
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (virtual && expanded) {
-      console.log(expanded);
       setVirtualExpanded(expanded);
     }
   }, [expanded]);
@@ -69583,7 +69605,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.0-beta.27'
+  version: '3.6.0-beta.29'
 });
 }();
 /******/ 	return __webpack_exports__;