@logicflow/core 2.2.0-alpha.6 → 2.2.0-alpha.7
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/.turbo/turbo-build$colon$dev.log +2 -2
- package/.turbo/turbo-build.log +7 -7
- package/CHANGELOG.md +6 -0
- package/dist/index.min.js +1 -1
- package/dist/index.min.js.map +1 -1
- package/es/model/EditConfigModel.d.ts +1 -3
- package/es/model/EditConfigModel.js +0 -5
- package/es/view/Anchor.js +1 -7
- package/lib/model/EditConfigModel.d.ts +1 -3
- package/lib/model/EditConfigModel.js +0 -5
- package/lib/view/Anchor.js +1 -7
- package/package.json +1 -1
- package/src/model/EditConfigModel.ts +4 -7
- package/src/model/GraphModel.ts +0 -1
- package/src/view/Anchor.tsx +9 -15
- package/src/view/shape/Text.tsx +0 -1
- package/stats.html +1 -1
|
@@ -115,7 +115,6 @@ export interface IEditConfigType {
|
|
|
115
115
|
edgeTextMode: TextMode;
|
|
116
116
|
snapGrid: boolean;
|
|
117
117
|
isPinching: boolean;
|
|
118
|
-
anchorProximityValidate: boolean;
|
|
119
118
|
}
|
|
120
119
|
export type IConfigKeys = keyof IEditConfigType;
|
|
121
120
|
/**
|
|
@@ -148,7 +147,6 @@ export declare class EditConfigModel {
|
|
|
148
147
|
edgeTextDraggable: boolean;
|
|
149
148
|
edgeTextMultiple: boolean;
|
|
150
149
|
edgeTextVertical: boolean;
|
|
151
|
-
anchorProximityValidate: boolean;
|
|
152
150
|
/*********************************************************
|
|
153
151
|
* 节点相关配置
|
|
154
152
|
********************************************************/
|
|
@@ -174,7 +172,7 @@ export declare class EditConfigModel {
|
|
|
174
172
|
multipleSelectKey: string;
|
|
175
173
|
constructor(config: Partial<IEditConfigType>);
|
|
176
174
|
updateEditConfig(config: Partial<IEditConfigType>): void;
|
|
177
|
-
computeConfig(config: Partial<IEditConfigType>): Partial<IEditConfigType> & Pick<Partial<IEditConfigType>, "textMode" | "adjustEdgeStartAndEnd" | "edgeTextDraggable" | "edgeTextEdit" | "nodeTextDraggable" | "nodeTextEdit" | "adjustEdge" | "edgeTextMode" | "nodeTextMode" | "allowRotate" | "allowResize" | "isSilentMode" | "stopScrollGraph" | "stopZoomGraph" | "stopMoveGraph" | "textEdit" | "snapGrid" | "adjustEdgeMiddle" | "adjustEdgeStart" | "adjustEdgeEnd" | "adjustNodePosition" | "hideAnchors" | "autoExpand" | "hoverOutline" | "nodeSelectedOutline" | "edgeSelectedOutline" | "textDraggable" | "multipleSelectKey" | "nodeTextMultiple" | "edgeTextMultiple" | "nodeTextVertical" | "edgeTextVertical" | "isPinching"
|
|
175
|
+
computeConfig(config: Partial<IEditConfigType>): Partial<IEditConfigType> & Pick<Partial<IEditConfigType>, "textMode" | "adjustEdgeStartAndEnd" | "edgeTextDraggable" | "edgeTextEdit" | "nodeTextDraggable" | "nodeTextEdit" | "adjustEdge" | "edgeTextMode" | "nodeTextMode" | "allowRotate" | "allowResize" | "isSilentMode" | "stopScrollGraph" | "stopZoomGraph" | "stopMoveGraph" | "textEdit" | "snapGrid" | "adjustEdgeMiddle" | "adjustEdgeStart" | "adjustEdgeEnd" | "adjustNodePosition" | "hideAnchors" | "autoExpand" | "hoverOutline" | "nodeSelectedOutline" | "edgeSelectedOutline" | "textDraggable" | "multipleSelectKey" | "nodeTextMultiple" | "edgeTextMultiple" | "nodeTextVertical" | "edgeTextVertical" | "isPinching">;
|
|
178
176
|
updateTextMode(textMode: TextMode): void;
|
|
179
177
|
getConfig(): IEditConfigType;
|
|
180
178
|
}
|
|
@@ -63,7 +63,6 @@ var allKeys = [
|
|
|
63
63
|
'nodeTextVertical', // 节点文本是否纵向显示
|
|
64
64
|
'edgeTextVertical', // 边文本是否纵向显示
|
|
65
65
|
'isPinching', //是否是双指捏合态
|
|
66
|
-
'anchorProximityValidate', // 仅在靠近锚点时触发连接校验
|
|
67
66
|
];
|
|
68
67
|
/**
|
|
69
68
|
* 页面编辑配置
|
|
@@ -97,7 +96,6 @@ var EditConfigModel = /** @class */ (function () {
|
|
|
97
96
|
this.edgeTextDraggable = false;
|
|
98
97
|
this.edgeTextMultiple = false; // 是否支持多个边文本
|
|
99
98
|
this.edgeTextVertical = false; // 边文本朝向是否是纵向
|
|
100
|
-
this.anchorProximityValidate = false; // 仅在靠近锚点时触发连接校验
|
|
101
99
|
/*********************************************************
|
|
102
100
|
* 节点相关配置
|
|
103
101
|
********************************************************/
|
|
@@ -239,9 +237,6 @@ var EditConfigModel = /** @class */ (function () {
|
|
|
239
237
|
__decorate([
|
|
240
238
|
observable
|
|
241
239
|
], EditConfigModel.prototype, "edgeTextVertical", void 0);
|
|
242
|
-
__decorate([
|
|
243
|
-
observable
|
|
244
|
-
], EditConfigModel.prototype, "anchorProximityValidate", void 0);
|
|
245
240
|
__decorate([
|
|
246
241
|
observable
|
|
247
242
|
], EditConfigModel.prototype, "hideAnchors", void 0);
|
package/es/view/Anchor.js
CHANGED
|
@@ -264,13 +264,7 @@ var Anchor = /** @class */ (function (_super) {
|
|
|
264
264
|
return;
|
|
265
265
|
}
|
|
266
266
|
this.preTargetNode = targetNode;
|
|
267
|
-
|
|
268
|
-
var validateDistance = 10;
|
|
269
|
-
var editConfigModel = graphModel.editConfigModel;
|
|
270
|
-
if (!editConfigModel.anchorProximityValidate ||
|
|
271
|
-
anchorDist <= validateDistance) {
|
|
272
|
-
this.validateAndSetState(targetNode, anchorId, info.anchor, nodeModel, anchorData);
|
|
273
|
-
}
|
|
267
|
+
this.validateAndSetState(targetNode, anchorId, info.anchor, nodeModel, anchorData);
|
|
274
268
|
// 人工触发进入目标节点事件,同步设置 hovered 以驱动锚点显隐和样式
|
|
275
269
|
if (!targetNode.isHovered) {
|
|
276
270
|
var nodeData = targetNode.getData();
|
|
@@ -115,7 +115,6 @@ export interface IEditConfigType {
|
|
|
115
115
|
edgeTextMode: TextMode;
|
|
116
116
|
snapGrid: boolean;
|
|
117
117
|
isPinching: boolean;
|
|
118
|
-
anchorProximityValidate: boolean;
|
|
119
118
|
}
|
|
120
119
|
export type IConfigKeys = keyof IEditConfigType;
|
|
121
120
|
/**
|
|
@@ -148,7 +147,6 @@ export declare class EditConfigModel {
|
|
|
148
147
|
edgeTextDraggable: boolean;
|
|
149
148
|
edgeTextMultiple: boolean;
|
|
150
149
|
edgeTextVertical: boolean;
|
|
151
|
-
anchorProximityValidate: boolean;
|
|
152
150
|
/*********************************************************
|
|
153
151
|
* 节点相关配置
|
|
154
152
|
********************************************************/
|
|
@@ -174,7 +172,7 @@ export declare class EditConfigModel {
|
|
|
174
172
|
multipleSelectKey: string;
|
|
175
173
|
constructor(config: Partial<IEditConfigType>);
|
|
176
174
|
updateEditConfig(config: Partial<IEditConfigType>): void;
|
|
177
|
-
computeConfig(config: Partial<IEditConfigType>): Partial<IEditConfigType> & Pick<Partial<IEditConfigType>, "textMode" | "adjustEdgeStartAndEnd" | "edgeTextDraggable" | "edgeTextEdit" | "nodeTextDraggable" | "nodeTextEdit" | "adjustEdge" | "edgeTextMode" | "nodeTextMode" | "allowRotate" | "allowResize" | "isSilentMode" | "stopScrollGraph" | "stopZoomGraph" | "stopMoveGraph" | "textEdit" | "snapGrid" | "adjustEdgeMiddle" | "adjustEdgeStart" | "adjustEdgeEnd" | "adjustNodePosition" | "hideAnchors" | "autoExpand" | "hoverOutline" | "nodeSelectedOutline" | "edgeSelectedOutline" | "textDraggable" | "multipleSelectKey" | "nodeTextMultiple" | "edgeTextMultiple" | "nodeTextVertical" | "edgeTextVertical" | "isPinching"
|
|
175
|
+
computeConfig(config: Partial<IEditConfigType>): Partial<IEditConfigType> & Pick<Partial<IEditConfigType>, "textMode" | "adjustEdgeStartAndEnd" | "edgeTextDraggable" | "edgeTextEdit" | "nodeTextDraggable" | "nodeTextEdit" | "adjustEdge" | "edgeTextMode" | "nodeTextMode" | "allowRotate" | "allowResize" | "isSilentMode" | "stopScrollGraph" | "stopZoomGraph" | "stopMoveGraph" | "textEdit" | "snapGrid" | "adjustEdgeMiddle" | "adjustEdgeStart" | "adjustEdgeEnd" | "adjustNodePosition" | "hideAnchors" | "autoExpand" | "hoverOutline" | "nodeSelectedOutline" | "edgeSelectedOutline" | "textDraggable" | "multipleSelectKey" | "nodeTextMultiple" | "edgeTextMultiple" | "nodeTextVertical" | "edgeTextVertical" | "isPinching">;
|
|
178
176
|
updateTextMode(textMode: TextMode): void;
|
|
179
177
|
getConfig(): IEditConfigType;
|
|
180
178
|
}
|
|
@@ -66,7 +66,6 @@ var allKeys = [
|
|
|
66
66
|
'nodeTextVertical', // 节点文本是否纵向显示
|
|
67
67
|
'edgeTextVertical', // 边文本是否纵向显示
|
|
68
68
|
'isPinching', //是否是双指捏合态
|
|
69
|
-
'anchorProximityValidate', // 仅在靠近锚点时触发连接校验
|
|
70
69
|
];
|
|
71
70
|
/**
|
|
72
71
|
* 页面编辑配置
|
|
@@ -100,7 +99,6 @@ var EditConfigModel = /** @class */ (function () {
|
|
|
100
99
|
this.edgeTextDraggable = false;
|
|
101
100
|
this.edgeTextMultiple = false; // 是否支持多个边文本
|
|
102
101
|
this.edgeTextVertical = false; // 边文本朝向是否是纵向
|
|
103
|
-
this.anchorProximityValidate = false; // 仅在靠近锚点时触发连接校验
|
|
104
102
|
/*********************************************************
|
|
105
103
|
* 节点相关配置
|
|
106
104
|
********************************************************/
|
|
@@ -242,9 +240,6 @@ var EditConfigModel = /** @class */ (function () {
|
|
|
242
240
|
__decorate([
|
|
243
241
|
mobx_1.observable
|
|
244
242
|
], EditConfigModel.prototype, "edgeTextVertical", void 0);
|
|
245
|
-
__decorate([
|
|
246
|
-
mobx_1.observable
|
|
247
|
-
], EditConfigModel.prototype, "anchorProximityValidate", void 0);
|
|
248
243
|
__decorate([
|
|
249
244
|
mobx_1.observable
|
|
250
245
|
], EditConfigModel.prototype, "hideAnchors", void 0);
|
package/lib/view/Anchor.js
CHANGED
|
@@ -266,13 +266,7 @@ var Anchor = /** @class */ (function (_super) {
|
|
|
266
266
|
return;
|
|
267
267
|
}
|
|
268
268
|
this.preTargetNode = targetNode;
|
|
269
|
-
|
|
270
|
-
var validateDistance = 10;
|
|
271
|
-
var editConfigModel = graphModel.editConfigModel;
|
|
272
|
-
if (!editConfigModel.anchorProximityValidate ||
|
|
273
|
-
anchorDist <= validateDistance) {
|
|
274
|
-
this.validateAndSetState(targetNode, anchorId, info.anchor, nodeModel, anchorData);
|
|
275
|
-
}
|
|
269
|
+
this.validateAndSetState(targetNode, anchorId, info.anchor, nodeModel, anchorData);
|
|
276
270
|
// 人工触发进入目标节点事件,同步设置 hovered 以驱动锚点显隐和样式
|
|
277
271
|
if (!targetNode.isHovered) {
|
|
278
272
|
var nodeData = targetNode.getData();
|
package/package.json
CHANGED
|
@@ -23,10 +23,10 @@ export interface IEditConfigType {
|
|
|
23
23
|
* - [number, number, number, number]:[minX, minY, maxX, maxY] 画布可拖动范围
|
|
24
24
|
*/
|
|
25
25
|
stopMoveGraph:
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
| boolean
|
|
27
|
+
| 'vertical'
|
|
28
|
+
| 'horizontal'
|
|
29
|
+
| [number, number, number, number]
|
|
30
30
|
/**
|
|
31
31
|
* 允许调整边
|
|
32
32
|
*/
|
|
@@ -126,7 +126,6 @@ export interface IEditConfigType {
|
|
|
126
126
|
// 开启网格对齐
|
|
127
127
|
snapGrid: boolean
|
|
128
128
|
isPinching: boolean
|
|
129
|
-
anchorProximityValidate: boolean
|
|
130
129
|
}
|
|
131
130
|
|
|
132
131
|
export type IConfigKeys = keyof IEditConfigType
|
|
@@ -189,7 +188,6 @@ const allKeys = [
|
|
|
189
188
|
'nodeTextVertical', // 节点文本是否纵向显示
|
|
190
189
|
'edgeTextVertical', // 边文本是否纵向显示
|
|
191
190
|
'isPinching', //是否是双指捏合态
|
|
192
|
-
'anchorProximityValidate', // 仅在靠近锚点时触发连接校验
|
|
193
191
|
] as const
|
|
194
192
|
|
|
195
193
|
/**
|
|
@@ -225,7 +223,6 @@ export class EditConfigModel {
|
|
|
225
223
|
@observable edgeTextDraggable = false
|
|
226
224
|
@observable edgeTextMultiple = false // 是否支持多个边文本
|
|
227
225
|
@observable edgeTextVertical = false // 边文本朝向是否是纵向
|
|
228
|
-
@observable anchorProximityValidate = false // 仅在靠近锚点时触发连接校验
|
|
229
226
|
/*********************************************************
|
|
230
227
|
* 节点相关配置
|
|
231
228
|
********************************************************/
|
package/src/model/GraphModel.ts
CHANGED
|
@@ -500,7 +500,6 @@ export class GraphModel {
|
|
|
500
500
|
this.elementsModelMap.clear()
|
|
501
501
|
this.nodeModelMap.clear()
|
|
502
502
|
this.edgeModelMap.clear()
|
|
503
|
-
|
|
504
503
|
if (graphData.nodes) {
|
|
505
504
|
this.nodes = map(graphData.nodes, (node: NodeConfig) => {
|
|
506
505
|
const nodeModel = this.getModelAfterSnapToGrid(node)
|
package/src/view/Anchor.tsx
CHANGED
|
@@ -314,21 +314,15 @@ class Anchor extends Component<IProps, IState> {
|
|
|
314
314
|
return
|
|
315
315
|
}
|
|
316
316
|
this.preTargetNode = targetNode
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
anchorId,
|
|
327
|
-
info.anchor,
|
|
328
|
-
nodeModel,
|
|
329
|
-
anchorData,
|
|
330
|
-
)
|
|
331
|
-
}
|
|
317
|
+
|
|
318
|
+
this.validateAndSetState(
|
|
319
|
+
targetNode,
|
|
320
|
+
anchorId,
|
|
321
|
+
info.anchor,
|
|
322
|
+
nodeModel,
|
|
323
|
+
anchorData,
|
|
324
|
+
)
|
|
325
|
+
|
|
332
326
|
// 人工触发进入目标节点事件,同步设置 hovered 以驱动锚点显隐和样式
|
|
333
327
|
if (!targetNode.isHovered) {
|
|
334
328
|
const nodeData = targetNode.getData()
|