From 98785c4014c32fcafd1a4724f321bc9d9f51c90c Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Mon, 29 Jun 2026 16:05:40 +0800 Subject: [PATCH] fix: issues #IJXBCC --- .../plugins/content-pad/contentPadProvider.js | 36 +++++++++---------- .../plugins/content-pad/contentPadProvider.js | 36 +++++++++---------- .../plugins/content-pad/contentPadProvider.js | 36 +++++++++---------- 3 files changed, 48 insertions(+), 60 deletions(-) diff --git a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js index b8f1dfef7..fcc698646 100644 --- a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js +++ b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js @@ -77,7 +77,7 @@ ContextPadProvider.$inject = [ ContextPadProvider.prototype.getContextPadEntries = function (element) { const autoPlace = this._autoPlace; - const canvas = this._canvas; + // const canvas = this._canvas; const connect = this._connect; const contextPad = this._contextPad; const create = this._create; @@ -103,25 +103,25 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { modeling.removeElements([element]); } - function getReplaceMenuPosition(element) { - const Y_OFFSET = 5; + // function getReplaceMenuPosition(element) { + // const Y_OFFSET = 5; - const diagramContainer = canvas.getContainer(); - const pad = contextPad.getPad(element).html; + // const diagramContainer = canvas.getContainer(); + // const pad = contextPad.getPad(element).html; - const diagramRect = diagramContainer.getBoundingClientRect(); - const padRect = pad.getBoundingClientRect(); + // const diagramRect = diagramContainer.getBoundingClientRect(); + // const padRect = pad.getBoundingClientRect(); - const top = padRect.top - diagramRect.top; - const left = padRect.left - diagramRect.left; + // const top = padRect.top - diagramRect.top; + // const left = padRect.left - diagramRect.left; - const pos = { - x: left, - y: top + padRect.height + Y_OFFSET, - }; + // const pos = { + // x: left, + // y: top + padRect.height + Y_OFFSET, + // }; - return pos; - } + // return pos; + // } /** * Create an append action @@ -335,11 +335,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { title: '修改类型', action: { click(event, element) { - const position = Object.assign(getReplaceMenuPosition(element), { - cursor: { x: event.x, y: event.y }, - }); - - popupMenu.open(element, 'bpmn-replace', position); + popupMenu.open(element, 'bpmn-replace', { x: event.x, y: event.y }); }, }, }, diff --git a/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js b/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js index b8f1dfef7..fcc698646 100644 --- a/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js +++ b/apps/web-antdv-next/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js @@ -77,7 +77,7 @@ ContextPadProvider.$inject = [ ContextPadProvider.prototype.getContextPadEntries = function (element) { const autoPlace = this._autoPlace; - const canvas = this._canvas; + // const canvas = this._canvas; const connect = this._connect; const contextPad = this._contextPad; const create = this._create; @@ -103,25 +103,25 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { modeling.removeElements([element]); } - function getReplaceMenuPosition(element) { - const Y_OFFSET = 5; + // function getReplaceMenuPosition(element) { + // const Y_OFFSET = 5; - const diagramContainer = canvas.getContainer(); - const pad = contextPad.getPad(element).html; + // const diagramContainer = canvas.getContainer(); + // const pad = contextPad.getPad(element).html; - const diagramRect = diagramContainer.getBoundingClientRect(); - const padRect = pad.getBoundingClientRect(); + // const diagramRect = diagramContainer.getBoundingClientRect(); + // const padRect = pad.getBoundingClientRect(); - const top = padRect.top - diagramRect.top; - const left = padRect.left - diagramRect.left; + // const top = padRect.top - diagramRect.top; + // const left = padRect.left - diagramRect.left; - const pos = { - x: left, - y: top + padRect.height + Y_OFFSET, - }; + // const pos = { + // x: left, + // y: top + padRect.height + Y_OFFSET, + // }; - return pos; - } + // return pos; + // } /** * Create an append action @@ -335,11 +335,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { title: '修改类型', action: { click(event, element) { - const position = Object.assign(getReplaceMenuPosition(element), { - cursor: { x: event.x, y: event.y }, - }); - - popupMenu.open(element, 'bpmn-replace', position); + popupMenu.open(element, 'bpmn-replace', { x: event.x, y: event.y }); }, }, }, diff --git a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js index b8f1dfef7..fcc698646 100644 --- a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js +++ b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js @@ -77,7 +77,7 @@ ContextPadProvider.$inject = [ ContextPadProvider.prototype.getContextPadEntries = function (element) { const autoPlace = this._autoPlace; - const canvas = this._canvas; + // const canvas = this._canvas; const connect = this._connect; const contextPad = this._contextPad; const create = this._create; @@ -103,25 +103,25 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { modeling.removeElements([element]); } - function getReplaceMenuPosition(element) { - const Y_OFFSET = 5; + // function getReplaceMenuPosition(element) { + // const Y_OFFSET = 5; - const diagramContainer = canvas.getContainer(); - const pad = contextPad.getPad(element).html; + // const diagramContainer = canvas.getContainer(); + // const pad = contextPad.getPad(element).html; - const diagramRect = diagramContainer.getBoundingClientRect(); - const padRect = pad.getBoundingClientRect(); + // const diagramRect = diagramContainer.getBoundingClientRect(); + // const padRect = pad.getBoundingClientRect(); - const top = padRect.top - diagramRect.top; - const left = padRect.left - diagramRect.left; + // const top = padRect.top - diagramRect.top; + // const left = padRect.left - diagramRect.left; - const pos = { - x: left, - y: top + padRect.height + Y_OFFSET, - }; + // const pos = { + // x: left, + // y: top + padRect.height + Y_OFFSET, + // }; - return pos; - } + // return pos; + // } /** * Create an append action @@ -335,11 +335,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element) { title: '修改类型', action: { click(event, element) { - const position = Object.assign(getReplaceMenuPosition(element), { - cursor: { x: event.x, y: event.y }, - }); - - popupMenu.open(element, 'bpmn-replace', position); + popupMenu.open(element, 'bpmn-replace', { x: event.x, y: event.y }); }, }, },