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

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

Browse Source
This commit is contained in:
zh
2025-07-18 14:23:45 +08:00
parent 552c086d3a 603421ea87
commit 72fc510167
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Global/mouseRightMenu/index.js
View File

@ -25,15 +25,15 @@ function MouseRightMenu(sdk, status, callBack) {
if (eventListener[sdk.div_id].click) { if (eventListener[sdk.div_id].click) {
document.removeEventListener('click', eventListener[sdk.div_id].click) document.removeEventListener('click', eventListener[sdk.div_id].click)
} }
if(!eventListener[sdk.div_id].callBack) { if (!eventListener[sdk.div_id].callBack) {
eventListener[sdk.div_id].callBack = callBack eventListener[sdk.div_id].callBack = callBack
} }
if(sdk !== sdkD) { if (sdk !== sdkD) {
eventListener[sdk.div_id].mouseRightMenuEvent && eventListener[sdk.div_id].mouseRightMenuEvent &&
eventListener[sdk.div_id].mouseRightMenuEvent.destroy() eventListener[sdk.div_id].mouseRightMenuEvent.destroy()
} }
let menuElm = document.getElementById('custom-menu') let menuElm = document.getElementById('custom-menu')
if (menuElm) { if (menuElm) {
_element.removeChild(menuElm) _element.removeChild(menuElm)
@ -87,7 +87,7 @@ function MouseRightMenu(sdk, status, callBack) {
} }
let entityId = getEntityId(movement) let entityId = getEntityId(movement)
let targetId let targetId
if(Object.prototype.toString.call(entityId) === '[object Object]') { if (Object.prototype.toString.call(entityId) === '[object Object]') {
targetId = entityId.id targetId = entityId.id
entityId = entityId.parentId entityId = entityId.parentId
} }
@ -123,7 +123,7 @@ function MouseRightMenu(sdk, status, callBack) {
</ul> </ul>
${addedMenu} ${addedMenu}
` `
_element.appendChild(menuElm) _element.appendChild(menuElm)
let left = movement.position.x let left = movement.position.x
let top = movement.position.y let top = movement.position.y
if ( if (
@ -141,7 +141,7 @@ function MouseRightMenu(sdk, status, callBack) {
menuElm.style.left = left + 'px' menuElm.style.left = left + 'px'
menuElm.style.top = top + 'px' menuElm.style.top = top + 'px'
menuElm.addEventListener('contextmenu', function(event) { menuElm.addEventListener('contextmenu', function (event) {
event.preventDefault() event.preventDefault()
}) })
let liElms = menuElm.getElementsByTagName('li') let liElms = menuElm.getElementsByTagName('li')
@ -162,7 +162,7 @@ function MouseRightMenu(sdk, status, callBack) {
// this.rotateAround(position) // this.rotateAround(position)
break break
case '属性': case '属性':
if(targetId) { if (targetId) {
object.id = targetId object.id = targetId
object.parentId = that.options.id object.parentId = that.options.id
} }

12
src/Obj/Base/FlowLine/index.js
View File

@ -139,6 +139,7 @@ class FlowLine extends Base {
//创建线 //创建线
that.viewer.entities.add({ that.viewer.entities.add({
parent: celiangEntity, parent: celiangEntity,
id: that.options.id + '-' + new Date().getTime() + index,
polyline: { polyline: {
positions: [start, end], positions: [start, end],
width: that.options.width, width: that.options.width,
@ -215,6 +216,17 @@ class FlowLine extends Base {
this.getLine(this, this.positions) this.getLine(this, this.positions)
} }
} }
get show() {
return this.options.show
}
set show(v) {
this.options.show = v
let entity = this.viewer.entities.getById(this.options.id)
if (entity) {
entity.show = v
}
}
get heightDifference() { get heightDifference() {
return this.options.heightDifference return this.options.heightDifference