@aloudata/ink-lineage 0.0.1-beta.4 → 0.0.1-beta.41

package/dist/manager/nodeManager/BaseColumnEventManager.js

@@ -0,0 +1,77 @@
+import { __awaiter, __extends, __generator, __read } from "tslib";
+import { runtime } from '@aloudata/ink-graph-new';
+import { EDirection, EElementType, EColumnEvents, EEventEnum, EEntityType, } from '../../types';
+import { BaseEventManager } from './BaseEventManager';
+var BaseColumnEventManager = /** @class */ (function (_super) {
+    __extends(BaseColumnEventManager, _super);
+    function BaseColumnEventManager() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(BaseColumnEventManager.prototype, "eventType", {
+        get: function () {
+            return EColumnEvents;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    BaseColumnEventManager.prototype.registerEvents = function () {
+        var _this = this;
+        _super.prototype.registerEvents.call(this);
+        this.lineageManager.on(EEventEnum.COLUMN_LINEAGE, function (node) {
+            _this.showDetailPanel(node);
+            _this.handleExpand({ direction: EDirection.BOTH, node: node });
+        });
+    };
+    BaseColumnEventManager.prototype.onHeaderClick = function (node) {
+        var _a, _b, _c, _d, _e, _f;
+        var onlyShowRelated = !!((_b = (_a = this.lineageManager) === null || _a === void 0 ? void 0 : _a.rightKeyMenuManager) === null || _b === void 0 ? void 0 : _b.onlyShowRelated);
+        // hide context menu
+        (_c = this.lineageManager) === null || _c === void 0 ? void 0 : _c.hideContextMenu();
+        if (node.isForbidden)
+            return;
+        // show detail panel
+        this.showDetailPanel(node);
+        if (!onlyShowRelated) {
+            // update active nodes
+            (_d = this.lineageManager) === null || _d === void 0 ? void 0 : _d.updateActiveNodes([
+                node.config,
+            ]);
+            (_e = this.lineageManager) === null || _e === void 0 ? void 0 : _e.setRelatedNodesAndEdges(node.config, true);
+            // refresh toolbar related status
+            (_f = this.lineageManager) === null || _f === void 0 ? void 0 : _f.refreshToolbarRelatedStatus(node.config);
+        }
+    };
+    BaseColumnEventManager.prototype.onContextMenu = function (node) {
+        var _a = node.config, isStartNode = _a.isStartNode, id = _a.id, data = _a.data;
+        if (!data)
+            return;
+        var name = data.name, direction = data.direction;
+        var translate = runtime.sceneGraphManager.getPosition(node.colText);
+        var _b = __read(translate, 2), translateX = _b[0], translateY = _b[1];
+        var x = 70 + translateX;
+        var y = Number(node.colText.style.y) + translateY - 20;
+        this.lineageManager.showContextMenu({
+            id: id,
+            visible: true,
+            x: x,
+            y: y,
+            type: EElementType.COLUMN,
+            typeCode: 'Table',
+            isStartNode: isStartNode,
+            parentGuid: node.config.tableId || '',
+            parentName: node.config.tableName || '',
+            parentType: node.node.config.data.type || EEntityType.TABLE,
+            name: name,
+            direction: direction,
+        });
+    };
+    BaseColumnEventManager.prototype.handleFold = function (direction, node) { };
+    BaseColumnEventManager.prototype.handleExpand = function (data) {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    return BaseColumnEventManager;
+}(BaseEventManager));
+export { BaseColumnEventManager };
+//# sourceMappingURL=BaseColumnEventManager.js.map

package/dist/manager/nodeManager/BaseColumnEventManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BaseColumnEventManager.js","sourceRoot":"","sources":["../../../src/manager/nodeManager/BaseColumnEventManager.ts"],"names":[],"mappings":"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"}

package/dist/manager/nodeManager/BaseEventManager.d.ts

@@ -1,21 +1,18 @@
-import { IGraph } from '@aloudata/ink-graph-new';
 import { InkLineageManager } from '..';
-import { EDirection, EventEnumType, IColResBase, TDataBase } from '../../types';
+import { EDirection, EventEnumType, IColResBase, IExpandData, ITableResBase } from '../../types';
 import { INode } from '../../types';
-export declare class BaseEventManager<TTableData extends TDataBase<TColumnData>, TColumnData extends IColResBase> {
-    lineageManager: InkLineageManager<TTableData, TColumnData>;
-    graph: IGraph;
-    eventsType: EventEnumType;
-    constructor(lineageManager: InkLineageManager<TTableData, TColumnData>, eventType: EventEnumType);
-    registerEvents(eventType: EventEnumType): void;
-    onClick(node: INode): void;
-    onLeftIconClick(node: INode): void;
-    onRightIconClick(node: INode): void;
+import { BaseManager } from '../BaseManager';
+export declare class BaseEventManager<TTableData extends ITableResBase<TColumnData>, TColumnData extends IColResBase> extends BaseManager<TTableData, TColumnData> {
+    static eventType: EventEnumType;
+    get eventType(): EventEnumType;
+    constructor(lineageManager: InkLineageManager<TTableData, TColumnData>);
+    registerEvents(): void;
+    onHeaderClick(node: INode): void;
+    handleFold(direction: EDirection, node: INode): void;
     onContextMenu(node: INode): void;
-    handleExpand({ direction, depth, node, }: {
-        direction: EDirection;
-        depth?: number;
-        node: INode;
-    }): Promise<void>;
+    handleExpand(data: IExpandData): Promise<void>;
+    onLeftIconClick(node: any): void;
+    onRightIconClick(node: any): void;
+    showDetailPanel: (node: any) => void;
 }
 //# sourceMappingURL=BaseEventManager.d.ts.map

package/dist/manager/nodeManager/BaseEventManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseEventManager.d.ts","sourceRoot":"","sources":["../../../src/manager/nodeManager/BaseEventManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,qBAAa,gBAAgB,CAC3B,UAAU,SAAS,SAAS,CAAC,WAAW,CAAC,EACzC,WAAW,SAAS,WAAW;IAE/B,cAAc,EAAE,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAE3D,KAAK,EAAE,MAAM,CAAC;IAEd,UAAU,EAAE,aAAa,CAAC;gBAGxB,cAAc,EAAE,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,EAC1D,SAAS,EAAE,aAAa;IAS1B,cAAc,CAAC,SAAS,EAAE,aAAa;IAwBvC,OAAO,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAE1B,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAElC,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAEnC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAE1B,YAAY,CAAC,EACjB,SAAS,EACT,KAAS,EACT,IAAI,GACL,EAAE;QACD,SAAS,EAAE,UAAU,CAAC;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,KAAK,CAAC;KACb;CACF"}
+{"version":3,"file":"BaseEventManager.d.ts","sourceRoot":"","sources":["../../../src/manager/nodeManager/BaseEventManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AACvC,OAAO,EACL,UAAU,EAKV,aAAa,EACb,WAAW,EACX,WAAW,EACX,aAAa,EACd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,gBAAgB,CAC3B,UAAU,SAAS,aAAa,CAAC,WAAW,CAAC,EAC7C,WAAW,SAAS,WAAW,CAC7B,SAAQ,WAAW,CAAC,UAAU,EAAE,WAAW,CAAC;IAC9C,MAAM,CAAC,SAAS,EAAE,aAAa,CAAC;IAEhC,IAAI,SAAS,IAAI,aAAa,CAE7B;gBAGC,cAAc,EAAE,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC;IAO5D,cAAc;IA8Bd,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAEhC,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,GAAG,IAAI;IAEpD,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAE1B,YAAY,CAAC,IAAI,EAAE,WAAW;IAEpC,eAAe,CAAC,IAAI,KAAA;IAapB,gBAAgB,CAAC,IAAI,KAAA;IAarB,eAAe,GAAI,SAAI,UAyBrB;CACH"}

package/dist/manager/nodeManager/BaseEventManager.js

@@ -1,43 +1,89 @@
-import { __assign, __awaiter, __generator } from "tslib";
-var BaseEventManager = /** @class */ (function () {
-    function BaseEventManager(lineageManager, eventType) {
-        this.lineageManager = lineageManager;
-        this.graph = lineageManager.graph;
-        this.eventsType = eventType;
-        this.registerEvents(eventType);
+import { __assign, __awaiter, __extends, __generator } from "tslib";
+import { EDirection, EEntityType, EExpandType, EOverviewType, ETableEvents, } from '../../types';
+import { getOverviewType } from '../../utils';
+import { BaseManager } from '../BaseManager';
+var BaseEventManager = /** @class */ (function (_super) {
+    __extends(BaseEventManager, _super);
+    function BaseEventManager(lineageManager) {
+        var _this = _super.call(this, lineageManager) || this;
+        _this.showDetailPanel = function (node) {
+            var _a, _b, _c, _d, _e, _f;
+            // 将data同步到atom，触发更新
+            var _g = _this.lineageManager.rightKeyMenuManager.overviewState, userClosed = _g.userClosed, visible = _g.visible;
+            var type = (_b = (_a = node.config) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.type;
+            if (node.node) {
+                var tableType = (_e = (_d = (_c = node.node) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.type;
+                if (tableType === EEntityType.TEMP_TABLE) {
+                    type = EOverviewType.TEMP_COLUMN;
+                }
+                type = EOverviewType.COLUMN;
+            }
+            _this.lineageManager.setOverview(__assign(__assign({}, _this.lineageManager.rightKeyMenuManager.overviewState), { targetId: node.config.id, type: getOverviewType(type), visible: !(userClosed && !visible), initial: true, caliberIsHighlight: false, taskIsHighlight: false, isNarrowTable: (_f = node.config.data) === null || _f === void 0 ? void 0 : _f.isNarrowTable }));
+        };
+        _this.registerEvents();
+        return _this;
     }
-    BaseEventManager.prototype.registerEvents = function (eventType) {
+    Object.defineProperty(BaseEventManager.prototype, "eventType", {
+        get: function () {
+            return ETableEvents;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    BaseEventManager.prototype.registerEvents = function () {
         var _this = this;
         // 左边icon
-        this.lineageManager.on(eventType.LEFT_ICON_CLICK, function (node) {
+        this.lineageManager.on(this.eventType.LEFT_ICON_CLICK, function (node) {
             _this.onLeftIconClick(node);
         });
         // 右边icon
-        this.lineageManager.on(eventType.RIGHT_ICON_CLICK, function (node) {
+        this.lineageManager.on(this.eventType.RIGHT_ICON_CLICK, function (node) {
             _this.onRightIconClick(node);
         });
         // 右键菜单
-        this.lineageManager.on(eventType.CONTEXT_MENU, function (node) {
+        this.lineageManager.on(this.eventType.CONTEXT_MENU, function (node) {
             _this.onContextMenu(node);
         });
         // 表/列右键的扩展
-        this.lineageManager.on(eventType.EXPAND, function (data) {
+        this.lineageManager.on(this.eventType.EXPAND, function (data) {
             _this.handleExpand(__assign({}, data));
         });
+        // 表/列点击
+        this.lineageManager.on(this.eventType.HEADER_CLICK, function (node) {
+            _this.onHeaderClick(node);
+        });
     };
-    BaseEventManager.prototype.onClick = function (node) { };
-    BaseEventManager.prototype.onLeftIconClick = function (node) { };
-    BaseEventManager.prototype.onRightIconClick = function (node) { };
+    BaseEventManager.prototype.onHeaderClick = function (node) { };
+    BaseEventManager.prototype.handleFold = function (direction, node) { };
     BaseEventManager.prototype.onContextMenu = function (node) { };
-    BaseEventManager.prototype.handleExpand = function (_a) {
-        return __awaiter(this, arguments, void 0, function (_b) {
-            var direction = _b.direction, _c = _b.depth, depth = _c === void 0 ? 1 : _c, node = _b.node;
-            return __generator(this, function (_d) {
-                return [2 /*return*/];
-            });
-        });
+    BaseEventManager.prototype.handleExpand = function (data) {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    BaseEventManager.prototype.onLeftIconClick = function (node) {
+        if (this.lineageManager.isExpanding)
+            return;
+        var iconType = node.leftIcon.iconType;
+        if (iconType === EExpandType.EXPAND) {
+            this.handleExpand({ direction: EDirection.INPUT, node: node });
+        }
+        if (iconType === EExpandType.FOLD) {
+            this.handleFold(EDirection.INPUT, node);
+        }
+    };
+    BaseEventManager.prototype.onRightIconClick = function (node) {
+        if (this.lineageManager.isExpanding)
+            return;
+        var iconType = node.rightIcon.iconType;
+        if (iconType === EExpandType.EXPAND) {
+            this.handleExpand({ direction: EDirection.OUTPUT, node: node });
+        }
+        if (iconType === EExpandType.FOLD) {
+            this.handleFold(EDirection.OUTPUT, node);
+        }
     };
     return BaseEventManager;
-}());
+}(BaseManager));
 export { BaseEventManager };
 //# sourceMappingURL=BaseEventManager.js.map

package/dist/manager/nodeManager/BaseEventManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseEventManager.js","sourceRoot":"","sources":["../../../src/manager/nodeManager/BaseEventManager.ts"],"names":[],"mappings":";AAKA;IAUE,0BACE,cAA0D,EAC1D,SAAwB;QAExB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAE5B,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;IAED,yCAAc,GAAd,UAAe,SAAwB;QAAvC,iBAsBC;QArBC,SAAS;QACT,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,UAAC,IAAW;YAC5D,KAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,SAAS;QACT,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,SAAS,CAAC,gBAAgB,EAAE,UAAC,IAAW;YAC7D,KAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,OAAO;QACP,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,UAAC,IAAW;YACzD,KAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,WAAW;QACX,IAAI,CAAC,cAAc,CAAC,EAAE,CACpB,SAAS,CAAC,MAAM,EAChB,UAAC,IAA4D;YAC3D,KAAI,CAAC,YAAY,cAAM,IAAI,EAAG,CAAC;QACjC,CAAC,CACF,CAAC;IACJ,CAAC;IAED,kCAAO,GAAP,UAAQ,IAAW,IAAU,CAAC;IAE9B,0CAAe,GAAf,UAAgB,IAAW,IAAU,CAAC;IAEtC,2CAAgB,GAAhB,UAAiB,IAAW,IAAU,CAAC;IAEvC,wCAAa,GAAb,UAAc,IAAW,IAAU,CAAC;IAE9B,uCAAY,GAAlB;4DAAmB,EAQlB;gBAPC,SAAS,eAAA,EACT,aAAS,EAAT,KAAK,mBAAG,CAAC,KAAA,EACT,IAAI,UAAA;;;;;KAKA;IACR,uBAAC;AAAD,CAAC,AA9DD,IA8DC"}
+{"version":3,"file":"BaseEventManager.js","sourceRoot":"","sources":["../../../src/manager/nodeManager/BaseEventManager.ts"],"names":[],"mappings":"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"}

package/dist/manager/nodeManager/ColumnEventManager.d.ts

@@ -1,20 +1,8 @@
-import { InkLineageManager } from '..';
 import { ColumnNode } from '../../components';
-import { EDirection, IColResBase, TDataBase } from '../../types';
-import { BaseEventManager } from './BaseEventManager';
-export declare class ColumnEventManager<TTableData extends TDataBase<TColumnData>, TColumnData extends IColResBase> extends BaseEventManager<TTableData, TColumnData> {
-    constructor(lineageManager: InkLineageManager<TTableData, TColumnData>);
-    registerExtraEvents(): void;
-    onClick(node: ColumnNode): void;
-    onLeftIconClick(node: ColumnNode): void;
-    onRightIconClick(node: ColumnNode): void;
-    onContextMenu(node: ColumnNode): void;
-    showDetailPanel: (node: ColumnNode) => void;
+import { EDirection, IColResBase, ITableResBase, IExpandData } from '../../types';
+import { BaseColumnEventManager } from './BaseColumnEventManager';
+export declare class ColumnEventManager<TTableData extends ITableResBase<TColumnData>, TColumnData extends IColResBase> extends BaseColumnEventManager<TTableData, TColumnData> {
     handleFold(direction: EDirection, node: ColumnNode): void;
-    handleExpand(data: {
-        direction: EDirection;
-        depth?: number;
-        node: ColumnNode;
-    }): Promise<void>;
+    handleExpand(data: IExpandData): Promise<void>;
 }
 //# sourceMappingURL=ColumnEventManager.d.ts.map

package/dist/manager/nodeManager/ColumnEventManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnEventManager.d.ts","sourceRoot":"","sources":["../../../src/manager/nodeManager/ColumnEventManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAoB,MAAM,IAAI,CAAC;AACzD,OAAO,EAAE,UAAU,EAAa,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAEL,UAAU,EAKV,WAAW,EACX,SAAS,EAKV,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,qBAAa,kBAAkB,CAC7B,UAAU,SAAS,SAAS,CAAC,WAAW,CAAC,EACzC,WAAW,SAAS,WAAW,CAC/B,SAAQ,gBAAgB,CAAC,UAAU,EAAE,WAAW,CAAC;gBACrC,cAAc,EAAE,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC;IAKtE,mBAAmB,IAAI,IAAI;IAM3B,OAAO,CAAC,IAAI,EAAE,UAAU;IAuBxB,eAAe,CAAC,IAAI,EAAE,UAAU;IAahC,gBAAgB,CAAC,IAAI,EAAE,UAAU;IAajC,aAAa,CAAC,IAAI,EAAE,UAAU;IAsB9B,eAAe,GAAI,MAAM,UAAU,UAoBjC;IAEF,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU;IAkG5C,YAAY,CAAC,IAAI,EAAE;QACvB,SAAS,EAAE,UAAU,CAAC;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,UAAU,CAAC;KAClB;CA0OF"}
+{"version":3,"file":"ColumnEventManager.d.ts","sourceRoot":"","sources":["../../../src/manager/nodeManager/ColumnEventManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAa,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAEL,UAAU,EAEV,WAAW,EACX,aAAa,EAKb,WAAW,EAEZ,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,qBAAa,kBAAkB,CAC7B,UAAU,SAAS,aAAa,CAAC,WAAW,CAAC,EAC7C,WAAW,SAAS,WAAW,CAC/B,SAAQ,sBAAsB,CAAC,UAAU,EAAE,WAAW,CAAC;IACvD,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU;IAqF5C,YAAY,CAAC,IAAI,EAAE,WAAW;CAuRrC"}

package/dist/manager/nodeManager/ColumnEventManager.js

@@ -1,93 +1,16 @@
 import { __assign, __awaiter, __extends, __generator, __read, __spreadArray } from "tslib";
-import { getNodeHeight, runtime } from '@aloudata/ink-graph-new';
+import { getNodeHeight } from '@aloudata/ink-graph-new';
 import { ColumnNode, TableNode } from '../../components';
 import { COL_HEIGHT } from '../../constant';
-import { EDashType, EDirection, EElementType, EEntityType, EExpandType, EOverviewType, EColumnEvents, EEventEnum, } from '../../types';
+import { EDashType, EDirection, EEventEnum, } from '../../types';
 import { getRelatedData } from '../../utils';
-import { BaseEventManager } from './BaseEventManager';
 import _ from 'lodash';
+import { BaseColumnEventManager } from './BaseColumnEventManager';
 var ColumnEventManager = /** @class */ (function (_super) {
     __extends(ColumnEventManager, _super);
-    function ColumnEventManager(lineageManager) {
-        var _this = _super.call(this, lineageManager, EColumnEvents) || this;
-        _this.showDetailPanel = function (node) {
-            var _a, _b, _c;
-            // 将data同步到atom，触发更新
-            var _d = _this.lineageManager.rightKeyMenuManager.overviewState, userClosed = _d.userClosed, visible = _d.visible;
-            var overviewType = EOverviewType.COLUMN;
-            if (((_c = (_b = (_a = node.node) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.type) === EEntityType.TEMP_TABLE) {
-                overviewType = EOverviewType.TEMP_COLUMN;
-            }
-            _this.lineageManager.setOverview(__assign(__assign({}, _this.lineageManager.rightKeyMenuManager.overviewState), { targetId: node.config.id, type: overviewType, visible: !(userClosed && !visible), initial: true, caliberIsHighlight: false, taskIsHighlight: false }));
-        };
-        _this.registerExtraEvents();
-        return _this;
+    function ColumnEventManager() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
-    ColumnEventManager.prototype.registerExtraEvents = function () {
-        var _this = this;
-        this.lineageManager.on(EColumnEvents.CLICK, function (node) {
-            _this.onClick(node);
-        });
-    };
-    ColumnEventManager.prototype.onClick = function (node) {
-        var _a, _b, _c, _d, _e, _f;
-        var onlyShowRelated = !!((_b = (_a = this.lineageManager) === null || _a === void 0 ? void 0 : _a.rightKeyMenuManager) === null || _b === void 0 ? void 0 : _b.onlyShowRelated);
-        // hide context menu
-        (_c = this.lineageManager) === null || _c === void 0 ? void 0 : _c.hideContextMenu();
-        if (node.isForbidden)
-            return;
-        // show detail panel
-        this.showDetailPanel(node);
-        if (!onlyShowRelated) {
-            // update active nodes
-            (_d = this.lineageManager) === null || _d === void 0 ? void 0 : _d.updateActiveNodes([node.config]);
-            (_e = this.lineageManager) === null || _e === void 0 ? void 0 : _e.setRelatedNodesAndEdges(node.config);
-            // refresh toolbar related status
-            (_f = this.lineageManager) === null || _f === void 0 ? void 0 : _f.refreshToolbarRelatedStatus(node.config);
-        }
-    };
-    ColumnEventManager.prototype.onLeftIconClick = function (node) {
-        if (this.lineageManager.isExpanding)
-            return;
-        var iconType = node.leftIcon.iconType;
-        if (iconType === EExpandType.EXPAND) {
-            this.handleExpand({ direction: EDirection.INPUT, node: node });
-        }
-        if (iconType === EExpandType.FOLD) {
-            this.handleFold(EDirection.INPUT, node);
-        }
-    };
-    ColumnEventManager.prototype.onRightIconClick = function (node) {
-        if (this.lineageManager.isExpanding)
-            return;
-        var iconType = node.rightIcon.iconType;
-        if (iconType === EExpandType.EXPAND) {
-            this.handleExpand({ direction: EDirection.OUTPUT, node: node });
-        }
-        if (iconType === EExpandType.FOLD) {
-            this.handleFold(EDirection.OUTPUT, node);
-        }
-    };
-    ColumnEventManager.prototype.onContextMenu = function (node) {
-        var _a = node.config, isStartNode = _a.isStartNode, id = _a.id;
-        var name = node.config.data.name;
-        var translate = runtime.sceneGraphManager.getPosition(node.colText);
-        var _b = __read(translate, 2), translateX = _b[0], translateY = _b[1];
-        var x = 70 + translateX;
-        var y = Number(node.colText.style.y) + translateY - 20;
-        this.lineageManager.showContextMenu({
-            id: id,
-            visible: true,
-            x: x,
-            y: y,
-            type: EElementType.COLUMN,
-            typeCode: 'Table',
-            isStartNode: isStartNode,
-            parentGuid: node.config.tableId || '',
-            parentName: node.config.tableName || '',
-            name: name,
-        });
-    };
     ColumnEventManager.prototype.handleFold = function (direction, node) {
         var _this = this;
         var _a, _b, _c, _d, _e, _f, _g;
@@ -110,12 +33,11 @@ var ColumnEventManager = /** @class */ (function (_super) {
             // find all outputNodes
             var outputNodes = [];
             edges.forEach(function (edge) {
-                if (edge.target === nodeId &&
-                    (edge.visible || edge.relationType === EDashType.INDIRECT)) {
+                var edgeVisible = edge.visible || edge.relationType === EDashType.INDIRECT;
+                if (edge.target === nodeId && edgeVisible) {
                     inputNodes.push(edge.source);
                 }
-                if (edge.source === nodeId &&
-                    (edge.visible || edge.relationType === EDashType.INDIRECT)) {
+                if (edge.source === nodeId && edgeVisible) {
                     outputNodes.push(edge.target);
                 }
             });
@@ -129,9 +51,9 @@ var ColumnEventManager = /** @class */ (function (_super) {
             if (!node) {
                 (_a = _this.lineageManager.graph.nodes) === null || _a === void 0 ? void 0 : _a.forEach(function (n) {
                     var _a;
-                    (_a = n.relatedColumns) === null || _a === void 0 ? void 0 : _a.forEach(function (c) {
-                        if (c.id === nodeId) {
-                            node = c;
+                    (_a = n.relatedColumns) === null || _a === void 0 ? void 0 : _a.forEach(function (column) {
+                        if (column.id === nodeId) {
+                            node = column;
                             return;
                         }
                     });
@@ -148,47 +70,56 @@ var ColumnEventManager = /** @class */ (function (_super) {
                 node.destroy();
             }
         });
-        relatedEdges.forEach(function (edgeCfg) {
-            var edge = _this.lineageManager.getEdgeInstanceById(edgeCfg.id);
-            if (edge) {
-                // edge.config.isFolded = true;
-                // edge.destroy();
-                // edge.update();
-                _this.lineageManager.setData(__assign(__assign({}, _this.lineageManager.parsedData), { edges: _this.lineageManager.parsedData.edges.filter(function (e) { return e.id !== edgeCfg.id; }) }));
-            }
-        });
+        var edgeIdsToRemove = relatedEdges.map(function (edgeCfg) { return edgeCfg.id; });
+        if (edgeIdsToRemove.length > 0) {
+            this.lineageManager.setData(__assign(__assign({}, this.lineageManager.parsedData), { edges: this.lineageManager.parsedData.edges.filter(function (edge) { return !edgeIdsToRemove.includes(edge.id); }) }));
+        }
         (_f = this.lineageManager) === null || _f === void 0 ? void 0 : _f.resetRelatedNodes(false);
         (_g = this.lineageManager) === null || _g === void 0 ? void 0 : _g.update();
     };
     ColumnEventManager.prototype.handleExpand = function (data) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, depth, direction, node, onlyShowRelated, params, getNewDataPromise, newData, nodes, edges, prevNodesConfig, prevEdgesConfig_1, differentObjects, commonObjects, newNodesConfig, newEdgesConfig, currRelatedColumn;
+            var shouldLayout, _a, depth, direction, node, onlyShowRelated, nodeEdges, params, getNewDataPromise, newData, nodes, edges, prevNodesConfig, prevEdgesConfig_1, differentObjects, commonObjects, newNodesConfig, newEdgesMap_1, newEdgesConfig, currRelatedColumn;
             var _this = this;
-            var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-            return __generator(this, function (_r) {
-                switch (_r.label) {
+            var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+            return __generator(this, function (_s) {
+                switch (_s.label) {
                     case 0:
+                        shouldLayout = true;
                         _a = data.depth, depth = _a === void 0 ? 1 : _a, direction = data.direction, node = data.node;
                         // get prev start related column id
                         node.prevStartRelatedColumnId =
                             this.lineageManager.expandManager.prevStartRelatedColumnId;
                         onlyShowRelated = !!((_c = (_b = this.lineageManager) === null || _b === void 0 ? void 0 : _b.rightKeyMenuManager) === null || _c === void 0 ? void 0 : _c.onlyShowRelated);
-                        if (onlyShowRelated) {
-                            // 开启仅相关的时候扩展
-                            // 1. 先打开仅相关
-                            this.lineageManager.updateRelatedTableVisible(false, false);
-                            // 2. 接下来按照正常逻辑扩展
-                        }
+                        // if (onlyShowRelated) {
+                        //   this.lineageManager.updateRelatedTableVisible(false, false);
+                        // }
                         // reset active nodes
                         (_d = this.lineageManager) === null || _d === void 0 ? void 0 : _d.resetActiveNodes();
                         // reset related nodes
                         (_e = this.lineageManager) === null || _e === void 0 ? void 0 : _e.resetRelatedNodes(false);
                         // show expand loading
                         (_f = this.lineageManager) === null || _f === void 0 ? void 0 : _f.showExpandLoading(node, direction);
+                        nodeEdges = [];
+                        if (direction === EDirection.INPUT) {
+                            this.lineageManager.parsedData.edges.forEach(function (item) {
+                                if (item.source === node.id) {
+                                    nodeEdges.push(item.data);
+                                }
+                            });
+                        }
+                        else if (direction === EDirection.OUTPUT) {
+                            this.lineageManager.parsedData.edges.forEach(function (item) {
+                                if (item.target === node.id) {
+                                    nodeEdges.push(item.data);
+                                }
+                            });
+                        }
                         params = {
                             depth: depth,
                             direction: direction,
                             guid: node.config.id,
+                            nodeEdges: nodeEdges
                         };
                         getNewDataPromise = new Promise(function (resolve) {
                             _this.lineageManager.once(EEventEnum.COLUMN_EXPAND_RESPONSE, function (response) {
@@ -198,7 +129,7 @@ var ColumnEventManager = /** @class */ (function (_super) {
                         });
                         return [4 /*yield*/, getNewDataPromise];
                     case 1:
-                        newData = _r.sent();
+                        newData = _s.sent();
                         //  hide expand loading
                         (_g = this.lineageManager) === null || _g === void 0 ? void 0 : _g.hideExpandLoading();
                         if (!newData)
@@ -218,7 +149,7 @@ var ColumnEventManager = /** @class */ (function (_super) {
                         if (nodes.length > 0 && nodes.some(function (e) { var _a; return (_a = e.data) === null || _a === void 0 ? void 0 : _a.isHotspot; })) {
                             if (direction === EDirection.BOTH)
                                 return [2 /*return*/];
-                            this.lineageManager.emit(EEventEnum.INDIRECT_TIPS, {
+                            this.lineageManager.emit(EEventEnum.NOTIFICATION_TIPS, {
                                 message: '存在热点资产',
                                 description: '本次探索过程中存在热点资产，热点资产默认不继续探索，请手动探索后展开',
                                 position: 'top-center',
@@ -238,20 +169,27 @@ var ColumnEventManager = /** @class */ (function (_super) {
                             if (direction === EDirection.OUTPUT) {
                                 node.config.hasMoreOutput = false;
                             }
-                            this.lineageManager.emit(EEventEnum.INDIRECT_TIPS, { message: "\u8BE5\u8282\u70B9\u65E0".concat(direction === EDirection.INPUT ? '上游' : '下游', "\u8840\u7F18") });
+                            this.lineageManager.emit(EEventEnum.NOTIFICATION_TIPS, {
+                                message: "\u8BE5\u8282\u70B9\u65E0".concat(direction === EDirection.INPUT ? '上游' : '下游', "\u8840\u7F18"),
+                            });
+                            shouldLayout = false;
                         }
                         else {
                             if (edges.every(function (edge) { return edge.relationType === EDashType.INDIRECT; }) &&
                                 ((_j = (_h = this.lineageManager) === null || _h === void 0 ? void 0 : _h.rightKeyMenuManager) === null || _j === void 0 ? void 0 : _j.edgeDashVisible) ===
                                     EDashType.DIRECT) {
-                                this.lineageManager.emit(EEventEnum.INDIRECT_TIPS, { message: '当前字段只有间接血缘，请打开间接血缘开关后查看' });
+                                this.lineageManager.emit(EEventEnum.NOTIFICATION_TIPS, {
+                                    message: '当前字段只有间接血缘，请打开间接血缘开关后查看',
+                                });
+                                shouldLayout = false;
                             }
                             prevNodesConfig = this.lineageManager.parsedData.nodes;
                             prevEdgesConfig_1 = this.lineageManager.parsedData.edges;
                             // 如果是从起始列往下扩展并且不是同一个列，先清空之前所有节点下的的relatedColumns，再把新的parse后的列赋值给每一个表下
                             // 展开列是起始资产的列且展开列不是起始资产的第一个列
                             if (node.config.isStartNode &&
-                                node.prevStartRelatedColumnId !== ((_k = node.config) === null || _k === void 0 ? void 0 : _k.id)) {
+                                node.prevStartRelatedColumnId !== ((_k = node.config) === null || _k === void 0 ? void 0 : _k.id) &&
+                                !node.config.isRelatedColumn) {
                                 // find related nodes and edges
                                 // 获取起始资产首列的上下游列，包含间接血缘
                                 if (node.prevStartRelatedColumnId) {
@@ -304,7 +242,12 @@ var ColumnEventManager = /** @class */ (function (_super) {
                                 }
                             });
                             newNodesConfig = _.concat(prevNodesConfig, differentObjects);
-                            newEdgesConfig = _.unionBy(__spreadArray(__spreadArray([], __read(prevEdgesConfig_1), false), __read(edges), false), 'id');
+                            newEdgesMap_1 = new Map(edges.map(function (n) { return [n.id, n]; }));
+                            newEdgesConfig = _.unionBy(__spreadArray(__spreadArray([], __read(prevEdgesConfig_1), false), __read(edges), false), // 合并旧节点和新节点，旧节点在前优先保留
+                            'id').map(function (edge) {
+                                var newEdge = newEdgesMap_1.get(edge.id);
+                                return __assign(__assign({}, edge), { data: __assign(__assign({}, edge.data), newEdge === null || newEdge === void 0 ? void 0 : newEdge.data) });
+                            });
                             // update related column position
                             newNodesConfig.forEach(function (n) {
                                 n.relatedColumns
@@ -327,7 +270,9 @@ var ColumnEventManager = /** @class */ (function (_super) {
                         if (!onlyShowRelated) {
                             currRelatedColumn = node.node.config.relatedColumns.find(function (col) { return col.id === node.config.id; });
                             // update active nodes
-                            (_l = this.lineageManager) === null || _l === void 0 ? void 0 : _l.updateActiveNodes([currRelatedColumn]);
+                            (_l = this.lineageManager) === null || _l === void 0 ? void 0 : _l.updateActiveNodes([
+                                currRelatedColumn,
+                            ]);
                             // cache related edges
                             (_m = this.lineageManager) === null || _m === void 0 ? void 0 : _m.setRelatedNodesAndEdges(node.config, false);
                         }
@@ -337,18 +282,21 @@ var ColumnEventManager = /** @class */ (function (_super) {
                                 this.lineageManager.cachedRelatedNodeConfig,
                             ]);
                             // cache related edges
-                            (_p = this.lineageManager) === null || _p === void 0 ? void 0 : _p.setRelatedNodesAndEdges(this.lineageManager.cachedRelatedNodeConfig);
-                            // 开启仅相关的时候扩展   FIXME: 这里需要优化  @yunke
-                            // this.lineageManager.updateRelatedTableVisible(true);
+                            (_p = this.lineageManager) === null || _p === void 0 ? void 0 : _p.setRelatedNodesAndEdges(this.lineageManager.cachedRelatedNodeConfig, false);
                         }
                         // calc fold nodes
-                        (_q = this.lineageManager) === null || _q === void 0 ? void 0 : _q.updateFoldStatus(this.lineageManager.foldLineageManager.isFoldChecked);
+                        if (shouldLayout) {
+                            (_q = this.lineageManager) === null || _q === void 0 ? void 0 : _q.updateFoldStatus(this.lineageManager.foldLineageManager.isFoldChecked);
+                        }
+                        else {
+                            (_r = this.lineageManager) === null || _r === void 0 ? void 0 : _r.update({ shouldLayout: shouldLayout });
+                        }
                         return [2 /*return*/];
                 }
             });
         });
     };
     return ColumnEventManager;
-}(BaseEventManager));
+}(BaseColumnEventManager));
 export { ColumnEventManager };
 //# sourceMappingURL=ColumnEventManager.js.map