diff --git a/src/components/ItemTree/RefreshDir/index.jsx b/src/components/ItemTree/RefreshDir/index.jsx
index fc43820..23b62c3 100644
--- a/src/components/ItemTree/RefreshDir/index.jsx
+++ b/src/components/ItemTree/RefreshDir/index.jsx
@@ -1,19 +1,12 @@
-import React, {useRef, useState} from 'react';
-import {Button, Input, Menu, Modal} from 'antd';
-import {readDir} from "../../../utils/File";
-import {nextDirAdd} from "../../../redux/dirMessage_reducer";
-import {useDispatch} from "react-redux";
-
+import React from 'react';
const RefreshDir = (prop) => {
- console.log("prop",prop)
- const dispatch = useDispatch()
+ console.log("RefreshDir:prop", prop)
const refreshDir = () => {
prop.refreshDir(prop.filePath)
prop.closeMenu()
};
-
return (
- 更新目录
+ 更新目录
);
};
export default RefreshDir;
\ No newline at end of file
diff --git a/src/components/ItemTree/index.jsx b/src/components/ItemTree/index.jsx
index 1281472..e3c9368 100644
--- a/src/components/ItemTree/index.jsx
+++ b/src/components/ItemTree/index.jsx
@@ -7,7 +7,7 @@ const {Search} = Input;
import {useSelector, useDispatch} from "react-redux";
import {addExpandedKeys, addTableBarItem, setExpandedKeys} from "../../redux/tableBarItem_reducer";
import {readDir} from "../../utils/File";
-import {nextDirAdd} from "../../redux/dirMessage_reducer";
+import {nextDirAdd,refreshDir as refreshDirReducer} from "../../redux/dirMessage_reducer";
import {isEmpty} from "../../utils/ObjectUtils";
import UpdateFileName from "./UpdateFileName";
import RefreshDir from "./RefreshDir";
@@ -146,7 +146,7 @@ const ItemTree = (prop) => {
const refreshDir = (filePath) => {
readDir(filePath).then(fileStateList => {
if (Array.isArray(fileStateList[0].childList) && fileStateList[0].childList.length > 0) {
- dispatch(nextDirAdd({selectDirKey: filePath, fileStateList}))
+ dispatch(refreshDirReducer({selectDirKey: filePath, fileStateList}))
// 添加下级节点
addChildNode(defaultValueState, flushTree(fileStateList))
const result = [...defaultValueState]
@@ -164,7 +164,19 @@ const ItemTree = (prop) => {
if (e.node.dirFlag) {
// 加载目录下一级文件信息
if (!Array.isArray(e.node.children) || e.node.children.length === 0) {
- refreshDir(e.node.key)
+ readDir(e.node.key).then(fileStateList => {
+ if (Array.isArray(fileStateList[0].childList) && fileStateList[0].childList.length > 0) {
+ dispatch(nextDirAdd({selectDirKey: e.node.key, fileStateList}))
+ // 添加下级节点
+ addChildNode(defaultValueState, flushTree(fileStateList))
+ const result = [...defaultValueState]
+ console.log("[...defaultValueState]:", result)
+ setDefaultValueState(result)
+ // 打开当前目录
+ dispatch(addExpandedKeys([e.node.key]));
+ setAutoExpandParent(false);
+ }
+ })
} else {
// 打开当前目录
dispatch(addExpandedKeys([e.node.key]));
@@ -257,9 +269,7 @@ const ItemTree = (prop) => {
setState("")}/>
,
- {
- setState("")
- }}>关闭菜单
+ {setState("")}}>关闭菜单
]
return (