feat: canvas.activeTracker add targer prop

liujuping · JackLian · commit 2b3d96cedada · 2023-05-17T19:28:59.000+08:00
diff --git a/packages/designer/src/designer/active-tracker.ts b/packages/designer/src/designer/active-tracker.ts
@@ -7,6 +7,8 @@ import {
 import { isNode } from '@alilc/lowcode-utils';
 
 export interface IActiveTracker extends Omit< IPublicModelActiveTracker, 'track' | 'onChange' > {
+  _target: ActiveTarget | INode;
+
   track(originalTarget: ActiveTarget | INode): void;
 
   onChange(fn: (target: ActiveTarget) => void): () => void;
@@ -17,10 +19,10 @@ export interface ActiveTarget extends Omit< IPublicTypeActiveTarget, 'node' > {
 }
 
 export class ActiveTracker implements IActiveTracker {
-  private emitter: IEventBus = createModuleEventBus('ActiveTracker');
-
   @obx.ref private _target?: ActiveTarget | INode;
 
+  private emitter: IEventBus = createModuleEventBus('ActiveTracker');
+
   track(originalTarget: ActiveTarget | INode) {
     let target = originalTarget;
     if (isNode(originalTarget)) {
diff --git a/packages/plugin-outline-pane/src/controllers/tree-master.ts b/packages/plugin-outline-pane/src/controllers/tree-master.ts
@@ -90,28 +90,29 @@ export class TreeMaster {
   private initEvent() {
     let startTime: any;
     const { event, project, canvas } = this.pluginContext;
+    const setExpandByActiveTracker = (target: IPublicTypeActiveTarget) => {
+      const { node, detail } = target;
+      const tree = this.currentTree;
+      if (!tree/* || node.document !== tree.document */) {
+        return;
+      }
+      const treeNode = tree.getTreeNode(node);
+      if (detail && isLocationChildrenDetail(detail)) {
+        treeNode.expand(true);
+      } else {
+        treeNode.expandParents();
+      }
+      this.boards.forEach((board) => {
+        board.scrollToNode(treeNode, detail);
+      });
+    };
     this.disposeEvents = [
       canvas.dragon?.onDragstart(() => {
         startTime = Date.now() / 1000;
         // needs?
         this.toVision();
       }),
-      canvas.activeTracker?.onChange((target: IPublicTypeActiveTarget) => {
-        const { node, detail } = target;
-        const tree = this.currentTree;
-        if (!tree/* || node.document !== tree.document */) {
-          return;
-        }
-        const treeNode = tree.getTreeNode(node);
-        if (detail && isLocationChildrenDetail(detail)) {
-          treeNode.expand(true);
-        } else {
-          treeNode.expandParents();
-        }
-        this.boards.forEach((board) => {
-          board.scrollToNode(treeNode, detail);
-        });
-      }),
+      canvas.activeTracker?.onChange(setExpandByActiveTracker),
       canvas.dragon?.onDragend(() => {
         const endTime: any = Date.now() / 1000;
         const nodes = project.currentDocument?.selection?.getNodes();
@@ -135,6 +136,9 @@ export class TreeMaster {
         this.treeMap.delete(id);
       }),
     ];
+    if (canvas.activeTracker?.target) {
+      setExpandByActiveTracker(canvas.activeTracker?.target);
+    }
   }
 
   private toVision() {
diff --git a/packages/shell/src/model/active-tracker.ts b/packages/shell/src/model/active-tracker.ts
@@ -12,6 +12,16 @@ export class ActiveTracker implements IPublicModelActiveTracker {
     this[activeTrackerSymbol] = innerTracker;
   }
 
+  get target() {
+    const { node: innerNode, detail, instance } = this[activeTrackerSymbol]._target;
+    const publicNode = ShellNode.create(innerNode);
+    return {
+      node: publicNode!,
+      detail,
+      instance,
+    };
+  }
+
   onChange(fn: (target: IPublicTypeActiveTarget) => void): () => void {
     if (!fn) {
       return () => {};
diff --git a/packages/types/src/shell/model/active-tracker.ts b/packages/types/src/shell/model/active-tracker.ts
@@ -2,6 +2,12 @@ import { IPublicTypeActiveTarget } from '../type';
 import { IPublicModelNode } from './node';
 
 export interface IPublicModelActiveTracker {
+
+  /**
+   * @since 1.1.7
+   */
+  target: IPublicTypeActiveTarget;
+
   onChange(fn: (target: IPublicTypeActiveTarget) => void): () => void;
 
   track(node: IPublicModelNode): void;
diff --git a/packages/workspace/src/resource.ts b/packages/workspace/src/resource.ts
@@ -70,9 +70,7 @@ export class Resource implements IResource {
     return this.context.innerSkeleton;
   }
 
-  get children(): IResource[] {
-    return this.resourceData?.children?.map(d => new Resource(d, this.workspace.getResourceType(d.resourceName || this.resourceType.name), this.workspace)) || [];
-  }
+  children: IResource[];
 
   get config() {
     return this.resourceData.config;
@@ -92,6 +90,7 @@ export class Resource implements IResource {
     if (!resourceType) {
       logger.error(`resourceType[${resourceType}] is unValid.`);
     }
+    this.children = this.resourceData?.children?.map(d => new Resource(d, this.workspace.getResourceType(d.resourceName || this.resourceType.name), this.workspace)) || [];
   }
 
   async init() {

Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,7 @@ export class Resource implements IResource {`
`70`	`70`	`return this.context.innerSkeleton;`
`71`	`71`	`}`
`72`	`72`
`73`		`- get children(): IResource[] {`
`74`		`- return this.resourceData?.children?.map(d => new Resource(d, this.workspace.getResourceType(d.resourceName \|\| this.resourceType.name), this.workspace)) \|\| [];`
`75`		`- }`
	`73`	`+ children: IResource[];`
`76`	`74`
`77`	`75`	`get config() {`
`78`	`76`	`return this.resourceData.config;`
`@@ -92,6 +90,7 @@ export class Resource implements IResource {`
`92`	`90`	`if (!resourceType) {`
`93`	`91`	logger.error(`resourceType[${resourceType}] is unValid.`);
`94`	`92`	`}`
	`93`	`+ this.children = this.resourceData?.children?.map(d => new Resource(d, this.workspace.getResourceType(d.resourceName \|\| this.resourceType.name), this.workspace)) \|\| [];`
`95`	`94`	`}`
`96`	`95`
`97`	`96`	`async init() {`