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 into develop

Browse Source
This commit is contained in:
zh
2025-08-26 15:34:24 +08:00
parent 65441ddff4 7f3b04eb08
commit d0a682f233
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ class BatchModel extends Base {
this.options.name = options.name || '批量模型' this.options.name = options.name || '批量模型'
this.options.type = options.type || '面' this.options.type = options.type || '面'
this.options.url = options.url || '' this.options.url = options.url || ''
this.options.spacing = options.spacing || 50 this.options.spacing = options.spacing * 1 || 50
this.options.positions = options.positions || [] this.options.positions = options.positions || []
this.options.show = (options.show || options.show === false) ? options.show : true this.options.show = (options.show || options.show === false) ? options.show : true
this.callback = callback this.callback = callback
@ -50,6 +50,10 @@ class BatchModel extends Base {
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) {
if (this.options.spacing < 0 || options.spacing * 1 === 0) {
tools.message({ type: 'warning', text: '请输入正确的间距！' })
return;
}
if ((options.type && options.spacing != undefined) || options.type == '点') { if ((options.type && options.spacing != undefined) || options.type == '点') {
// BatchModel.computeDis(this) // BatchModel.computeDis(this)

2
src/YJEarth/index.js
View File

@ -419,7 +419,6 @@ class YJEarth {
let ClickHandler = new Cesium.ScreenSpaceEventHandler(_this.viewer.canvas) let ClickHandler = new Cesium.ScreenSpaceEventHandler(_this.viewer.canvas)
ClickHandler.setInputAction((movement) => { ClickHandler.setInputAction((movement) => {
console.log(_this.viewer, 'hhhh')
// let textList = document.getElementsByClassName('popup-textarea') // let textList = document.getElementsByClassName('popup-textarea')
let textList = _this.viewer._element.getElementsByClassName('popup-textarea') let textList = _this.viewer._element.getElementsByClassName('popup-textarea')
_this.isLeftClick = false _this.isLeftClick = false
@ -430,7 +429,6 @@ class YJEarth {
let height = textList[i].clientHeight * 1 let height = textList[i].clientHeight * 1
let x = movement.position.x let x = movement.position.x
let y = movement.position.y let y = movement.position.y
console.log(i, left, top, width, height, x, y, 'yyyyy')
if (x > left && x < left + width && y > top && y < top + height) { if (x > left && x < left + width && y > top && y < top + height) {
if (_this.clickTextDom) { if (_this.clickTextDom) {
_this.clickTextDom.style['pointer-events'] = 'none' _this.clickTextDom.style['pointer-events'] = 'none'