aldehyde 0.2.486 → 0.2.488
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/controls/direct-file-view/index.d.ts.map +1 -1
- package/lib/controls/direct-file-view/index.js +2 -1
- package/lib/controls/direct-file-view/index.js.map +1 -1
- package/lib/controls/entry-control.d.ts +1 -0
- package/lib/controls/entry-control.d.ts.map +1 -1
- package/lib/controls/entry-control.js +2 -0
- package/lib/controls/entry-control.js.map +1 -1
- package/lib/draw-canvas-edit/components/asset-bar/index.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/asset-bar/index.js +26 -7
- package/lib/draw-canvas-edit/components/asset-bar/index.js.map +1 -1
- package/lib/draw-canvas-edit/components/asset-bar/index.less +1 -1
- package/lib/draw-canvas-edit/components/main-header/index.js +1 -1
- package/lib/draw-canvas-edit/components/render/draws/bg-draw.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/draws/bg-draw.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/bg-draw.js +3 -2
- package/lib/draw-canvas-edit/components/render/draws/bg-draw.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/contextmenu-draw.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/draws/contextmenu-draw.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/contextmenu-draw.js +2 -1
- package/lib/draw-canvas-edit/components/render/draws/contextmenu-draw.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/graph-draw.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/draws/graph-draw.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/graph-draw.js +9 -8
- package/lib/draw-canvas-edit/components/render/draws/graph-draw.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/link-draw.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/draws/link-draw.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/link-draw.js +24 -23
- package/lib/draw-canvas-edit/components/render/draws/link-draw.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/preview-draw.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/draws/preview-draw.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/preview-draw.js +6 -5
- package/lib/draw-canvas-edit/components/render/draws/preview-draw.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/ref-line-draw.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/draws/ref-line-draw.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/ref-line-draw.js +3 -2
- package/lib/draw-canvas-edit/components/render/draws/ref-line-draw.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/ruler-draw.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/draws/ruler-draw.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/draws/ruler-draw.js +8 -7
- package/lib/draw-canvas-edit/components/render/draws/ruler-draw.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/graphs/base-graph.js +3 -3
- package/lib/draw-canvas-edit/components/render/graphs/bezier.js +5 -5
- package/lib/draw-canvas-edit/components/render/graphs/circle.js +4 -4
- package/lib/draw-canvas-edit/components/render/graphs/curve.js +5 -5
- package/lib/draw-canvas-edit/components/render/graphs/line.js +5 -5
- package/lib/draw-canvas-edit/components/render/graphs/rect.js +4 -4
- package/lib/draw-canvas-edit/components/render/handlers/drag-handlers.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/handlers/drag-handlers.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/drag-handlers.js +7 -6
- package/lib/draw-canvas-edit/components/render/handlers/drag-handlers.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/drag-outside-handlers.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/handlers/drag-outside-handlers.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/drag-outside-handlers.js +13 -8
- package/lib/draw-canvas-edit/components/render/handlers/drag-outside-handlers.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/graph-handlers.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/handlers/graph-handlers.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/graph-handlers.js +2 -1
- package/lib/draw-canvas-edit/components/render/handlers/graph-handlers.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/key-move-handlers.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/handlers/key-move-handlers.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/key-move-handlers.js +5 -4
- package/lib/draw-canvas-edit/components/render/handlers/key-move-handlers.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/link-handlers.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/handlers/link-handlers.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/link-handlers.js +3 -2
- package/lib/draw-canvas-edit/components/render/handlers/link-handlers.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/selection-handlers.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/handlers/selection-handlers.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/selection-handlers.js +5 -4
- package/lib/draw-canvas-edit/components/render/handlers/selection-handlers.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/shutcut-handlers.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/handlers/shutcut-handlers.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/shutcut-handlers.js +1 -0
- package/lib/draw-canvas-edit/components/render/handlers/shutcut-handlers.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/text-handlers.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/handlers/text-handlers.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/text-handlers.js +1 -0
- package/lib/draw-canvas-edit/components/render/handlers/text-handlers.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/zoom-handlers.d.ts +1 -0
- package/lib/draw-canvas-edit/components/render/handlers/zoom-handlers.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/handlers/zoom-handlers.js +7 -6
- package/lib/draw-canvas-edit/components/render/handlers/zoom-handlers.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/index.d.ts.map +1 -1
- package/lib/draw-canvas-edit/components/render/index.js +49 -49
- package/lib/draw-canvas-edit/components/render/index.js.map +1 -1
- package/lib/draw-canvas-edit/components/render/tools/align-tool.js +4 -4
- package/lib/draw-canvas-edit/components/render/tools/asset-tool.js +1 -1
- package/lib/draw-canvas-edit/components/render/tools/copy-tool.js +4 -4
- package/lib/draw-canvas-edit/components/render/tools/import-export-tool.js +7 -7
- package/lib/draw-canvas-edit/components/render/tools/link-tool.js +9 -9
- package/lib/draw-canvas-edit/components/render/tools/position-tool.js +18 -18
- package/lib/draw-canvas-edit/components/render/tools/selection-tool.js +2 -2
- package/lib/draw-canvas-edit/components/render/tools/z-index-tool.js +16 -16
- package/lib/lowcode-components/bar-chart/index.d.ts +4 -1
- package/lib/lowcode-components/bar-chart/index.d.ts.map +1 -1
- package/lib/lowcode-components/bar-chart/index.js +3 -0
- package/lib/lowcode-components/bar-chart/index.js.map +1 -1
- package/lib/lowcode-components/column-3d-chart/index.d.ts +4 -1
- package/lib/lowcode-components/column-3d-chart/index.d.ts.map +1 -1
- package/lib/lowcode-components/column-3d-chart/index.js +3 -0
- package/lib/lowcode-components/column-3d-chart/index.js.map +1 -1
- package/lib/lowcode-components/column-chart/index.d.ts +6 -3
- package/lib/lowcode-components/column-chart/index.d.ts.map +1 -1
- package/lib/lowcode-components/column-chart/index.js +4 -1
- package/lib/lowcode-components/column-chart/index.js.map +1 -1
- package/lib/lowcode-components/line-bar-chart/index.d.ts +4 -1
- package/lib/lowcode-components/line-bar-chart/index.d.ts.map +1 -1
- package/lib/lowcode-components/line-bar-chart/index.js +3 -0
- package/lib/lowcode-components/line-bar-chart/index.js.map +1 -1
- package/lib/lowcode-components/line-chart/index.d.ts +5 -2
- package/lib/lowcode-components/line-chart/index.d.ts.map +1 -1
- package/lib/lowcode-components/line-chart/index.js +6 -2
- package/lib/lowcode-components/line-chart/index.js.map +1 -1
- package/lib/lowcode-components/pie-chart/index.d.ts +4 -1
- package/lib/lowcode-components/pie-chart/index.d.ts.map +1 -1
- package/lib/lowcode-components/pie-chart/index.js +3 -0
- package/lib/lowcode-components/pie-chart/index.js.map +1 -1
- package/lib/module/dtmpl-edit-card.d.ts +1 -1
- package/lib/module/dtmpl-edit-card.d.ts.map +1 -1
- package/lib/module/dtmpl-edit-card.js +50 -7
- package/lib/module/dtmpl-edit-card.js.map +1 -1
- package/lib/module/dtmpl-edit-page.d.ts +1 -1
- package/lib/module/dtmpl-edit-page.d.ts.map +1 -1
- package/lib/module/dtmpl-edit-page.js +50 -7
- package/lib/module/dtmpl-edit-page.js.map +1 -1
- package/lib/table/act-table.d.ts +2 -0
- package/lib/table/act-table.d.ts.map +1 -1
- package/lib/table/act-table.js +20 -17
- package/lib/table/act-table.js.map +1 -1
- package/lib/table/page-chart.d.ts +15 -0
- package/lib/table/page-chart.d.ts.map +1 -0
- package/lib/table/page-chart.js +147 -0
- package/lib/table/page-chart.js.map +1 -0
- package/lib/table/page-chart.less +10 -0
- package/lib/table/relation-table.d.ts +2 -0
- package/lib/table/relation-table.d.ts.map +1 -1
- package/lib/table/row-table.d.ts +11 -0
- package/lib/table/row-table.d.ts.map +1 -0
- package/lib/table/row-table.js +11 -0
- package/lib/table/row-table.js.map +1 -0
- package/lib/tmpl/interface.d.ts +12 -1
- package/lib/tmpl/interface.d.ts.map +1 -1
- package/lib/tmpl/interface.js.map +1 -1
- package/lib/tmpl/tmpl-config-analysis.js +1 -1
- package/lib/tmpl/tmpl-config-analysis.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/controls/direct-file-view/index.tsx +2 -1
- package/src/aldehyde/controls/entry-control.tsx +3 -0
- package/src/aldehyde/draw-canvas-edit/components/asset-bar/index.less +1 -1
- package/src/aldehyde/draw-canvas-edit/components/asset-bar/index.tsx +19 -6
- package/src/aldehyde/draw-canvas-edit/components/main-header/index.tsx +1 -1
- package/src/aldehyde/draw-canvas-edit/components/render/draws/bg-draw.ts +3 -2
- package/src/aldehyde/draw-canvas-edit/components/render/draws/contextmenu-draw.ts +2 -1
- package/src/aldehyde/draw-canvas-edit/components/render/draws/graph-draw.ts +249 -249
- package/src/aldehyde/draw-canvas-edit/components/render/draws/link-draw.ts +1415 -1414
- package/src/aldehyde/draw-canvas-edit/components/render/draws/preview-draw.ts +274 -273
- package/src/aldehyde/draw-canvas-edit/components/render/draws/ref-line-draw.ts +71 -70
- package/src/aldehyde/draw-canvas-edit/components/render/draws/ruler-draw.ts +166 -165
- package/src/aldehyde/draw-canvas-edit/components/render/graphs/base-graph.ts +3 -3
- package/src/aldehyde/draw-canvas-edit/components/render/graphs/bezier.ts +5 -5
- package/src/aldehyde/draw-canvas-edit/components/render/graphs/circle.ts +4 -4
- package/src/aldehyde/draw-canvas-edit/components/render/graphs/curve.ts +5 -5
- package/src/aldehyde/draw-canvas-edit/components/render/graphs/line.ts +5 -5
- package/src/aldehyde/draw-canvas-edit/components/render/graphs/rect.ts +4 -4
- package/src/aldehyde/draw-canvas-edit/components/render/handlers/drag-handlers.ts +7 -6
- package/src/aldehyde/draw-canvas-edit/components/render/handlers/drag-outside-handlers.ts +8 -3
- package/src/aldehyde/draw-canvas-edit/components/render/handlers/graph-handlers.ts +2 -1
- package/src/aldehyde/draw-canvas-edit/components/render/handlers/key-move-handlers.ts +5 -4
- package/src/aldehyde/draw-canvas-edit/components/render/handlers/link-handlers.ts +3 -2
- package/src/aldehyde/draw-canvas-edit/components/render/handlers/selection-handlers.ts +5 -4
- package/src/aldehyde/draw-canvas-edit/components/render/handlers/shutcut-handlers.ts +1 -0
- package/src/aldehyde/draw-canvas-edit/components/render/handlers/text-handlers.ts +1 -0
- package/src/aldehyde/draw-canvas-edit/components/render/handlers/zoom-handlers.ts +7 -6
- package/src/aldehyde/draw-canvas-edit/components/render/index.ts +48 -49
- package/src/aldehyde/draw-canvas-edit/components/render/tools/align-tool.ts +4 -4
- package/src/aldehyde/draw-canvas-edit/components/render/tools/asset-tool.ts +1 -1
- package/src/aldehyde/draw-canvas-edit/components/render/tools/copy-tool.ts +4 -4
- package/src/aldehyde/draw-canvas-edit/components/render/tools/import-export-tool.ts +7 -7
- package/src/aldehyde/draw-canvas-edit/components/render/tools/link-tool.ts +9 -9
- package/src/aldehyde/draw-canvas-edit/components/render/tools/position-tool.ts +18 -18
- package/src/aldehyde/draw-canvas-edit/components/render/tools/selection-tool.ts +2 -2
- package/src/aldehyde/draw-canvas-edit/components/render/tools/z-index-tool.ts +16 -16
- package/src/aldehyde/lowcode-components/bar-chart/index.tsx +5 -1
- package/src/aldehyde/lowcode-components/column-3d-chart/index.tsx +5 -1
- package/src/aldehyde/lowcode-components/column-chart/index.tsx +7 -3
- package/src/aldehyde/lowcode-components/line-bar-chart/index.tsx +5 -1
- package/src/aldehyde/lowcode-components/line-chart/index.tsx +9 -5
- package/src/aldehyde/lowcode-components/pie-chart/index.tsx +5 -1
- package/src/aldehyde/module/dtmpl-edit-card.tsx +47 -7
- package/src/aldehyde/module/dtmpl-edit-page.tsx +47 -8
- package/src/aldehyde/table/act-table.tsx +31 -25
- package/src/aldehyde/table/page-chart.less +10 -0
- package/src/aldehyde/table/page-chart.tsx +192 -0
- package/src/aldehyde/table/row-table.tsx +23 -0
- package/src/aldehyde/tmpl/interface.tsx +13 -1
- package/src/aldehyde/tmpl/tmpl-config-analysis.tsx +1 -1
|
@@ -98,7 +98,7 @@ export class Line extends BaseGraph {
|
|
|
98
98
|
document.body.style.cursor = anchorShape.attrs.adjusting ? 'move' : 'default';
|
|
99
99
|
graph.setAttr('hover', false);
|
|
100
100
|
graph.setAttr('hoverAnchor', false);
|
|
101
|
-
render.redraw([GraphDraw.
|
|
101
|
+
render.redraw([GraphDraw.NAME]);
|
|
102
102
|
});
|
|
103
103
|
anchorAndShadow.shape = anchorShape;
|
|
104
104
|
} else {
|
|
@@ -134,7 +134,7 @@ export class Line extends BaseGraph {
|
|
|
134
134
|
document.body.style.cursor = anchorShape.attrs.adjusting ? 'move' : 'default';
|
|
135
135
|
graph.setAttr('hover', false);
|
|
136
136
|
graph.setAttr('hoverAnchor', false);
|
|
137
|
-
render.redraw([GraphDraw.
|
|
137
|
+
render.redraw([GraphDraw.NAME]);
|
|
138
138
|
});
|
|
139
139
|
anchorAndShadow.shape = anchorShape;
|
|
140
140
|
}
|
|
@@ -265,7 +265,7 @@ export class Line extends BaseGraph {
|
|
|
265
265
|
}
|
|
266
266
|
}
|
|
267
267
|
}
|
|
268
|
-
render.redraw([GraphDraw.
|
|
268
|
+
render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
|
|
269
269
|
}
|
|
270
270
|
BaseGraph.adjust(
|
|
271
271
|
render,
|
|
@@ -355,7 +355,7 @@ export class Line extends BaseGraph {
|
|
|
355
355
|
Line.updateAnchorShadows(this.group, this.anchorShadows, this.line);
|
|
356
356
|
// 更新 图形 的 连接点 的 锚点位置
|
|
357
357
|
Line.updateLinkAnchorShadows(this.group, this.linkAnchorShadows, this.line);
|
|
358
|
-
this.render.redraw([GraphDraw.
|
|
358
|
+
this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
|
|
359
359
|
}
|
|
360
360
|
|
|
361
361
|
// 实现:拖动结束
|
|
@@ -378,7 +378,7 @@ export class Line extends BaseGraph {
|
|
|
378
378
|
this.group.size(size);
|
|
379
379
|
this.render.attractTool.alignLinesClear();
|
|
380
380
|
this.render.updateHistory();
|
|
381
|
-
this.render.redraw([GraphDraw.
|
|
381
|
+
this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
|
|
382
382
|
super.drawEnd(size, {
|
|
383
383
|
x: Math.min(...this.line.points().reduce((arr, item, idx) => {
|
|
384
384
|
if (idx % 2 === 0) arr.push(item);
|
|
@@ -118,7 +118,7 @@ export class Rect extends BaseGraph {
|
|
|
118
118
|
document.body.style.cursor = anchorShape.attrs.adjusting ? 'move' : 'default';
|
|
119
119
|
graph.setAttr('hover', false);
|
|
120
120
|
graph.setAttr('hoverAnchor', false);
|
|
121
|
-
render.redraw([GraphDraw.
|
|
121
|
+
render.redraw([GraphDraw.NAME]);
|
|
122
122
|
});
|
|
123
123
|
anchorAndShadow.shape = anchorShape;
|
|
124
124
|
}
|
|
@@ -590,7 +590,7 @@ export class Rect extends BaseGraph {
|
|
|
590
590
|
}
|
|
591
591
|
}
|
|
592
592
|
}
|
|
593
|
-
render.redraw([GraphDraw.
|
|
593
|
+
render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
|
|
594
594
|
}
|
|
595
595
|
BaseGraph.adjust(render, graph, graphSnap, adjustShape, anchorAndShadows, startPoint, endPoint, hoverRect);
|
|
596
596
|
}
|
|
@@ -660,7 +660,7 @@ export class Rect extends BaseGraph {
|
|
|
660
660
|
this.group.size({ width: offsetX, height: offsetY });
|
|
661
661
|
Rect.updateAnchorShadows(this.group, this.anchorShadows);
|
|
662
662
|
Rect.updateLinkAnchorShadows(this.group, this.linkAnchorShadows);
|
|
663
|
-
this.render.redraw([GraphDraw.
|
|
663
|
+
this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
|
|
664
664
|
}
|
|
665
665
|
|
|
666
666
|
// 实现:拖动结束
|
|
@@ -674,7 +674,7 @@ export class Rect extends BaseGraph {
|
|
|
674
674
|
Rect.updateLinkAnchorShadows(this.group, this.linkAnchorShadows);
|
|
675
675
|
this.render.attractTool.alignLinesClear();
|
|
676
676
|
this.render.updateHistory();
|
|
677
|
-
this.render.redraw([GraphDraw.
|
|
677
|
+
this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
|
|
678
678
|
}
|
|
679
679
|
super.drawEnd();
|
|
680
680
|
}
|
|
@@ -4,6 +4,7 @@ import { Handler, MouseButton } from '../types';
|
|
|
4
4
|
import { LinkDraw, BgDraw, GraphDraw, RulerDraw, PreviewDraw } from '../draws';
|
|
5
5
|
|
|
6
6
|
export class DragHandlers implements Handler {
|
|
7
|
+
static readonly NAME = 'DragHandlers';
|
|
7
8
|
private render: Render;
|
|
8
9
|
constructor(render: Render) {
|
|
9
10
|
this.render = render;
|
|
@@ -19,7 +20,7 @@ export class DragHandlers implements Handler {
|
|
|
19
20
|
mousedown: (e: Konva.KonvaEventObject<GlobalEventHandlersEventMap['mousedown']>) => {
|
|
20
21
|
// 拐点操作中,防止异常拖动
|
|
21
22
|
// 新建图形并拖动中
|
|
22
|
-
if (!(this.render.draws[LinkDraw.
|
|
23
|
+
if (!(this.render.draws[LinkDraw.NAME] as LinkDraw)?.state.linkManualing && !this.render.graphType) {
|
|
23
24
|
if (e.evt.button === MouseButton["右键"] || (e.evt.ctrlKey && e.evt.button === MouseButton["左键"])) // mac 拖动画布快捷键
|
|
24
25
|
{
|
|
25
26
|
const stageState = this.render.getStageState();
|
|
@@ -53,11 +54,11 @@ export class DragHandlers implements Handler {
|
|
|
53
54
|
this.render.stage.position({ x: this.mousedownStagePos.x + offsetX, y: this.mousedownStagePos.y + offsetY });
|
|
54
55
|
// 重绘
|
|
55
56
|
this.render.redraw([
|
|
56
|
-
BgDraw.
|
|
57
|
-
GraphDraw.
|
|
58
|
-
LinkDraw.
|
|
59
|
-
RulerDraw.
|
|
60
|
-
PreviewDraw.
|
|
57
|
+
BgDraw.NAME,
|
|
58
|
+
GraphDraw.NAME,
|
|
59
|
+
LinkDraw.NAME,
|
|
60
|
+
RulerDraw.NAME,
|
|
61
|
+
PreviewDraw.NAME
|
|
61
62
|
]);
|
|
62
63
|
}
|
|
63
64
|
}
|
|
@@ -5,6 +5,7 @@ import { Handler, AssetInfoPoint, LinkDrawPoint } from '../types';
|
|
|
5
5
|
import { RefLineDraw, PreviewDraw } from '../draws';
|
|
6
6
|
|
|
7
7
|
export class DragOutsideHandlers implements Handler {
|
|
8
|
+
static readonly NAME = 'DragOutsideHandlers';
|
|
8
9
|
private render: Render;
|
|
9
10
|
constructor(render: Render) {
|
|
10
11
|
this.render = render;
|
|
@@ -13,14 +14,15 @@ export class DragOutsideHandlers implements Handler {
|
|
|
13
14
|
dom: {
|
|
14
15
|
dragenter: (e: GlobalEventHandlersEventMap['dragenter']) => {
|
|
15
16
|
this.render.stage.setPointersPositions(e);
|
|
16
|
-
this.render.redraw([RefLineDraw.
|
|
17
|
+
this.render.redraw([RefLineDraw.NAME]); // 更新参考线
|
|
17
18
|
},
|
|
18
19
|
dragover: (e: GlobalEventHandlersEventMap['dragover']) => {
|
|
19
20
|
this.render.stage.setPointersPositions(e);
|
|
20
|
-
this.render.redraw([RefLineDraw.
|
|
21
|
+
this.render.redraw([RefLineDraw.NAME]); // 更新参考线
|
|
21
22
|
},
|
|
22
23
|
drop: async (e: GlobalEventHandlersEventMap['drop']) => {
|
|
23
24
|
const componentItem = JSON.parse(e.dataTransfer?.getData('componentItem') || '{}');
|
|
25
|
+
const defaultValues = JSON.parse(e.dataTransfer?.getData('defaultValues') || '{}');
|
|
24
26
|
const src = e.dataTransfer?.getData('src');
|
|
25
27
|
const componentType = e.dataTransfer?.getData('componentType'); // 组件类型
|
|
26
28
|
const showPoints = e.dataTransfer?.getData('showPoints'); // 是否显示连接点
|
|
@@ -56,6 +58,9 @@ export class DragOutsideHandlers implements Handler {
|
|
|
56
58
|
group.setAttrs({ x, y });
|
|
57
59
|
// 更新坐标记录
|
|
58
60
|
this.render.setAssetSettings(group, this.render.getAssetSettings(group), false);
|
|
61
|
+
if (Object.keys(defaultValues).length > 0) { // 设置默认值
|
|
62
|
+
this.render.setAssetSettings(group, { ...this.render.getAssetSettings(group), ...defaultValues }, false);
|
|
63
|
+
}
|
|
59
64
|
// 设置连接点
|
|
60
65
|
this.render.componentFactory.createComponentLinkPoints({ group, points, showPoints });
|
|
61
66
|
// 组件鼠标移入移出事件
|
|
@@ -64,7 +69,7 @@ export class DragOutsideHandlers implements Handler {
|
|
|
64
69
|
// 更新历史
|
|
65
70
|
this.render.updateHistory();
|
|
66
71
|
// 重绘
|
|
67
|
-
this.render.redraw([PreviewDraw.
|
|
72
|
+
this.render.redraw([PreviewDraw.NAME]);
|
|
68
73
|
}
|
|
69
74
|
}
|
|
70
75
|
}
|
|
@@ -5,6 +5,7 @@ import { BaseGraph, Circle, Rect, Line, Bezier, Curve } from '../graphs';
|
|
|
5
5
|
import { GraphDraw } from '../draws';
|
|
6
6
|
|
|
7
7
|
export class GraphHandlers implements Handler {
|
|
8
|
+
static readonly NAME = 'GraphHandlers';
|
|
8
9
|
private render: Render;
|
|
9
10
|
constructor(render: Render) {
|
|
10
11
|
this.render = render;
|
|
@@ -104,7 +105,7 @@ export class GraphHandlers implements Handler {
|
|
|
104
105
|
this.graphing = false; // 调整结束
|
|
105
106
|
this.render.changeGraphType(); // 清空图形类型选择
|
|
106
107
|
this.render.attractTool.alignLinesClear(); // 对齐线清除
|
|
107
|
-
this.render.redraw([GraphDraw.
|
|
108
|
+
this.render.redraw([GraphDraw.NAME]);
|
|
108
109
|
}
|
|
109
110
|
}
|
|
110
111
|
}
|
|
@@ -5,6 +5,7 @@ import { GraphDraw, LinkDraw, RulerDraw, PreviewDraw } from '../draws';
|
|
|
5
5
|
|
|
6
6
|
// 键盘控制组件移动
|
|
7
7
|
export class KeyMoveHandlers implements Handler {
|
|
8
|
+
static readonly NAME = 'KeyMoveHandlers';
|
|
8
9
|
private render: Render;
|
|
9
10
|
constructor(render: Render) {
|
|
10
11
|
this.render = render;
|
|
@@ -32,10 +33,10 @@ export class KeyMoveHandlers implements Handler {
|
|
|
32
33
|
this.change();
|
|
33
34
|
// 重绘
|
|
34
35
|
this.render.redraw([
|
|
35
|
-
GraphDraw.
|
|
36
|
-
LinkDraw.
|
|
37
|
-
RulerDraw.
|
|
38
|
-
PreviewDraw.
|
|
36
|
+
GraphDraw.NAME,
|
|
37
|
+
LinkDraw.NAME,
|
|
38
|
+
RulerDraw.NAME,
|
|
39
|
+
PreviewDraw.NAME
|
|
39
40
|
]);
|
|
40
41
|
}
|
|
41
42
|
}
|
|
@@ -5,6 +5,7 @@ import { LinkDraw } from '../draws';
|
|
|
5
5
|
// 临时连接线
|
|
6
6
|
|
|
7
7
|
export class LinkHandlers implements Handler {
|
|
8
|
+
static readonly NAME = 'LinkHandlers';
|
|
8
9
|
private render: Render;
|
|
9
10
|
constructor(render: Render) {
|
|
10
11
|
this.render = render;
|
|
@@ -12,14 +13,14 @@ export class LinkHandlers implements Handler {
|
|
|
12
13
|
handlers = {
|
|
13
14
|
stage: {
|
|
14
15
|
mouseup: () => {
|
|
15
|
-
const linkDrawState = (this.render.draws[LinkDraw.
|
|
16
|
+
const linkDrawState = (this.render.draws[LinkDraw.NAME] as LinkDraw)?.state;
|
|
16
17
|
if (linkDrawState) { // 临时 连接线 移除
|
|
17
18
|
linkDrawState.linkingLine?.line.destroy();
|
|
18
19
|
linkDrawState.linkingLine = null;
|
|
19
20
|
}
|
|
20
21
|
},
|
|
21
22
|
mousemove: () => {
|
|
22
|
-
const linkDrawState = (this.render.draws[LinkDraw.
|
|
23
|
+
const linkDrawState = (this.render.draws[LinkDraw.NAME] as LinkDraw)?.state;
|
|
23
24
|
if (linkDrawState) {
|
|
24
25
|
const pos = this.render.stage.getPointerPosition();
|
|
25
26
|
if (pos) {
|
|
@@ -4,6 +4,7 @@ import { Handler, LinkDrawPoint, LinkDrawPair, ManualPointsMap, MouseButton, Man
|
|
|
4
4
|
import { GraphDraw, LinkDraw, PreviewDraw, RulerDraw } from '../draws';
|
|
5
5
|
|
|
6
6
|
export class SelectionHandlers implements Handler {
|
|
7
|
+
static readonly NAME = 'SelectionHandlers';
|
|
7
8
|
private render: Render;
|
|
8
9
|
constructor(render: Render) {
|
|
9
10
|
this.render = render;
|
|
@@ -304,12 +305,12 @@ export class SelectionHandlers implements Handler {
|
|
|
304
305
|
this.render.emit('asset-rotation-change', groups);
|
|
305
306
|
this.render.emit('asset-size-change', groups);
|
|
306
307
|
}
|
|
307
|
-
this.render.redraw([GraphDraw.
|
|
308
|
+
this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
|
|
308
309
|
},
|
|
309
310
|
transformend: () => {
|
|
310
311
|
this.reset(); // 变换结束 重置状态
|
|
311
312
|
this.render.updateHistory(); // 更新历史
|
|
312
|
-
this.render.redraw([GraphDraw.
|
|
313
|
+
this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, PreviewDraw.NAME]);
|
|
313
314
|
},
|
|
314
315
|
dragstart: () => {
|
|
315
316
|
},
|
|
@@ -335,12 +336,12 @@ export class SelectionHandlers implements Handler {
|
|
|
335
336
|
group.setAttr('assetSettings', this.render.getAssetSettings(group));
|
|
336
337
|
}
|
|
337
338
|
this.render.emit('asset-position-change', groups);
|
|
338
|
-
this.render.redraw([GraphDraw.
|
|
339
|
+
this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, RulerDraw.NAME, PreviewDraw.NAME]);
|
|
339
340
|
},
|
|
340
341
|
dragend: () => {
|
|
341
342
|
this.reset(); // 拖动结束 重置状态
|
|
342
343
|
this.render.updateHistory();
|
|
343
|
-
this.render.redraw([GraphDraw.
|
|
344
|
+
this.render.redraw([GraphDraw.NAME, LinkDraw.NAME, RulerDraw.NAME, PreviewDraw.NAME]);
|
|
344
345
|
},
|
|
345
346
|
mousemove: () => { // 子节点 hover
|
|
346
347
|
const pos = this.render.stage.getPointerPosition();
|
|
@@ -6,6 +6,7 @@ import { GraphDraw, LinkDraw, RulerDraw, PreviewDraw, RefLineDraw, BgDraw } from
|
|
|
6
6
|
// 缩放
|
|
7
7
|
|
|
8
8
|
export class ZoomHandlers implements Handler {
|
|
9
|
+
static readonly NAME = 'ZoomHandlers';
|
|
9
10
|
private render: Render;
|
|
10
11
|
constructor(render: Render) {
|
|
11
12
|
this.render = render;
|
|
@@ -45,12 +46,12 @@ export class ZoomHandlers implements Handler {
|
|
|
45
46
|
}
|
|
46
47
|
// 重绘
|
|
47
48
|
this.render.redraw([
|
|
48
|
-
BgDraw.
|
|
49
|
-
GraphDraw.
|
|
50
|
-
LinkDraw.
|
|
51
|
-
RulerDraw.
|
|
52
|
-
RefLineDraw.
|
|
53
|
-
PreviewDraw.
|
|
49
|
+
BgDraw.NAME,
|
|
50
|
+
GraphDraw.NAME,
|
|
51
|
+
LinkDraw.NAME,
|
|
52
|
+
RulerDraw.NAME,
|
|
53
|
+
RefLineDraw.NAME,
|
|
54
|
+
PreviewDraw.NAME
|
|
54
55
|
]);
|
|
55
56
|
}
|
|
56
57
|
}
|
|
@@ -105,36 +105,36 @@ export class Render {
|
|
|
105
105
|
this.layerCover.add(this.groupTransformer);
|
|
106
106
|
|
|
107
107
|
if (this.config.showBg) { // 背景
|
|
108
|
-
this.draws[BgDraw.
|
|
108
|
+
this.draws[BgDraw.NAME] = new BgDraw(this, this.layerFloor, { size: this.bgSize, showGrid: this.showGrid, readonly: this.config.readonly });
|
|
109
109
|
}
|
|
110
110
|
|
|
111
|
-
this.draws[LinkDraw.
|
|
111
|
+
this.draws[LinkDraw.NAME] = new LinkDraw(this, this.layerCover, {
|
|
112
112
|
size: this.pointSize
|
|
113
113
|
});
|
|
114
114
|
|
|
115
115
|
if (!this.config.readonly && this.config.showRuler) {
|
|
116
|
-
this.draws[RulerDraw.
|
|
116
|
+
this.draws[RulerDraw.NAME] = new RulerDraw(this, this.layerCover, {
|
|
117
117
|
size: this.rulerSize
|
|
118
118
|
});
|
|
119
119
|
}
|
|
120
120
|
|
|
121
121
|
if (!this.config.readonly && this.config.showRefLine) {
|
|
122
|
-
this.draws[RefLineDraw.
|
|
122
|
+
this.draws[RefLineDraw.NAME] = new RefLineDraw(this, this.layerCover, {
|
|
123
123
|
padding: this.rulerSize
|
|
124
124
|
});
|
|
125
125
|
}
|
|
126
126
|
|
|
127
127
|
if (this.config.showContextmenu) {
|
|
128
|
-
this.draws[ContextmenuDraw.
|
|
128
|
+
this.draws[ContextmenuDraw.NAME] = new ContextmenuDraw(this, this.layerCover, {});
|
|
129
129
|
}
|
|
130
130
|
|
|
131
131
|
if (!this.config.readonly && this.config.showPreview) {
|
|
132
|
-
this.draws[PreviewDraw.
|
|
132
|
+
this.draws[PreviewDraw.NAME] = new PreviewDraw(this, this.layerCover, {
|
|
133
133
|
size: this.previewSize
|
|
134
134
|
});
|
|
135
135
|
}
|
|
136
136
|
|
|
137
|
-
this.draws[GraphDraw.
|
|
137
|
+
this.draws[GraphDraw.NAME] = new GraphDraw(this, this.layerCover, {});
|
|
138
138
|
|
|
139
139
|
this.assetTool = new AssetTool(this); // 素材工具
|
|
140
140
|
this.selectionTool = new SelectionTool(this); // 选择工具
|
|
@@ -148,23 +148,23 @@ export class Render {
|
|
|
148
148
|
this.componentFactory = new ComponentFactory(this); // 统一组件渲染
|
|
149
149
|
|
|
150
150
|
// 事件处理
|
|
151
|
-
this.handlers[DragHandlers.
|
|
152
|
-
this.handlers[ZoomHandlers.
|
|
151
|
+
this.handlers[DragHandlers.NAME] = new DragHandlers(this);
|
|
152
|
+
this.handlers[ZoomHandlers.NAME] = new ZoomHandlers(this);
|
|
153
153
|
|
|
154
154
|
if (!this.config.readonly) {
|
|
155
|
-
this.handlers[DragOutsideHandlers.
|
|
156
|
-
this.handlers[SelectionHandlers.
|
|
157
|
-
this.handlers[KeyMoveHandlers.
|
|
158
|
-
this.handlers[LinkHandlers.
|
|
159
|
-
this.handlers[GraphHandlers.
|
|
160
|
-
this.handlers[TextHandlers.
|
|
155
|
+
this.handlers[DragOutsideHandlers.NAME] = new DragOutsideHandlers(this);
|
|
156
|
+
this.handlers[SelectionHandlers.NAME] = new SelectionHandlers(this);
|
|
157
|
+
this.handlers[KeyMoveHandlers.NAME] = new KeyMoveHandlers(this);
|
|
158
|
+
this.handlers[LinkHandlers.NAME] = new LinkHandlers(this);
|
|
159
|
+
this.handlers[GraphHandlers.NAME] = new GraphHandlers(this);
|
|
160
|
+
this.handlers[TextHandlers.NAME] = new TextHandlers(this);
|
|
161
161
|
}
|
|
162
162
|
if (!this.config.readonly && this.config.showRefLine) {
|
|
163
|
-
if (this.draws[RefLineDraw.
|
|
164
|
-
this.handlers[RefLineDraw.
|
|
163
|
+
if (this.draws[RefLineDraw.NAME] !== void 0) {
|
|
164
|
+
this.handlers[RefLineDraw.NAME] = this.draws[RefLineDraw.NAME]!;
|
|
165
165
|
}
|
|
166
166
|
}
|
|
167
|
-
this.handlers[ShutcutHandlers.
|
|
167
|
+
this.handlers[ShutcutHandlers.NAME] = new ShutcutHandlers(this);
|
|
168
168
|
// 初始化
|
|
169
169
|
this.init();
|
|
170
170
|
}
|
|
@@ -172,14 +172,14 @@ export class Render {
|
|
|
172
172
|
// 初始化
|
|
173
173
|
init() {
|
|
174
174
|
this.stage.add(this.layerFloor);
|
|
175
|
-
this.draws[BgDraw.
|
|
175
|
+
this.draws[BgDraw.NAME]?.init();
|
|
176
176
|
this.stage.add(this.layer);
|
|
177
177
|
this.stage.add(this.layerCover);
|
|
178
|
-
this.draws[LinkDraw.
|
|
179
|
-
this.draws[RulerDraw.
|
|
180
|
-
this.draws[RefLineDraw.
|
|
181
|
-
this.draws[ContextmenuDraw.
|
|
182
|
-
this.draws[PreviewDraw.
|
|
178
|
+
this.draws[LinkDraw.NAME]?.init();
|
|
179
|
+
this.draws[RulerDraw.NAME]?.init();
|
|
180
|
+
this.draws[RefLineDraw.NAME]?.init();
|
|
181
|
+
this.draws[ContextmenuDraw.NAME]?.init();
|
|
182
|
+
this.draws[PreviewDraw.NAME]?.init();
|
|
183
183
|
// 事件绑定
|
|
184
184
|
this.eventBind();
|
|
185
185
|
// 更新历史
|
|
@@ -358,9 +358,9 @@ export class Render {
|
|
|
358
358
|
});
|
|
359
359
|
}
|
|
360
360
|
|
|
361
|
-
this.handlers[SelectionHandlers.
|
|
361
|
+
this.handlers[SelectionHandlers.NAME]?.transformerConfig?.anchorDragBoundFunc &&
|
|
362
362
|
this.transformer.anchorDragBoundFunc(
|
|
363
|
-
this.handlers[SelectionHandlers.
|
|
363
|
+
this.handlers[SelectionHandlers.NAME].transformerConfig!.anchorDragBoundFunc!
|
|
364
364
|
);
|
|
365
365
|
}
|
|
366
366
|
|
|
@@ -399,7 +399,7 @@ export class Render {
|
|
|
399
399
|
|
|
400
400
|
// 忽略各 draw 的根 group
|
|
401
401
|
ignoreDraw(node: Konva.Node) {
|
|
402
|
-
return [BgDraw.
|
|
402
|
+
return [BgDraw.NAME, RulerDraw.NAME, RefLineDraw.NAME, ContextmenuDraw.NAME, PreviewDraw.NAME, LinkDraw.NAME, GraphDraw.NAME].includes(node.name());
|
|
403
403
|
}
|
|
404
404
|
|
|
405
405
|
// 忽略各 draw 的根 group
|
|
@@ -411,14 +411,14 @@ export class Render {
|
|
|
411
411
|
redraw(drawNames?: string[]) {
|
|
412
412
|
const all = [
|
|
413
413
|
// layerFloor
|
|
414
|
-
BgDraw.
|
|
414
|
+
BgDraw.NAME, // 更新背景
|
|
415
415
|
// layerCover(按先后顺序)
|
|
416
|
-
GraphDraw.
|
|
417
|
-
LinkDraw.
|
|
418
|
-
RulerDraw.
|
|
419
|
-
RefLineDraw.
|
|
420
|
-
PreviewDraw.
|
|
421
|
-
ContextmenuDraw.
|
|
416
|
+
GraphDraw.NAME, // 更新图形调整点
|
|
417
|
+
LinkDraw.NAME, // 更新连线
|
|
418
|
+
RulerDraw.NAME, // 更新比例尺
|
|
419
|
+
RefLineDraw.NAME, // 更新参考线
|
|
420
|
+
PreviewDraw.NAME, // 更新预览
|
|
421
|
+
ContextmenuDraw.NAME // 更新右键菜单
|
|
422
422
|
];
|
|
423
423
|
|
|
424
424
|
// 可以以此发现缺失的 draw
|
|
@@ -471,7 +471,7 @@ export class Render {
|
|
|
471
471
|
// 更改网格显示
|
|
472
472
|
changeShowGrid(show: boolean) {
|
|
473
473
|
this.showGrid = show;
|
|
474
|
-
(this.draws[BgDraw.
|
|
474
|
+
(this.draws[BgDraw.NAME] as BgDraw)?.updateOption({ showGrid: show });
|
|
475
475
|
}
|
|
476
476
|
|
|
477
477
|
// 更改磁吸显示
|
|
@@ -511,15 +511,15 @@ export class Render {
|
|
|
511
511
|
|
|
512
512
|
// 获取背景
|
|
513
513
|
getBackground() {
|
|
514
|
-
return this.draws[BgDraw.
|
|
514
|
+
return this.draws[BgDraw.NAME]?.layer.findOne(`.${BgDraw.NAME}__background`) as Konva.Rect;
|
|
515
515
|
}
|
|
516
516
|
|
|
517
517
|
// 更新背景
|
|
518
518
|
updateBackground() {
|
|
519
|
-
this.draws[BgDraw.
|
|
520
|
-
this.draws[GraphDraw.
|
|
521
|
-
this.draws[LinkDraw.
|
|
522
|
-
this.draws[PreviewDraw.
|
|
519
|
+
this.draws[BgDraw.NAME]?.draw();
|
|
520
|
+
this.draws[GraphDraw.NAME]?.draw();
|
|
521
|
+
this.draws[LinkDraw.NAME]?.draw();
|
|
522
|
+
this.draws[PreviewDraw.NAME]?.draw();
|
|
523
523
|
}
|
|
524
524
|
|
|
525
525
|
// 素材设置 默认值
|
|
@@ -551,7 +551,6 @@ export class Render {
|
|
|
551
551
|
fontSize: base.fontSize || this.getPageSettings().fontSize,
|
|
552
552
|
textFill: base.textFill || this.getPageSettings().textFill,
|
|
553
553
|
// 绘制图形,默认不填充
|
|
554
|
-
fill: base.fill || "transparent",
|
|
555
554
|
x: parseFloat((asset?.position().x ?? 0).toFixed(1)),
|
|
556
555
|
y: parseFloat((asset?.position().y ?? 0).toFixed(1)),
|
|
557
556
|
rotation: parseFloat((asset?.rotation() ?? 0).toFixed(1)),
|
|
@@ -717,10 +716,10 @@ export class Render {
|
|
|
717
716
|
// 更新历史
|
|
718
717
|
this.updateHistory();
|
|
719
718
|
}
|
|
720
|
-
this.draws[BgDraw.
|
|
721
|
-
this.draws[GraphDraw.
|
|
722
|
-
this.draws[LinkDraw.
|
|
723
|
-
this.draws[PreviewDraw.
|
|
719
|
+
this.draws[BgDraw.NAME]?.draw();
|
|
720
|
+
this.draws[GraphDraw.NAME]?.draw();
|
|
721
|
+
this.draws[LinkDraw.NAME]?.draw();
|
|
722
|
+
this.draws[PreviewDraw.NAME]?.draw();
|
|
724
723
|
}
|
|
725
724
|
|
|
726
725
|
// 获取画布上所有素材节点及其配置
|
|
@@ -782,10 +781,10 @@ export class Render {
|
|
|
782
781
|
this.updateHistory();
|
|
783
782
|
}
|
|
784
783
|
|
|
785
|
-
this.draws[BgDraw.
|
|
786
|
-
this.draws[GraphDraw.
|
|
787
|
-
this.draws[LinkDraw.
|
|
788
|
-
this.draws[PreviewDraw.
|
|
784
|
+
this.draws[BgDraw.NAME]?.draw();
|
|
785
|
+
this.draws[GraphDraw.NAME]?.draw();
|
|
786
|
+
this.draws[LinkDraw.NAME]?.draw();
|
|
787
|
+
this.draws[PreviewDraw.NAME]?.draw();
|
|
789
788
|
}
|
|
790
789
|
|
|
791
790
|
// 获取连接线设置
|
|
@@ -80,10 +80,10 @@ export class AlignTool {
|
|
|
80
80
|
this.render.updateHistory();
|
|
81
81
|
// 重绘
|
|
82
82
|
this.render.redraw([
|
|
83
|
-
GraphDraw.
|
|
84
|
-
LinkDraw.
|
|
85
|
-
RulerDraw.
|
|
86
|
-
PreviewDraw.
|
|
83
|
+
GraphDraw.NAME,
|
|
84
|
+
LinkDraw.NAME,
|
|
85
|
+
RulerDraw.NAME,
|
|
86
|
+
PreviewDraw.NAME
|
|
87
87
|
]);
|
|
88
88
|
}
|
|
89
89
|
}
|
|
@@ -55,7 +55,7 @@ export class AssetTool {
|
|
|
55
55
|
ctx.drawImage(frame.buffer, frame.x, frame.y);
|
|
56
56
|
this.render.layer.draw();
|
|
57
57
|
// 更新预览(layer)
|
|
58
|
-
this.render.draws[PreviewDraw.
|
|
58
|
+
this.render.draws[PreviewDraw.NAME]?.layer.draw();
|
|
59
59
|
});
|
|
60
60
|
img.remove();
|
|
61
61
|
// TODO: 拖动 gif 素材产生大量 JS event listeners
|
|
@@ -235,10 +235,10 @@ export class CopyTool {
|
|
|
235
235
|
this.render.updateHistory();
|
|
236
236
|
// 重绘
|
|
237
237
|
this.render.redraw([
|
|
238
|
-
GraphDraw.
|
|
239
|
-
LinkDraw.
|
|
240
|
-
RulerDraw.
|
|
241
|
-
PreviewDraw.
|
|
238
|
+
GraphDraw.NAME,
|
|
239
|
+
LinkDraw.NAME,
|
|
240
|
+
RulerDraw.NAME,
|
|
241
|
+
PreviewDraw.NAME
|
|
242
242
|
]);
|
|
243
243
|
}
|
|
244
244
|
}
|
|
@@ -46,7 +46,7 @@ export class ImportExportTool {
|
|
|
46
46
|
|
|
47
47
|
if (withLink) {
|
|
48
48
|
// 从 Link group 中提取 连接线
|
|
49
|
-
const linkDraw = cover.children.find((o) => o.attrs.name === LinkDraw.
|
|
49
|
+
const linkDraw = cover.children.find((o) => o.attrs.name === LinkDraw.NAME) as Konva.Group;
|
|
50
50
|
if (linkDraw) {
|
|
51
51
|
nodes = nodes.concat(linkDraw.children.filter((o) => o.attrs.name === 'link-line'));
|
|
52
52
|
}
|
|
@@ -157,7 +157,7 @@ export class ImportExportTool {
|
|
|
157
157
|
// 防止进入调整点,重复处理
|
|
158
158
|
if (!node.attrs.hoverAnchor) {
|
|
159
159
|
node.setAttr('hover', true);
|
|
160
|
-
this.render.redraw([GraphDraw.
|
|
160
|
+
this.render.redraw([GraphDraw.NAME]);
|
|
161
161
|
}
|
|
162
162
|
setTimeout(() => {
|
|
163
163
|
// 调整产生 redraw,导致离开调整点不触发其 mouseleave(进入其他元素区域除外)
|
|
@@ -177,7 +177,7 @@ export class ImportExportTool {
|
|
|
177
177
|
if (!node.attrs.hoverAnchor) {
|
|
178
178
|
node.setAttr('hover', false);
|
|
179
179
|
node.setAttr('hoverAnchor', false);
|
|
180
|
-
this.render.redraw([GraphDraw.
|
|
180
|
+
this.render.redraw([GraphDraw.NAME]);
|
|
181
181
|
}
|
|
182
182
|
});
|
|
183
183
|
// 隐藏 连接点
|
|
@@ -238,10 +238,10 @@ export class ImportExportTool {
|
|
|
238
238
|
this.render.linkTool.pointsVisible(false);
|
|
239
239
|
// 重绘
|
|
240
240
|
this.render.redraw([
|
|
241
|
-
GraphDraw.
|
|
242
|
-
LinkDraw.
|
|
243
|
-
RulerDraw.
|
|
244
|
-
PreviewDraw.
|
|
241
|
+
GraphDraw.NAME,
|
|
242
|
+
LinkDraw.NAME,
|
|
243
|
+
RulerDraw.NAME,
|
|
244
|
+
PreviewDraw.NAME
|
|
245
245
|
]);
|
|
246
246
|
stage.destroy();
|
|
247
247
|
} catch (e) {
|
|
@@ -26,9 +26,9 @@ export class LinkTool {
|
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
28
|
// 拐点操作中,此处不重绘
|
|
29
|
-
if (!(this.render.draws[LinkDraw.
|
|
29
|
+
if (!(this.render.draws[LinkDraw.NAME] as LinkDraw)?.state.linkManualing) {
|
|
30
30
|
// 重绘
|
|
31
|
-
this.render.redraw([LinkDraw.
|
|
31
|
+
this.render.redraw([LinkDraw.NAME, RulerDraw.NAME, PreviewDraw.NAME]);
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
}
|
|
@@ -57,9 +57,9 @@ export class LinkTool {
|
|
|
57
57
|
|
|
58
58
|
// 重绘
|
|
59
59
|
this.render.redraw([
|
|
60
|
-
LinkDraw.
|
|
61
|
-
RulerDraw.
|
|
62
|
-
PreviewDraw.
|
|
60
|
+
LinkDraw.NAME,
|
|
61
|
+
RulerDraw.NAME,
|
|
62
|
+
PreviewDraw.NAME
|
|
63
63
|
]);
|
|
64
64
|
}
|
|
65
65
|
}
|
|
@@ -205,8 +205,8 @@ export class LinkTool {
|
|
|
205
205
|
this.render.emit('link-selection-change', this.linkCurrent);
|
|
206
206
|
// 重绘
|
|
207
207
|
this.render.redraw([
|
|
208
|
-
LinkDraw.
|
|
209
|
-
RulerDraw.
|
|
208
|
+
LinkDraw.NAME, // 更新连线
|
|
209
|
+
RulerDraw.NAME // 更新比例尺
|
|
210
210
|
]);
|
|
211
211
|
}
|
|
212
212
|
|
|
@@ -216,8 +216,8 @@ export class LinkTool {
|
|
|
216
216
|
this.render.emit('link-selection-change', undefined);
|
|
217
217
|
// 重绘
|
|
218
218
|
this.render.redraw([
|
|
219
|
-
LinkDraw.
|
|
220
|
-
RulerDraw.
|
|
219
|
+
LinkDraw.NAME, // 更新连线
|
|
220
|
+
RulerDraw.NAME
|
|
221
221
|
]);
|
|
222
222
|
}
|
|
223
223
|
}
|