@gingkoo/pandora-explorer 0.0.1-alpha.22 → 0.0.1-alpha.23

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-explorer v0.0.1-alpha.22
+ * @gingkoo/pandora-explorer v0.0.1-alpha.23
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import cx$1 from 'classnames';
@@ -5373,30 +5373,6 @@ function NotData() {
   });
 }
 
-//添加层级
-const addLevel = (data, levelIndex = 0, filedata) => {
-  let arr = data;
-  if (filedata) {
-    arr = arr.filter(v => filedata?.(v));
-  }
-  let i = 0;
-  while (i < arr.length) {
-    let item = arr[i];
-    item['level'] = levelIndex;
-    if (!item?.api && !item?.children) {
-      item['isLeaf'] = true;
-    }
-    if (Array.isArray(item.children) && item.children.length > 0) {
-      if (filedata) {
-        item.children = addLevel(item.children, levelIndex + 1, filedata);
-      } else {
-        addLevel(item.children, levelIndex + 1, filedata);
-      }
-    }
-    i++;
-  }
-  return arr;
-};
 //下拉动画
 const motion = {
   motionName: 'node-motion',
@@ -5440,7 +5416,8 @@ var Tree = (props => {
     onRename,
     loadData,
     filterData,
-    onExpand
+    onExpand,
+    onLoad
   } = props;
   const ref = useRef(null);
   const tree = useRef(null);
@@ -5459,11 +5436,11 @@ var Tree = (props => {
     }, 0);
     return size > w ? size : Math.ceil(w);
   }, [width, _widht]);
-  useEffect(() => {
-    let arr = cloneDeep(treeData);
-    arr = addLevel(arr, 0, filterData);
-    setData(arr);
-  }, [treeData, type, filterData]);
+  // useEffect(() => {
+  //   let arr = cloneDeep(treeData);
+  //   arr = addLevel(arr, 0, filterData);
+  //   setData(arr);
+  // }, [treeData, type, filterData]);
   useEffect(() => {
     if (!Array.isArray(columns)) return;
     if (!ref.current) return;
@@ -5546,7 +5523,7 @@ var Tree = (props => {
       data.forEach((item, index) => {
         let l = levelkey + `-${index}`;
         if (curKey.indexOf(l) === 0) {
-          if (item.children) {
+          if (item.children && item.children.length) {
             loop(item.children, l);
           } else {
             item.children = child;
@@ -5589,19 +5566,10 @@ var Tree = (props => {
         });
       }
       getNewTreeData(tree, treeNode.pos, child, 10);
-      if (onChange) {
-        onChange?.(tree);
-        setTimeout(() => {
-          resolve();
-        }, 100);
+      onChange?.(tree);
+      setTimeout(() => {
         resolve();
-      } else {
-        setData(tree);
-        setTimeout(() => {
-          animation && seTmotionShow(true);
-          resolve();
-        }, 100);
-      }
+      }, 200);
     });
   };
   if (type == 'table' && !treeData.length) {
@@ -5640,6 +5608,7 @@ var Tree = (props => {
           ref: tree,
           checkStrictly: true,
           expandedKeys: expandedKeys,
+          loadedKeys: loadedKeys,
           checkable: type == 'table' ? true : false,
           autoExpandParent: autoExpandParent,
           defaultExpandedKeys: defaultExpandedKeys || [],
@@ -5748,6 +5717,10 @@ var Tree = (props => {
               });
             }
           },
+          onLoad: v => {
+            if (v.length == loadedKeys?.length) return;
+            onLoad?.(v);
+          },
           loadData: isload ? onLoadData : null,
           treeData: type == 'table' ? [...data, {
             key: '_ending',
@@ -7031,9 +7004,9 @@ const Layout$1 = props => {
     onMenuClick
   } = props;
   const store = useContext(ExampleContext);
-  const [expandkey, useExpandkey] = useState([]);
+  const [expandkey, setExpandkey] = useState([]);
   useEffect(() => {
-    useExpandkey([]);
+    setExpandkey([]);
   }, [store.curInfo?.key]);
   function Loading() {
     return jsx("div", {
@@ -7105,6 +7078,7 @@ const Layout$1 = props => {
         type: 'table',
         checks: checks,
         expandedKeys: expandkey,
+        loadedKeys: store.loadkey,
         treeData: store.curlist,
         columns: store.columns,
         checkType: store.checkType,
@@ -7135,8 +7109,11 @@ const Layout$1 = props => {
         onMenuClick: onMenuClick,
         onDblclick: _onDblclick,
         loadData: loadNode,
+        onLoad: v => {
+          store.setLoadKey(v);
+        },
         onExpand: v => {
-          useExpandkey(v);
+          setExpandkey(v);
         },
         onChange: v => {
           store.setCurList(v);
@@ -7393,6 +7370,7 @@ const Explorer = props => {
   const [menuSize, setMenuSize] = useState(80);
   const [reamekey, setReName] = useState(null);
   const [log, setLog] = useState([]);
+  const [loadkey, setLoadKey] = useState([]);
   const [menutype, setMenutype] = useState('tile');
   const [infoshow, setInfoShow] = useState(false);
   const [loading, setLoading] = useState(ApiStatusEnum.READY);
@@ -7457,7 +7435,6 @@ const Explorer = props => {
     };
     let map = addLevel(curlist, {});
     setDataMap(map);
-    // setCurSelect('');
   }, [curlist]);
   //清空日志
   useEffect(() => {
@@ -7475,6 +7452,8 @@ const Explorer = props => {
       }, 300);
       return null;
     }
+    //清空加载过的结点记录
+    setLoadKey([]);
     setCurList(data?.fileList || []);
     setCurInfo(data?.current || {});
     setTimeout(() => {
@@ -7516,6 +7495,7 @@ const Explorer = props => {
       checkMode,
       reamekey,
       curSelect,
+      loadkey,
       //icon
       getIcons: Icons,
       //set
@@ -7528,7 +7508,8 @@ const Explorer = props => {
       setPathDisplay,
       setLoading,
       setReName,
-      setCurSelect
+      setCurSelect,
+      setLoadKey
     },
     children: jsxs("div", {
       className: 'explorer-container',