diff --git a/src/Obj/Base/PolygonObject/index.js b/src/Obj/Base/PolygonObject/index.js index dbaafdf..ca87983 100644 --- a/src/Obj/Base/PolygonObject/index.js +++ b/src/Obj/Base/PolygonObject/index.js @@ -1216,7 +1216,6 @@ class PolygonObject extends Base { alt: this.label.position[2] } this.originalOptions = this.deepCopyObj(this.options) - console.log('000000000000',this.options.label.scaleByDistance) this._DialogObject.close() this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions) diff --git a/src/Obj/Base/PolyhedronObject/eventBinding.js b/src/Obj/Base/PolyhedronObject/eventBinding.js index 6e7380d..87fa67f 100644 --- a/src/Obj/Base/PolyhedronObject/eventBinding.js +++ b/src/Obj/Base/PolyhedronObject/eventBinding.js @@ -61,7 +61,7 @@ class eventBinding { }) blurEvent = (e) => { let value = e.target.value - if (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null))) { + if ((e.target.type == 'number') && (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null)))) { value = Number(value) if ((e.target.max) && value > Number(e.target.max)) { value = Number(e.target.max) diff --git a/src/Obj/Base/WallRealStereoscopic/eventBinding.js b/src/Obj/Base/WallRealStereoscopic/eventBinding.js index 60f6829..22136c8 100644 --- a/src/Obj/Base/WallRealStereoscopic/eventBinding.js +++ b/src/Obj/Base/WallRealStereoscopic/eventBinding.js @@ -57,7 +57,7 @@ class eventBinding { }) blurEvent = (e) => { let value = e.target.value - if (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null))) { + if ((e.target.type == 'number') && (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null)))) { value = Number(value) if ((e.target.max) && value > Number(e.target.max)) { value = Number(e.target.max) diff --git a/src/Obj/Base/WallStereoscopic/eventBinding.js b/src/Obj/Base/WallStereoscopic/eventBinding.js index 52240e6..4a2f708 100644 --- a/src/Obj/Base/WallStereoscopic/eventBinding.js +++ b/src/Obj/Base/WallStereoscopic/eventBinding.js @@ -54,7 +54,7 @@ class eventBinding { }) blurEvent = (e) => { let value = e.target.value - if (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null))) { + if ((e.target.type == 'number') && (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null)))) { value = Number(value) if ((e.target.max) && value > Number(e.target.max)) { value = Number(e.target.max) diff --git a/src/Obj/Base/index.js b/src/Obj/Base/index.js index 7439d37..3f16db4 100644 --- a/src/Obj/Base/index.js +++ b/src/Obj/Base/index.js @@ -31,6 +31,7 @@ class Base extends Tools { this.rightClickCallBack = null this.picking = true this.options.host = this.options.host || getHost() + // this.#_showView = this.options.showView || 0 this.setDefaultValue() // this.sdk.addIncetance(this.options.id, this) @@ -66,7 +67,15 @@ class Base extends Tools { let sdk2D = get2DSdk().sdkD if (!sdk2D) { - v = 0 + this.#_showView = v + if(this.entity) { + this.entity._showView = v + } + return + } + if (this.sdk === sdk2D) { + this.#_showView = 0 + return } if (!this.#_showView && !this.show) { return diff --git a/static/custom/css/index.css b/static/custom/css/index.css index f7ce847..f78718f 100644 --- a/static/custom/css/index.css +++ b/static/custom/css/index.css @@ -3096,7 +3096,7 @@ /* 贴地图片 */ .YJ-custom-base-dialog.ground-image>.content { - width: 500px; + width: 560px; } /* 模型 */