@gingkoo/pandora-explorer 0.1.11-alpha.1 → 0.1.11-alpha.2

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-explorer v0.1.11-alpha.1
+ * @gingkoo/pandora-explorer v0.1.11-alpha.2
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import cx$1 from 'classnames';
@@ -9546,6 +9546,7 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
   const box = useRef(null);
   const boxMenu = useRef(null);
   const menu = useRef(null);
+  const expandedKeysRef = useRef([]);
   useImperativeHandle(ref, () => ({
     removeLog: () => {
       //清空日志
@@ -9565,8 +9566,8 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
         await loadData(curInfo?.key || '', undefined, closeload);
       }
     },
-    updateCurListNode: key => {
-      updateCurlist(key || '');
+    updateCurListNode: async key => {
+      await updateCurlist(key || '');
     },
     createFolder: createFolder,
     setNavSelect: params => {
@@ -9716,9 +9717,10 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
     onChangeCurMap?.(dataMap);
   }, [dataMap]);
   useEffect(() => {
-    if (props?.expandedKeys) {
-      setExpandNavKey(cloneDeep(props?.expandedKeys) || []);
-    }
+    const expandedKeys = cloneDeep(props?.expandedKeys) || [];
+    if (_$3.isEqual(expandedKeysRef.current, expandedKeys)) return;
+    expandedKeysRef.current = expandedKeys;
+    setExpandNavKey(expandedKeys);
   }, [props.expandedKeys]);
   /* ************  加载更新数据   **************** */
   async function loadData(key, param, closeload = true) {
@@ -9749,6 +9751,56 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
     let data = await props.loadData?.(key);
     return data?.fileList || [];
   }
+  async function hydrateExpandedList(list = [], expandedKeys = []) {
+    const expandedKeySet = new Set(expandedKeys);
+    const result = [];
+    for (const item of list) {
+      const next = cloneDeep(item);
+      if (next?.type == 'folder' && next?.key && expandedKeySet.has(next.key)) {
+        const data = await props.loadData?.(next.key);
+        next.children = await hydrateExpandedList(data?.fileList || [], expandedKeys);
+        next.api = true;
+        next.isLeaf = false;
+      }
+      result.push(next);
+    }
+    return result;
+  }
+  async function loadExpandedData(key, expandedKeys = []) {
+    if (!props.loadData) return null;
+    const data = await props.loadData?.(key);
+    if (!data || data.status == 'Err') return null;
+    return {
+      ...data,
+      fileList: await hydrateExpandedList(data?.fileList || [], expandedKeys)
+    };
+  }
+  async function refreshCurrentList(key, expandedKeys = expandkey) {
+    const data = await loadExpandedData(key || curInfo?.key || '', expandedKeys);
+    if (!data) return false;
+    setCurList(data?.fileList || []);
+    setCurInfo(data?.current || {});
+    setTotalNum(data?.totalNum || 0);
+    setLoadKey(expandedKeys);
+    setExpandkey(expandedKeys);
+    return true;
+  }
+  async function refreshNavData(expandedKeys = nav_expandkey) {
+    if (!onChange || !Array.isArray(data)) return;
+    const tree = await hydrateExpandedList(data || [], expandedKeys);
+    onChange(tree);
+    setNavLoadKey(expandedKeys);
+    setExpandNavKey(expandedKeys);
+  }
+  async function refreshAfterMove() {
+    const currentExpandKeys = cloneDeep(expandkey || []);
+    const navExpandKeys = cloneDeep(nav_expandkey || []);
+    setLoading(ApiStatusEnum.LOADING);
+    await Promise.all([refreshCurrentList(curInfo?.key || '', currentExpandKeys), refreshNavData(navExpandKeys)]);
+    setCurSelect(null);
+    setCurSelectFile(null);
+    setLoading(ApiStatusEnum.READY);
+  }
   // 直接通过 刷新数节点 达到刷新效果
   const reloadNode = (key, params) => {
     let isfix = false;
@@ -9851,29 +9903,7 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
     onChange?.(arr);
   }
   async function updateCurlist(key) {
-    let data = [];
-    data = await reduceGetTreeData(curlist, key || curInfo?.key || '', expandkey);
-    setCurList(data);
-  }
-  async function reduceGetTreeData(data, key, expand) {
-    let res = await loadNode(key);
-    const newData = [];
-    // @ts-ignore
-    await data.myforeach(async v => {
-      let obj = _$3.cloneDeep(v);
-      if (expand.includes(obj.key)) {
-        obj.children = await reduceGetTreeData(obj.children || [], obj.key, expand);
-      }
-      if (obj.type == 'file') {
-        let match = res.filter(it => it.key === obj.key);
-        if (match.length) {
-          newData.push(match[0]);
-          return null;
-        }
-      }
-      newData.push(obj);
-    });
-    return newData;
+    await refreshCurrentList(key || curInfo?.key || '', expandkey);
   }
   /* ************  功能方法   **************** */
   async function uploadFile(param) {
@@ -10205,7 +10235,10 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
         data.push(dataMap?.[v]);
       }
     });
-    _onMoveFile?.(data, info);
+    if (!_onMoveFile) return;
+    const result = await _onMoveFile?.(data, info);
+    if (result === false) return;
+    await refreshAfterMove();
   }
   return jsx(ExampleContext.Provider, {
     value: {