joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

多选设备筛选逻辑调整

Browse Source
This commit is contained in:
fan 2022-08-04 16:17:46 +08:00
parent 5344ea5788
commit 0e858fb921
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/jmapNew/mouseController.js
View File

@ -306,7 +306,18 @@ class MouseController extends Eventful {
if (this.whetherInclude(boundingRect, deviceBoundingRect )) { if (this.whetherInclude(boundingRect, deviceBoundingRect )) {
includeDeviceList.push(item); includeDeviceList.push(item);
} // item.instance._type !== deviceType.TrainWindow && } // item.instance._type !== deviceType.TrainWindow &&
} else if (item.instance && item.instance._type !== deviceType.CheckBox && item.instance._type !== deviceType.Train && (window.location.href.indexOf('pictureDraw') > -1 && item.instance._type === deviceType.TrainWindow) ) { } else if (window.location.href.indexOf('pictureDraw') > -1 && item.instance && item.instance._type === deviceType.TrainWindow) {
const rect = item.instance.getBoundingRect();
const deviceBoundingRect = {
x1: rect.x,
y1: rect.y,
x2: rect.x,
y2: rect.y
};
if (this.whetherInclude(boundingRect, deviceBoundingRect)) {
includeDeviceList.push(item);
}
} else if (item.instance && item.instance._type !== deviceType.CheckBox && item.instance._type !== deviceType.Train && item.instance._type !== deviceType.TrainWindow) {
const rect = item.instance.getBoundingRect(); const rect = item.instance.getBoundingRect();
const deviceBoundingRect = { const deviceBoundingRect = {
x1: rect.x, x1: rect.x,