Commit 7d81e7a11e57833c2e04a39d871f5312d7ea5bfb
Merge branch 'fix/DEFECT-1766' into 'main_dev'
fix: 修复双击事件无效 See merge request yunteng/thingskit-scada!188
Showing
2 changed files
with
5 additions
and
5 deletions
| ... | ... | @@ -237,11 +237,11 @@ a.geStatus .geStatusMessage { |
| 237 | 237 | -moz-box-shadow: 2px 2px 3px 0px #ddd; |
| 238 | 238 | box-shadow: 2px 2px 3px 0px #ddd; |
| 239 | 239 | } |
| 240 | -.geEditor input, .geEditor button:not([class*="ant-"]), .geEditor select, .geColorBtn { | |
| 240 | +.geEditor input, .geEditor button:not([class*="ant-"], [class*="vjs-"]), .geEditor select, .geColorBtn { | |
| 241 | 241 | border: 1px solid #d8d8d8; |
| 242 | 242 | border-radius: 4px; |
| 243 | 243 | } |
| 244 | -.geEditor button:not([class*="ant-"]), .geEditor select, .geColorBtn { | |
| 244 | +.geEditor button:not([class*="ant-"], [class*="vjs-"]), .geEditor select, .geColorBtn { | |
| 245 | 245 | background:#eee; |
| 246 | 246 | } |
| 247 | 247 | .geEditor button:hover:not([class*="ant-"], [disabled], .geBigButton, .geShareBtn), | ... | ... |
| ... | ... | @@ -3,11 +3,11 @@ import type { LightboxModeWebsocketService } from '.' |
| 3 | 3 | import type { RenderComponentExposeType } from '@/core/Library/types' |
| 4 | 4 | import { useNodeEvent } from '@/core/Library/hook/useNodeEvent' |
| 5 | 5 | import { EventTypeEnum } from '@/enums/datasource' |
| 6 | -import type { MxState } from '@/fitCore/types' | |
| 6 | +import type { MxCell } from '@/fitCore/types' | |
| 7 | 7 | import { getAppInstanceId } from '@/utils/draw' |
| 8 | 8 | |
| 9 | 9 | interface MxEvent { |
| 10 | - state: MxState | |
| 10 | + state: { cell: MxCell } | |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | export class EventHandler { |
| ... | ... | @@ -33,7 +33,7 @@ export class EventHandler { |
| 33 | 33 | const graphDblClick = this.getDrawApp.editor.graph.dblClick |
| 34 | 34 | const dispathEvent = this.dispathEvent.bind(this) |
| 35 | 35 | this.getDrawApp.editor.graph.dblClick = function (...args) { |
| 36 | - dispathEvent(EventTypeEnum.DOUBLE, args[0]) | |
| 36 | + dispathEvent(EventTypeEnum.DOUBLE, { state: { cell: args[1] } }) | |
| 37 | 37 | graphDblClick.apply(this, args) |
| 38 | 38 | } |
| 39 | 39 | } | ... | ... |