feat: move select parent node to SelectSource

NetEase · May 20, 2024 · 625eaee · 625eaee
1 parent e7e2c7b
commit 625eaee
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 22 deletions.
diff --git a/packages/core/src/models/interfaces.ts b/packages/core/src/models/interfaces.ts
@@ -200,7 +200,6 @@ export interface IWorkspace {
 
   // ----------------- 节点操作 -----------------
 
-  selectParentNode: () => void;
   removeSelectedNode: () => void;
   cloneSelectedNode: () => void;
   copySelectedNode: () => void;

diff --git a/packages/core/src/models/select-source.ts b/packages/core/src/models/select-source.ts
@@ -109,6 +109,20 @@ export class SelectSource {
     this._start = null;
   }
 
+  /**
+   * 选中当前选中节点的父节点
+   */
+  selectParent() {
+    const parents = this.first?.parents || [];
+    if (parents.length) {
+      const [parent, ...rest] = parents;
+      this.select({
+        ...parent,
+        parents: rest,
+      });
+    }
+  }
+
   setStart(data: StartDataType) {
     this._start = data;
   }

diff --git a/packages/core/src/models/workspace.ts b/packages/core/src/models/workspace.ts
@@ -865,20 +865,6 @@ export class Workspace extends EventTarget implements IWorkspace {
       });
   }
 
-  /**
-   * 选中当前选中节点的父节点
-   */
-  selectParentNode() {
-    const parents = this.selectSource?.first?.parents || [];
-    if (parents.length) {
-      const [parent, ...rest] = parents;
-      this.selectSource.select({
-        ...parent,
-        parents: rest,
-      });
-    }
-  }
-
   /**
    * 删除选中节点
    */

diff --git a/packages/designer/src/dnd/use-dnd.ts b/packages/designer/src/dnd/use-dnd.ts
@@ -59,7 +59,7 @@ export function useDnd({
         workspace.pasteSelectedNode();
       },
       'command+arrowup,ctrl+arrowup': () => {
-        workspace.selectParentNode();
+        workspace.selectSource.selectParent();
       },
       'command+z,ctrl+z': () => {
         workspace.history.back();

diff --git a/packages/designer/src/selection-menu/index.ts b/packages/designer/src/selection-menu/index.ts
@@ -1,4 +1,4 @@
 export * from './copy-node';
 export * from './delete-node';
-export * from './parent-node';
+export * from './select-parent-node';
 export * from './view-source';
diff --git a/...signer/src/selection-menu/parent-node.tsx → ...src/selection-menu/select-parent-node.tsx b/...signer/src/selection-menu/parent-node.tsx → ...src/selection-menu/select-parent-node.tsx
@@ -3,14 +3,14 @@ import { useWorkspace, observer } from '@music163/tango-context';
 import { SelectAction } from '@music163/tango-ui';
 import { EnterOutlined } from '@ant-design/icons';
 
-export const ParentNodeAction = observer(() => {
+export const SelectParentNodeAction = observer(() => {
   const workspace = useWorkspace();
 
   return (
     <SelectAction
       tooltip="选中父节点"
       onClick={() => {
-        workspace.selectParentNode();
+        workspace.selectSource.selectParent();
       }}
     >
       <EnterOutlined rotate={90} />

diff --git a/packages/designer/src/simulator/selection.tsx b/packages/designer/src/simulator/selection.tsx
@@ -25,7 +25,7 @@ export interface SelectionToolsProps {
 
 export const SelectionTools = observer(
   ({
-    actions: actionsProp = ['viewSource', 'copyNode', 'deleteNode', 'parentNode'],
+    actions: actionsProp = ['viewSource', 'copyNode', 'deleteNode', 'selectParentNode'],
   }: SelectionToolsProps) => {
     const workspace = useWorkspace();
     const selectSource = workspace.selectSource;

diff --git a/packages/designer/src/widgets.ts b/packages/designer/src/widgets.ts
@@ -17,7 +17,7 @@ import {
   CopyNodeAction,
   DeleteNodeAction,
   ViewSourceAction,
-  ParentNodeAction,
+  SelectParentNodeAction,
 } from './selection-menu';
 
 const widgets = {};
@@ -53,5 +53,5 @@ registerWidget('sidebar.dataSource', DataSourcePanel);
 
 registerWidget('selectionMenu.copyNode', CopyNodeAction);
 registerWidget('selectionMenu.deleteNode', DeleteNodeAction);
-registerWidget('selectionMenu.parentNode', ParentNodeAction);
+registerWidget('selectionMenu.selectParentNode', SelectParentNodeAction);
 registerWidget('selectionMenu.viewSource', ViewSourceAction);