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

This commit is contained in:
zh
2025-08-27 00:57:04 +08:00
2 changed files with 5 additions and 5 deletions

View File

@ -46,7 +46,7 @@ class BatchModel extends Base {
this._EventBinding = new EventBinding() this._EventBinding = new EventBinding()
this._elms = {}; this._elms = {};
this.pointArr = [] this.pointArr = []
this.sdk.addIncetance(this.options.id, this) // this.sdk.addIncetance(this.options.id, this)
let tools = new Tools(sdk) let tools = new Tools(sdk)
// BatchModel.computeDis(this) // BatchModel.computeDis(this)
// if (this.options.positions.length > 0 || this.options.positions.lng) { // if (this.options.positions.length > 0 || this.options.positions.lng) {
@ -58,6 +58,7 @@ class BatchModel extends Base {
// BatchModel.computeDis(this) // BatchModel.computeDis(this)
let Draw let Draw
console.log('kkkkk')
switch (options.type) { switch (options.type) {
case '点': case '点':
Draw = new DrawPoint(this.sdk) Draw = new DrawPoint(this.sdk)
@ -73,8 +74,9 @@ class BatchModel extends Base {
} }
Draw && Draw.start((a, positions) => { Draw && Draw.start((a, positions) => {
this.options.positions = positions; this.options.positions = positions;
console.log('uuuuuu')
//判断范围是否过大 //判断范围是否过大
if (positions) { if (positions.length != 0 || positions.lng) {
if (options.type == '面') { if (options.type == '面') {
let posi = positions.map(v => { let posi = positions.map(v => {
return Cesium.Cartesian3.fromDegrees(v.lng, v.lat) return Cesium.Cartesian3.fromDegrees(v.lng, v.lat)

View File

@ -441,7 +441,6 @@ class YJEarth {
textList[i].querySelector('textarea').focus() textList[i].querySelector('textarea').focus()
_this.isLeftClick = true _this.isLeftClick = true
_this.entityMap.get(_this.clickTextDom.id).isClick(movement.position, _this.clickTextDom.id) _this.entityMap.get(_this.clickTextDom.id).isClick(movement.position, _this.clickTextDom.id)
_this.blurFun = () => { _this.blurFun = () => {
// let { sdkP } = getSdk() // let { sdkP } = getSdk()
// if (_this == sdkP && sdkP) {//二维 // if (_this == sdkP && sdkP) {//二维
@ -449,7 +448,6 @@ class YJEarth {
// } else if (!sdkP) { // } else if (!sdkP) {
_this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value) _this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
// } // }
_this.clickTextDom.querySelector('textarea').removeEventListener('blur', _this.blurFun) _this.clickTextDom.querySelector('textarea').removeEventListener('blur', _this.blurFun)
} }
_this.clickTextDom.querySelector('textarea').addEventListener('blur', _this.blurFun) _this.clickTextDom.querySelector('textarea').addEventListener('blur', _this.blurFun)
@ -474,7 +472,7 @@ class YJEarth {
click = true click = true
} }
mousemove = function (e) { mousemove = function (e) {
if (!click) { if (!click || !_this.clickTextDom) {
return return
} }
let width = _this.clickTextDom.clientWidth * 1 let width = _this.clickTextDom.clientWidth * 1