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

修改tip提示语

Browse Source
This commit is contained in:
zh
2025-12-10 14:59:18 +08:00
parent 5b200529b5
commit 44d9ace1c7
30 changed files with 448 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Obj/Base/BaseSource/BaseTileset/index.js
View File

@ -488,14 +488,6 @@ class BaseTileset extends BaseSource {
* */
set rotationEditing(status) {
if (!this.tileset.root.transform) {
if (window.ELEMENT) {
window.ELEMENT.Message.closeAll();
window.ELEMENT.Message({
message: '该模型不支持移动和旋转！',
type: 'warning',
duration: 1500
});
}
console.warn('该模型不支持移动和旋转！')
return
}
@ -534,14 +526,6 @@ class BaseTileset extends BaseSource {
return
}
if (!this.tileset.root.transform) {
if (window.ELEMENT) {
window.ELEMENT.Message.closeAll();
window.ELEMENT.Message({
message: '该模型不支持移动和旋转！',
type: 'warning',
duration: 1500
});
}
console.warn('该模型不支持移动和旋转！')
return
}

5
src/Obj/Base/Graffiti/index.js
View File

@ -125,13 +125,14 @@ class Graffiti extends Draw {
start() {
let _this = this
if (YJ.Measure.GetMeasureStatus()) {
this.tools.message({ type: 'warning', text: '上一次测量未结束' })
this._error = '上一次测量未结束'
} else {
this._error = null
let viewer = this.sdk.viewer
CameraController(this.sdk, false)
super.start()
YJ.Measure.SetMeasureStatus(true)
this.tip = new MouseTip('长按左键，拖动鼠标进行涂鸦，右键结束涂鸦', this.sdk)
this.tip = new MouseTip('左键按下开始，松开完成，右键单击完成绘制', this.sdk)
this.event = new MouseEvent(this.sdk)
this.positions = []
this.points_ids = [] //存放左键点击时临时添加的point的id

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

@ -1500,7 +1500,7 @@ class PolygonObject extends Base {
fromDegreesArray = []
this.heightMode = this.heightMode
if(this._positionEditingCallback) {
if (this._positionEditingCallback) {
this._positionEditingCallback()
this._positionEditingCallback = null
}
@ -1700,19 +1700,20 @@ class PolygonObject extends Base {
return this._areaChangeCallBack
}
set areaChangeCallBack (cd) {
set areaChangeCallBack(cd) {
this._areaChangeCallBack = cd
}
nodeEdit(cb = () => { }) {
this.positionEditing = false
setTimeout(() => {
let previous = [...this.options.positions]
if (YJ.Measure.GetMeasureStatus()) {
cb('上一次测量未结束')
} else {
YJ.Measure.SetMeasureStatus(true)
this.picking = false
this.tip = new MouseTip('请选择一个顶点，右键取消', this.sdk)
this.tip = new MouseTip('左键单击选择控制点，右键单击取消编辑', this.sdk)
this.event = new MouseEvent(this.sdk)
this.nodePoints = []
let _this = this
@ -1848,7 +1849,7 @@ class PolygonObject extends Base {
selectPoint = pick.id
this.nodePoints.splice(pick.id.index, 1)
this.sdk.viewer.entities.remove(pick.id)
this.tip.set_text('左键开始，右键结束，CTRL+右键撤销')
this.tip.set_text('左键单击确定控制点位置，右键单击结束编辑! CTRL+右键单击撤销上一个控制点')
originalPosition = this.cartesian3Towgs84(
selectPoint.position.getValue(),
this.sdk.viewer
@ -1863,6 +1864,51 @@ class PolygonObject extends Base {
if (added) {
this.options.positions.splice(selectPoint.index, 1)
}
if (this.options.positions.length < 3) {
this.options.positions = [...previous]
let positions = this.options.positions
let fromDegreesArray = []
for (let i = 0; i < positions.length; i++) {
fromDegreesArray.push(positions[i].lng, positions[i].lat)
}
this.positions = Cesium.Cartesian3.fromDegreesArray(
fromDegreesArray
)
newpositions = Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)
this.previous = {
positions: [...this.positions]
}
let objectsToExclude = [...this.sdk.viewer.entities.values]
let positions2 = [[]]
for (let i = 0; i < this.options.positions.length; i++) {
positions2[0].push([
this.options.positions[i].lng,
this.options.positions[i].lat
])
}
positions2[0].push([
this.options.positions[0].lng,
this.options.positions[0].lat
])
let polygon = turf.polygon(positions2)
let centroid = turf.centroid(polygon)
this
.getClampToHeight({
lng: centroid.geometry.coordinates[0],
lat: centroid.geometry.coordinates[1]
}, objectsToExclude)
.then(height => {
this.label.position = [
centroid.geometry.coordinates[0],
centroid.geometry.coordinates[1],
height
]
})
this.areaByMeter = this.computeArea(this.options.positions)
this.areaChangeCallBack && this.areaChangeCallBack()
}
cb(null, this.options.positions)
}
@ -2018,6 +2064,9 @@ class PolygonObject extends Base {
}
}
this.nodePoints.pop()
if(this.options.positions.length < 3) {
this.tip.set_text('左键单击确定控制点位置，右键单击取消编辑! CTRL+右键单击撤销上一个控制点')
}
}
})

11
src/Obj/Base/TextObject/StandText/index.js
View File

@ -595,7 +595,7 @@ class StandText extends Base {
selectPoint = pick.id
this.nodePoints.splice(pick.id.index, 1)
this.sdk.viewer.entities.remove(pick.id)
this.tip.set_text('左键开始，右键结束，CTRL+右键撤销')
this.tip.set_text('左键单击确认顶点位置，右键单击结束，CTRL+右键撤销')
originalPosition = this.cartesian3Towgs84(cartesian, this.sdk.viewer)
this.entity.wall.positions = new Cesium.CallbackProperty(function () {
return Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)
@ -615,6 +615,15 @@ class StandText extends Base {
if(isAdd) {
this.options.positions.splice(selectPoint.index, 1)
}
if (!that.options.positions || that.options.positions.length < 2) {
console.warn('最少需要两个坐标！')
window.ELEMENT && window.ELEMENT.Message({
message: '最少需要两个坐标！',
type: 'warning',
duration: 1500
});
that.options.positions = [...previous]
}
cb(null, this.options.positions)
}
let positions = this.options.positions