|
@@ -266,7 +266,11 @@ export class FlowDragLayer extends Layer<FlowDragOptions> {
|
|
|
|
|
|
|
|
if (activatedNodeId) {
|
|
if (activatedNodeId) {
|
|
|
if (this.flowDragService.isDragBranch) {
|
|
if (this.flowDragService.isDragBranch) {
|
|
|
- this.flowDragService.dropBranch();
|
|
|
|
|
|
|
+ if (this.dragJSON) {
|
|
|
|
|
+ await this.flowDragService.dropCreateNode(this.dragJSON, this.onCreateNode);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.flowDragService.dropBranch();
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
if (this.dragJSON) {
|
|
if (this.dragJSON) {
|
|
|
await this.flowDragService.dropCreateNode(this.dragJSON, this.onCreateNode);
|
|
await this.flowDragService.dropCreateNode(this.dragJSON, this.onCreateNode);
|
|
@@ -280,6 +284,7 @@ export class FlowDragLayer extends Layer<FlowDragOptions> {
|
|
|
// 清空碰撞 id
|
|
// 清空碰撞 id
|
|
|
this.flowRenderStateEntity.setNodeDroppingId('');
|
|
this.flowRenderStateEntity.setNodeDroppingId('');
|
|
|
this.flowRenderStateEntity.setDragLabelSide();
|
|
this.flowRenderStateEntity.setDragLabelSide();
|
|
|
|
|
+ this.flowRenderStateEntity.setIsBranch(false);
|
|
|
this.dragStartEntity = undefined;
|
|
this.dragStartEntity = undefined;
|
|
|
this.dragEntities = [];
|
|
this.dragEntities = [];
|
|
|
|
|
|
|
@@ -313,7 +318,13 @@ export class FlowDragLayer extends Layer<FlowDragOptions> {
|
|
|
*/
|
|
*/
|
|
|
async startDrag(
|
|
async startDrag(
|
|
|
e: { clientX: number; clientY: number },
|
|
e: { clientX: number; clientY: number },
|
|
|
- { dragStartEntity: startEntityFromProps, dragEntities, dragJSON, onCreateNode }: StartDragProps,
|
|
|
|
|
|
|
+ {
|
|
|
|
|
+ dragStartEntity: startEntityFromProps,
|
|
|
|
|
+ dragEntities,
|
|
|
|
|
+ dragJSON,
|
|
|
|
|
+ isBranch,
|
|
|
|
|
+ onCreateNode,
|
|
|
|
|
+ }: StartDragProps,
|
|
|
options?: {
|
|
options?: {
|
|
|
dragOffsetX?: number;
|
|
dragOffsetX?: number;
|
|
|
dragOffsetY?: number;
|
|
dragOffsetY?: number;
|
|
@@ -328,6 +339,7 @@ export class FlowDragLayer extends Layer<FlowDragOptions> {
|
|
|
this.disableDragScroll = Boolean(options?.disableDragScroll);
|
|
this.disableDragScroll = Boolean(options?.disableDragScroll);
|
|
|
this.dragJSON = dragJSON;
|
|
this.dragJSON = dragJSON;
|
|
|
this.onCreateNode = onCreateNode;
|
|
this.onCreateNode = onCreateNode;
|
|
|
|
|
+ this.flowRenderStateEntity.setIsBranch(Boolean(isBranch));
|
|
|
|
|
|
|
|
this.dragOffset.x = options?.dragOffsetX || DEFAULT_DRAG_OFFSET_X;
|
|
this.dragOffset.x = options?.dragOffsetX || DEFAULT_DRAG_OFFSET_X;
|
|
|
this.dragOffset.y = options?.dragOffsetY || DEFAULT_DRAG_OFFSET_Y;
|
|
this.dragOffset.y = options?.dragOffsetY || DEFAULT_DRAG_OFFSET_Y;
|