zh/sdk4.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://xny.yj-3d.com:3000/zh/sdk4.0 into develop

Browse Source
This commit is contained in:
zh
2025-08-22 23:50:31 +08:00
parent dff3739a0f 53d2f06918
commit 1856bc85e3
21 changed files with 631 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Obj/Base/AssembleObject/index.js
View File

@ -319,7 +319,7 @@ class AssembleObject extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
}
else {

2
src/Obj/Base/AttackArrowObject/index.js
View File

@ -324,7 +324,7 @@ class AttackArrowObject extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
}
else {

2
src/Obj/Base/BaseSource/BaseModel/Model/index.js
View File

@ -637,7 +637,7 @@ class Model extends BaseModel {
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label && (this.label.show = v)
}
else {

2
src/Obj/Base/CurvelineObject/index.js
View File

@ -666,7 +666,7 @@ class CurvelineObject extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
setTimeout(() => {
this.label.position = [

2
src/Obj/Base/EllipseObject/index.js
View File

@ -347,7 +347,7 @@ class EllipseObject extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
}
else {

2
src/Obj/Base/PincerArrowObject/index.js
View File

@ -334,7 +334,7 @@ class PincerArrowObject extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
}
else {

2
src/Obj/Base/PolygonObject/index.js
View File

@ -355,7 +355,7 @@ class PolygonObject extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
} else {
this.label.show = false

2
src/Obj/Base/PolyhedronObject/index.js
View File

@ -517,7 +517,7 @@ class PolyhedronObject extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
}
else {

2
src/Obj/Base/PolylineObject/index.js
View File

@ -701,7 +701,7 @@ class PolylineObject extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
setTimeout(() => {
this.label.position = [

2
src/Obj/Base/RadarScanStereoscopic/index.js
View File

@ -424,7 +424,7 @@ class RadarScanStereoscopic extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
}
else {

2
src/Obj/Base/SectorObject/index.js
View File

@ -344,7 +344,7 @@ class SectorObject extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
}
else {

2
src/Obj/Base/StraightArrowObject/index.js
View File

@ -321,7 +321,7 @@ class StraightArrowObject extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
}
else {

2
src/Obj/Base/WallRealStereoscopic/index.js
View File

@ -253,7 +253,7 @@ class WallRealStereoscopic extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
}
else {

2
src/Obj/Base/WallRealStereoscopic/index2.js
View File

@ -157,7 +157,7 @@ class WallStereoscopic extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
}
else {

2
src/Obj/Base/WallRealStereoscopic2/index.js
View File

@ -243,7 +243,7 @@ class WallRealStereoscopic extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
}
else {

2
src/Obj/Base/WallStereoscopic/index.js
View File

@ -195,7 +195,7 @@ class WallStereoscopic extends Base {
}
set labelShow(v) {
this.options.label.show = v
if (this.show) {
if (this.show && !this.showView || this.showView == 3) {
this.label.show = v
}
else {

24
src/Obj/Base/index.js
View File

@ -9,6 +9,7 @@ import Tools from "../../Tools";
import { getHost, getToken } from "../../on";
import { regLeftClickCallback, regRightClickCallback, regMoveCallback } from "../../Global/ClickCallback";
import { regLeftClickCallback as regLeftClickCallback2, regRightClickCallback as regRightClickCallback2, regMoveCallback as regMoveCallback2 } from "../../Global/SplitScreen/ClickCallback";
import { regLeftClickCallback as regLeftClickCallback3, regRightClickCallback as regRightClickCallback3, regMoveCallback as regMoveCallback3 } from "../../Global/MultiViewportMode/ClickCallback";
import { setSplitDirection, syncSplitData, getSdk } from "../../Global/SplitScreen";
import { syncData, getSdk as get2DSdk } from '../../Global/MultiViewportMode'
import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../Global/global'
@ -68,7 +69,7 @@ class Base extends Tools {
let sdk2D = get2DSdk().sdkD
if (!sdk2D) {
this.#_showView = v
if(this.entity) {
if (this.entity) {
this.entity._showView = v
}
return
@ -361,12 +362,17 @@ class Base extends Tools {
console.error('val:', val, '不是一个function')
} else {
let sdkD = getSdk().sdkD
let sdk2D = get2DSdk().sdkD
if (sdkD && this.sdk === sdkD) {
if (this.clickCallBack == null && this.options && this.options.id) {
regLeftClickCallback2(this.options.id, this.leftClickCB, this)
}
}
else {
else if (sdk2D && this.sdk === sdk2D) {
if (this.clickCallBack == null && this.options && this.options.id) {
regLeftClickCallback3(this.options.id, this.leftClickCB, this)
}
} else {
if (this.clickCallBack == null && this.options && this.options.id) {
regLeftClickCallback(this.options.id, this.leftClickCB, this)
}
@ -384,12 +390,17 @@ class Base extends Tools {
console.error('val:', val, '不是一个function')
} else {
let sdkD = getSdk().sdkD
let sdk2D = get2DSdk().sdkD
if (sdkD && this.sdk === sdkD) {
if (this.rightClickCallBack == null && this.entity && this.entity.id) {
regRightClickCallback2(this.entity.id, this.rightClickCB, this)
}
}
else {
else if (sdk2D && this.sdk === sdk2D) {
if (this.clickCallBack == null && this.options && this.options.id) {
regRightClickCallback3(this.options.id, this.leftClickCB, this)
}
} else {
if (this.rightClickCallBack == null && this.entity && this.entity.id) {
regRightClickCallback(this.entity.id, this.rightClickCB, this)
}
@ -407,12 +418,17 @@ class Base extends Tools {
console.error('val:', val, '不是一个function')
} else {
let sdkD = getSdk().sdkD
let sdk2D = get2DSdk().sdkD
if (sdkD && this.sdk === sdkD) {
if (this.mouseMoveCallBack == null && this.entity && this.entity.id) {
regMoveCallback2(this.entity.id, this.mouseMoveCB, this)
}
}
else {
else if (sdk2D && this.sdk === sdk2D) {
if (this.clickCallBack == null && this.options && this.options.id) {
regMoveCallback3(this.options.id, this.leftClickCB, this)
}
} else {
if (this.mouseMoveCallBack == null && this.entity && this.entity.id) {
regMoveCallback(this.entity.id, this.mouseMoveCB, this)
}