fix: manual pass Controller to View

manual pass Controller to View
DTStack · Mar 11, 2021 · 03791e7 · 03791e7
1 parent cd6fa5b
commit 03791e7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/controller/explorer/explorer.tsx b/src/controller/explorer/explorer.tsx
@@ -10,7 +10,8 @@ import * as React from 'react';
 import { IFolderTree } from 'mo/model';
 import { ExplorerView, FolderTreeView } from 'mo/workbench/sidebar/explore';
 import { IActionBarItem } from 'mo/components/actionBar';
-
+// TODO: 自依赖问题 connect 失效，暂时手动引入 Controller 往 View 层传递
+import { folderTreeController, explorerController } from 'mo/controller';
 export interface IExplorerController {
     onHeaderToolbarClick?: (e: React.MouseEvent, item: IActionBarItem) => void;
 }
@@ -42,7 +43,7 @@ export class ExplorerController
             id: 'explore',
             title: 'EXPLORER',
             render() {
-                return <ExplorerView />;
+                return <ExplorerView {...explorerController} />;
             },
         };
 
@@ -128,7 +129,7 @@ export class ExplorerController
                     data: explorerState.folderTree?.data,
                     contextMenu: explorerState.folderTree?.contextMenu,
                 };
-                return <FolderTreeView {...folderProps} />;
+                return <FolderTreeView {...folderProps} {...folderTreeController} />;
             },
         };
 

diff --git a/src/workbench/sidebar/explore/explore.tsx b/src/workbench/sidebar/explore/explore.tsx
@@ -12,6 +12,7 @@ export const Explorer: React.FunctionComponent<IExplorer> = (
     props: IExplorer & IExplorerController
 ) => {
     const { data = [], headerToolBar = [], onHeaderToolbarClick } = props;
+    console.log('Explorer => ExplorerController', props)
     return (
         <div className={defaultExplorerClassName}>
             <Header

diff --git a/src/workbench/sidebar/explore/folderTree.tsx b/src/workbench/sidebar/explore/folderTree.tsx
@@ -22,7 +22,7 @@ const FolderTree: React.FunctionComponent<IFolderTree> = (
         onClickContextMenu,
         ...restProps
     } = props;
-
+    console.log('FolderTree => FolderTreeController', props)
     const inputRef = useRef<any>(null);
 
     const contextView = useContextView();
@@ -87,8 +87,8 @@ const FolderTree: React.FunctionComponent<IFolderTree> = (
                 onBlur={handleInputBlur}
             />
         ) : (
-            name
-        );
+                name
+            );
     };
 
     const renderByData = (