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-08-09 09:33:22 +08:00
parent bdc7e58263 d47ab3715d
commit 656a21a6dd
4 changed files with 108 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,9 +315,9 @@ class FlowLine extends Base {
this.reset()
this.Dialog.resetCallBack && this.Dialog.resetCallBack()
},
// removeCallBack: () => {
// this.Dialog.removeCallBack && this.Dialog.removeCallBack()
// },
removeCallBack: () => {
this.Dialog.removeCallBack && this.Dialog.removeCallBack()
},
closeCallBack: () => {
this.reset()
// this.entity.style = new Cesium.Cesium3DTileStyle({

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

@ -441,16 +441,16 @@ class PolylineObject extends Base {
this._elms.lineType.forEach(item => {
item.value = lineTypeData[i].value
if (2 < item.value && item.value < 13) {//贴图参数
document.getElementById('dashTextureDom').style.display = 'flex'
document.getElementById('dashTextureDom') && (document.getElementById('dashTextureDom').style.display = 'flex')
} else {
document.getElementById('dashTextureDom').style.display = 'none'
document.getElementById('dashTextureDom') && (document.getElementById('dashTextureDom').style.display = 'none')
}
if (2 < item.value && item.value < 5) {//尾迹参数
document.getElementsByClassName('lineSpace')[0].style.display = 'none'
document.getElementsByClassName('lineSpace')[1].style.display = 'none'
document.getElementsByClassName('lineSpace')[0] && (document.getElementsByClassName('lineSpace')[0].style.display = 'none')
document.getElementsByClassName('lineSpace')[1] && (document.getElementsByClassName('lineSpace')[1].style.display = 'none')
} else {
document.getElementsByClassName('lineSpace')[0].style.display = 'flex'
document.getElementsByClassName('lineSpace')[1].style.display = 'flex'
document.getElementsByClassName('lineSpace')[0] && (document.getElementsByClassName('lineSpace')[0].style.display = 'flex')
document.getElementsByClassName('lineSpace')[1] && (document.getElementsByClassName('lineSpace')[1].style.display = 'flex')
}
})
break
@ -822,6 +822,7 @@ class PolylineObject extends Base {
set labelLineColor(v) {
this.options.label.lineColor = v
this.label.lineColor = v
let _this = this
if (this._elms.labelLineColor) {
this._elms.labelLineColor.forEach((item, i) => {
let lineColorPicker = new YJColorPicker({
@ -844,7 +845,7 @@ class PolylineObject extends Base {
})
this._elms.labelBackgroundColorStart[
i
] = labelBackgroundColorStartPicker
] = _this.labelBackgroundColorStartPicker
})
}
}
@ -1337,12 +1338,19 @@ class PolylineObject extends Base {
positions: Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArray),
width: that.options.width,
clampToGround: ground,
material: that.getMaterial(that.options.color, that.options.type, that.entity, that.options),
// material: that.getMaterial(that.options.color, that.options.type, that.entity, that.options),
zIndex: that.sdk._entityZIndex
}
})
that.entity.polyline.oriWidth = that.options.width
that.judgeLine(that.entity, that.options)
that.entity.polyline.material = that.getMaterial(
that.options.color,
that.options.type,
that.entity,
that.options
)
that.sdk._entityZIndex++
PolylineObject.createLabel(that)
// that.entity.polyline.positionsLngLat = positions
@ -1549,10 +1557,20 @@ class PolylineObject extends Base {
// this.attributeCamera = this.options.attribute.camera.content
// this.attributeGoods = this.options.attribute.goods.content
function tabClick(e) {
if (e === '2' || e === 2) {//点击线条样式
if (2 < _this.options.type && _this.options.type < 13) {//贴图参数
document.getElementById('dashTextureDom') && (document.getElementById('dashTextureDom').style.display = 'flex')
} else {
document.getElementById('dashTextureDom') && (document.getElementById('dashTextureDom').style.display = 'none')
}
}
}
// 创建标签页
let tabsElm = new cy_tabs(
'polyline-object-edit-tabs',
undefined,
tabClick,
this.sdk
)
// 颜色组件
@ -1612,7 +1630,7 @@ class PolylineObject extends Base {
this.labelLineColor = 'rgba(255,255,255,1)'
} //点击清空按钮事件回调
})
let labelBackgroundColorStartPicker = new YJColorPicker({
_this.labelBackgroundColorStartPicker = new YJColorPicker({
el: contentElm.getElementsByClassName('labelBackgroundColorStart')[0],
size: 'mini',
alpha: true,
@ -1647,7 +1665,7 @@ class PolylineObject extends Base {
this._elms.labelColor = [labelColorPicker]
this._elms.extendColor = [extendColorPicker]
this._elms.labelLineColor = [lineColorPicker]
this._elms.labelBackgroundColorStart = [labelBackgroundColorStartPicker]
this._elms.labelBackgroundColorStart = [_this.labelBackgroundColorStartPicker]
this._elms.labelBackgroundColorEnd = [labelBackgroundColorEndPicker]
setTimeout(() => {
@ -1925,16 +1943,16 @@ class PolylineObject extends Base {
//控制参数显隐
if (2 < this.lineType && this.lineType < 13) {//贴图参数
document.getElementById('dashTextureDom').style.display = 'flex'
document.getElementById('dashTextureDom') && (document.getElementById('dashTextureDom').style.display = 'flex')
} else {
document.getElementById('dashTextureDom').style.display = 'none'
document.getElementById('dashTextureDom') && (document.getElementById('dashTextureDom').style.display = 'none')
}
if (2 < this.lineType && this.lineType < 5) {//尾迹参数
document.getElementsByClassName('lineSpace')[0].style.display = 'none'
document.getElementsByClassName('lineSpace')[1].style.display = 'none'
document.getElementsByClassName('lineSpace')[0] && (document.getElementsByClassName('lineSpace')[0].style.display = 'none')
document.getElementsByClassName('lineSpace')[1] && (document.getElementsByClassName('lineSpace')[1].style.display = 'none')
} else {
document.getElementsByClassName('lineSpace')[0].style.display = 'flex'
document.getElementsByClassName('lineSpace')[1].style.display = 'flex'
document.getElementsByClassName('lineSpace')[0] && (document.getElementsByClassName('lineSpace')[0].style.display = 'flex')
document.getElementsByClassName('lineSpace')[1] && (document.getElementsByClassName('lineSpace')[1].style.display = 'flex')
}
break
}

1
src/Obj/Element/cy_html_tabs.js
View File

@ -49,6 +49,7 @@
tabs[i].addEventListener('click', (e) => {
let tabindex = e.target.getAttribute('tabindex')
let contentElm = BoxElm.getElementsByClassName('DIV-cy-tab-content-pane')
clickTabCallBack && clickTabCallBack(tabindex)
for (let i = 0; i < contentElm.length; i++) {
if (i === parseInt(tabindex)) {
contentElm[i].style.display = ''

9
src/Tools/index.js
View File

@ -638,7 +638,7 @@ class Tools {
// break
case 6: //流动虚线2
let that = this
let repeatX
material = new Cesium.FlowDashedLineFlowMaterialProperty({
color: color,
uType: type == 5 ? 0 : 1,
@ -660,11 +660,10 @@ class Tools {
let point2 = new Cesium.Cartesian2(that.sdk.viewer.canvas.clientWidth / 2, that.sdk.viewer.canvas.clientHeight)
var cartesian1 = that.sdk.viewer.scene.pickPosition(point1)
var cartesian2 = that.sdk.viewer.scene.pickPosition(point2)
if (cartesian1 && cartesian2) {
var distance2 = Cesium.Cartesian3.distance(cartesian1, cartesian2);
let repeatX = distance2 * 2 / distance
repeatX = distance2 * 2 / distance
}
return repeatX;
})
})