材质颜色

src/BaseDialog/index.js

@@ -1,5 +1,5 @@
 class BaseDialog {
-  constructor(container, options = {}) {
+  constructor(container, options = {}, only = true) {
     this.container = container
     this.options = { ...options }
     this.options.ismove = true
@@ -9,10 +9,13 @@ class BaseDialog {
     this.closeCallBack = options.closeCallBack
     this._element = {}
     this._element_style = undefined
+    this.only = only
   }
 
   async init() {
-    this.closeAll()
+    if (this.only) {
+      this.closeAll()
+    }
     DialogAll.push(this)
     this.isDestroy = false
     // body
@@ -48,6 +51,15 @@ class BaseDialog {
     <button class="close">关闭</button>
     `
     this._element.body.appendChild(this._element.foot)
+    let curtain = await document.createElement('div')
+    curtain.style.position = 'absolute'
+    curtain.style.top = '0'
+    curtain.style.left = '0'
+    curtain.style.width = '100%'
+    curtain.style.height = '100%'
+    curtain.style.backdropFilter = 'blur(2px)'
+    curtain.style.zIndex = '-999999'
+    this._element.body.appendChild(curtain)
 
     // 关闭
     let closeBtnsBox = this._element.body.getElementsByClassName('close-box')[0];

src/Draw/drawAttackArrow.js

@@ -59,12 +59,17 @@ export default class DrawAttackArrow extends Draw {
           return
         }
         into = '3D'
+        let pos84 = this.cartesian3Towgs84(cartesian, this.viewer)
+        let lastPos84 = cache_positions[cache_positions.length - 1]
+        if(lastPos84 && (lastPos84.lng === pos84.lng && lastPos84.lat === pos84.lat)) {
+          return
+        }
         if (!this.entityHasCreated) {
           let polyline_id = DrawAttackArrow.create_arrow_polygon(this)
           this.points_ids.push(polyline_id)
         }
         this.points_ids.push(this.create_point(cartesian))
-        cache_positions.push(this.cartesian3Towgs84(cartesian, this.viewer))
+        cache_positions.push(pos84)
         isMove = false
       })
       this.event.mouse_right((movement, cartesian) => {

src/Draw/drawCircle.js

@@ -49,7 +49,7 @@ export default class DrawCircle extends Draw {
         if (clickNum === 2) {
           radius_points = cache_points.concat(cartesian)
           endpoint = this.cartesian3Towgs84(cartesian, this.viewer)
-          radius = this.computeDistance([center, endpoint])
+          radius = this.computeDistance2([center, endpoint])
           positions = this.createCircle(center, radius)
           this.end()
           cb(null, { center, radius: Number(radius) })
@@ -74,7 +74,7 @@ export default class DrawCircle extends Draw {
         if (clickNum) {
           radius_points = cache_points.concat(cartesian)
           endpoint = this.cartesian3Towgs84(cartesian, this.viewer)
-          radius = this.computeDistance([center, endpoint])
+          radius = this.computeDistance2([center, endpoint])
           positions = this.createCircle(center, radius)
         }
 
@@ -108,7 +108,7 @@ export default class DrawCircle extends Draw {
             if (clickNum === 2) {
               radius_points = cache_points.concat(cartesian)
               endpoint = this.cartesian3Towgs84(cartesian, this.viewer)
-              radius = this.computeDistance([center, endpoint])
+              radius = this.computeDistance2([center, endpoint])
               positions = this.createCircle(center, radius)
               this.end()
               cb(null, { center, radius: Number(radius) })
@@ -136,7 +136,7 @@ export default class DrawCircle extends Draw {
           if (clickNum === 2) {
             radius_points = cache_points.concat(cartesian)
             endpoint = this.cartesian3Towgs84(cartesian, this.viewer)
-            radius = this.computeDistance([center, endpoint])
+            radius = this.computeDistance2([center, endpoint])
             positions = this.createCircle(center, radius)
             this.end()
             cb(null, { center, radius: Number(radius) })
@@ -161,7 +161,7 @@ export default class DrawCircle extends Draw {
           if (clickNum) {
             radius_points = cache_points.concat(cartesian)
             endpoint = this.cartesian3Towgs84(cartesian, this.viewer)
-            radius = this.computeDistance([center, endpoint])
+            radius = this.computeDistance2([center, endpoint])
             positions = this.createCircle(center, radius)
           }
 
@@ -195,7 +195,7 @@ export default class DrawCircle extends Draw {
               if (clickNum === 2) {
                 radius_points = cache_points.concat(cartesian)
                 endpoint = this.cartesian3Towgs84(cartesian, this.viewer)
-                radius = this.computeDistance([center, endpoint])
+                radius = this.computeDistance2([center, endpoint])
                 positions = this.createCircle(center, radius)
                 this.end()
                 cb(null, { center, radius: Number(radius) })

src/Draw/drawPolygon.js

@@ -13,6 +13,7 @@ class DrawPolygon extends Draw {
    * */
   constructor(sdk, options = {}) {
     super(sdk, options)
+    this.color = options.color || 'rgba(255,0,0,0.5)'
     this.polygonHasCreated = false
   }
 
@@ -34,8 +35,8 @@ class DrawPolygon extends Draw {
           positions: new Cesium.CallbackProperty((e) => {
             return that.positions.concat(that.positions[0])
           }),
-          width: 2,
-          material: Cesium.Color.fromCssColorString('#c1c505').withAlpha(0.5),
+          width: 3,
+          material: Cesium.Color.fromCssColorString(that.color).withAlpha(1),
           clampToGround: true,
           zIndex: 99999999
         },

src/Draw/drawThreeRect.js

@@ -0,0 +1,317 @@
+import MouseTip from '../MouseTip'
+import MouseEvent from '../Event'
+import Draw from './draw'
+
+/**
+ * @extends Draw*/
+class DrawThreeRect extends Draw {
+  /**
+   * @constructor
+   * @param [options] {object} 三点矩形属性
+   * @param [options.color=rgba(185,14,14,0.58)] {object} 线属性
+
+   * */
+  constructor(sdk, options = {}) {
+    super(sdk, options)
+    this.polygonHasCreated = false
+    this.rectObject = []
+  }
+
+  static create_polygon(that, viewer = that.viewer) {
+    that.polygonHasCreated = true
+    let id = that.randomString()
+    viewer.entities.add(
+      new Cesium.Entity({
+        id: id,
+        polygon: {
+          classificationType: Cesium.ClassificationType.BOTH,
+          hierarchy: new Cesium.CallbackProperty((e) => {
+            return new Cesium.PolygonHierarchy(that.positions)
+          }),
+          material: Cesium.Color.fromCssColorString(that.color),
+          zIndex: 99999999
+        },
+        polyline: {
+          positions: new Cesium.CallbackProperty((e) => {
+            return that.positions.concat(that.positions[0])
+          }),
+          width: 2,
+          material: Cesium.Color.fromCssColorString('#c1c505').withAlpha(0.5),
+          clampToGround: true,
+          zIndex: 99999999
+        },
+      })
+    )
+    return id
+  }
+  computedLastPoint(arr) {
+    const start = arr[0];
+    const end = arr[1];
+    // 计算点到线的距离
+    const directionVector = Cesium.Cartesian3.subtract(end, start, new Cesium.Cartesian3());
+    const pointToStart = Cesium.Cartesian3.subtract(arr[2], start, new Cesium.Cartesian3());
+    const projectionLength = Cesium.Cartesian3.dot(pointToStart, directionVector) / Cesium.Cartesian3.magnitudeSquared(directionVector);
+    const projectionVector = Cesium.Cartesian3.multiplyByScalar(directionVector, projectionLength, new Cesium.Cartesian3());
+    const projectionPoint = Cesium.Cartesian3.add(start, projectionVector, new Cesium.Cartesian3());
+    const distance = Cesium.Cartesian3.distance(arr[2], projectionPoint)
+
+    const perp = Cesium.Cartesian3.subtract(arr[2], projectionPoint, new Cesium.Cartesian3());
+    Cesium.Cartesian3.normalize(perp, perp);
+    // 生成偏移向量
+    const offset = Cesium.Cartesian3.multiplyByScalar(perp, distance, new Cesium.Cartesian3());
+    let threePoint = Cesium.Cartesian3.add(end, offset, new Cesium.Cartesian3())
+    let lastPoint = Cesium.Cartesian3.add(start, offset, new Cesium.Cartesian3())
+    return [{ ...threePoint }, { ...lastPoint }]
+  }
+  /**
+   * @desc 开始动态绘制面
+   * @method start
+   * @param cb {function} 回调函数
+   * @memberOf DrawPolygon
+   * @example draw.start((err,positions)=>{
+   *
+   * })
+   * */
+  start(cb) {
+    if (YJ.Measure.GetMeasureStatus()) {
+      cb('上一次测量未结束')
+    } else {
+      this.polygonHasCreated = false
+      super.start()
+      YJ.Measure.SetMeasureStatus(true)
+      let into
+      this.tip = new MouseTip('左键确定，右键结束；CTRL+右键撤销', this.sdk)
+      this.event = new MouseEvent(this.sdk)
+      let cnt = 0
+      this.positions = []
+      this.positionsLine = []
+      this.points_ids = [] //存放左键点击时临时添加的point的id
+      let cache_positions = []
+      let cache_84_position = []
+      this.event.mouse_left((movement, cartesian) => {
+        if (into === '2D') {
+          return
+        }
+        into = '3D'
+        cnt++
+        this.positions = cache_positions.concat({ ...cartesian })
+        this.tip.setPosition(
+          cartesian,
+          movement.position.x,
+          movement.position.y
+        )
+        if (!this.polygonHasCreated) {
+          let polyline_id = DrawThreeRect.create_polygon(this)
+          this.points_ids.push(polyline_id)
+        }
+        cache_positions.push(cartesian)
+        cache_84_position.push(this.cartesian3Towgs84(cartesian, this.viewer))
+        this.points_ids.push(this.create_point(cartesian))
+        if (cnt == 3) {
+          this.end()
+          cb(null, this.rectObject)
+        }
+      })
+      this.event.mouse_right((movement, cartesian) => {
+        if (into === '2D') {
+          return
+        }
+        // let positions = []
+        // console.log(cache_positions)
+        // cache_positions.forEach((item) => {
+        //   let p = this.cartesian3Towgs84(item)
+        //   console.log(item)
+        //   positions.push(p)
+        // })
+        this.end()
+        cb('取消', '')
+      })
+      this.event.mouse_move((movement, cartesian) => {
+        if (into === '2D') {
+          return
+        }
+
+        // this.positions = cache_positions.concat({ ...cartesian })
+        this.tip.setPosition(
+          cartesian,
+          movement.endPosition.x,
+          movement.endPosition.y
+        )
+
+        if (cnt == 2) {
+          let arr = JSON.parse(JSON.stringify(cache_positions))
+          let arr1 = arr.concat({ ...cartesian })
+          let pointArr = this.computedLastPoint(arr1)
+          arr = arr.concat(pointArr)
+          this.positions = arr
+          let arr_84 = arr.map(item => {
+            return this.cartesian3Towgs84(item, this.viewer)
+          })
+          this.rectObject = arr_84
+        }
+      })
+      this.event.mouse_right_keyboard_ctrl((movement, cartesian) => {
+        if (into === '2D') {
+          return
+        }
+        if (this.points_ids.length > 1) {
+          this.remove_entity(this.points_ids.pop()) //移除point
+          cache_positions.pop()
+          cache_84_position.pop()
+        }
+      })
+
+      this.event.gesture_pinck_start_keyboard_ctrl(() => {
+        if (into === '2D') {
+          return
+        }
+        if (this.points_ids.length > 1) {
+          this.remove_entity(this.points_ids.pop()) //移除point
+          cache_positions.pop()
+          cache_84_position.pop()
+          this.positions = cache_positions.concat(cartesian)
+        }
+      })
+
+      this.event.gesture_pinck_start((movement, cartesian) => {
+        if (into === '2D') {
+          return
+        }
+        let startTime = new Date()
+        this.event.gesture_pinck_end(() => {
+          let endTime = new Date()
+          if (endTime - startTime >= 500) {
+            cb(null, cache_84_position)
+            this.end()
+          }
+          else {
+            this.tip.setPosition(
+              cartesian,
+              (movement.position1.x + movement.position2.x) / 2,
+              (movement.position1.y + movement.position2.y) / 2
+            )
+            if (!this.polygonHasCreated) {
+              let polyline_id = DrawThreeRect.create_polygon(this)
+              this.points_ids.push(polyline_id)
+            }
+            cache_positions.push(cartesian)
+            cache_84_position.push(this.cartesian3Towgs84(cartesian, this.viewer))
+            this.points_ids.push(this.create_point(cartesian))
+            this.positions = cache_positions.concat(cartesian)
+          }
+        })
+      })
+
+      if (!this._is2D && this._sdk2D) {
+        this.event2D = new MouseEvent(this._sdk2D)
+        this.event2D.mouse_left((movement, cartesian) => {
+          if (into === '3D') {
+            return
+          }
+          into = '2D'
+          cnt++
+          this.positions = cache_positions.concat({ ...cartesian })
+          this.tip.setPosition(
+            cartesian,
+            movement.position.x + this.viewer.canvas.width,
+            movement.position.y
+          )
+          if (!this.polygonHasCreated) {
+            let polyline_id = DrawThreeRect.create_polygon(this, this._sdk2D.viewer)
+            this.points_ids.push(polyline_id)
+          }
+          cache_positions.push(cartesian)
+          cache_84_position.push(this.cartesian3Towgs84(cartesian, this.viewer))
+          this.points_ids.push(this.create_point(cartesian, this._sdk2D.viewer))
+          if (cnt == 3) {
+            this.end()
+            cb(null, this.rectObject)
+          }
+        })
+        this.event2D.mouse_right((movement, cartesian) => {
+          if (into === '3D') {
+            return
+          }
+          this.end()
+          cb('取消', '')
+        })
+        this.event2D.mouse_move((movement, cartesian) => {
+          if (into === '3D') {
+            return
+          }
+          // this.positions = cache_positions.concat({ ...cartesian })
+          this.tip.setPosition(
+            cartesian,
+            movement.endPosition.x + this.viewer.canvas.width,
+            movement.endPosition.y
+          )
+
+          if (cnt == 2) {
+            let arr = JSON.parse(JSON.stringify(cache_positions))
+            let arr1 = arr.concat({ ...cartesian })
+            let pointArr = this.computedLastPoint(arr1)
+            arr = arr.concat(pointArr)
+            this.positions = arr
+            let arr_84 = arr.map(item => {
+              return this.cartesian3Towgs84(item, this.viewer)
+            })
+            this.rectObject = arr_84
+          }
+        })
+        this.event2D.mouse_right_keyboard_ctrl((movement, cartesian) => {
+          if (into === '3D') {
+            return
+          }
+          if (this.points_ids.length > 1) {
+            this.remove_entity(this.points_ids.pop()) //移除point
+            cache_positions.pop()
+            cache_84_position.pop()
+          }
+        })
+
+        this.event2D.gesture_pinck_start_keyboard_ctrl(() => {
+          if (into === '3D') {
+            return
+          }
+          if (this.points_ids.length > 1) {
+            this.remove_entity(this.points_ids.pop()) //移除point
+            cache_positions.pop()
+            cache_84_position.pop()
+            this.positions = cache_positions.concat(cartesian)
+          }
+        })
+
+        this.event2D.gesture_pinck_start((movement, cartesian) => {
+          if (into === '3D') {
+            return
+          }
+          let startTime = new Date()
+          this.event2D.gesture_pinck_end(() => {
+            let endTime = new Date()
+            if (endTime - startTime >= 500) {
+              cb(null, cache_84_position)
+              this.end()
+            }
+            else {
+              this.tip.setPosition(
+                cartesian,
+                ((movement.position1.x + movement.position2.x) / 2) + this.viewer.canvas.width,
+                (movement.position1.y + movement.position2.y) / 2
+              )
+              if (!this.polygonHasCreated) {
+                let polyline_id = DrawThreeRect.create_polygon(this, this._sdk2D.viewer)
+                this.points_ids.push(polyline_id)
+              }
+              cache_positions.push(cartesian)
+              cache_84_position.push(this.cartesian3Towgs84(cartesian, this.viewer))
+              this.points_ids.push(this.create_point(cartesian, this._sdk2D.viewer))
+              this.positions = cache_positions.concat(cartesian)
+            }
+          })
+        })
+      }
+    }
+  }
+}
+
+export default DrawThreeRect

src/Global/Contour/_element.js

@@ -0,0 +1,109 @@
+function html() {
+    return `
+    <span class="custom-divider"></span>
+    <div class="div-item">
+        <div class="row" style="align-items: flex-start;">
+            <div class="col" style="flex: 0 0 120px;">
+                <span class="label">等高线</span>
+                <input class="btn-switch show" type="checkbox">
+            </div>
+        </div>
+    </div>
+    <span class="custom-divider"></span>
+    <div class="div-item">
+        <div class="row">
+            <div class="col input-select-unit-box">
+                <span class="label">等高距</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input equal-height-distance" type="number" title="" min="1" max="1000">
+                    <span class="unit">m</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col input-select-unit-box"  style="flex: 0 0 60px;">
+            </div>
+            <div class="col input-select-unit-box" style="flex: 0 0 157px;">
+                <span class="label">选中线颜色</span>
+                <div class="active-color"></div>
+            </div>
+        </div>
+    </div>
+    <span class="custom-divider"></span>
+    <div class="div-item">
+        <div class="row" style="align-items: flex-start;">
+            <div class="col" style="flex: 0 0 120px;">
+                <span class="label">计曲线</span>
+                <input class="btn-switch index-contour-switch" type="checkbox">
+            </div>
+            <div class="col input-select-unit-box" style="flex: 0 0 120px;">
+                <span class="label">计曲线颜色</span>
+                <div class="index-contour-color"></div>
+            </div>
+            <div class="col input-select-unit-box">
+                <span class="label">计曲线宽度</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input index-contour-width" type="number" title="" step="0.1" min="1" max="10">
+                    <span class="unit">px</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+        <div class="row" style="align-items: flex-start;">
+            <div class="col" style="flex: 0 0 120px;">
+                <span class="label">首曲线</span>
+                <input class="btn-switch intermediate-contour-switch" type="checkbox">
+            </div>
+            <div class="col input-select-unit-box" style="flex: 0 0 120px;">
+                <span class="label">首曲线颜色</span>
+                <div class="intermediate-contour-color"></div>
+            </div>
+            <div class="col input-select-unit-box">
+                <span class="label">首曲线宽度</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input intermediate-contour-width" type="number" step="0.1" title="" min="1" max="10">
+                    <span class="unit">px</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+        <div class="row" style="align-items: flex-start;">
+            <div class="col" style="flex: 0 0 120px;">
+                <span class="label">间曲线</span>
+                <input class="btn-switch halfInterval-contour-switch" type="checkbox">
+            </div>
+            <div class="col input-select-unit-box" style="flex: 0 0 120px;">
+                <span class="label">间曲线颜色</span>
+                <div class="halfInterval-contour-color"></div>
+            </div>
+            <div class="col input-select-unit-box">
+                <span class="label">间曲线宽度</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input halfInterval-contour-width" type="number" title="" min="1" max="10">
+                    <span class="unit">px</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+        <div class="row" style="align-items: flex-start;">
+            <div class="col" style="flex: 0 0 120px;">
+                <span class="label">助曲线</span>
+                <input class="btn-switch supplementary-contour-switch" type="checkbox">
+            </div>
+            <div class="col input-select-unit-box" style="flex: 0 0 120px;">
+                <span class="label">助曲线颜色</span>
+                <div class="supplementary-contour-color"></div>
+            </div>
+            <div class="col input-select-unit-box">
+                <span class="label">助曲线宽度</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input supplementary-contour-width" type="number" title="" min="1" max="10">
+                    <span class="unit">px</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+    </div>
+    `
+}
+
+export { html }

src/Global/Contour/index.js

@@ -3,12 +3,35 @@
  */
 import Dialog from "../../Obj/Element/Dialog";
 import Tools from "../../Tools";
+import { flyTo } from '../global'
+import YJColorPicker from "../../Obj/Element/yj-color-picker";
+
+import { html } from "./_element";
 
 let _DialogObject = null;
 let material = null;
 let handler = null;
 let activeHeightElm = null;
 let tools
+let _sdk
+let secondaryLinesCount = 19
+let show = false
+let equalHeightDistance = 10
+let activeColor = '#ffd000'
+let indexContourShow = true
+let indexContourWidth = 2.5
+let indexContourColor = '#43cf7c'
+let intermediateContourShow = true
+let intermediateContourWidth = 1.8
+let intermediateContourColor = '#ff0000'
+let halfIntervalContourShow = false
+let halfIntervalContourWidth = 1.0
+let halfIntervalContourColor = '#64b6d9'
+let supplementaryContourShow = false
+let supplementaryContourWidth = 1.0
+let supplementaryContourColor = '#d084d1'
+
+
 activeHeightElm = document.createElement('div')
 activeHeightElm.className = 'YJ-customize-active-height-elm'
 activeHeightElm.style.position = 'absolute'
@@ -20,7 +43,39 @@ activeHeightElm.style.textAlign = 'center'
 activeHeightElm.style.pointerEvents = 'none'
 activeHeightElm.style.color = '#ff0000'
 activeHeightElm.style.display = 'none'
+
+
+
+function accordingToCameraHeight() {
+  if (_sdk) {
+    const camera = _sdk.viewer.camera;
+    const position = camera.positionCartographic;
+
+    // 计算相机高度（相对于椭球面）
+    let cameraHeight = Cesium.Math.toDegrees(position.height);
+    if (cameraHeight < 1000000) {
+      if (!_sdk.viewer.scene.globe.material && show === true) {
+        showContour(_sdk)
+      }
+      // if (material) {
+      //   if (cameraHeight > 450000) {
+      //     material.uniforms.supplementaryContourShow = false
+      //   }
+      //   else if (supplementaryContourShow) {
+      //     material.uniforms.supplementaryContourShow = true
+      //   }
+      // }
+    }
+    else {
+      hideContour(_sdk)
+    }
+    // console.log(cameraHeight)
+  }
+
+}
 async function dialog(sdk) {
+  _sdk = sdk
+
   if (!sdk || _DialogObject) {
     return
   }
@@ -28,13 +83,12 @@ async function dialog(sdk) {
     createMaterial()
   }
   if (!tools) {
-    tools = new Tools()
+    tools = new Tools(sdk)
   }
 
   _DialogObject = await new Dialog(sdk, {}, {
-    title: "等高线", left: '180px',
+    title: "全局等高线", left: '180px',
     top: '100px',
-    confirmCallBack: options => { },
     closeCallBack: () => {
       _DialogObject = null
     }
@@ -43,125 +97,374 @@ async function dialog(sdk) {
   _DialogObject._element.body.className =
     _DialogObject._element.body.className + ' contour'
   let contentElm = document.createElement('div')
-  contentElm.innerHTML = `
-  <span class="custom-divider"></span>
-  <div class="div-item">
-      <div class="row">
-          <div class="col input-select-unit-box">
-              <span class="label">高差</span>
-              <div class="input-number input-number-unit-1">
-                  <input class="input gap" type="number" title="" min="0" max="1000">
-                  <span class="unit">m</span>
-                  <span class="arrow"></span>
-              </div>
-          </div>
-          <div class="col input-select-unit-box" style="flex: 0 0 120px;">
-              <span class="label">主线颜色</span>
-              <div class="primary-lice-color"></div>
-          </div>
-      </div>
-      <div class="row">
-          <div class="col input-select-unit-box">
-              <span class="label">次线条数</span>
-              <div class="input-number input-number-unit-1">
-                  <input class="input gap2" type="number" title="" min="0" max="10">
-                  <span class="unit"></span>
-                  <span class="arrow"></span>
-              </div>
-          </div>
-          <div class="col input-select-unit-box" style="flex: 0 0 120px;">
-              <span class="label">次线颜色</span>
-              <div class="secondary-lice-color"></div>
-          </div>
-      </div>
-      <div class="row" style="align-items: flex-start;">
-          <div class="col">
-          </div>
-          <div class="col" style="flex: 0 0 120px;">
-              <span class="label">开关</span>
-              <input class="btn-switch" type="checkbox">
-          </div>
-      </div>
-  </div>
-  <span class="custom-divider"></span>
-  `
-  contentElm.innerHTML = `
-  <span class="custom-divider"></span>
-  <div class="div-item">
-      <div class="row" style="align-items: flex-start;">
-          <div class="col" style="flex: 0 0 120px;">
-              <span class="label">开关</span>
-              <input class="btn-switch" type="checkbox">
-          </div>
-      </div>
-  </div>
-  `
+  contentElm.innerHTML = html(this)
+
   _DialogObject.contentAppChild(contentElm)
 
-  contentElm.getElementsByClassName('btn-switch')[0].addEventListener('change', (e) => {
-    if (e.target.checked) {
-      if (handler) {
-        handler.destroy()
-      }
-      if (!sdk.viewer.container.getElementsByClassName('YJ-customize-active-height-elm')[0]) {
-        sdk.viewer.container.appendChild(activeHeightElm)
-      }
+  sdk.viewer.scene.postRender.removeEventListener(accordingToCameraHeight)
+  sdk.viewer.scene.postRender.addEventListener(accordingToCameraHeight)
 
-      handler = new Cesium.ScreenSpaceEventHandler(
-        sdk.viewer.canvas
-      )
-      handler.setInputAction((movement) => {
-        let cartesian = sdk.viewer.scene.pickPosition(movement.endPosition)
-        if (cartesian) {
-          let top = 0
-          let left = 0
-          if (sdk.viewer && sdk.viewer._element) {
-            let element = sdk.viewer._element.getElementsByClassName('cesium-widget')[0].getElementsByTagName('canvas')[0]
-            top = element.getBoundingClientRect().top + window.scrollY
-            left = element.getBoundingClientRect().left + window.scrollX
-          }
-          activeHeightElm.style.left = movement.endPosition.x - 50 + left + 'px'
-          activeHeightElm.style.top = movement.endPosition.y - 40 + top + 'px'
-          activeHeightElm.style.display = 'block'
-          let pos84 = tools.cartesian3Towgs84(cartesian, sdk.viewer)
-          let mainContourHeight = Math.floor(pos84.alt / material.uniforms.spacing) * material.uniforms.spacing
-          let gap = pos84.alt - mainContourHeight
-          let gap2 = material.uniforms.spacing / (material.uniforms.secondaryLinesCount + 1)
-          let activeHeight = Math.floor(gap / gap2) * gap2 + mainContourHeight
-          if ((pos84.alt - activeHeight) > gap2 / 2) {
-            activeHeight = activeHeight + gap2
-          }
-          material.uniforms.mouseHeight = pos84.alt
-          material.uniforms.mousePosition = cartesian
-          activeHeightElm.innerHTML = `${activeHeight.toFixed(0)}`
+  // 显示
+  let showBtn = contentElm.getElementsByClassName('show')[0]
+  showBtn.checked = show
+  showBtn.addEventListener('change', (e) => {
+    if (e.target.checked) {
+      show = true
+      let height = sdk.viewer.camera.positionCartographic.height
+      if (height > 16360) {
+        let cartographic = sdk.viewer.camera.positionCartographic
+        let options = {
+          position: {
+            lng: Cesium.Math.toDegrees(cartographic.longitude),
+            lat: Cesium.Math.toDegrees(cartographic.latitude),
+            alt: 16360,
+          },
         }
-        else {
-          activeHeightElm.style.display = 'none'
-        }
-      }, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
-      sdk.viewer.scene.globe.material = material;
+        flyTo(sdk, options, 0.5)
+      }
+      showContour(sdk)
     } else {
-      if (handler) {
-        handler.destroy()
-        handler = null
-      }
-      if (sdk.viewer.container.getElementsByClassName('YJ-customize-active-height-elm')[0]) {
-        activeHeightElm.style.display = 'none'
-        sdk.viewer.container.removeChild(activeHeightElm)
-      }
-      sdk.viewer.scene.globe.material = null;
+      show = false
+      hideContour(sdk)
     }
   })
+  // 等高距
+  let equalHeightDistanceInput = contentElm.getElementsByClassName('equal-height-distance')[0]
+  equalHeightDistanceInput.value = equalHeightDistance
+  equalHeightDistanceInput.addEventListener('blur', (e) => {
+    let value = initInputValue(e)
+    equalHeightDistance = value
+    equalHeightDistanceInput.value = value
+    if (material) {
+      material.uniforms.spacing = equalHeightDistance * 5
+    }
+  })
+
+  // 选中颜色
+  // let activeColorPicker = new YJColorPicker({
+  //   el: contentElm.getElementsByClassName('active-color')[0],
+  //   size: "mini",
+  //   isLog: false,
+  //   alpha: true, //是否开启透明度
+  //   disabled: false, //是否禁止打开颜色选择器
+  //   predefineColor: true, // 预定义颜色
+  //   defaultColor: '#ffffff',
+  //   sure: color => {
+  //     activeColor = color
+  //     if (material) {
+  //       material.uniforms.activeColor = Cesium.Color.fromCssColorString(activeColor)
+  //     }
+  //   },
+  //   clear: () => {
+  //     activeColor = 'rgba(255,255,255,1)'
+  //     if (material) {
+  //       material.uniforms.activeColor = Cesium.Color.fromCssColorString(activeColor)
+  //     }
+  //   }
+  // })
+  let activeColorPicker = new YJColorPicker({
+    el: contentElm.getElementsByClassName('active-color')[0],
+    size: 'mini',//颜色box类型
+    alpha: true,//是否开启透明度
+    defaultColor: activeColor,
+    disabled: false,//是否禁止打开颜色选择器
+    openPickerAni: 'opacity',//打开颜色选择器动画
+    sure: color => {
+      activeColor = color
+      if (material) {
+        material.uniforms.activeColor = Cesium.Color.fromCssColorString(activeColor)
+      }
+    },
+    clear: () => {
+      activeColor = 'rgba(255,255,255,1)'
+      if (material) {
+        material.uniforms.activeColor = Cesium.Color.fromCssColorString(activeColor)
+      }
+    }
+  })
+
+  // 计曲线开关
+  let indexContourSwitch = contentElm.getElementsByClassName('index-contour-switch')[0]
+  indexContourSwitch.checked = indexContourShow
+  indexContourSwitch.addEventListener('change', (e) => {
+    indexContourShow = e.target.checked
+    if (material) {
+      material.uniforms.indexContourShow = indexContourShow
+    }
+  })
+  // 计曲线颜色
+  let indexContourColorPicker = new YJColorPicker({
+    el: contentElm.getElementsByClassName('index-contour-color')[0],
+    size: 'mini',//颜色box类型
+    alpha: true,//是否开启透明度
+    defaultColor: indexContourColor,
+    disabled: false,//是否禁止打开颜色选择器
+    openPickerAni: 'opacity',//打开颜色选择器动画
+    sure: color => {
+      indexContourColor = color
+      if (material) {
+        material.uniforms.indexContourColor = Cesium.Color.fromCssColorString(indexContourColor)
+      }
+    },
+    clear: () => {
+      indexContourColor = 'rgba(255,255,255,1)'
+      if (material) {
+        material.uniforms.indexContourColor = Cesium.Color.fromCssColorString(indexContourColor)
+      }
+    }
+  })
+  // 计曲线宽度
+  let indexContourWidthInput = contentElm.getElementsByClassName('index-contour-width')[0]
+  indexContourWidthInput.value = indexContourWidth
+  indexContourWidthInput.addEventListener('blur', (e) => {
+    let value = initInputValue(e)
+    indexContourWidth = value
+    indexContourWidthInput.value = value
+    if (material) {
+      material.uniforms.indexContourWidth = indexContourWidth
+    }
+  })
+
+  // 首曲线开关
+  let intermediateContourSwitch = contentElm.getElementsByClassName('intermediate-contour-switch')[0]
+  intermediateContourSwitch.checked = intermediateContourShow
+  intermediateContourSwitch.addEventListener('change', (e) => {
+    intermediateContourShow = e.target.checked
+    if (material) {
+      material.uniforms.intermediateContourShow = intermediateContourShow
+    }
+  })
+  // 首曲线颜色
+  let intermediateContourColorPicker = new YJColorPicker({
+    el: contentElm.getElementsByClassName('intermediate-contour-color')[0],
+    size: 'mini',//颜色box类型
+    alpha: true,//是否开启透明度
+    defaultColor: intermediateContourColor,
+    disabled: false,//是否禁止打开颜色选择器
+    openPickerAni: 'opacity',//打开颜色选择器动画
+    sure: color => {
+      intermediateContourColor = color
+      if (material) {
+        material.uniforms.intermediateContourColor = Cesium.Color.fromCssColorString(intermediateContourColor)
+      }
+    },
+    clear: () => {
+      intermediateContourColor = 'rgba(255,255,255,1)'
+      if (material) {
+        material.uniforms.intermediateContourColor = Cesium.Color.fromCssColorString(intermediateContourColor)
+      }
+    }
+  })
+  // 首曲线宽度
+  let intermediateContourWidthInput = contentElm.getElementsByClassName('intermediate-contour-width')[0]
+  intermediateContourWidthInput.value = intermediateContourWidth
+  intermediateContourWidthInput.addEventListener('blur', (e) => {
+    let value = initInputValue(e)
+    intermediateContourWidth = value
+    intermediateContourWidthInput.value = value
+    if (material) {
+      material.uniforms.intermediateContourWidth = intermediateContourWidth
+    }
+  })
+
+  // 间曲线开关
+  let halfIntervalContourSwitch = contentElm.getElementsByClassName('halfInterval-contour-switch')[0]
+  halfIntervalContourSwitch.checked = halfIntervalContourShow
+  halfIntervalContourSwitch.addEventListener('change', (e) => {
+    halfIntervalContourShow = e.target.checked
+    if (material) {
+      material.uniforms.halfIntervalContourShow = halfIntervalContourShow
+    }
+  })
+  // 间曲线颜色
+  let halfIntervalContourColorPicker = new YJColorPicker({
+    el: contentElm.getElementsByClassName('halfInterval-contour-color')[0],
+    size: 'mini',//颜色box类型
+    alpha: true,//是否开启透明度
+    defaultColor: halfIntervalContourColor,
+    disabled: false,//是否禁止打开颜色选择器
+    openPickerAni: 'opacity',//打开颜色选择器动画
+    sure: color => {
+      halfIntervalContourColor = color
+      if (material) {
+        material.uniforms.halfIntervalContourColor = Cesium.Color.fromCssColorString(halfIntervalContourColor)
+      }
+    },
+    clear: () => {
+      halfIntervalContourColor = 'rgba(255,255,255,1)'
+      if (material) {
+        material.uniforms.halfIntervalContourColor = Cesium.Color.fromCssColorString(halfIntervalContourColor)
+      }
+    }
+  })
+  // 间曲线宽度
+  let halfIntervalContourWidthInput = contentElm.getElementsByClassName('halfInterval-contour-width')[0]
+  halfIntervalContourWidthInput.value = halfIntervalContourWidth
+  halfIntervalContourWidthInput.addEventListener('blur', (e) => {
+    let value = initInputValue(e)
+    halfIntervalContourWidth = value
+    halfIntervalContourWidthInput.value = value
+    if (material) {
+      material.uniforms.halfIntervalContourWidth = halfIntervalContourWidth
+    }
+  })
+
+  // 助曲线开关
+  let supplementaryContourSwitch = contentElm.getElementsByClassName('supplementary-contour-switch')[0]
+  supplementaryContourSwitch.checked = supplementaryContourShow
+  supplementaryContourSwitch.addEventListener('change', (e) => {
+    supplementaryContourShow = e.target.checked
+    if (material) {
+      material.uniforms.supplementaryContourShow = supplementaryContourShow
+    }
+  })
+  // 助曲线颜色
+  let supplementaryContourColorPicker = new YJColorPicker({
+    el: contentElm.getElementsByClassName('supplementary-contour-color')[0],
+    size: 'mini',//颜色box类型
+    alpha: true,//是否开启透明度
+    defaultColor: supplementaryContourColor,
+    disabled: false,//是否禁止打开颜色选择器
+    openPickerAni: 'opacity',//打开颜色选择器动画
+    sure: color => {
+      supplementaryContourColor = color
+      if (material) {
+        material.uniforms.supplementaryContourColor = Cesium.Color.fromCssColorString(supplementaryContourColor)
+      }
+    },
+    clear: () => {
+      supplementaryContourColor = 'rgba(255,255,255,1)'
+      if (material) {
+        material.uniforms.supplementaryContourColor = Cesium.Color.fromCssColorString(supplementaryContourColor)
+      }
+    }
+  })
+  // 助曲线宽度
+  let supplementaryContourWidthInput = contentElm.getElementsByClassName('supplementary-contour-width')[0]
+  supplementaryContourWidthInput.value = supplementaryContourWidth
+  supplementaryContourWidthInput.addEventListener('blur', (e) => {
+    let value = initInputValue(e)
+    supplementaryContourWidth = value
+    supplementaryContourWidthInput.value = value
+    if (material) {
+      material.uniforms.supplementaryContourWidth = supplementaryContourWidth
+    }
+  })
+
+
+
+
+
+
+  function initInputValue(e) {
+    let value = e.target.value
+    if (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)
+      }
+      if ((e.target.min) && value < Number(e.target.min)) {
+        value = Number(e.target.min)
+      }
+      if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+        value = Number(e.target.dataset.min)
+      }
+    }
+    return value
+  }
+
+}
+
+function showContour(sdk) {
+  const camera = sdk.viewer.camera;
+  const position = camera.positionCartographic;
+  // 计算相机高度（相对于椭球面）
+  let cameraHeight = Cesium.Math.toDegrees(position.height);
+  if (cameraHeight > 1000000) {
+    return
+  }
+  if (handler) {
+    handler.destroy()
+  }
+  if (!sdk.viewer.container.getElementsByClassName('YJ-customize-active-height-elm')[0]) {
+    sdk.viewer.container.appendChild(activeHeightElm)
+  }
+
+  handler = new Cesium.ScreenSpaceEventHandler(
+    sdk.viewer.canvas
+  )
+  handler.setInputAction((movement) => {
+    let cartesian = sdk.viewer.scene.pickPosition(movement.endPosition)
+    if (cartesian) {
+      let top = 0
+      let left = 0
+      if (sdk.viewer && sdk.viewer._element) {
+        let element = sdk.viewer._element.getElementsByClassName('cesium-widget')[0].getElementsByTagName('canvas')[0]
+        top = element.getBoundingClientRect().top + window.scrollY
+        left = element.getBoundingClientRect().left + window.scrollX
+      }
+      activeHeightElm.style.left = movement.endPosition.x - 50 + left + 'px'
+      activeHeightElm.style.top = movement.endPosition.y - 40 + top + 'px'
+      activeHeightElm.style.display = 'block'
+      // let pos = sdk.viewer.scene.clampToHeight(cartesian)
+      let pos84 = tools.cartesian3Towgs84(cartesian, sdk.viewer)
+      // pos84.alt = height
+      let mainContourHeight = Math.floor(pos84.alt / material.uniforms.spacing) * material.uniforms.spacing
+      let gap = pos84.alt - mainContourHeight
+      let gap2 = material.uniforms.spacing / (material.uniforms.secondaryLinesCount + 1)
+      let activeHeight = Math.floor(gap / gap2) * gap2 + mainContourHeight
+      if (pos84.alt < 0) {
+        pos84.alt = 0
+      }
+      if ((pos84.alt - activeHeight) > gap2 / 2) {
+        activeHeight = activeHeight + gap2
+      }
+      material.uniforms.mouseHeight = pos84.alt
+      material.uniforms.mousePosition = cartesian
+      activeHeightElm.innerHTML = `${activeHeight.toFixed(0)}`
+    }
+    else {
+      activeHeightElm.style.display = 'none'
+    }
+  }, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
+  sdk.viewer.scene.globe.material = material;
+}
+function hideContour(sdk) {
+  if (handler) {
+    handler.destroy()
+    handler = null
+  }
+  if (sdk.viewer.container.getElementsByClassName('YJ-customize-active-height-elm')[0]) {
+    activeHeightElm.style.display = 'none'
+    sdk.viewer.container.removeChild(activeHeightElm)
+  }
+  sdk.viewer.scene.globe.material = null;
 }
 
 function createMaterial() {
   Cesium.Material._materialCache._materials.ElevationContour.fabric.source = `
-uniform vec4 color;
-uniform vec4 secondaryLinesColor;
-uniform float spacing;
-uniform float width;
-uniform float secondaryLinesWidth;
+uniform vec4 activeColor; // 选中颜色
+uniform float spacing; // 等高距
+
+// 计曲线
+uniform bool indexContourShow;
+uniform float indexContourWidth;
+uniform vec4 indexContourColor;
+// 首曲线
+uniform bool intermediateContourShow;
+uniform float intermediateContourWidth;
+uniform vec4 intermediateContourColor;
+// 间曲线
+uniform bool halfIntervalContourShow;
+uniform float halfIntervalContourWidth;
+uniform vec4 halfIntervalContourColor;
+// 助曲线
+uniform bool supplementaryContourShow;
+uniform float supplementaryContourWidth;
+uniform vec4 supplementaryContourColor;
+
 uniform float mouseHeight;
+
 uniform float secondaryLinesCount; // 0=无次线, 1=1条次线, 2=2条次线...
 
 czm_material czm_getMaterial(czm_materialInput materialInput)
@@ -175,24 +478,60 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
 #if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))
     float dxc = abs(dFdx(materialInput.height));
     float dyc = abs(dFdy(materialInput.height));
-    float dFMain = max(dxc, dyc) * czm_pixelRatio * width;
+    float dFMain = max(dxc, dyc) * czm_pixelRatio * indexContourWidth;
 #else
-    float dFMain = czm_pixelRatio * width;
+    float dFMain = czm_pixelRatio * indexContourWidth;
 #endif
 
     bool isMainContour = distanceToMainContour < dFMain;
     bool isSecondaryContour = false;
     float dFSecondary = 0.0;
     float secondarySpacing = 0.0;
+    bool isHalfInterval = false;
+    bool isIntermediate= false;
+
+    // 计算当前高度所属的等高线高度
+    float mainContourHeight = floor(materialInput.height / spacing) * spacing;
+    float secondaryContourHeight = floor(materialInput.height / spacing * (secondaryLinesCount + 1.0)) * spacing / (secondaryLinesCount + 1.0);
+    
+    // 计算次线在两条主等高线之间的相对位置
+    float relativeHeight = materialInput.height - mainContourHeight;
+    float normalizedPosition = relativeHeight / spacing;
+    
+    // 计算次线索引（从主等高线开始计数）
+    float lineIndex = floor(normalizedPosition * (secondaryLinesCount + 1.0));
 
     // 只有当存在次线时才计算次线
     if(secondaryLinesCount > 0.0) {
+      float secondaryLinesWidth = supplementaryContourWidth;
         secondarySpacing = spacing / (secondaryLinesCount + 1.0);
         float distanceToSecondaryContour = mod(materialInput.height, secondarySpacing);
         
         // 确保次线不会与主线重叠
         float minDistanceToMain = min(distanceToMainContour, spacing - distanceToMainContour);
         bool notCloseToMain = minDistanceToMain > dFMain * 2.0; // 2倍线宽缓冲
+
+
+        if (lineIndex > 0.0 && lineIndex < secondaryLinesCount) {
+          // 使用mod函数检查余数是否接近0（考虑浮点数精度问题）
+          isHalfInterval = abs(mod(lineIndex, 2.0)) < 0.01;
+          if(isHalfInterval) {
+            secondaryLinesWidth = halfIntervalContourWidth;
+          }
+          // 使用mod函数检查余数是否接近0（考虑浮点数精度问题）
+          isIntermediate = abs(mod(lineIndex, 4.0)) < 0.01;
+          if(isIntermediate) {
+            secondaryLinesWidth = intermediateContourWidth;
+          }
+        }
+
+
+
+
+
+
+
+
         
 #if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))
         dFSecondary = max(dxc, dyc) * czm_pixelRatio * secondaryLinesWidth;
@@ -203,10 +542,6 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
         isSecondaryContour = (distanceToSecondaryContour < dFSecondary) && notCloseToMain;
     }
 
-    // 计算当前高度所属的等高线高度
-    float mainContourHeight = floor(materialInput.height / spacing) * spacing;
-    float secondaryContourHeight = floor(materialInput.height / spacing * (secondaryLinesCount + 1.0)) * spacing / (secondaryLinesCount + 1.0);
-
     // 高亮判断
     bool shouldHighlight = false;
     if(isMainContour && abs(mainContourHeight - mouseHeight) < 0.5 * (spacing/(secondaryLinesCount+1.0))) {
@@ -218,15 +553,41 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
     // 颜色输出
     vec4 outColor;
     if(shouldHighlight) {
-        outColor = vec4(1.0, 0.0, 0.0, 1.0);
+        outColor = czm_gammaCorrect(vec4(activeColor.rgb, activeColor.a));
     } else if(isMainContour) {
-        outColor = czm_gammaCorrect(vec4(color.rgb, color.a));
+        float a = indexContourColor.a;
+        if(!indexContourShow) {
+          a = 0.0;
+        }
+        outColor = czm_gammaCorrect(vec4(indexContourColor.rgb, a));
     } else if(isSecondaryContour) {
-        outColor = czm_gammaCorrect(vec4(secondaryLinesColor.rgb, secondaryLinesColor.a));
+        float a = supplementaryContourColor.a;
+        if(!supplementaryContourShow) {
+          a = 0.0;
+        }
+        outColor = czm_gammaCorrect(vec4(supplementaryContourColor.rgb, a));
+        if(isHalfInterval) {
+          float a = halfIntervalContourColor.a;
+          if(!halfIntervalContourShow) {
+            a = 0.0;
+          }
+          outColor = czm_gammaCorrect(vec4(halfIntervalContourColor.rgb, a));
+        }
+        if(isIntermediate) {
+          float a = intermediateContourColor.a;
+          if(!intermediateContourShow) {
+            a = 0.0;
+          }
+          outColor = czm_gammaCorrect(vec4(intermediateContourColor.rgb, a));
+        }
     } else {
         outColor = vec4(0.0);
     }
 
+    if(materialInput.height<0.0) {
+      outColor = vec4(0.0);
+    }
+
     material.diffuse = outColor.rgb;
     material.alpha = outColor.a;
     return material;
@@ -237,14 +598,25 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
     fabric: {
       type: "ElevationContour",
       uniforms: {
-        width: 2,
-        secondaryLinesWidth: 1, // 次级线宽度
-        spacing: 200,
-        color: Cesium.Color.fromCssColorString('#ffd000'),
-        secondaryLinesColor: Cesium.Color.fromCssColorString('#0dff00').withAlpha(0.5),
+        spacing: 10 * 5,
+        activeColor: Cesium.Color.fromCssColorString(activeColor),
         mouseHeight: -100000,
         mousePosition: new Cesium.Cartesian3(0, 0, 0),
-        secondaryLinesCount: 3
+        secondaryLinesCount: secondaryLinesCount,
+        cameraHeight: 0,
+
+        indexContourShow: indexContourShow,
+        indexContourWidth: indexContourWidth,
+        indexContourColor: Cesium.Color.fromCssColorString(indexContourColor),
+        intermediateContourShow: intermediateContourShow,
+        intermediateContourWidth: intermediateContourWidth,
+        intermediateContourColor: Cesium.Color.fromCssColorString(intermediateContourColor),
+        halfIntervalContourShow: halfIntervalContourShow,
+        halfIntervalContourWidth: halfIntervalContourWidth,
+        halfIntervalContourColor: Cesium.Color.fromCssColorString(halfIntervalContourColor),
+        supplementaryContourShow: supplementaryContourShow,
+        supplementaryContourWidth: supplementaryContourWidth,
+        supplementaryContourColor: Cesium.Color.fromCssColorString(supplementaryContourColor),
       },
     }
   });

src/Global/MapPrint/index.js

@@ -263,7 +263,7 @@ async function MapPrint(sdk, thumbnailImg, rectangle, originalImg) {
       updateCanvas()
     }
   })
-  let borderColorPicker = new ewPlugins('colorpicker', {
+  let borderColorPicker = new YJColorPicker({
     el: contentElm.getElementsByClassName('border-color')[0],
     size: 'mini', //颜色box类型
     alpha: false, //是否开启透明度
@@ -564,7 +564,7 @@ async function MapPrint(sdk, thumbnailImg, rectangle, originalImg) {
 
   function changeMapBorderColor(color) {
     border.color = color || '#000000'
-    new ewPlugins('colorpicker', {
+    new YJColorPicker({
       el: contentElm.getElementsByClassName('border-color')[0],
       size: 'mini', //颜色box类型
       alpha: false, //是否开启透明度
@@ -1420,11 +1420,11 @@ async function MapPrint(sdk, thumbnailImg, rectangle, originalImg) {
         const url = URL.createObjectURL(blob);
         let downloadElement = document.createElement('a');
         downloadElement.href = url;
-        downloadElement.download = `高清出图-${getDateTimeString()}.jpg`;
+        downloadElement.download = `高清出图-${getDateTimeString()}.png`;
         document.body.appendChild(downloadElement);
         downloadElement.click();
         document.body.removeChild(downloadElement);
-      }, 'image/jpeg', 0.95);
+      }, 'image/png', 0.95);
       exporting = false;
       exportBtn.innerHTML = '打印';
       // canvas2.toBlob(function (blob) {

src/Global/MapX/index.js

@@ -124,7 +124,7 @@ function syncViewer() {
   if (height > 9000000) {
     height = 9000000
   }
-  if (height < 100000) {
+  if (height < 400000) {
     this.entity.billboard.show = true
     this.entity.rectangle.show = false
   }

src/Global/MouseCoordinate/index.js

@@ -4,18 +4,38 @@
 import Tools from "../../Tools";
 import { getCoordinateSystem } from "../../Global/global";
 import MouseEvent from '../../Event/index'
+import { getSdk as get2DSdk } from '../../Global/MultiViewportMode'
+import { getSdk as getSplitScreenSdk } from "../../Global/SplitScreen";
 
 let event
+let event2
 let MouseCoordinateElm
 let requestAnimationFrameEventId
+let tmovement
+let targetSdk
+let sdkD
 
 const MouseCoordinate = (sdk, status) => {
+  if (!sdk || !sdk.viewer) {
+    return
+  }
+  targetSdk = sdk
+  sdkD = get2DSdk().sdkD
+  if(!sdkD) {
+    sdkD = getSplitScreenSdk().sdkD
+  }
+
   let tools = new Tools(sdk)
   if (status) {
     if (event) {
       event.destroy()
     }
+    if (event2) {
+      event2.destroy()
+      event2 = undefined
+    }
     event = new MouseEvent(sdk)
+    tmovement = null
     let position = {
       x: '',
       y: '',
@@ -40,22 +60,60 @@ const MouseCoordinate = (sdk, status) => {
       contentElm.style['background-size'] = `200% 200%`;
       MouseCoordinateElm = contentElm
     }
-    sdk.viewer._element.appendChild(contentElm)
-    let tmovement
+    sdk.viewer.container.appendChild(contentElm)
+
     event.mouse_move((movement, cartesian) => {
-      tmovement = { ...movement }
+      targetSdk = sdk
+      tmovement = { ...movement.endPosition }
     })
 
     const getPosition = () => {
-      if(!tmovement) {
+      if (!targetSdk) {
         return
       }
       let canvas = sdk.viewer._element.getElementsByTagName('canvas')[0]
-      let left = tmovement.endPosition.x;
-      let top = tmovement.endPosition.y;
-      let cartesian = event.getcartesian(tmovement)
-      contentElm.style['background-position-x'] = `${-canvas.width + left + 4}px`;
-      contentElm.style['background-position-y'] = `${-canvas.height + top - 2}px`;
+      sdkD = get2DSdk().sdkD
+      if(!sdkD) {
+        sdkD = getSplitScreenSdk().sdkD
+      }
+      if (!event2 && sdkD) {
+        event2 = new MouseEvent(sdkD)
+        event2.mouse_move((movement, cartesian) => {
+          targetSdk = sdkD
+          tmovement = { x: movement.endPosition.x, y: movement.endPosition.y }
+        })
+      }
+      if (!tmovement) {
+        return
+      }
+      let left = tmovement.x;
+      let top = tmovement.y;
+      let cartesian
+      if (targetSdk.viewer.scene.mode === 2) {
+        left = left + canvas.width
+        cartesian = targetSdk.viewer.camera.pickEllipsoid(tmovement, targetSdk.viewer.scene.globe.ellipsoid)
+      }
+      else {
+        cartesian = targetSdk.viewer.scene.pickPosition(tmovement)
+        if (!cartesian) {
+          const ray = targetSdk.viewer.camera.getPickRay(position); //相交的射线
+          let pickedObjects = targetSdk.viewer.scene.drillPickFromRay(ray, 10);
+          let result = {}
+          for (let i = 0; i < pickedObjects.length; i++) {
+            if (pickedObjects[i].position) {
+              result = pickedObjects[i]
+              break
+            }
+          }
+          cartesian = result.position
+          if (!cartesian) {
+            cartesian = targetSdk.viewer.scene.globe.pick(ray, targetSdk.viewer.scene);
+          }
+        }
+      }
+      contentElm.style['background-position-x'] = `${-sdk.viewer.container.clientWidth + left + 4}px`;
+
+      contentElm.style['background-position-y'] = `${-sdk.viewer.container.clientHeight + top - 2}px`;
       // this.entity.position = cartesian
       if (cartesian) {
         let degrees = tools.cartesian3Towgs84(cartesian, sdk.viewer)
@@ -97,10 +155,13 @@ const MouseCoordinate = (sdk, status) => {
   else {
     if (event) {
       event.destroy()
-      event = undefined
+    }
+    if (event2) {
+      event2.destroy()
+      event2 = undefined
     }
     if (MouseCoordinateElm) {
-      sdk.viewer._element.removeChild(MouseCoordinateElm)
+      sdk.viewer.container.removeChild(MouseCoordinateElm)
       MouseCoordinateElm = undefined
     }
     if (requestAnimationFrameEventId) {

src/Global/MultiViewportMode/ClickCallback/index.js

@@ -0,0 +1,578 @@
+/**
+ * @name: click
+ * @author: Administrator
+ * @date: 2023-05-28 11:05
+ * @description：click
+ * @update: 2023-05-28 11:05
+ */
+let leftClickHandler = null
+let rightClickHandler = null
+let MoveHandler = null
+let leftClickCallbackMap = new Map()
+let rightClickCallbackMap = new Map()
+let MoveCallbackMap = new Map()
+let selectedFeature;
+
+
+function cartesian3Towgs84(cartesian, viewer) {
+  var ellipsoid = viewer.scene.globe.ellipsoid
+  var cartesian3 = new Cesium.Cartesian3(
+    cartesian.x,
+    cartesian.y,
+    cartesian.z
+  )
+  var cartographic = ellipsoid.cartesianToCartographic(cartesian3)
+  var lat = Cesium.Math.toDegrees(cartographic.latitude)
+  var lng = Cesium.Math.toDegrees(cartographic.longitude)
+  var alt = cartographic.height < 0 ? 0 : cartographic.height
+  return {
+    lng: lng,
+    lat: lat,
+    alt: alt,
+  }
+}
+
+function getcartesian(sdk, movement) {
+  if (movement.endPosition) {
+    movement.endPosition.y -= 2
+  }
+  let position = movement.position || movement.endPosition
+  // 获取世界坐标系地表坐标，考虑地形，不包括模型，倾斜摄影模型表面；
+  let cartesian = sdk.viewer.scene.pickPosition(position)
+  if (!cartesian) {
+    const ray = sdk.viewer.camera.getPickRay(position); //相交的射线
+    cartesian = sdk.viewer.scene.globe.pick(ray, sdk.viewer.scene);
+  }
+  return cartesian
+}
+
+function openLeftClick(sdk, cb) {
+  if (!sdk || !sdk.viewer) {
+    return
+  }
+  let click = true
+  leftClickHandler = new Cesium.ScreenSpaceEventHandler(sdk.viewer.canvas)
+  leftClickHandler.setInputAction((movement) => {
+    let cartesian = sdk.viewer.scene.pickPosition(movement.position)
+    if (!cartesian) {
+      const ray = sdk.viewer.camera.getPickRay(movement.position); //相交的射线
+      cartesian = sdk.viewer.scene.globe.pick(ray, sdk.viewer.scene);
+    }
+    if (!cartesian) {
+      return
+    }
+
+    let pos84 = cartesian3Towgs84(cartesian, sdk.viewer)
+
+    cb && cb(pos84)
+
+    if (click) {
+      click = false
+      setTimeout(() => {
+        click = true
+      }, 600);
+      if (!YJ.Measure.GetMeasureStatus() && cartesian) {
+        let flag = false
+        for (let i = leftClickCallbackMap.size - 1; i >= 0; i--) {
+          let key = Array.from(leftClickCallbackMap.keys())[i]
+          let obj = leftClickCallbackMap.get(key)
+          if (obj) {
+
+            if (obj.that) {
+              // 是否为多边形
+              if (obj.that.type === 'PolygonObject') {
+                // 是否可点击y
+                if (obj.that.picking) {
+                  if (obj.that.options.positions && obj.that.options.positions.length >= 3) {
+                    let pt = turf.point([pos84.lng, pos84.lat]);
+                    let polyPos = []
+                    for (let i = 0; i < obj.that.options.positions.length; i++) {
+                      polyPos.push([
+                        obj.that.options.positions[i].lng,
+                        obj.that.options.positions[i].lat
+                      ])
+                    }
+                    polyPos.push([
+                      obj.that.options.positions[0].lng,
+                      obj.that.options.positions[0].lat
+                    ])
+                    let poly = turf.polygon([polyPos]);
+                    let contain = turf.booleanPointInPolygon(pt, poly);
+                    if (contain) {
+                      obj.callback(
+                        movement,
+                        obj.that.options.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      flag = true
+                      break
+                    }
+                  }
+                }
+              }
+              // 聚集地
+              else if (obj.that.type === 'AssembleObject') {
+                if (obj.that.picking) {
+                  if (obj.that.options.positions && obj.that.options.positions.length >= 3) {
+                    let positions = obj.that.computeAssemble(obj.that.options.positions, true)
+                    let pt = turf.point([pos84.lng, pos84.lat]);
+                    let polyPos = []
+                    for (let i = 0; i < positions.length; i += 2) {
+                      polyPos.push([
+                        positions[i],
+                        positions[i + 1]
+                      ])
+                    }
+                    let poly = turf.polygon([polyPos]);
+                    let contain = turf.booleanPointInPolygon(pt, poly);
+                    if (contain) {
+                      obj.callback(
+                        movement,
+                        obj.that.options.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      flag = true
+                      break
+                    }
+                  }
+                }
+              }
+              // 单箭头
+              else if (obj.that.type === 'AttackArrowObject') {
+                if (obj.that.picking) {
+                  if (obj.that.options.positions && obj.that.options.positions.length >= 3) {
+                    let pt = turf.point([pos84.lng, pos84.lat]);
+                    let positions = obj.that.computeAttackArrow(obj.that.options.positions)
+                    let polyPos = []
+                    for (let m = 0; m < positions.length; m++) {
+                      let pos84 = cartesian3Towgs84(positions[m], sdk.viewer)
+                      polyPos.push([pos84.lng, pos84.lat])
+                    }
+                    let poly = turf.polygon([polyPos]);
+                    let contain = turf.booleanPointInPolygon(pt, poly);
+                    if (contain) {
+                      obj.callback(
+                        movement,
+                        obj.that.options.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      flag = true
+                      break
+                    }
+                  }
+                }
+              }
+              // 双箭头
+              else if (obj.that.type === 'PincerArrowObject') {
+                if (obj.that.picking) {
+                  if (obj.that.options.positions && obj.that.options.positions.length >= 5) {
+                    let pt = turf.point([pos84.lng, pos84.lat]);
+                    let positions = obj.that.computePincerArrow(obj.that.options.positions)
+                    let polyPos = []
+                    for (let m = 0; m < positions.length; m++) {
+                      let pos84 = cartesian3Towgs84(positions[m], sdk.viewer)
+                      polyPos.push([pos84.lng, pos84.lat])
+                    }
+                    let pos84_0 = cartesian3Towgs84(positions[0], sdk.viewer)
+                    polyPos.push([pos84_0.lng, pos84_0.lat])
+                    let poly = turf.polygon([polyPos]);
+                    let contain = turf.booleanPointInPolygon(pt, poly);
+                    if (contain) {
+                      obj.callback(
+                        movement,
+                        obj.that.options.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      flag = true
+                      break
+                    }
+                  }
+                }
+              }
+              // 圆
+              else if (obj.that.type === 'CircleObject') {
+                if (obj.that.picking) {
+                  let pt = turf.point([pos84.lng, pos84.lat]);
+                  if (obj.that.options.center && obj.that.options.radius) {
+                    let center = [obj.that.options.center.lng, obj.that.options.center.lat];
+                    let radius = obj.that.options.radius / 1000;
+                    let options = { steps: 360, units: 'kilometers' };
+                    let circle = turf.circle(center, radius, options);
+                    let contain = turf.booleanPointInPolygon(pt, circle);
+                    if (contain) {
+                      obj.callback(
+                        movement,
+                        obj.that.options.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      flag = true
+                      break
+                    }
+                  }
+
+                }
+              }
+              // 扇形
+              else if (obj.that.type === 'SectorObject') {
+                if (obj.that.picking) {
+                  let pt = turf.point([pos84.lng, pos84.lat]);
+                  if (obj.that.options.center && obj.that.options.radius && obj.that.options.startAngle && obj.that.options.endAngle) {
+                    let positions = obj.that.calSector(obj.that.options.center, obj.that.options.radius, obj.that.options.startAngle, obj.that.options.endAngle, undefined, true)
+                    let polyPos = []
+                    for (let m = 0; m < positions.length; m++) {
+                      polyPos.push([positions[m].lng, positions[m].lat])
+                    }
+                    let poly = turf.polygon([polyPos]);
+                    let contain = turf.booleanPointInPolygon(pt, poly);
+                    if (contain) {
+                      obj.callback(
+                        movement,
+                        obj.that.options.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      flag = true
+                      break
+                    }
+                  }
+
+                }
+              }
+            }
+          }
+        }
+        if (!flag) {
+          const pick = sdk.viewer.scene.pick(movement.position)
+          if (pick) {
+            if (pick.id) {
+              let entityId
+              // 矢量
+              if (pick.id.type && pick.id.type === 'vector' && pick.id.parentId) {
+                let obj = leftClickCallbackMap.get(pick.id.parentId)
+                if (obj.that.picking && obj.that.geojson) {
+                  for (let i = 0; i < obj.that.geojson.features.length; i++) {
+                    if (obj.that.geojson.features[i].id === pick.id._id) {
+                      obj.callback(
+                        movement,
+                        obj.that.geojson.features[i].id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                    }
+                  }
+                }
+              }
+              else if (typeof pick.id.id == 'string') {
+                let array = pick.id.id.split('-')
+                array.splice(array.length - 1, 1)
+                entityId = array.join('-')
+              }
+
+              if (pick.id.properties && pick.id.properties.id && leftClickCallbackMap.has(pick.id.properties.id._value)) {
+                let obj = leftClickCallbackMap.get(pick.id.properties.id._value)
+                if (obj.that.picking) {
+                  obj.callback(
+                    movement,
+                    pick.id.properties.id._value,
+                    cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                }
+              }
+              else if (leftClickCallbackMap.has(pick.id.id)) {
+                let obj = leftClickCallbackMap.get(pick.id.id)
+                if (obj.that.picking) {
+                  obj.callback(
+                    movement,
+                    pick.id.id,
+                    cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                }
+              }
+              else if (entityId && leftClickCallbackMap.has(entityId)) {
+                let obj = leftClickCallbackMap.get(entityId)
+                if (obj.that.picking) {
+                  obj.callback(
+                    movement,
+                    entityId,
+                    cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                }
+              }
+              else if (pick.primitive) {
+                if (typeof pick.id == 'string' && leftClickCallbackMap.has(pick.id)) {
+                  let obj = leftClickCallbackMap.get(pick.id)
+                  obj.callback(
+                    movement,
+                    pick.id,
+                    cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                }
+              }
+            }
+            else {
+              if (pick.primitive && pick.primitive.id) {
+                if (leftClickCallbackMap.has(pick.primitive.id)) {
+                  let obj = leftClickCallbackMap.get(pick.primitive.id)
+                  if (obj.that.picking) {
+                    if (obj.that.type === 'bim') {
+                      if (YJ.Global.getBimPickStatus(sdk)) {
+                        obj.callback(
+                          movement,
+                          pick.primitive,
+                          cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      }
+                    }
+                    else {
+                      obj.callback(
+                        movement,
+                        pick.primitive.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                    }
+                  }
+                }
+              }
+            }
+            if (pick.content && (!pick.primitive || !pick.primitive.id)) {
+              if (leftClickCallbackMap.has(pick.content.tileset.id)) {
+                let obj = leftClickCallbackMap.get(pick.content.tileset.id)
+                if (obj.that.picking) {
+                  if (obj.that.type === 'bim') {
+                    if (YJ.Global.getBimPickStatus(sdk)) {
+                      obj.callback(
+                        movement,
+                        pick.content.tileset,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                    }
+                  }
+                  else {
+                    obj.callback(
+                      movement,
+                      pick.content.tileset.id,
+                      cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+
+    // if (click) {
+    //   click = false
+    //   setTimeout(() => {
+    //     click = true
+    //   }, 300);
+    //   if (!YJ.Measure.GetMeasureStatus()) {
+
+    //   }
+    // }
+  }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
+
+  // leftClickHandler.setInputAction(function (movement) {
+  //   const feature = sdk.viewer.scene.pick(movement.endPosition);
+  //   // unselectFeature(selectedFeature);
+  //   if (selectedFeature) {
+  //     selectedFeature.color = Cesium.Color.WHITE;
+  //   }
+  //   selectedFeature = feature
+  //   if (feature) {
+  //     feature.color = Cesium.Color.YELLOW;
+  //   }
+  // }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+  // }
+
+}
+
+function closeLeftClick(sdk) {
+  leftClickHandler.destroy() //关闭事件句柄
+  leftClickHandler = null
+  // }
+}
+
+function openRightClick(sdk) {
+  if (!sdk || !sdk.viewer) {
+    return
+  }
+  rightClickHandler = new Cesium.ScreenSpaceEventHandler(sdk.viewer.canvas)
+  rightClickHandler.setInputAction((movement) => {
+    if (!YJ.Measure.GetMeasureStatus()) {
+      const pick = sdk.viewer.scene.pick(movement.position)
+      if (pick && pick.id) {
+        let id
+        if (pick.id.type && pick.id.type === 'vector' && pick.id.parentId) {
+          let obj = rightClickCallbackMap.get(pick.id.parentId)
+          if (obj.that.picking && obj.that.geojson) {
+            for (let i = 0; i < obj.that.geojson.features.length; i++) {
+              if (obj.that.geojson.features[i].id === pick.id._id) {
+                obj.callback(
+                  movement,
+                  obj.that.geojson.features[i].id,
+                  cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+              }
+            }
+          }
+        }
+        else {
+          if (typeof pick.id === 'string') {
+            id = pick.id
+          }
+          else {
+            id = pick.id.id
+          }
+          if (rightClickCallbackMap.has(id)) {
+            let obj = rightClickCallbackMap.get(id)
+            if (obj.that.picking) {
+              let cartesian = getcartesian(sdk, movement)
+              if (!cartesian) {
+                return
+              }
+              obj.callback(
+                movement,
+                id,
+                cartesian3Towgs84(cartesian, sdk.viewer), obj.that)
+            }
+          }
+        }
+      }
+      if (pick && pick.content) {
+        if (rightClickCallbackMap.has(pick.content.tileset.id)) {
+          let obj = rightClickCallbackMap.get(pick.content.tileset.id)
+          if (obj.that.picking) {
+            if (obj.that.type === 'bim') {
+              if (YJ.Global.getBimPickStatus(sdk)) {
+                let cartesian = getcartesian(sdk, movement)
+                if (!cartesian) {
+                  return
+                }
+                obj.callback(
+                  movement,
+                  pick.getProperty('id'),
+                  cartesian3Towgs84(cartesian, sdk.viewer), obj.that)
+              }
+            }
+            else {
+              let cartesian = getcartesian(sdk, movement)
+              if (!cartesian) {
+                return
+              }
+              obj.callback(
+                movement,
+                pick.content.tileset.id,
+                cartesian3Towgs84(cartesian, sdk.viewer), obj.that)
+            }
+          }
+        }
+      }
+    }
+  }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+}
+
+function closeRightClick() {
+  if (rightClickHandler) {
+    rightClickHandler.destroy() //关闭事件句柄
+    rightClickHandler = null
+  }
+}
+
+function openMove(sdk) {
+  MoveHandler = new Cesium.ScreenSpaceEventHandler(sdk.viewer.canvas)
+  MoveHandler.setInputAction(function (movement) {
+    const pick = sdk.viewer.scene.pick(movement.endPosition);
+    // unselectFeature(selectedFeature);
+    // if (selectedFeature) {
+    //   let color = '#fff'
+    //   let state = selectedFeature.getProperty('state')
+    //   switch (state) {
+    //     case '0':
+    //       color = '#fff'
+    //       break;
+    //     case '1':
+    //       color = '#f00'
+    //       break;
+    //     case '2':
+    //       color = '#0f0'
+    //       break;
+    //     case '3':
+    //       color = '#00f'
+    //       break;
+    //     default:
+    //   }
+    //   selectedFeature.color = Cesium.Color.fromCssColorString(color).withAlpha(selectedFeature.tileset.transparency)
+    // }
+    // if (pick && pick.id) { }
+    // if (pick && pick.content) {
+    //   if (MoveCallbackMap.has(pick.content.tileset.id)) {
+    //     let obj = MoveCallbackMap.get(pick.content.tileset.id)
+    //     if (obj.that.picking) {
+    //       if (obj.that.type === 'bim') {
+    //         if (YJ.Global.getBimPickStatus(sdk)) {
+    //           selectedFeature = pick
+    //           pick.color = Cesium.Color.YELLOW;
+    //         }
+    //         else {
+    //           selectedFeature = null
+    //         }
+    //       }
+    //       else {
+    //         selectedFeature = pick
+    //         pick.color = Cesium.Color.YELLOW;
+    //       }
+    //     }
+    //     else {
+    //       selectedFeature = null
+    //     }
+    //   }
+    // }
+  }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+}
+
+function closeMove() {
+  if (MoveHandler) {
+    MoveHandler.destroy() //关闭事件句柄
+    MoveHandler = null
+  }
+}
+
+/*注册左键回调*/
+function regLeftClickCallback(id, callback, that) {
+
+  leftClickCallbackMap.set(id, { callback, that })
+}/*取消左键回调*/
+function unRegLeftClickCallback(id,) {
+  leftClickCallbackMap.delete(id,)
+}
+
+/*注册右键回调*/
+function regRightClickCallback(id, callback, that) {
+  rightClickCallbackMap.set(id, { callback, that })
+}/*取消右键回调*/
+function unRegRightClickCallback(id,) {
+  rightClickCallbackMap.delete(id,)
+}
+
+/*注册左键回调*/
+function regMoveCallback(id, callback, that) {
+  MoveCallbackMap.set(id, { callback, that })
+}/*取消左键回调*/
+function unregMoveCallback(id,) {
+  MoveCallbackMap.delete(id,)
+}
+
+function getLeftClickState() {
+  if (leftClickHandler) {
+    return true
+  }
+  else {
+    false
+  }
+}
+
+function getRightClickState() {
+  if (rightClickHandler) {
+    return true
+  }
+  else {
+    false
+  }
+}
+
+function getMoveState() {
+  if (MoveHandler) {
+    return true
+  }
+  else {
+    false
+  }
+}
+
+
+export { openLeftClick, closeLeftClick, regLeftClickCallback, unRegLeftClickCallback, openRightClick, closeRightClick, regRightClickCallback, unRegRightClickCallback, openMove, closeMove, regMoveCallback, unregMoveCallback, getLeftClickState, getRightClickState, getMoveState }

src/Global/MultiViewportMode/index.js

@@ -7,6 +7,9 @@ import { CesiumContainer } from '../global'
 import { off as offSplitScreen } from "../SplitScreen";
 import { FlwStatusSwitch, JwwStatusSwitch, getFlwStatus, getJwwStatus } from "../global"
 import { SheetIndexStatusSwitch, getStatus } from '../SheetIndex'
+import { getLeftClickState, getRightClickState, getMoveState } from "../../Global/ClickCallback"
+import { openLeftClick, openRightClick, openMove } from "./ClickCallback"
+
 
 let sdk2D
 let sdk3D
@@ -32,6 +35,16 @@ async function init(sdk) {
   })
   sdk2.viewer.scene.mode = Cesium.SceneMode.SCENE2D
   sdk2D = await sdk2
+  if(getLeftClickState()) {
+    openLeftClick(sdk2D)
+  }
+  if(getRightClickState()) {
+    openRightClick(sdk2D)
+  }
+  if(getMoveState()) {
+    openMove(sdk2D)
+  }
+
   // window.sdk2D = sdk2D
   solveBug()
   syncObject = { sdks: [sdk, sdk2], tools }
@@ -49,7 +62,16 @@ async function init(sdk) {
   sdk2D.viewer.imageryLayers.removeAll()
   for (let i = 0; i < imageryLayers.length; i++) {
     let entity = sdk2D.viewer.imageryLayers.addImageryProvider(imageryLayers[i].imageryProvider, imageryLayers[i]._layerIndex)
+    if(imageryLayers[i]._id) {
+      entity._id = imageryLayers[i]._id
+    }
     entity.show = imageryLayers[i].show
+    entity.alpha = imageryLayers[i].alpha
+    if (imageryLayers[i]._objectState) {
+      if (imageryLayers[i]._showView == 3) {
+        entity.show = false
+      }
+    }
   }
   // sdk.viewer.entities.collectionChanged.addEventListener(syncEntities)
   // sdk.viewer.dataSources.dataSourceAdded.addEventListener(syncDataSources)
@@ -61,6 +83,12 @@ async function init(sdk) {
     JwwStatusSwitch(sdk2, true)
   }
 
+  sdk.entityMap.forEach((item, key) => {
+    if (item.showView == 2) {
+      item.showView = 2
+    }
+  })
+
 }
 async function on(sdk) {
   if (sdk2D) {
@@ -94,6 +122,11 @@ function off(sdk) {
     activeViewer = null
     syncObject = {}
   }
+  sdk.entityMap.forEach((item, key) => {
+    if (item.showView) {
+      item.show = item.show
+    }
+  })
 }
 
 async function syncData2(sdk, id, entityId) {
@@ -119,7 +152,11 @@ async function syncData2(sdk, id, entityId) {
         options.heightMode = 0
         options.height = 0
       }
-      if (!that.type || (that.type !== 'tileset' && that.type !== 'bim' && that.type !== 'glb' && that.type !== 'layer')) {
+
+      if (!that.type || (that.type !== 'tileset' && that.type !== 'bim' && that.type !== 'glb' && that.type !== 'layer' && that.type !== 'wallStereoscopic')) {
+        if (that.showView == 3) {
+          options.show = false
+        }
         let newObject = await new that.constructor(sdk2D, options)
         newObject.onClick = that.onClick
         newObject.onRightClick = that.onRightClick
@@ -207,8 +244,15 @@ async function syncData2(sdk, id, entityId) {
         obj.options.heightReference = 1
       }
       let options = syncObject.tools.deepCopyObj(obj.options)
-      if (!obj.type || (obj.type !== 'tileset' && obj.type !== 'bim' && obj.type !== 'glb' && obj.type !== 'layer')) {
-        let target = await new obj.constructor(sdk2D, options)
+      if (!obj.type || (obj.type !== 'tileset' && obj.type !== 'bim' && obj.type !== 'glb' && obj.type !== 'layer' && obj.type !== 'wallStereoscopic')) {
+        if (obj.showView == 3) {
+          options.show = false
+        }
+        let target = await sdk2D.entityMap.get(options.id)
+        if(target) {
+          await target.remove()
+        }
+        target = await new obj.constructor(sdk2D, options)
         target.onClick = obj.onClick
         target.onRightClick = obj.onRightClick
         target.onMouseMove = obj.onMouseMove
@@ -401,11 +445,25 @@ function syncImageryLayerRemoved(layer, index) {
   sdk2D.viewer.imageryLayers.remove(layer2d)
 }
 function syncImageryLayerShownOrHidden(layer, index, state) {
+  return
   let layer2d = sdk2D.viewer.imageryLayers._layers[index]
+  let layer3d = sdk3D.viewer.imageryLayers._layers[index]
+  console.log('layer2d', layer2d, sdk2D, layer3d)
+
   if (!layer2d) {
     return
   }
-  layer2d.show = state
+  if (layer3d._objectState) {
+    if (!layer3d._showView || layer3d._showView == 2) {
+      layer2d.show = true
+    }
+    if (layer3d._showView == 3) {
+      layer2d.show = false
+    }
+  }
+  else {
+    layer2d.show = state
+  }
 }
 
 async function syncPrimitives(primitive) {
@@ -535,6 +593,7 @@ function syncViewer() {
 
 }
 
+
 function get2DView() {
   return sdk2D
 }

src/Global/SplitScreen/index.js

@@ -278,7 +278,7 @@ async function init(sdk) {
   sdk.viewer.scene.preRender.addEventListener(syncViewer, syncObject)
 
   // sdk.viewer.imageryLayers.layerAdded.addEventListener(syncImageryLayerAdded);
-  // sdk.viewer.imageryLayers.layerMoved.addEventListener(syncImageryLayerMoved);
+  sdk.viewer.imageryLayers.layerMoved.addEventListener(syncImageryLayerMoved);
   // sdk.viewer.imageryLayers.layerRemoved.addEventListener(syncImageryLayerRemoved);
   // sdk.viewer.imageryLayers.layerShownOrHidden.addEventListener(syncImageryLayerShownOrHidden);
 
@@ -517,7 +517,7 @@ async function setSplitDirection(v, id, isoff = false, entityId) {
             thatD.textShow = thatP.textShow
           }
           if (thatP.label && thatP.labelShow) {
-            thatP.label.entity.show = true
+            thatP.labelShow = true
           }
           if (thatD.label) {
             thatD.label.options.ground = false
@@ -711,6 +711,9 @@ async function setSplitDirection(v, id, isoff = false, entityId) {
           status.P = true
           status.D = true
           options.show = true
+          if(thatP.type==='layer') {
+            options.layer_index = thatP.layer_index
+          }
           target = await new thatP.constructor(sdkD, options)
           if (thatP.onClick) {
             target.onClick = thatP.onClick
@@ -794,6 +797,9 @@ async function setSplitDirection(v, id, isoff = false, entityId) {
           status.P = false
           status.D = true
           options.show = true
+          if(thatP.type==='layer') {
+            options.layer_index = thatP.layer_index
+          }
           target = await new thatP.constructor(sdkD, options)
           if (thatP.onClick) {
             target.onClick = thatP.onClick
@@ -1033,7 +1039,13 @@ function syncImageryLayerAdded(layer, index) {
   sdkD.viewer.imageryLayers.addImageryProvider(layer.imageryProvider, index)
 }
 function syncImageryLayerMoved(layer, newindxe, oldindex) {
-  let layerD = sdkD.viewer.imageryLayers._layers[oldindex]
+  let layerD
+  for (let i = 0; i < sdkD.viewer.imageryLayers._layers.length; i++) {
+    if (sdkD.viewer.imageryLayers._layers[i]._id === layer._id) {
+      layerD = sdkD.viewer.imageryLayers._layers[i]
+      break
+    }
+  }
   if (!layerD) {
     return
   }
@@ -1042,12 +1054,14 @@ function syncImageryLayerMoved(layer, newindxe, oldindex) {
     sdkD.viewer.imageryLayers.lowerToBottom(layerD)
   }
   // 移到最高层
-  else if (newindxe === sdk.viewer.imageryLayers._layers.length - 1) {
+  else if (newindxe === sdkD.viewer.imageryLayers._layers.length - 1) {
     sdkD.viewer.imageryLayers.raiseToTop(layerD)
   }
   else {
     if (newindxe < oldindex) {
-      sdkD.viewer.imageryLayers.lower(layerD)
+      if(newindxe<sdkD.viewer.imageryLayers._layers.length-1) {
+        sdkD.viewer.imageryLayers.lower(layerD)
+      }
     }
     else {
       sdkD.viewer.imageryLayers.raise(layerD)

src/Global/efflect/Sunshine/_element.js

@@ -0,0 +1,56 @@
+function html() {
+  return `
+    <span class="custom-divider"></span>
+    <div class="div-item">
+        <div class="row">
+            <div class="col">
+                <span class="label">播放倍数</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="0.01" max="999999" step="10" @model="speed">
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col">
+                <span class="label">阴影柔和度</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="0" max="1" step="0.1" @model="darkness">
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="div-item">
+        <div class="row">
+            <div class="col">
+                <span class="label">阴影优化</span>
+                <input class="btn-switch" type="checkbox" @model="softShadow">
+            </div>
+            <div class="col">
+                <span class="label" style="flex: 0 0 56px;">日期选择</span>
+                <input class="sunshine-date" type="text" placeholder="YYYY-MM-DD" @model="time">
+            </div>
+        </div>
+    </div>
+    <span class="custom-divider"></span>
+    <div class="div-item">
+        <div class="row">
+            <div class="col">
+              <div class="timeline-container">
+                  <div class="timeline" id="timeline">
+                      <div class="progress" id="progress">
+                          <div class="handle" id="handle"></div>
+                          <div class="current-time" id="currentTime">00:00:00</div>
+                      </div>
+                  </div>
+                  <div class="time-marks">
+                  </div>
+                  <button id="timePause">暂停</button>
+              </div>
+            </div>
+        </div>
+    </div>
+    <span class="custom-divider"></span>
+    `
+}
+
+export { html }

src/Global/efflect/Sunshine/eventBinding.js

@@ -0,0 +1,92 @@
+class eventBinding {
+  constructor() {
+    this.element = {}
+  }
+  static event = {}
+
+  getEvent(name) {
+    return eventBinding.event[name]
+  }
+
+  getEventAll() {
+    return eventBinding.event
+  }
+
+  setEvent(name, event) {
+    eventBinding.event[name] = event
+  }
+
+  on(that, elements) {
+    for (let i = 0; i < elements.length; i++) {
+      let Event = []
+      let isEvent = false
+      let removeName = []
+      if (!elements[i] || !elements[i].attributes) {
+        continue;
+      }
+      for (let m of elements[i].attributes) {
+        switch (m.name) {
+          case '@model': {
+            isEvent = true
+            if (elements[i].type == 'checkbox') {
+              Event.push((e) => { that[m.value] = e.target.checked })
+              elements[i].checked = that[m.value]
+            }
+            else {
+              Event.push((e) => {
+                let value = e.target.value
+                if (e.target.type == 'number') {
+                  value = Number(value)
+                }
+                that[m.value] = value
+              })
+              if (elements[i].nodeName == 'IMG') {
+                elements[i].src = that[m.value]
+              }
+              else {
+                elements[i].value = that[m.value]
+              }
+            }
+            if (this.element[m.value]) {
+              this.element[m.value].push(elements[i])
+            }
+            else {
+              this.element[m.value] = [elements[i]]
+            }
+            removeName.push(m.name)
+            break;
+          }
+          case '@click': {
+            elements[i].addEventListener('click', (e) => {
+              if (typeof (that.Dialog[m.value]) === 'function') {
+                that.Dialog[m.value](e)
+              }
+            });
+            removeName.push(m.name)
+            // elements[i].attributes.removeNamedItem(m.name)
+            break;
+          }
+        }
+        // elements[i].attributes[m] = undefined
+      }
+      for (let n = 0; n < removeName.length; n++) {
+        elements[i].attributes.removeNamedItem(removeName[n])
+      }
+
+      if (isEvent) {
+        let ventType = 'input'
+        if (elements[i].tagName != 'INPUT' || elements[i].type == 'checkbox') {
+          ventType = 'change'
+        }
+        elements[i].addEventListener(ventType, (e) => {
+          for (let t = 0; t < Event.length; t++) {
+            Event[t](e)
+          }
+        });
+      }
+    }
+  }
+}
+
+const EventBinding = new eventBinding();
+export default EventBinding;

src/Global/efflect/Sunshine/index.js

@@ -0,0 +1,249 @@
+/**
+ * @description 水面
+ */
+import Dialog from '../../../Obj/Element/Dialog';
+import { html } from "./_element";
+import EventBinding from '../../../Obj/Element/Dialog/eventBinding';
+import { syncData } from '../../MultiViewportMode'
+import Tools from '../../../Tools'
+import TimeLine from './TimeLine'
+import { setSplitDirection, syncSplitData, setActiveId } from '../../SplitScreen'
+
+export default class Sunshine {
+  /**
+   * @constructor
+   * @param sdk
+   * @description 光照
+   * @param options {object} 光照属性
+   * @param options.time=当前时间 {string} 当前时间
+   * @param options.speed=1000 {number} 速度倍速
+   * @param options.darkness=0.3 {number} 阴影不透明度--越大越不透明
+   * @param options.softShadow=false {boolean} 阴影优化--true/false}
+   * @param Dialog {object} 弹框对象
+   * @param Dialog.confirmCallBack {function} 弹框确认时的回调
+   * */
+  constructor(sdk, options = {}, _Dialog = {}) {
+    this.viewer = sdk.viewer
+    this.options = { ...options }
+    this.sdk = { ...sdk }
+    this.options.time = options.time || new Date()
+    this.options.speed = options.speed || 1000
+    this.options.darkness = options.darkness || 0.4
+    this.options.softShadow = options.softShadow || true
+    this.options.show = options.show === true ? true : false
+    this.Dialog = _Dialog
+    this.timeLine
+    this._EventBinding = new EventBinding()
+    this._elms = {};
+    Sunshine.start(this)
+  }
+
+
+  static start(that) {
+    that.viewer.scene.globe.enableLighting = true
+    that.viewer.shadows = true
+    that.viewer.scene.globe.enableLighting = true;
+
+    that.viewer.terrainShadows = Cesium.ShadowMode.RECEIVE_ONLY
+    that.viewer.shadowMap.darkness = 1.0 - that.options.darkness //阴影透明度--越大越透明
+
+    const now = new Date();
+    now.setHours(0, 0, 0, 0); // 设置为当天0点
+    that.viewer.clock.currentTime = Cesium.JulianDate.fromDate(now);
+    that.viewer.clock.multiplier = that.options.speed;
+    that.viewer.shadowMap.softShadows = that.options.softShadow;
+    that.viewer.shadowMap.cascadesEnabled = true
+    that.viewer.shadowMap.size = 2048;
+    that.viewer.shadowMap.numberOfCascades = 4;   // 增加级联层数（默认3层）
+    that.viewer.shadowMap.maximumDistance = 5000; // 扩大阴影渲染距离
+    const lightCamera = that.viewer.shadowMap._lightCamera;
+    lightCamera.frustum.near = 0.1;    // 缩小近平面距离
+    lightCamera.frustum.far = 10000;   // 扩大远平面距离
+    that.viewer.shadowMap.normalOffset = true; // 避免深度冲突导致的阴影闪烁
+
+    that.edit(true)
+  }
+  get darkness() {
+    return this.options.darkness
+  }
+  set darkness(v) {
+    this.options.darkness = v
+    this.viewer.shadowMap.darkness = 1.0 - this.options.darkness
+    this._elms.darkness &&
+      this._elms.darkness.forEach(item => {
+        item.value = v
+      })
+  }
+
+  get speed() {
+    return this.options.speed
+  }
+  set speed(v) {
+    this.options.speed = v
+    this._elms.speed &&
+      this._elms.speed.forEach(item => {
+        item.value = v
+      })
+    this.viewer.clock.multiplier = this.options.speed;
+    this.timeLine.setSpeed(v)
+  }
+  get softShadow() {
+    return this.options.softShadow
+  }
+  set softShadow(v) {
+    this.options.softShadow = v
+    this.viewer.shadowMap.softShadows = this.options.softShadow;
+  }
+
+  /**
+   * @description 编辑框
+   * @param state=false {boolean} 状态: true打开, false关闭
+   */
+  async edit(state = false) {
+    let tools = new Tools()
+    this.originalOptions = tools.deepCopyObj(this.options)
+
+    // let elms = this.sdk.viewer._container.getElementsByClassName('YJ-custom-base-dialog')
+    // for (let i = elms.length - 1; i >= 0; i--) {
+    //   this.sdk.viewer._container.removeChild(elms[i])
+    // }
+
+    if (this._DialogObject && this._DialogObject.close) {
+      this._DialogObject.close()
+      this._DialogObject = null
+    }
+
+    if (state) {
+      let _this = this
+      this._DialogObject = await new Dialog(this.sdk, this.originalOptions, {
+        title: '光照属性', left: '180px', top: '100px',
+        // confirmCallBack: (options) => {
+        //   this.originalOptions = tools.deepCopyObj(this.options)
+        //   this._DialogObject.close()
+        //   this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
+        //   syncData(this.sdk, this.options.id)
+        //   syncSplitData(this.sdk, this.options.id)
+        //   this.remove()
+        // },
+        resetCallBack: () => {
+          this.reset()
+          this.Dialog.resetCallBack && this.Dialog.resetCallBack()
+        },
+        // removeCallBack: () => {
+        //   this.Dialog.removeCallBack && this.Dialog.removeCallBack()
+        // },
+        closeCallBack: () => {
+          this.reset()
+          _this.remove()
+          // this.entity.style = new Cesium.Cesium3DTileStyle({
+          //   color: "color('rgba(255,255,255," + this.newData.transparency + ")')",
+          //   show: true,
+          // });
+          this.Dialog.closeCallBack && this.Dialog.closeCallBack()
+        },
+        showCallBack: (show) => {
+          this.show = show
+          this.Dialog.showCallBack && this.Dialog.showCallBack()
+        }
+      }, true)
+      this._DialogObject._element.body.className = this._DialogObject._element.body.className + ' sun-shine-surface'
+      let contentElm = document.createElement('div');
+      contentElm.innerHTML = html()
+      this._DialogObject.contentAppChild(contentElm)
+
+      //时间轴
+      let _that = this
+      this.timeLine = new TimeLine(this.sdk, this.options.speed)
+      // this.timeLine.setSpeed(1000)
+      this.timeLine.moveComplay(item => {
+        let timeData = _that.time + " " + item
+        _that.viewer.clock.currentTime = Cesium.JulianDate.fromDate(new Date(timeData));
+        _that.viewer.scene.requestRender();
+
+
+      })
+      let jeDateObject
+      let printDateElm = contentElm.getElementsByClassName('sunshine-date')[0]
+      let text
+
+      jeDateObject = jeDate(printDateElm, {
+        format: "YYYY-MM-DD",
+        isinitVal: true,
+        isClear: false,
+        donefun: function (obj) {
+          this.time = obj.val
+
+          const now = new Date();
+          let timeData = now.setHours(0, 0, 0, 0); // 设置为当天0点
+          _that.viewer.clock.currentTime = Cesium.JulianDate.fromDate(new Date(timeData));
+
+          _that.timeLine.updateTime(timeData)
+        }
+      });
+      if (this.time) {
+        jeDateObject.setValue(this.time)
+      }
+      else {
+        jeDateObject.nowBtn && jeDateObject.nowBtn()
+        this.time = jeDateObject.getValue()
+      }
+
+      let all_elm = contentElm.getElementsByTagName("*")
+      this._EventBinding.on(this, all_elm)
+      this._elms = this._EventBinding.element
+      this._elms.color = [jeDateObject]
+    } else {
+      // if (this._element_style) {
+      //   document.getElementsByTagName('head')[0].removeChild(this._element_style)
+      //   this._element_style = null
+      // }
+      // if (this._DialogObject && this._DialogObject.remove) {
+      //   this._DialogObject.remove()
+      //   this._DialogObject = null
+      // }
+    }
+  }
+
+  reset() {
+    if (!this.viewer.entities.getById(this.options.id)) {
+      return
+    }
+    this.time = this.originalOptions.time
+    this.speed = this.originalOptions.speed
+    this.darkness = this.originalOptions.darkness
+  }
+
+  /**
+   * 飞到对应实体
+   */
+  async flyTo(options = {}) {
+  }
+  /**
+   * 删除
+   */
+  async remove() {
+
+    this.viewer.scene.globe.enableLighting = false
+    this.viewer.shadows = false
+    this.viewer.clock.multiplier = 1.0
+    this.viewer.clock.currentTime = Cesium.JulianDate.fromDate(new Date());
+    this.entity = null
+    this.timeLine.clear()
+
+    this.viewer.shadowMap.cascadesEnabled = false
+    this.viewer.shadowMap.size = 1024;
+    this.viewer.shadowMap.numberOfCascades = 3;   // 增加级联层数（默认3层）
+    const lightCamera = this.viewer.shadowMap._lightCamera;
+    this.viewer.shadowMap.normalOffset = false; // 避免深度冲突导致的阴影闪烁
+
+    if (this._DialogObject && !this._DialogObject.isDestroy) {
+      this._DialogObject.close()
+      this._DialogObject = null
+    }
+    // await this.sdk.removeIncetance(this.options.id)
+    await syncData(this.sdk, this.options.id)
+  }
+
+  flicker() { }
+}
+

src/Global/efflect/Sunshine/timeLIne.js

@@ -0,0 +1,171 @@
+export default class TimeLine {
+  constructor(sdk, speed) {
+    this.sdk = { ...sdk };
+    this.progress = document.getElementById('progress');
+    this.handle = document.getElementById('handle');
+    // this.timeline = document.getElementById('timeline');
+    this.timeline = document.getElementsByClassName('timeline-container')[0];
+    this.currentTime = document.getElementById('currentTime');
+    this.timelineCon = document.getElementsByClassName('timeline-container')[0];
+    this.speed = speed;
+    this.animationId;
+    this.startTime = performance.now();
+    this.manualPosition = null;
+    this.isDragging = false;
+    this.pauseed = false;
+    this.time = '';
+    this.update = this.update.bind(this);
+
+    TimeLine.init(this)
+  }
+  static init(that) {
+    for (let i = 0; i <= 24; i++) {
+      if (i % 6 === 0) {
+        const label = document.createElement('div');
+        label.className = 'time-mark';
+        label.textContent = `${i}:00`;
+        label.style.left = `${(i / 24) * 100}%`;
+        document.getElementsByClassName('time-marks')[0].appendChild(label)
+      }
+    }
+    that.startTime = performance.now() - ((that.manualPosition || 0) * 86400 * 1000 / that.speed);
+
+    that.timeline.addEventListener('mousedown', (e) => {
+      if (e.srcElement.className === 'handle') {
+        that.isDragging = true;
+      }
+      e.preventDefault();
+    });
+
+    that.timeline.addEventListener('mousemove', (e) => {
+      if (!that.isDragging) return;
+
+      const rect = that.timeline.getBoundingClientRect();
+      let pos = (e.clientX - rect.left) / rect.width;
+      pos = Math.max(0, Math.min(1, pos));
+
+      that.manualPosition = pos;
+      that.progress.style.width = `${pos * 100}%`;
+
+      const seconds = pos * 86400;
+      that.currentTime.textContent = that.formatTime(seconds);
+    });
+    that.update();
+
+    document.getElementById('timePause').addEventListener('click', function () {
+      that.pauseed = !that.pauseed;
+      if (that.pauseed) {//暂停
+        that.pausedTime = performance.now(); // 记录暂停时刻
+        document.getElementById('timePause').textContent = '播放';
+        that.animationId && cancelAnimationFrame(that.animationId);
+        that.sdk.viewer.clock.shouldAnimate = false
+      } else {//播放
+        let now = performance.now()
+        const pausedDuration = now - that.pausedTime;
+        document.getElementById('timePause').textContent = '暂停';
+        that.manualPosition = null
+        that.startTime += pausedDuration; // 补偿暂停期间的时间差
+
+        if (that.changeDate) {//切换日期后让时间从0开始
+          if (that.changeDateGrag) {
+            that.changeDateGrag = undefined
+          } else {
+            that.startTime = now
+          }
+          that.changeDate = undefined
+        }
+        that.sdk.viewer.clock.shouldAnimate = true
+        that.update(); // 重启动画循环
+      }
+    });
+  }
+  moveComplay(func) {
+    let that = this
+    // that.timeline.addEventListener('mouseup', () => {
+    document.addEventListener('mouseup', () => {
+      if (that.isDragging) {
+        that.isDragging = false;
+        if (that.manualPosition !== null) {
+          // that.sdk.viewer.clock.shouldAnimate = true
+          that.startTime = performance.now() - (that.manualPosition * 86400 * 1000 / that.speed);
+          that.manualPosition = null;
+          that.changeDate && (that.changeDateGrag = true)
+          if (!that.pauseed) {
+            that.update()
+            func(that.time)
+          } else {
+            that.pausedTime = performance.now(); // 记录暂停时刻
+            func(that.currentTime.textContent)
+          }
+
+        }
+      }
+    });
+  }
+  formatTime(seconds) {
+    const hrs = Math.floor(seconds / 3600).toString().padStart(2, '0');
+    const mins = Math.floor((seconds % 3600) / 60).toString().padStart(2, '0');
+    const secs = Math.floor(seconds % 60).toString().padStart(2, '0');
+    return `${hrs}:${mins}:${secs}`;
+  }
+
+  update() {
+    if (this.manualPosition !== null) return;
+    if (this.changeDate) {//切换日期后让时间从0开始
+      this.startTime = performance.now()
+    }
+    let elapsed = (performance.now() - this.startTime) * this.speed;
+    // if (this.elapsed) {
+    //   elapsed = elapsed + this.elapsed
+    //   this.elapsed = undefined
+    // }
+    const totalSeconds = elapsed / 1000;//秒
+    const daySeconds = totalSeconds % 86400;//天
+    const percentage = daySeconds / 86400;
+
+    this.progress.style.width = `${percentage * 100}%`;
+    this.time = this.formatTime(daySeconds)
+    this.currentTime.textContent = this.time;
+    if (!this.pauseed) {
+      this.animationId && cancelAnimationFrame(this.animationId);
+      this.animationId = requestAnimationFrame(this.update);
+    }
+  }
+  setSpeed(v) {
+    let now = performance.now()
+    if (!this.pauseed) {
+      const currentProgress = this.manualPosition ??
+        (performance.now() - this.startTime) * this.speed / (86400 * 1000);
+      this.speed = v;
+      this.startTime = performance.now() - (currentProgress * 86400 * 1000 / this.speed);
+
+    } else {
+      let pausedDuration = now - this.pausedTime;
+      this.startTime += pausedDuration; // 补偿暂停期间的时间差
+      const currentProgress = this.manualPosition ??
+        (now - this.startTime) * this.speed / (86400 * 1000);
+      this.speed = v;
+      this.startTime = now - (currentProgress * 86400 * 1000 / this.speed);
+
+      this.pausedTime = now; // 记录切换speed暂停时刻
+      // this.speed = v;
+    }
+    this.manualPosition = null;
+
+    // this.update();
+
+  }
+  updateTime() {
+    this.manualPosition = null;
+    this.startTime = performance.now() - ((this.manualPosition || 0) * 86400 * 1000 / this.speed);
+    this.pauseed && (this.changeDate = true)
+    this.changeDateGrag = undefined
+    this.update();
+  }
+  clear() {
+    this.animationId && cancelAnimationFrame(this.animationId);
+    this.progress.style.width = '0%';
+    this.currentTime.textContent = '00:00:00';
+  }
+
+}

src/Global/global.js

@@ -14,6 +14,7 @@ import { getTheme, setTheme } from "../Obj/Element/theme";
 import { setActiveViewer as setMultiViewportActiveViewer } from './MultiViewportMode'
 import { setActiveViewer as setSplitActiveViewer, getSdk } from './SplitScreen'
 import { updateCluster } from './cluster/cluster'
+import { getHost } from "../on";
 
 let coordinateSystem = 'EPSG:4326'
 let _cartesian
@@ -110,7 +111,7 @@ function CesiumContainer(sdk, options) {
   }
   containerObject[sdk.viewer._element.className] || (containerObject[sdk.viewer._element.className] = {})
   containerObject[sdk.viewer._element.className].event && containerObject[sdk.viewer._element.className].event.destroy()
-  let tools = new Tools()
+  let tools = new Tools(sdk)
   let element = sdk.viewer._element
   let proj = sdk.proj
   for (let key in options) {
@@ -173,15 +174,28 @@ function CesiumContainer(sdk, options) {
           }
           let event = new MouseEvent(sdk)
           containerObject[sdk.viewer._element.className].event = event
+          let lastPickTime = 0;
+          let timeoutEvent
           event.mouse_move((movement, cartesian) => {
             _cartesian = cartesian
+            // const now = Date.now();
+            // if (now - lastPickTime < 500) {
+            //   clearTimeout(timeoutEvent)
+            //   timeoutEvent = setTimeout(() => {
+            //     update()
+            //   }, 500);
+            //   return
+            // }
+            // lastPickTime = now;
             update()
           })
-          function update() {
+          async function update() {
             if (!_cartesian) {
               return
             }
+            // let pos = sdk.viewer.scene.clampToHeight(_cartesian)
             let position = tools.cartesian3Towgs84(_cartesian, sdk.viewer)
+            // position.alt = height
             if (coordinateSystem === 'EPSG:4326') {
               infoElm.innerHTML = `
                   <span>经度：</span><span>${Number(position.lng.toFixed(6))}° </span>
@@ -244,6 +258,16 @@ function setBillboardDefaultUrl(url, name) {
   else {
     name = 'billboard_default_url'
   }
+  let host = getHost()
+  if (!url.startsWith("http")) {
+    //说明是本地的json，在磁盘中存在的
+    if (!url.includes(":")) {
+      if (host) {
+        let o = new URL(url, host)
+        url = o.href
+      }
+    }
+  }
   localStorage.setItem(name, url);
 }
 /*获取广告牌默认图标*/
@@ -426,12 +450,12 @@ function closeViewFollow(sdk) {
 
 /* 方里网状态开关 */
 function FlwStatusSwitch(sdk, status) {
-  if(!sdk) {
+  if (!sdk) {
     return
   }
   let layer
   let sdkD = getSdk().sdkD
-  if(sdkD && sdk !== sdkD) {
+  if (sdkD && sdk !== sdkD) {
     FlwStatusSwitch(sdkD, status)
   }
   for (let i = 0; i < sdk.viewer.imageryLayers._layers.length; i++) {
@@ -466,12 +490,12 @@ function getFlwStatus(sdk) {
 
 /* 经纬网状态开关 */
 function JwwStatusSwitch(sdk, status) {
-  if(!sdk) {
+  if (!sdk) {
     return
   }
   let layer
   let sdkD = getSdk().sdkD
-  if(sdkD && sdk !== sdkD) {
+  if (sdkD && sdk !== sdkD) {
     JwwStatusSwitch(sdkD, status)
   }
   for (let i = 0; i < sdk.viewer.imageryLayers._layers.length; i++) {

src/Global/mouseRightMenu/index.js

@@ -25,15 +25,15 @@ function MouseRightMenu(sdk, status, callBack) {
   if (eventListener[sdk.div_id].click) {
     document.removeEventListener('click', eventListener[sdk.div_id].click)
   }
-  if(!eventListener[sdk.div_id].callBack) {
+  if (!eventListener[sdk.div_id].callBack) {
     eventListener[sdk.div_id].callBack = callBack
   }
-  
-  if(sdk !== sdkD) {
+
+  if (sdk !== sdkD) {
     eventListener[sdk.div_id].mouseRightMenuEvent &&
-    eventListener[sdk.div_id].mouseRightMenuEvent.destroy()
+      eventListener[sdk.div_id].mouseRightMenuEvent.destroy()
   }
-  
+
   let menuElm = document.getElementById('custom-menu')
   if (menuElm) {
     _element.removeChild(menuElm)
@@ -87,7 +87,7 @@ function MouseRightMenu(sdk, status, callBack) {
         }
         let entityId = getEntityId(movement)
         let targetId
-        if(Object.prototype.toString.call(entityId) === '[object Object]') {
+        if (Object.prototype.toString.call(entityId) === '[object Object]') {
           targetId = entityId.id
           entityId = entityId.parentId
         }
@@ -100,14 +100,14 @@ function MouseRightMenu(sdk, status, callBack) {
           that = sdk.entityMap.get(entityId)
         }
 
-        if (that && that.picking) {
-          addedMenu = `
-        <span class="divider" style="display: block;border-top: 1px solid #ddd;margin: 5px;"></span>
-        <ul class="added" style="list-style: none;padding: 0;margin: 0;font-size: 12px;">
-          <li style="padding: 3px 10px;cursor: pointer;">属性</li>
-        </ul>
-        `
-        }
+        // if (that && that.picking) {
+        //   addedMenu = `
+        // <span class="divider" style="display: block;border-top: 1px solid #ddd;margin: 5px;"></span>
+        // <ul class="added" style="list-style: none;padding: 0;margin: 0;font-size: 12px;">
+        //   <li style="padding: 3px 10px;cursor: pointer;">属性</li>
+        // </ul>
+        // `
+        // }
         let position = tools.cartesian3Towgs84(cartesian, sdk.viewer)
         menuElm = document.createElement('div')
         menuElm.id = 'custom-menu'
@@ -123,7 +123,7 @@ function MouseRightMenu(sdk, status, callBack) {
         </ul>
         ${addedMenu}
       `
-      _element.appendChild(menuElm)
+        _element.appendChild(menuElm)
         let left = movement.position.x
         let top = movement.position.y
         if (
@@ -141,7 +141,7 @@ function MouseRightMenu(sdk, status, callBack) {
         menuElm.style.left = left + 'px'
         menuElm.style.top = top + 'px'
 
-        menuElm.addEventListener('contextmenu', function(event) {
+        menuElm.addEventListener('contextmenu', function (event) {
           event.preventDefault()
         })
         let liElms = menuElm.getElementsByTagName('li')
@@ -162,7 +162,7 @@ function MouseRightMenu(sdk, status, callBack) {
                 // this.rotateAround(position)
                 break
               case '属性':
-                if(targetId) {
+                if (targetId) {
                   object.id = targetId
                   object.parentId = that.options.id
                 }
@@ -173,6 +173,10 @@ function MouseRightMenu(sdk, status, callBack) {
                 // that.edit(true)
                 // this.attribute(entityId)
                 break
+              case '文本框':
+                object.position = position
+                key = 'textBox'
+                break
             }
             eventListener[sdk.div_id].callBack(key, object)
             _element.removeChild(menuElm)

src/In/index.js

@@ -70,7 +70,7 @@ import {
 import { MouseCoordinate } from '../Global/MouseCoordinate'
 import { MouseRightMenu } from '../Global/mouseRightMenu'
 import { dialog as ContourDialog } from '../Global/Contour'
-import { on as SplitScreenOn, off as SplitScreenOff, setActiveId as SplitScreenSetActiveId ,getSdk } from '../Global/SplitScreen'
+import { on as SplitScreenOn, off as SplitScreenOff, setActiveId as SplitScreenSetActiveId, getSdk } from '../Global/SplitScreen'
 import LocateCurrent from '../Obj/Base/LocateCurrent'
 
 import { AnalysisClear, SectionClear } from '../Obj/Analysis/clear'
@@ -100,6 +100,7 @@ import MeasureAngle from '../Measure/MeasureAngle'
 import MeasureAzimuth from '../Measure/MeasureAzimuth'
 import DrawPolyline from '../Draw/drawPolyline'
 import DrawPolygon from '../Draw/drawPolygon'
+import DrawThreeRect from '../Draw/drawThreeRect'
 import DrawPoint from '../Draw/drawPoint'
 import DrawCircle from '../Draw/drawCircle'
 import DrawElliptic from '../Draw/drawElliptic'
@@ -157,7 +158,7 @@ import WaterSurface from '../Obj/Base/WaterSurface'
 // import ItineraryMove from '../Obj/Base/ItineraryMove'
 import TrajectoryMotion from '../Obj/Base/TrajectoryMotion'
 import TrajectoryMotionObject from '../Obj/Base/TrajectoryMotionObject'
-import Road from '../Obj/Base/Road'
+// import Road from '../Obj/Base/Road'
 import Graffiti from '../Obj/Base/Graffiti'
 import GroundImage from '../Obj/Base/GroundImage'
 import GroundSvg from '../Obj/Base/GroundSvg'
@@ -183,6 +184,11 @@ import Dialog from '../Obj/Element/Dialog'
 import newAirLine from '../Obj/AirLine/pointRoute.js'
 import Frustum from '../Obj/AirLine/frustum'
 import DrawTakeOff from '../Obj/AirLine/DrawTakeOff'
+import FlowLine from '../Obj/Base/FlowLine'
+import Sunshine from '../Global/efflect/Sunshine'
+// import Road2 from '../Obj/Base/RoadObject'
+// import TextBox from '../Obj/Base/TextBox'
+import BatchModel from '../Obj/Base/BatchModel'
 
 const YJEarthismeasuring = Symbol('测量状态')
 const screenRecord = Symbol('录屏对象')
@@ -234,7 +240,7 @@ if (!window.YJ) {
       Model2,
       TrajectoryMotion,
       TrajectoryMotionObject,
-      Road,
+      // Road,
       Graffiti,
       GroundImage,
       GroundSvg,
@@ -253,7 +259,11 @@ if (!window.YJ) {
       newAirLine,
       FRUSTUN: Frustum,
       // GenerateRoute
-      Dialog
+      Dialog,
+      FlowLine,
+      // Road2,
+      // TextBox,
+      BatchModel
     },
     YJEarth,
     Tools,
@@ -292,7 +302,7 @@ if (!window.YJ) {
         cease: FlyRoamCease
       },
       flyTo,
-      efflect: { rain, snow, fog, nightVision, skyStarry, illumination },
+      efflect: { rain, snow, fog, nightVision, skyStarry, illumination, Sunshine },
       CameraController,
       CesiumContainer,
       setBillboardDefaultUrl,
@@ -301,7 +311,7 @@ if (!window.YJ) {
         on: multiViewportModeOn,
         off: multiViewportModeOff,
         get2DView,
-        getSdk:getSdk2
+        getSdk: getSdk2
       },
       MouseCoordinate,
       MouseRightMenu,
@@ -371,6 +381,7 @@ if (!window.YJ) {
       DrawAssemble,
       DrawSector,
       DrawTakeOff,
+      DrawThreeRect
     },
     // 分析
     Analysis: {

src/Measure/MeasureDistance/index.js

@@ -48,7 +48,7 @@ class MeasureDistance extends Measure {
   }
 
   async computeDisByTowPoint(p1, p2) {
-    let d = this.computeDistance([p1, p2])
+    let d = this.computeDistance2([p1, p2])
     let meters = 10
     let createLabel = (distance) => {
       if(this._isDestroy) {
@@ -80,7 +80,7 @@ class MeasureDistance extends Measure {
       let l = arr.length - 1
       arr.forEach((item, index) => {
         if (index !== l) {
-          let d1 = this.computeDistance([item.position, arr[index + 1].position])
+          let d1 = this.computeDistance2([item.position, arr[index + 1].position])
           let d2 = Math.abs(item.position.alt - arr[index + 1].position.alt)
           let d3 = Math.sqrt(d1 * d1 + d2 * d2)
           total_length += d3
@@ -91,7 +91,7 @@ class MeasureDistance extends Measure {
 
 
     //暂时固定取20个点
-    if (d > 20) {//大于20m时，固定取20个点
+    if (d > 2) {//大于20m时，固定取20个点
       meters = d / 20
       await start(meters)
     } else if (d < 1) {
@@ -106,8 +106,8 @@ class MeasureDistance extends Measure {
 
 
   async sampleHeight(p1, index) {
-    let p2 = await this.sampleHeightMostDetailed([p1])
-    p1.alt = p2[0].height
+    let height = await this.getClampToHeight(p1, [...this.sdk.viewer.entities.values])
+    p1.alt = height
     return {position: p1, index}
   }
 
@@ -131,7 +131,7 @@ class MeasureDistance extends Measure {
     let l = this.clampPositions.length - 1
     this.clampPositions.forEach((item, index) => {
       if (index !== l) {
-        let d1 = this.computeDistance([item.position, this.clampPositions[index + 1].position])
+        let d1 = this.computeDistance2([item.position, this.clampPositions[index + 1].position])
         let d2 = Math.abs(item.position.alt - this.clampPositions[index + 1].position.alt)
         let d3 = Math.sqrt(d1 * d1 + d2 * d2)
         total_length += d3
@@ -270,7 +270,7 @@ class MeasureDistance extends Measure {
         // if (this.cachePositions.length) {
         //   let cur_point = this.cartesian3Towgs84(car, this.viewer)
         //   let pre_p = this.cartesian3Towgs84(this.cachePositions[this.cachePositions.length - 1], this.viewer)
-        //   let cur_len = this.computeDistance([cur_point, pre_p])
+        //   let cur_len = this.computeDistance2([cur_point, pre_p])
         //   let text = "当前投影距离：" + cur_len + " 米"
         //   // this.tip.set_text(text)
         // }

src/Measure/MeasureDistance/index2.js

@@ -47,7 +47,7 @@ class MeasureDistance extends Measure {
   }
 
   async computeDisByTowPoint(p1, p2) {
-    let d = this.computeDistance([p1, p2])
+    let d = this.computeDistance2([p1, p2])
     let meters = 10
     let createLabel = (distance) => {
       let label = this.getLabel("贴地距离：" + distance.toFixed(2) + "米")
@@ -84,7 +84,7 @@ class MeasureDistance extends Measure {
       let l = arr.length - 1
       arr.forEach((item, index) => {
         if (index !== l) {
-          let d1 = this.computeDistance([item.position, arr[index + 1].position])
+          let d1 = this.computeDistance2([item.position, arr[index + 1].position])
           let d2 = Math.abs(item.position.alt - arr[index + 1].position.alt)
           let d3 = Math.sqrt(d1 * d1 + d2 * d2)
           total_length += d3
@@ -135,7 +135,7 @@ class MeasureDistance extends Measure {
     let l = this.clampPositions.length - 1
     this.clampPositions.forEach((item, index) => {
       if (index !== l) {
-        let d1 = this.computeDistance([item.position, this.clampPositions[index + 1].position])
+        let d1 = this.computeDistance2([item.position, this.clampPositions[index + 1].position])
         let d2 = Math.abs(item.position.alt - this.clampPositions[index + 1].position.alt)
         let d3 = Math.sqrt(d1 * d1 + d2 * d2)
         total_length += d3
@@ -231,7 +231,7 @@ class MeasureDistance extends Measure {
         if (this.ids.length !== 0) {
           let cur_point = this.cartesian3Towgs84(car, this.viewer)
           let pre_p = this.cartesian3Towgs84(this.cachePositions[this.cachePositions.length - 1], this.viewer)
-          let cur_len = this.computeDistance([cur_point, pre_p])
+          let cur_len = this.computeDistance2([cur_point, pre_p])
           let text = "投影距离：" + cur_len + " 米"
           this.ids.push(MeasureDistance.create_point(car, {label: this.getLabel(text)}, this))
           this.cachePositions.push(car)
@@ -250,7 +250,7 @@ class MeasureDistance extends Measure {
         if (this.cachePositions.length) {
           let cur_point = this.cartesian3Towgs84(car, this.viewer)
           let pre_p = this.cartesian3Towgs84(this.cachePositions[this.cachePositions.length - 1], this.viewer)
-          let cur_len = this.computeDistance([cur_point, pre_p])
+          let cur_len = this.computeDistance2([cur_point, pre_p])
           let text = "当前投影距离：" + cur_len + " 米"
           this.tip.set_text(text)
         }
@@ -280,7 +280,7 @@ class MeasureDistance extends Measure {
   }
 
   computeAngle(start, end) {
-    let d1 = this.computeDistance([start, end])
+    let d1 = this.computeDistance2([start, end])
     let d2 = Math.abs(start.alt - end.alt)
     let d3 = Math.sqrt(d1 * d1 + d2 * d2)
     let cosAlpha = d1 / d3

src/Measure/MeasureHeight/index.js

@@ -128,7 +128,7 @@ class MeasureHeight extends Measure {
             this.positions[1] = Cesium.Cartesian3.fromDegrees(this.firstpoint.lng, this.firstpoint.lat, cur_point.alt)
             this.positions[2] = cartesian
             this.position = this.positions[1]
-            this.circleRadius = this.computeDistance([this.firstpoint, cur_point])
+            this.circleRadius = this.computeDistance2([this.firstpoint, cur_point])
             this.height = Number((cur_point.alt - this.firstpoint.alt).toFixed(2))
             this.text = "相对高度：" + this.height + " 米"
             this.tip.set_text("左键完成，右键取消；半径：" + this.circleRadius + " 米")
@@ -145,7 +145,7 @@ class MeasureHeight extends Measure {
           this.positions[1] = Cesium.Cartesian3.fromDegrees(this.firstpoint.lng, this.firstpoint.lat, cur_point.alt)
           this.positions[2] = cartesian
           this.position = this.positions[1]
-          this.circleRadius = this.computeDistance([this.firstpoint, cur_point])
+          this.circleRadius = this.computeDistance2([this.firstpoint, cur_point])
           this.height = Number((cur_point.alt - this.firstpoint.alt).toFixed(2))
           this.text = "相对高度：" + this.height + " 米"
           this.tip.set_text("左键完成，右键取消；半径：" + this.circleRadius + " 米")

src/Measure/MeasureProjectionDistance/index.js

@@ -73,7 +73,7 @@ class MeasureProjectionDistance extends Measure {
     let l = this.clampPositions.length - 1
     this.clampPositions.forEach((item, index) => {
       if (index !== l) {
-        let d1 = this.computeDistance([item.position, this.clampPositions[index + 1].position])
+        let d1 = this.computeDistance2([item.position, this.clampPositions[index + 1].position])
         let d2 = Math.abs(item.position.alt - this.clampPositions[index + 1].position.alt)
         let d3 = Math.sqrt(d1 * d1 + d2 * d2)
         total_length += d3
@@ -174,7 +174,7 @@ class MeasureProjectionDistance extends Measure {
         if (this.ids.length !== 0) {
           let cur_point = this.cartesian3Towgs84(car, this.viewer)
           let pre_p = this.cartesian3Towgs84(this.cachePositions[this.cachePositions.length - 1], this.viewer)
-          let cur_len = this.computeDistance([cur_point, pre_p])
+          let cur_len = this.computeDistance2([cur_point, pre_p])
           let text = "投影距离：" + cur_len + " 米"
           this.ids.push(MeasureProjectionDistance.create_point(car, {label: this.getLabel(text)}, this))
           this.cachePositions.push(car)
@@ -215,7 +215,7 @@ class MeasureProjectionDistance extends Measure {
         if (this.cachePositions.length) {
           let cur_point = this.cartesian3Towgs84(car, this.viewer)
           let pre_p = this.cartesian3Towgs84(this.cachePositions[this.cachePositions.length - 1], this.viewer)
-          let cur_len = this.computeDistance([cur_point, pre_p])
+          let cur_len = this.computeDistance2([cur_point, pre_p])
           let text = "当前投影距离：" + cur_len + " 米"
           this.tip.set_text(text)
         }

src/Measure/MeasureSlopeDistance/index.js

@@ -75,7 +75,7 @@ class MeasureSlopeDistance extends Measure {
     let l = this.clampPositions.length - 1
     this.clampPositions.forEach((item, index) => {
       if (index !== l) {
-        let d1 = this.computeDistance([item.position, this.clampPositions[index + 1].position])
+        let d1 = this.computeDistance2([item.position, this.clampPositions[index + 1].position])
         let d2 = Math.abs(item.position.alt - this.clampPositions[index + 1].position.alt)
         let d3 = Math.sqrt(d1 * d1 + d2 * d2)
         total_length += d3
@@ -235,7 +235,7 @@ class MeasureSlopeDistance extends Measure {
         if (this.cachePositions.length) {
           let cur_point = this.cartesian3Towgs84(cartesian, this.viewer)
           let pre_p = this.cartesian3Towgs84(this.cachePositions[this.cachePositions.length - 1], this.viewer)
-          let d1 = this.computeDistance([pre_p, cur_point])
+          let d1 = this.computeDistance2([pre_p, cur_point])
           let d2 = Math.abs(pre_p.alt - cur_point.alt)
           let d3 = Math.sqrt(d1 * d1 + d2 * d2)
           let cosAlpha = d1 / d3
@@ -276,7 +276,7 @@ class MeasureSlopeDistance extends Measure {
   }
 
   computeAngle(start, end) {
-    let d1 = this.computeDistance([start, end])
+    let d1 = this.computeDistance2([start, end])
     let d2 = Math.abs(start.alt - end.alt)
     let d3 = Math.sqrt(d1 * d1 + d2 * d2)
     let cosAlpha = d1 / d3

src/Measure/MeasureTriangle/index.js

@@ -27,7 +27,7 @@ class MeasureTriangle extends Measure {
   cal_distance(positions) {
     let p1 = this.cartesian3Towgs84(positions[0], this.viewer)
     let p2 = this.cartesian3Towgs84(positions[1], this.viewer)
-    let dis = this.computeDistance([p1, p2])
+    let dis = this.computeDistance2([p1, p2])
     p1.alt = p1.alt.toFixed(2)
     p2.alt = p2.alt.toFixed(2)
     if (p1.alt === p2.alt) {//水平边
@@ -128,10 +128,10 @@ class MeasureTriangle extends Measure {
       let positions2 = this.id_map.get(id2).positions
       let p1 = this.cartesian3Towgs84(positions1[0], this.viewer)
       let p2 = this.cartesian3Towgs84(positions1[1], this.viewer)
-      let shuiping = this.computeDistance([p2, p1])
+      let shuiping = this.computeDistance2([p2, p1])
       let p3 = this.cartesian3Towgs84(positions2[0], this.viewer)
       let p4 = this.cartesian3Towgs84(positions2[1], this.viewer)
-      let d = this.computeDistance([p3, p4])
+      let d = this.computeDistance2([p3, p4])
       let h = Math.abs(p3.alt - p4.alt)
       let x = Math.sqrt(Math.pow(h, 2) + Math.pow(d, 2))
       if (shuiping == 0.00) {

src/Obj/Analysis/Contour/index.js

@@ -47,6 +47,11 @@ class ContourAnalysis {
     YJ.Analysis.AnalysesResults.push(this)
     this.createNewLine();
   }
+
+  get type() {
+    return 'ContourAnalysis'
+  }
+
   createNewLine() {
     ContourAnalysis.interpolatePoint(this);
   }

src/Obj/Analysis/Visibility/index.js

@@ -63,11 +63,15 @@ class VisibilityAnalysis extends Tools {
         that.tip.set_text("左键创建视角终点，右键结束通视分析")
         if (!that.resultObject.viewPoint) {
           let pos84 = that.cartesian3Towgs84(cartesian, that.viewer)
-          let positions = await Cesium.sampleTerrainMostDetailed(
-            that.sdk.viewer.terrainProvider,
-            [Cesium.Cartographic.fromDegrees(pos84.lng, pos84.lat)]
-          );
-          if (positions[0].height > pos84.alt) {
+          let positions
+          if(that.sdk.viewer.terrainProvider.availability)
+          {
+            positions = await Cesium.sampleTerrainMostDetailed(
+              that.sdk.viewer.terrainProvider,
+              [Cesium.Cartographic.fromDegrees(pos84.lng, pos84.lat)]
+            );
+          }
+          if (positions && positions[0].height > pos84.alt) {
             pos84.alt = positions[0].height
           }
           pos84.alt = pos84.alt + that.viewPointHeight

src/Obj/Analysis/test2/index.js

@@ -62,7 +62,7 @@ class PolygonObject extends Base {
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
       backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -105,7 +105,7 @@ class PolygonObject extends Base {
     this.entity.polygon.material = Cesium.Color.fromCssColorString(v)
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -218,7 +218,7 @@ class PolygonObject extends Base {
     this.entity.polyline.material = Cesium.Color.fromCssColorString(v)
     if (this._elms.lineColor) {
       this._elms.lineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -311,7 +311,7 @@ class PolygonObject extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -411,7 +411,7 @@ class PolygonObject extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -438,7 +438,7 @@ class PolygonObject extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -464,7 +464,7 @@ class PolygonObject extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1013,7 +1013,7 @@ class PolygonObject extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('polygon-object-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1027,7 +1027,7 @@ class PolygonObject extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let linecolorPicker = new ewPlugins('colorpicker', {
+      let linecolorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("lineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1041,7 +1041,7 @@ class PolygonObject extends Base {
           this.lineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1055,7 +1055,7 @@ class PolygonObject extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1069,7 +1069,7 @@ class PolygonObject extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1083,7 +1083,7 @@ class PolygonObject extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/AssembleObject/index.js

@@ -24,7 +24,7 @@ class AssembleObject extends Base {
    * @param options {object} 属性
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.color="#36c4ff" {string} 颜色
+   * @param options.color="#ff000080" {string} 颜色
    * @param options.height {number} 高度
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
    * @param {Array.<object>} options.positions 坐标数组 [{lon,lat,alt},...]
@@ -34,13 +34,13 @@ class AssembleObject extends Base {
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
     this.options.name = options.name || '未命名对象'
-    this.options.color = options.color || "#36c4ff"
+    this.options.color = options.color || "#ff000080"
     this.options.show = (options.show || options.show === false) ? options.show : true
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
     this.options.positions = options.positions || []
     this.options.line = options.line || {}
-    this.options.line.width = this.options.line.width || 2
-    this.options.line.color = this.options.line.color || 'rgba(155, 155, 124, 0.89)'
+    this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     this.entity
     this.event = new MouseEvent(this.sdk)
@@ -57,8 +57,8 @@ class AssembleObject extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -106,31 +106,31 @@ class AssembleObject extends Base {
     return this.options.color
   }
   set color(v) {
-    this.options.color = v
+    this.options.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polygon) {
       return
     }
-    let material = Cesium.Color.fromCssColorString(v)
+    let material = Cesium.Color.fromCssColorString(this.options.color)
     if (this.sdk.viewer.scene.mode === 2) {
       material = new Cesium.CustomColorMaterialSource({
-        color: v
+        color: this.options.color
       })
     }
     this.entity.polygon.material = material
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
             this.color = c
           },//点击确认按钮事件回调
           clear: () => {
-            this.color = 'rgba(255,255,255,1)'
+            this.color = 'rgba(255,0,0,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.color[i] = colorPicker
@@ -238,25 +238,25 @@ class AssembleObject extends Base {
     return this.options.line.color
   }
   set lineColor(v) {
-    this.options.line.color = v
+    this.options.line.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polyline) {
       return
     }
-    this.entity.polyline.material = Cesium.Color.fromCssColorString(v)
+    this.entity.polyline.material = Cesium.Color.fromCssColorString(this.options.line.color)
     if (this._elms.lineColor) {
       this._elms.lineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.line.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
             this.lineColor = c
           },//点击确认按钮事件回调
           clear: () => {
-            this.lineColor = 'rgba(255,255,255,1)'
+            this.lineColor = 'rgba(255,0,0,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.lineColor[i] = lineColorPicker
@@ -268,10 +268,10 @@ class AssembleObject extends Base {
     return this.options.line.width
   }
   set lineWidth(v) {
-    this.options.line.width = v
-    this.entity.polyline.width = v
+    this.options.line.width = ((v || v === 0) ? v : 3)
+    this.entity.polyline.width = this.options.line.width
     this._elms.lineColor && this._elms.lineColor.forEach((item) => {
-      item.value = v
+      item.value = this.options.line.width
     })
   }
 
@@ -319,7 +319,7 @@ class AssembleObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -353,7 +353,7 @@ class AssembleObject extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -453,7 +453,7 @@ class AssembleObject extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -464,7 +464,7 @@ class AssembleObject extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -480,7 +480,7 @@ class AssembleObject extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -506,7 +506,7 @@ class AssembleObject extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1171,7 +1171,7 @@ class AssembleObject extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('assemble-object-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1185,7 +1185,7 @@ class AssembleObject extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let linecolorPicker = new ewPlugins('colorpicker', {
+      let linecolorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("lineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1199,7 +1199,7 @@ class AssembleObject extends Base {
           this.lineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1213,7 +1213,7 @@ class AssembleObject extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labellineColorPicker = new ewPlugins('colorpicker', {
+      let labellineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1227,7 +1227,7 @@ class AssembleObject extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1241,7 +1241,7 @@ class AssembleObject extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/AttackArrowObject/index.js

@@ -24,7 +24,7 @@ class AttackArrowObject extends Base {
    * @param options {object} 属性
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.color="#36c4ff" {string} 颜色
+   * @param options.color="#ff000080" {string} 颜色
    * @param options.height {number} 高度
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
    * @param {Array.<object>} options.positions 坐标数组 [{lon,lat,alt},...]
@@ -34,13 +34,13 @@ class AttackArrowObject extends Base {
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
     this.options.name = options.name || '未命名对象'
-    this.options.color = options.color || "#36c4ff"
+    this.options.color = options.color || "#ff000080"
     this.options.show = (options.show || options.show === false) ? options.show : true
     this.options.positions = options.positions || []
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
     this.options.line = options.line || {}
-    this.options.line.width = this.options.line.width || 2
-    this.options.line.color = this.options.line.color || 'rgba(155, 155, 124, 0.89)'
+    this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     this.entity
     this.event = new MouseEvent(this.sdk)
@@ -61,8 +61,8 @@ class AttackArrowObject extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -110,31 +110,31 @@ class AttackArrowObject extends Base {
     return this.options.color
   }
   set color(v) {
-    this.options.color = v
+    this.options.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polygon) {
       return
     }
-    let material = Cesium.Color.fromCssColorString(v)
+    let material = Cesium.Color.fromCssColorString(this.options.color)
     if (this.sdk.viewer.scene.mode === 2) {
       material = new Cesium.CustomColorMaterialSource({
-        color: v
+        color: this.options.color
       })
     }
     this.entity.polygon.material = material
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
             this.color = c
           },//点击确认按钮事件回调
           clear: () => {
-            this.color = 'rgba(255,255,255,1)'
+            this.color = 'rgba(255,0,0,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.color[i] = colorPicker
@@ -243,25 +243,25 @@ class AttackArrowObject extends Base {
     return this.options.line.color
   }
   set lineColor(v) {
-    this.options.line.color = v
+    this.options.line.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polyline) {
       return
     }
-    this.entity.polyline.material = Cesium.Color.fromCssColorString(v)
+    this.entity.polyline.material = Cesium.Color.fromCssColorString(this.options.line.color)
     if (this._elms.lineColor) {
       this._elms.lineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.line.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
             this.lineColor = c
           },//点击确认按钮事件回调
           clear: () => {
-            this.lineColor = 'rgba(255,255,255,1)'
+            this.lineColor = 'rgba(255,0,0,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.lineColor[i] = lineColorPicker
@@ -273,8 +273,8 @@ class AttackArrowObject extends Base {
     return this.options.line.width
   }
   set lineWidth(v) {
-    this.options.line.width = v
-    this.entity.polyline.width = v
+    this.options.line.width = ((v || v === 0) ? v : 3)
+    this.entity.polyline.width = this.options.line.width
     this._elms.lineColor && this._elms.lineColor.forEach((item) => {
       item.value = v
     })
@@ -324,7 +324,7 @@ class AttackArrowObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show &&!this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -358,7 +358,7 @@ class AttackArrowObject extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -458,7 +458,7 @@ class AttackArrowObject extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -469,7 +469,7 @@ class AttackArrowObject extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -485,7 +485,7 @@ class AttackArrowObject extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -511,7 +511,7 @@ class AttackArrowObject extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1182,7 +1182,7 @@ class AttackArrowObject extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('attack-arrow-object-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1196,7 +1196,7 @@ class AttackArrowObject extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let linecolorPicker = new ewPlugins('colorpicker', {
+      let linecolorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("lineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1210,7 +1210,7 @@ class AttackArrowObject extends Base {
           this.lineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1224,7 +1224,7 @@ class AttackArrowObject extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labellineColorPicker = new ewPlugins('colorpicker', {
+      let labellineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1238,7 +1238,7 @@ class AttackArrowObject extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1252,7 +1252,7 @@ class AttackArrowObject extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/BaseSource/BaseLayer/ArcgisImagery/index.js

@@ -33,6 +33,7 @@ class ArcgisLayer extends BaseLayer {
     } else {
       this.entity = this.sdk.viewer.imageryLayers.addImageryProvider(imageryProvider,)
     }
+    this.entity._id = this.options.id
     for (let i = 0; i < this.sdk.viewer.imageryLayers._layers.length; i++) {
       if (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider && this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type && (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'flw' || this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'jww')) {
         let layer = this.sdk.viewer.imageryLayers._layers[i]

src/Obj/Base/BaseSource/BaseLayer/GdImagery/index.js

@@ -30,6 +30,7 @@ class GdImagery extends BaseLayer {
     } else {
       this.entity = this.sdk.viewer.imageryLayers.addImageryProvider(gdLayer,)
     }
+    this.entity._id = this.options.id
     for (let i = 0; i < this.sdk.viewer.imageryLayers._layers.length; i++) {
       if (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider && this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type && (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'flw' || this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'jww')) {
         let layer = this.sdk.viewer.imageryLayers._layers[i]

src/Obj/Base/BaseSource/BaseLayer/Layer/index.js

@@ -126,6 +126,7 @@ class Layer extends BaseLayer {
       this.entity =
         this.sdk.viewer.scene.imageryLayers.addImageryProvider(layer,)
     }
+    this.entity._id = this.options.id
     for (let i = 0; i < this.sdk.viewer.imageryLayers._layers.length; i++) {
       if (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider && this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type && (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'flw' || this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'jww')) {
         let layer = this.sdk.viewer.imageryLayers._layers[i]

src/Obj/Base/BaseSource/BaseLayer/Layer3rdparty/index.js

@@ -37,6 +37,7 @@ class Layer3rdparty extends BaseLayer {
       this.entity =
         this.sdk.viewer.scene.imageryLayers.addImageryProvider(layer,)
     }
+    this.entity._id = this.options.id
     for (let i = 0; i < this.sdk.viewer.imageryLayers._layers.length; i++) {
       if (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider && this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type && (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'flw' || this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'jww')) {
         let layer = this.sdk.viewer.imageryLayers._layers[i]

src/Obj/Base/BaseSource/BaseLayer/index.js

@@ -9,7 +9,7 @@
 import Dialog from '../../../Element/Dialog';
 import CoordTransform from "../../../../transform/CoordTransform";
 import BaseSource from "../index";
-import { syncData } from '../../../../Global/MultiViewportMode'
+import { syncData, get2DView } from '../../../../Global/MultiViewportMode'
 import { setSplitDirection, syncSplitData } from '../../../../Global/SplitScreen'
 import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../../Global/global'
 
@@ -28,11 +28,11 @@ class BaseLayer extends BaseSource {
   }
 
   get layerIndex() {
-    return this.entity._layerIndex
+    return this.entity ? this.entity._layerIndex : undefined
   }
 
   get layer_index() {
-    return this.entity._layerIndex
+    return this.entity ? this.entity._layerIndex : undefined
   }
 
   get brightness() {
@@ -244,8 +244,19 @@ class BaseLayer extends BaseSource {
         this.originalOptions = this.deepCopyObj(this.options)
         this._DialogObject.close()
         this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
-        syncData(this.sdk, this.options.id)
+        // syncData(this.sdk, this.options.id)
         syncSplitData(this.sdk, this.options.id)
+        let sdk2D = get2DView()
+        if (sdk2D && sdk2D != this.sdk) {
+          for(let i=0;i<sdk2D.viewer.imageryLayers._layers.length;i++) {
+            let layer = sdk2D.viewer.imageryLayers._layers[i]
+            if(layer._id && layer._id == this.options.id) {
+              layer.alpha = this.options.alpha
+              break
+            }
+          }
+
+        }
       },
       closeCallBack: () => {
         this.reset()

src/Obj/Base/BaseSource/BaseModel/Model/_element.js

@@ -56,7 +56,7 @@ function html(that) {
         </div>
       </div>
       <div class="col">
-        <span class="label">视野缩放</span>
+        <span class="label" style="flex: 0 0 60px;">固定大小</span>
         <input class="btn-switch" type="checkbox" @model="scaleByDistance">
       </div>
     </div>

src/Obj/Base/BaseSource/BaseModel/Model/index.js

@@ -100,8 +100,8 @@ class Model extends BaseModel {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -145,15 +145,7 @@ class Model extends BaseModel {
     if (!this.sdk || !this.sdk.viewer || !this.sdk.viewer.scene) {
       return
     }
-    if (!url.startsWith("http")) {
-      //说明是本地的json，在磁盘中存在的
-      if (!url.includes(":")) {
-        if (this.options.host) {
-          let o = new URL(url, this.options.host)
-          url = o.href
-        }
-      }
-    }
+    url = this.replaceHost(url, this.options.host)
     // this.handler = new Cesium.ScreenSpaceEventHandler(
     //   this.sdk.viewer.canvas
     // )
@@ -447,7 +439,7 @@ class Model extends BaseModel {
     this.entity.color = Cesium.Color.fromCssColorString(v)
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -645,7 +637,7 @@ class Model extends BaseModel {
 
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label && (this.label.show = v)
     }
     else {
@@ -679,7 +671,7 @@ class Model extends BaseModel {
     this.label && (this.label.color = v)
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -780,7 +772,7 @@ class Model extends BaseModel {
     this.label && (this.label.lineColor = v)
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -791,7 +783,7 @@ class Model extends BaseModel {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -807,7 +799,7 @@ class Model extends BaseModel {
     this.label && (this.label.backgroundColor = [v, this.label.backgroundColor[1]])
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -833,7 +825,7 @@ class Model extends BaseModel {
     this.label && (this.label.backgroundColor = [this.label.backgroundColor[0], v])
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1336,7 +1328,9 @@ class Model extends BaseModel {
           this.name = this.options.name || '未命名对象'
           this.originalOptions = this.deepCopyObj(this.options)
           this._DialogObject.close()
-          this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
+          let cdoptions = this.deepCopyObj(this.options)
+          cdoptions.host = ''
+          this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(cdoptions)
           syncData(this.sdk, this.options.id)
           syncSplitData(this.sdk, this.options.id)
         },
@@ -1425,7 +1419,7 @@ class Model extends BaseModel {
       }
 
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1439,7 +1433,7 @@ class Model extends BaseModel {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1453,7 +1447,7 @@ class Model extends BaseModel {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1467,7 +1461,7 @@ class Model extends BaseModel {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1481,7 +1475,7 @@ class Model extends BaseModel {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/BaseSource/BaseModel/Model2/index.js

@@ -381,7 +381,7 @@ class Model2 extends BaseModel {
     this.entity.color = Cesium.Color.fromCssColorString(v)
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -550,7 +550,7 @@ class Model2 extends BaseModel {
 
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -583,7 +583,7 @@ class Model2 extends BaseModel {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -676,7 +676,7 @@ class Model2 extends BaseModel {
     this.label.lineColor = v
     if (this._elms.lineColor) {
       this._elms.lineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -704,7 +704,7 @@ class Model2 extends BaseModel {
     this.label.backgroundColor = [v, this.labelBackgroundColorEnd]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -732,7 +732,7 @@ class Model2 extends BaseModel {
     this.label.backgroundColor = [this.labelBackgroundColorStart, v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1098,7 +1098,7 @@ class Model2 extends BaseModel {
       // 创建标签页
       let tabsElm = new cy_tabs('model-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1112,7 +1112,7 @@ class Model2 extends BaseModel {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("label_color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1126,7 +1126,7 @@ class Model2 extends BaseModel {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("line_color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1140,7 +1140,7 @@ class Model2 extends BaseModel {
           this.lineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1154,7 +1154,7 @@ class Model2 extends BaseModel {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/BaseSource/BaseTerrain/index.js

@@ -8,7 +8,7 @@
 import Dialog from '../../../Element/Dialog';
 import { getHost } from "../../../../on";
 import BaseSource from "../index";
-import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../../Global/global'
+import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../../Global/global'
 import { setSplitDirection, syncSplitData } from '../../../../Global/SplitScreen'
 
 class BaseTerrain extends BaseSource {
@@ -78,6 +78,11 @@ class BaseTerrain extends BaseSource {
   close() {
     this.sdk.viewer.scene.terrainProvider =
       new Cesium.EllipsoidTerrainProvider({})
+    for (let i = 0; i < YJ.Analysis.AnalysesResults.length; i++) {
+      if (YJ.Analysis.AnalysesResults[i].type === 'ContourAnalysis') {
+        YJ.Analysis.AnalysesResults[i].destroy()
+      }
+    }
     syncSplitData(this.sdk, this.options.id)
 
     clearTimeout(this.#updateModelTimeout)
@@ -156,7 +161,7 @@ class BaseTerrain extends BaseSource {
     }
     setActiveViewer(0)
     closeRotateAround(this.sdk)
-  closeViewFollow(this.sdk)
+    closeViewFollow(this.sdk)
 
     if (this.options.customView && this.options.customView.relativePosition && this.options.customView.orientation) {
       let orientation = {
@@ -247,7 +252,9 @@ class BaseTerrain extends BaseSource {
         }
         this.originalOptions = this.deepCopyObj(this.options)
         this._DialogObject.close()
-        this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
+        let cdoptions = this.deepCopyObj(this.options)
+        cdoptions.host = ''
+        this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(cdoptions)
       },
       // resetCallBack: () => {
       //   this.name = this.originalOptions.name

src/Obj/Base/BatchModel/_element.js

@@ -0,0 +1,24 @@
+function html() {
+  return `
+    <span class="custom-divider"></span>
+    <div class="div-item">
+        <div class="row">
+            <div class="col add-type-box">
+                <span class="label" style="flex: 0 0 56px;">添加方式</span>
+                <div class="add-type"></div>
+            </div>
+            <div class="col">
+                <span class="label">间距</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="1" max="99999" @model="spacing">
+                    <span class="unit">米</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <span class="custom-divider"></span>
+    `
+}
+
+export { html }

src/Obj/Base/BatchModel/eventBinding.js

@@ -0,0 +1,92 @@
+class eventBinding {
+  constructor() {
+    this.element = {}
+  }
+  static event = {}
+
+  getEvent(name) {
+    return eventBinding.event[name]
+  }
+
+  getEventAll() {
+    return eventBinding.event
+  }
+
+  setEvent(name, event) {
+    eventBinding.event[name] = event
+  }
+
+  on(that, elements) {
+    for (let i = 0; i < elements.length; i++) {
+      let Event = []
+      let isEvent = false
+      let removeName = []
+      if (!elements[i] || !elements[i].attributes) {
+        continue;
+      }
+      for (let m of elements[i].attributes) {
+        switch (m.name) {
+          case '@model': {
+            isEvent = true
+            if (elements[i].type == 'checkbox') {
+              Event.push((e) => { that[m.value] = e.target.checked })
+              elements[i].checked = that[m.value]
+            }
+            else {
+              Event.push((e) => {
+                let value = e.target.value
+                if (e.target.type == 'number') {
+                  value = Number(value)
+                }
+                that[m.value] = value
+              })
+              if (elements[i].nodeName == 'IMG') {
+                elements[i].src = that[m.value]
+              }
+              else {
+                elements[i].value = that[m.value]
+              }
+            }
+            if (this.element[m.value]) {
+              this.element[m.value].push(elements[i])
+            }
+            else {
+              this.element[m.value] = [elements[i]]
+            }
+            removeName.push(m.name)
+            break;
+          }
+          case '@click': {
+            elements[i].addEventListener('click', (e) => {
+              if (typeof (that.Dialog[m.value]) === 'function') {
+                that.Dialog[m.value](e)
+              }
+            });
+            removeName.push(m.name)
+            // elements[i].attributes.removeNamedItem(m.name)
+            break;
+          }
+        }
+        // elements[i].attributes[m] = undefined
+      }
+      for (let n = 0; n < removeName.length; n++) {
+        elements[i].attributes.removeNamedItem(removeName[n])
+      }
+
+      if (isEvent) {
+        let ventType = 'input'
+        if (elements[i].tagName != 'INPUT' || elements[i].type == 'checkbox') {
+          ventType = 'change'
+        }
+        elements[i].addEventListener(ventType, (e) => {
+          for (let t = 0; t < Event.length; t++) {
+            Event[t](e)
+          }
+        });
+      }
+    }
+  }
+}
+
+const EventBinding = new eventBinding();
+export default EventBinding;

src/Obj/Base/BatchModel/index.js

@@ -0,0 +1,681 @@
+/**
+ * @description 批量模型
+ */
+import Dialog from '../../Element/Dialog';
+import { html } from "./_element";
+import EventBinding from '../../Element/Dialog/eventBinding';
+import Base from "../index";
+import { syncData } from '../../../Global/MultiViewportMode'
+import Model from '../BaseSource/BaseModel/Model'
+import { legp } from '../../Element/datalist'
+
+import DrawPolyline from '../../../Draw/drawPolyline'
+import DrawPolygon from '../../../Draw/drawPolygon'
+import DrawThreeRect from '../../../Draw/drawThreeRect'
+import DrawPoint from '../../../Draw/drawPoint'
+import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
+
+import { setSplitDirection, syncSplitData, setActiveId } from '../../../Global/SplitScreen'
+
+class BatchModel extends Base {
+  /**
+   * @constructor
+   * @param sdk
+   * @description 批量模型
+   * @param options {object} 批量模型属性
+   * @param options.name=未命名对象 {string} 名称
+   * @param options.type=polygon {string} 线类型(line,polygon)
+   * @param options.url=polygon {string} 线类型(line,polygon,point)
+   * @param options.spacing= {number} 间距
+   * @param options.show=true {boolean}
+   * @param Dialog {object} 弹框对象
+   * @param Dialog.confirmCallBack {function} 弹框确认时的回调
+   * */
+  constructor(sdk, options = {}, callback = null, _Dialog = {}) {
+    super(sdk, options);
+    this.viewer = this.sdk.viewer
+    this.options.name = options.name || '批量模型'
+    this.options.type = options.type || '面'
+    this.options.url = options.url || ''
+    this.options.spacing = options.spacing || 50
+    this.options.positions = options.positions || []
+    this.options.show = (options.show || options.show === false) ? options.show : true
+    this.callback = callback
+    this.Dialog = _Dialog
+    this._EventBinding = new EventBinding()
+    this._elms = {};
+    this.pointArr = []
+    this.sdk.addIncetance(this.options.id, this)
+    // BatchModel.computeDis(this)
+    // if (this.options.positions.length > 0 || this.options.positions.lng) {
+    if (options.type && options.spacing != undefined) {
+      // BatchModel.computeDis(this)
+
+      let Draw
+      switch (options.type) {
+        case '点':
+          Draw = new DrawPoint(this.sdk)
+          break;
+        case '线':
+          Draw = new DrawPolyline(this.sdk)
+          break;
+        case '面':
+          Draw = new DrawThreeRect(this.sdk)
+          break;
+        default:
+          break;
+      }
+      Draw && Draw.start((a, positions) => {
+        this.options.positions = positions;
+        // this.callback(this.options);
+        (this.options.positions.length || this.options.positions.lng) && BatchModel.computeDis(this)
+      })
+
+    } else {
+      this.edit(true)
+    }
+  }
+
+  // 计算距离
+  static async computeDis(that) {
+    let fromDegreesArray = []
+    let arr
+    let posiArr = []
+    let array = []
+    if (that.options.type == '面') {
+      that.options.positions.forEach(item => {
+        fromDegreesArray.push(item.lng, item.lat)
+      })
+      // arr = that.generateInterpolatedPoints(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray), that.options.spacing)
+      arr = await that.computedArea(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray), that.options.spacing)
+      array[0] = arr
+      array[1] = that.calculateRoadAngle(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)[0], Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)[3])
+      arr.forEach((item, index) => {
+        const cartographic = Cesium.Cartographic.fromCartesian(
+          item // Cartesian3对象 {x, y, z}
+        );
+        const longitude = Cesium.Math.toDegrees(cartographic.longitude);
+        const latitude = Cesium.Math.toDegrees(cartographic.latitude);
+        const height = cartographic.height;
+        posiArr.push({
+          lng: longitude,
+          lat: latitude,
+          alt: height
+        })
+      })
+    } else if (that.options.type == '线') {
+      that.options.positions.forEach(item => {
+        fromDegreesArray.push(item.lng, item.lat)
+      })
+      array = await that.linePoint(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray), that.options.spacing)
+      arr = array[0]
+      that.pointArr = arr
+      arr.forEach((item, index) => {
+        const cartographic = Cesium.Cartographic.fromCartesian(
+          item // Cartesian3对象 {x, y, z}
+        );
+        const longitude = Cesium.Math.toDegrees(cartographic.longitude);
+        const latitude = Cesium.Math.toDegrees(cartographic.latitude);
+        const height = cartographic.height;
+        posiArr.push({
+          lng: longitude,
+          lat: latitude,
+          alt: height
+        })
+      })
+    } else if (that.options.type == '点') {
+      let height = await that.getClampToHeight({ lng: that.options.positions.lng, lat: that.options.positions.lat })
+      posiArr = [{ lng: that.options.positions.lng, lat: that.options.positions.lat, alt: height }]
+      // posiArr = [that.options.positions]
+      that.pointArr = posiArr
+    }
+    let params = {
+      type: that.options.type,
+      positions: posiArr,
+      rotate: that.options.type == '点' ? undefined : array[1]
+    }
+    that.callback(params)
+    // posiArr.forEach((item, index) => {
+    //   let model = new Model(that.sdk, {
+    //     id: 'model' + index,
+    //     show: that.options.show,
+    //     url: that.options.url,
+    //     position: item,
+    //     rotate: that.options.type == '点' ? undefined : { x: 0, y: 0, z: array[1] && (array[1][index] || array[1]) }
+    //   })
+    //   that.pointArr.push(model)
+    // })
+  }
+  async linePoint(polygonPositions, spacing) {
+    let boundaryPoints = [];
+    let boundaryAngle = [];
+    for (let i = 0; i < polygonPositions.length - 1; i++) {
+
+      const start = polygonPositions[i];
+      const end = polygonPositions[(i + 1) % polygonPositions.length];
+      const segmentLength = Cesium.Cartesian3.distance(start, end);
+      const segments = Math.ceil(segmentLength / spacing);
+
+      for (let j = 0; j <= segments; j++) {
+        const ratio = j / segments;
+        let point = Cesium.Cartesian3.lerp(
+          start, end, ratio, new Cesium.Cartesian3()
+        );
+
+        const cartographic = Cesium.Cartographic.fromCartesian(
+          point // Cartesian3对象 {x, y, z}
+        );
+        const longitude = Cesium.Math.toDegrees(cartographic.longitude);
+        const latitude = Cesium.Math.toDegrees(cartographic.latitude);
+
+
+        let height = await this.getClampToHeight({ lng: longitude, lat: latitude })
+        point = Cesium.Cartesian3.fromDegrees(longitude, latitude, height);
+
+        boundaryPoints.push(point);
+        if (j != segments || i == polygonPositions.length - 2) {
+          boundaryAngle.push(this.calculateRoadAngle(start, end))
+        }
+      }
+    }
+    return [[...new Set(boundaryPoints
+      .map(p => `${p.x},${p.y},${p.z}`))]
+      .map(str => {
+        const [x, y, z] = str.split(',').map(Number);
+        return new Cesium.Cartesian3(x, y, z);
+      }), boundaryAngle];
+  }
+  calculateRoadAngle(startPoint, endPoint) {
+    const normal = Cesium.Ellipsoid.WGS84.geodeticSurfaceNormal(startPoint);
+    const enuMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(startPoint, undefined, normal);
+    const inverseMatrix = Cesium.Matrix4.inverse(enuMatrix, new Cesium.Matrix4());
+
+    const localEnd = Cesium.Matrix4.multiplyByPoint(inverseMatrix, endPoint, new Cesium.Cartesian3());
+    const horizontalVec = new Cesium.Cartesian2(localEnd.x, localEnd.y);
+    Cesium.Cartesian2.normalize(horizontalVec, horizontalVec);
+
+    const north = new Cesium.Cartesian2(1, 0);
+
+    let angle = Cesium.Cartesian2.angleBetween(north, horizontalVec);
+    angle = Cesium.Math.toDegrees(angle)
+    const cross = Cesium.Cartesian2.cross(north, horizontalVec, new Cesium.Cartesian2());
+    // return cross < 0 ? angle : - angle;
+    return cross < 0 ? -angle : angle;
+  }
+  generateInterpolatedPoints(polygonPositions, spacing) {
+    // 1. 边界点插值
+    const boundaryPoints = [];
+
+    for (let i = 0; i < polygonPositions.length; i++) {
+
+      const start = polygonPositions[i];
+      const end = polygonPositions[(i + 1) % polygonPositions.length];
+      const segmentLength = Cesium.Cartesian3.distance(start, end);
+      const segments = Math.ceil(segmentLength / spacing);
+
+      for (let j = 0; j <= segments; j++) {
+        const ratio = j / segments;
+        const point = Cesium.Cartesian3.lerp(
+          start, end, ratio, new Cesium.Cartesian3()
+        );
+        boundaryPoints.push(point);
+      }
+    }
+
+    // 2. 内部网格生成
+    const extent = this.computePolygonExtent(polygonPositions);
+    let result = this.createGridFromBBox(extent, this.options.spacing)
+    // const extent = Cesium.Rectangle.fromCartesianArray(polygonPositions);
+
+    const gridPoints = [];
+    // const polygon = new Cesium.PolygonHierarchy(polygonPositions);
+    var polygon = []
+    this.options.positions.forEach(item => {
+      polygon.push([item.lng, item.lat])
+    })
+    polygon.push(polygon[0])
+    for (let x = extent.west; x <= extent.east; x += result.lonStep) {
+      for (let y = extent.south; y <= extent.north; y += result.latStep) {
+        const position = Cesium.Cartesian3.fromDegrees(x, y);
+        const point = turf.point([x, y]);
+        const polygonTurf = turf.polygon([polygon]);
+        const isInside = turf.booleanPointInPolygon(point, polygonTurf);
+        isInside && gridPoints.push(position)
+      }
+    }
+
+    // 3. 合并结果并去重
+    // return [...new Set([...boundaryPoints, ...gridPoints]
+    return [...new Set([...gridPoints]
+      .map(p => `${p.x},${p.y},${p.z}`))]
+      .map(str => {
+        const [x, y, z] = str.split(',').map(Number);
+        return new Cesium.Cartesian3(x, y, z);
+      });
+  }
+
+  createGridFromBBox(bbox, spacing) {
+    const earthRadius = 6378137; // WGS84椭球体长半轴
+    // 计算经度方向网格数
+    const lonDistance = Cesium.Cartesian3.distance(
+      Cesium.Cartesian3.fromDegrees(bbox.west, (bbox.south + bbox.north) / 2, 0),
+      Cesium.Cartesian3.fromDegrees(bbox.east, (bbox.south + bbox.north) / 2, 0)
+    );
+    const lonCount = Math.ceil(lonDistance / spacing);
+
+    // 计算纬度方向网格数
+    const latDistance = Cesium.Cartesian3.distance(
+      Cesium.Cartesian3.fromDegrees((bbox.west + bbox.east) / 2, bbox.south, 0),
+      Cesium.Cartesian3.fromDegrees((bbox.west + bbox.east) / 2, bbox.north, 0)
+    );
+    const latCount = Math.ceil(latDistance / spacing);
+    // 生成网格线
+    const lonStep = (bbox.east - bbox.west) / lonCount;
+    const latStep = (bbox.north - bbox.south) / latCount;
+    return { lonStep, latStep }
+  }
+
+  computePolygonExtent(positions) {
+    // 计算多边形经纬度范围
+    const cartographics = positions.map(p =>
+      Cesium.Cartographic.fromCartesian(p));
+    const lons = cartographics.map(c => Cesium.Math.toDegrees(c.longitude));
+    const lats = cartographics.map(c => Cesium.Math.toDegrees(c.latitude));
+    return {
+      west: Math.min(...lons),
+      east: Math.max(...lons),
+      south: Math.min(...lats),
+      north: Math.max(...lats)
+    };
+  }
+  async computedArea(polygonPositions, spacing) {
+    let dis12 = Cesium.Cartesian3.distance(polygonPositions[0], polygonPositions[1]);
+    let dis23 = Cesium.Cartesian3.distance(polygonPositions[1], polygonPositions[2]);
+    let vec12 = Cesium.Cartesian3.subtract(polygonPositions[1], polygonPositions[0], new Cesium.Cartesian3());
+    let vec23 = Cesium.Cartesian3.subtract(polygonPositions[2], polygonPositions[1], new Cesium.Cartesian3());
+
+    let num12 = Math.ceil(dis12 / spacing);
+    let num23 = Math.ceil(dis23 / spacing);
+
+    let line1 = []
+    for (let i = 0; i < num12; i++) {
+      line1.push(await this.calculatePointB(polygonPositions[0], polygonPositions[1], i * spacing))
+    }
+    let line2 = []
+    for (let i = 0; i < num12; i++) {
+      line2.push(await this.calculatePointB(polygonPositions[3], polygonPositions[2], i * spacing))
+    }
+
+    let allPoints = []
+    for (let i = 0; i < line1.length; i++) {
+      for (let j = 0; j < num23; j++) {
+        allPoints.push(await this.calculatePointB(line1[i], line2[i], j * spacing))
+      }
+    }
+    return allPoints
+  }
+  async calculatePointB(pointA, pointC, distance) {
+    // 将输入坐标转换为Cartesian3类型
+    // const pointA = Cesium.Cartesian3.fromDegrees(a.longitude, a.latitude, a.height);
+    // const pointC = Cesium.Cartesian3.fromDegrees(c.longitude, c.latitude, c.height);
+
+    // 计算向量AC
+    const vectorAC = Cesium.Cartesian3.subtract(pointC, pointA, new Cesium.Cartesian3());
+
+    // 计算向量AC的长度
+    const lengthAC = Cesium.Cartesian3.magnitude(vectorAC);
+
+    // 归一化向量AC
+    const unitVector = Cesium.Cartesian3.normalize(vectorAC, new Cesium.Cartesian3());
+
+    // 计算点B坐标
+    const scaledVector = Cesium.Cartesian3.multiplyByScalar(unitVector, distance, new Cesium.Cartesian3());
+    const pointB = Cesium.Cartesian3.add(pointA, scaledVector, new Cesium.Cartesian3());
+
+
+    const cartographic = Cesium.Cartographic.fromCartesian(
+      pointB // Cartesian3对象 {x, y, z}
+    );
+    const longitude = Cesium.Math.toDegrees(cartographic.longitude);
+    const latitude = Cesium.Math.toDegrees(cartographic.latitude);
+
+
+    let height = await this.getClampToHeight({ lng: longitude, lat: latitude })
+    let point = Cesium.Cartesian3.fromDegrees(longitude, latitude, height);
+    // 转换回经纬度
+    // const cartographic = Cesium.Cartographic.fromCartesian(pointB);
+    // return {
+    //   longitude: Cesium.Math.toDegrees(cartographic.longitude),
+    //   latitude: Cesium.Math.toDegrees(cartographic.latitude),
+    //   height: cartographic.height
+    // };
+    // return pointB
+    return point
+  }
+  get show() {
+    return this.options.show
+  }
+
+  set show(v) {
+    this.options.show = v
+    for (let i = 0; i < this.pointArr.length; i++) {
+      this.pointArr[i].show = v
+    }
+  }
+  get type() {
+    return this.options.type
+  }
+
+  set type(v) {
+    this.options.type = v
+    this._elms.type &&
+      this._elms.type.forEach(item => {
+        item.value = v
+      })
+  }
+  get spacing() {
+    return this.options.spacing
+  }
+
+  set spacing(v) {
+    this.options.spacing = v
+    this._elms.spacing &&
+      this._elms.spacing.forEach(item => {
+        item.value = v
+      })
+  }
+  /**
+   * @description 编辑框
+   * @param state=false {boolean} 状态: true打开, false关闭
+   */
+  async edit(state = false) {
+    let _this = this
+    this.originalOptions = this.deepCopyObj(this.options)
+
+    // let elms = this.sdk.viewer._container.getElementsByClassName('YJ-custom-base-dialog')
+    // for (let i = elms.length - 1; i >= 0; i--) {
+    //   this.sdk.viewer._container.removeChild(elms[i])
+    // }
+
+    if (this._DialogObject && this._DialogObject.close) {
+      this._DialogObject.close()
+      this._DialogObject = null
+    }
+
+    if (state) {
+      this._DialogObject = await new Dialog(this.sdk, this.originalOptions, {
+        title: '默认模型参数设置', left: '180px', top: '100px',
+        confirmCallBack: (options) => {
+          this.name = this.name.trim()
+          if (!this.name) {
+            // this.name = '未命名对象'
+            this.name = '飞线'
+          }
+
+          let Draw
+          switch (this.options.type) {
+            case '点':
+              Draw = new DrawPoint(this.sdk)
+              break;
+            case '线':
+              Draw = new DrawPolyline(this.sdk)
+              break;
+            case '面':
+              Draw = new DrawThreeRect(this.sdk)
+              break;
+            default:
+              break;
+          }
+          Draw && Draw.start((a, positions) => {
+            this.options.positions = positions;
+            // this.callback(this.options);
+            (this.options.positions.length || this.options.positions.lng) && BatchModel.computeDis(this)
+          })
+
+          this.originalOptions = this.deepCopyObj(this.options)
+          this._DialogObject.close()
+          this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
+          syncData(this.sdk, this.options.id)
+          syncSplitData(this.sdk, this.options.id)
+        },
+        // resetCallBack: () => {
+        //   this.reset()
+        //   console.log('22222')
+        //   this.Dialog.resetCallBack && this.Dialog.resetCallBack()
+        // },
+        // removeCallBack: () => {
+        //   console.log('33333')
+        //   this.Dialog.removeCallBack && this.Dialog.removeCallBack()
+        // },
+        closeCallBack: () => {
+          this.reset()
+          // this.entity.style = new Cesium.Cesium3DTileStyle({
+          //   color: "color('rgba(255,255,255," + this.newData.transparency + ")')",
+          //   show: true,
+          // });
+          this.Dialog.closeCallBack && this.Dialog.closeCallBack()
+        },
+        addFootElm: [
+          {
+            tagName: 'button',
+            className: 'flipe-over-y',
+            innerHTML: '重置',
+            event: [
+              'click',
+              () => {
+                this.reset()
+              }
+            ]
+          }
+        ]
+        // showCallBack: (show) => {
+        //   this.show = show
+        //   this.Dialog.showCallBack && this.Dialog.showCallBack()
+        // }
+      }, true)
+      this._DialogObject._element.body.className = this._DialogObject._element.body.className + ' flow-line-surface'
+      let contentElm = document.createElement('div');
+      contentElm.innerHTML = html()
+      this._DialogObject.contentAppChild(contentElm)
+      // 颜色组件
+      // let waterColorPicker = new YJColorPicker({
+      //   el: contentElm.getElementsByClassName("flowLine-color")[0],
+      //   size: 'mini',//颜色box类型
+      //   alpha: true,//是否开启透明度
+      //   defaultColor: this.color,
+      //   disabled: false,//是否禁止打开颜色选择器
+      //   openPickerAni: 'opacity',//打开颜色选择器动画
+      //   sure: (color) => {
+      //     this.color = color
+      //   },//点击确认按钮事件回调
+      //   clear: () => {
+      //     this.color = 'rgba(255,255,255,1)'
+      //   },//点击清空按钮事件回调
+      // })
+
+      let all_elm = contentElm.getElementsByTagName("*")
+      this._EventBinding.on(this, all_elm)
+      this._elms = this._EventBinding.element
+
+      let nameData = [
+        {
+          name: '点',
+          value: '点',
+        },
+        {
+          name: '线',
+          value: '线',
+        },
+        {
+          name: '面',
+          value: '面',
+        }
+      ]
+
+      let nameDataLegpObject = legp(
+        this._DialogObject._element.content.getElementsByClassName(
+          'add-type-box'
+        )[0],
+        '.add-type'
+      )
+      if (nameDataLegpObject) {
+        nameDataLegpObject.legp_search(nameData)
+        let nameDataLegpElm = this._DialogObject._element.content
+          .getElementsByClassName('add-type')[0]
+          .getElementsByTagName('input')[0]
+        this._elms.type = [nameDataLegpElm]
+        nameDataLegpElm.value = this.options.type
+        for (let i = 0; i < nameData.length; i++) {
+          if (nameData[i].value === nameDataLegpElm.value) {
+            nameDataLegpObject.legp_searchActive(nameData[i].value)
+            break
+          }
+        }
+        nameDataLegpElm.addEventListener('input', () => {
+          for (let i = 0; i < nameData.length; i++) {
+            if (nameData[i].value === nameDataLegpElm.value) {
+              this.type = nameData[i].value
+              break
+            }
+          }
+        })
+      }
+      // this._elms.color = [waterColorPicker]
+    } else {
+      // if (this._element_style) {
+      //   document.getElementsByTagName('head')[0].removeChild(this._element_style)
+      //   this._element_style = null
+      // }
+      // if (this._DialogObject && this._DialogObject.remove) {
+      //   this._DialogObject.remove()
+      //   this._DialogObject = null
+      // }
+    }
+  }
+  drawArea() {
+
+  }
+
+  reset() {
+    this.name = this.originalOptions.name
+    this.type = this.originalOptions.type
+    this.spacing = this.originalOptions.spacing
+    this.show = this.originalOptions.show
+    this.options.spacing = this.originalOptions.spacing
+  }
+
+  /**
+   * 飞到对应实体
+   */
+  async flyTo(options = {}) {
+    setActiveViewer(0)
+    closeRotateAround(this.sdk)
+    closeViewFollow(this.sdk)
+
+    if (this.options.customView && this.options.customView.relativePosition && this.options.customView.orientation) {
+      let orientation = {
+        heading: Cesium.Math.toRadians(this.options.customView.orientation.heading || 0.0),
+        pitch: Cesium.Math.toRadians(this.options.customView.orientation.pitch || -60.0),
+        roll: Cesium.Math.toRadians(this.options.customView.orientation.roll || 0.0)
+      }
+
+      let lng = this.options.customView.relativePosition.lng
+      let lat = this.options.customView.relativePosition.lat
+      let alt = this.options.customView.relativePosition.alt
+      let destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
+
+      let position = { lng: 0, lat: 0 }
+      if (this.options.position) {
+        position = { ...this.options.position }
+      }
+      else if (this.options.positions) {
+        position = { ...this.options.positions[0] }
+      }
+      else if (this.options.center) {
+        position = { ...this.options.center }
+      }
+      else if (this.options.start) {
+        position = { ...this.options.start }
+      }
+      else {
+        if (this.options.hasOwnProperty('lng')) {
+          position.lng = this.options.lng
+        }
+        if (this.options.hasOwnProperty('lat')) {
+          position.lat = this.options.lat
+        }
+        if (this.options.hasOwnProperty('alt')) {
+          position.alt = this.options.alt
+        }
+      }
+      // 如果没有高度值，则获取紧贴高度计算
+      // if (!position.hasOwnProperty('alt')) {
+      //   position.alt = await this.getClampToHeight(position)
+      // }
+      lng = this.options.customView.relativePosition.lng + position.lng
+      lat = this.options.customView.relativePosition.lat + position.lat
+      alt = this.options.customView.relativePosition.alt + position.alt
+      destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
+      this.sdk.viewer.camera.flyTo({
+        destination: destination,
+        orientation: orientation
+      })
+    }
+    else {
+      let positionArray = []
+      if (this.options.positions.length > 0) {
+        for (let i = 0; i < this.options.positions.length; i++) {
+          let a = Cesium.Cartesian3.fromDegrees(
+            this.options.positions[i].lng,
+            this.options.positions[i].lat,
+            this.options.positions[i].alt
+          )
+          positionArray.push(a.x, a.y, a.z)
+        }
+        let BoundingSphere = Cesium.BoundingSphere.fromVertices(positionArray)
+        this.viewer.camera.flyToBoundingSphere(BoundingSphere, {
+          offset: {
+            heading: Cesium.Math.toRadians(0.0),
+            pitch: Cesium.Math.toRadians(-20.0),
+            roll: Cesium.Math.toRadians(0.0)
+          }
+        })
+      } else if (this.options.positions.lng) {
+        let orientation = {
+          heading: Cesium.Math.toRadians(0.0),
+          pitch: Cesium.Math.toRadians(-60.0),
+          roll: Cesium.Math.toRadians(0.0)
+        }
+        this.sdk.viewer.camera.flyTo({
+          destination: Cesium.Cartesian3.fromDegrees(this.options.positions.lng, this.options.positions.lat, this.options.positions.alt + 100),
+          // orientation: orientation
+        })
+
+      }
+
+    }
+  }
+  /**
+   * 删除
+   */
+  async remove() {
+    for (let i = 0; i < this.pointArr.length; i++) {
+      this.pointArr[i].remove()
+    }
+
+    this.pointArr = []
+    this.positions = []
+    this.entity = null
+
+    if (this._DialogObject && !this._DialogObject.isDestroy) {
+      this._DialogObject.close()
+      this._DialogObject = null
+    }
+    await this.sdk.removeIncetance(this.options.id)
+    await syncData(this.sdk, this.options.id)
+  }
+
+  flicker() { }
+}
+
+export default BatchModel

src/Obj/Base/BillboardObject/index.js

@@ -63,9 +63,9 @@ class BillboardObject extends Base {
    *@param options.label {object} 标注文字的参数
    *@param [options.label.text] {string} 标注中文字
    *@param [options.label.show=true] {boolean} 标注文字显示/隐藏
-   *@param [options.label.fontFamily=0] {number} 标注文字字体 0：思源黑体；1：庞门正道标题体；2：数黑体
+   *@param [options.label.fontFamily=0] {number} 标注文字字体 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
    *@param [options.label.fontSize=39] {number} 标注文字大小 单位px，微软雅黑
-   *@param [options.label.color=#07f8e4] {string} 标注文字颜色
+   *@param [options.label.color=#00ffff] {string} 标注文字颜色
    *@param _Dialog {object} 弹框事件
    *@param _Dialog.confirmCallBack {function} 弹框确认时的回调
    *@param _Dialog.instructSubmit(id,name,instruct) {function} 提交指令（ID, 名称，指令内容）
@@ -107,7 +107,7 @@ class BillboardObject extends Base {
         : true
     this.options.label.fontFamily = options.label.fontFamily || 0
     this.options.label.fontSize = options.label.fontSize || 39
-    this.options.label.color = options.label.color || '#FFFF00'
+    this.options.label.color = options.label.color || '#00ffff'
     this.options.positions = options.positions = options.positions || {}
     this.options.positions.lng = Number(
       Number(options.positions.lng || 0).toFixed(8)
@@ -211,8 +211,9 @@ class BillboardObject extends Base {
     let index = 0
 
     let font = getFontFamily(that.labelFontFamily) || 'Helvetica'
+    let url = that.replaceHost(that.options.billboard.image, that.options.host)
     that._frameImages = []
-    if (that.options.billboard.image && that.options.billboard.image.endsWith('gif')) {
+    if (url && url.endsWith('gif')) {
       isGlf = true
       switch (that.options.heightMode) {
         case 2:
@@ -222,7 +223,7 @@ class BillboardObject extends Base {
       }
 
       let gifImg = document.createElement('img')
-      gifImg.setAttribute('rel:animated_src', that.options.billboard.image)
+      gifImg.setAttribute('rel:animated_src', url)
       gifImg.setAttribute('rel:auto_play', '1')
       const imgDiv = document.createElement('div')
       imgDiv.appendChild(gifImg)
@@ -272,7 +273,7 @@ class BillboardObject extends Base {
     else {
       let image = new Image()
       image.src =
-        that.options.billboard.image ||
+        url ||
         that.getSourceRootPath() + '/img/A-ablu-blank.png'
       switch (that.options.heightMode) {
         case 2:
@@ -432,31 +433,31 @@ class BillboardObject extends Base {
         value: '链接',
         key: 'link'
       },
-      {
-        name: 'IP摄像头',
-        value: 'IP摄像头',
-        key: 'camera'
-      },
       // {
-      //   name: 'ISC摄像头',
-      //   value: 'ISC摄像头',
-      //   key: 'isc'
+      //   name: 'IP摄像头',
+      //   value: 'IP摄像头',
+      //   key: 'camera'
+      // },
+      // // {
+      // //   name: 'ISC摄像头',
+      // //   value: 'ISC摄像头',
+      // //   key: 'isc'
+      // // },
+      // // {
+      // //   name: '传感器',
+      // //   value: '传感器',
+      // //   key: 'sensor'
+      // // },
+      // {
+      //   name: '全景图',
+      //   value: '全景图',
+      //   key: 'vr'
       // },
       // {
-      //   name: '传感器',
-      //   value: '传感器',
-      //   key: 'sensor'
-      // },
-      {
-        name: '全景图',
-        value: '全景图',
-        key: 'vr'
-      },
-      {
-        name: '物资',
-        value: '物资',
-        key: 'goods'
-      }
+      //   name: '物资',
+      //   value: '物资',
+      //   key: 'goods'
+      // }
     ]
   }
 
@@ -464,14 +465,24 @@ class BillboardObject extends Base {
     return this.options.show
   }
   set show(v) {
-    this.options.show = v
-    this.originalOptions.show = v
-    this.entity && (this.entity.show = v)
+    if(!this.isShowView) {
+      this.options.show = v
+      this.originalOptions.show = v
+    }
+    if(!this.showView || this.showView == 3) {
+      this.entity && (this.entity.show = this.options.show)
+    }
+    else {
+      this.entity && (this.entity.show = false)
+    }
     syncData(this.sdk, this.options.id)
     syncSplitData(this.sdk, this.options.id)
+
     if (this._DialogObject && this._DialogObject.showBtn) {
-      this._DialogObject.showBtn.checked = v
+      this._DialogObject.showBtn.checked = this.options.show
     }
+
+    this.isShowView = false
     // if (v) {
     //   if (this.diffuseShow) {
     //     this.diffuseShow = true
@@ -720,11 +731,21 @@ class BillboardObject extends Base {
   }
 
   get billboardImage() {
-    return this.options.billboard.image
+    let url = this.options.billboard.image
+    if (url && !url.startsWith("http")) {
+      //说明是本地的json，在磁盘中存在的
+      if (!url.includes(":")) {
+        if (this.options.host) {
+          let o = new URL(url, this.options.host)
+          url = o.href
+        }
+      }
+    }
+    return url
   }
   set billboardImage(v) {
     let _this = this
-    this.options.billboard.image = v
+    this.options.billboard.image = this.replaceHost(v, this.options.host)
     let url =
       this.options.billboard.image ||
       getBillboardDefaultUrl(this.options.billboard.defaultImage) ||
@@ -755,6 +776,8 @@ class BillboardObject extends Base {
       _this._frameImages = []
       superGif.load(function (status) {
         if (status == 404) {
+          let width = 31
+          let height = 36
           canvas = document.createElement('canvas')
           canvas.width = 0
           canvas.height = 0
@@ -844,6 +867,8 @@ class BillboardObject extends Base {
         billboardH = height * (31 / width)
       }
       image.onerror = function (err) {
+        let width = 31
+        let height = 36
         canvas.width = 0
         canvas.height = 0
         billboardH = 0
@@ -916,22 +941,22 @@ class BillboardObject extends Base {
     return this.options.label.color
   }
   set labelColor(v) {
-    this.options.label.color = v
+    this.options.label.color = v || '#00ffff'
     this.renewPoint()
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini', //颜色box类型
           alpha: true, //是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.label.color,
           disabled: false, //是否禁止打开颜色选择器
           openPickerAni: 'opacity', //打开颜色选择器动画
           sure: c => {
             this.labelColor = c
           }, //点击确认按钮事件回调
           clear: () => {
-            this.labelColor = 'rgba(255,255,255,1)'
+            this.labelColor = 'rgba(0,255,255,1)'
           } //点击清空按钮事件回调
         })
         this._elms.labelColor[i] = colorPicker
@@ -993,7 +1018,7 @@ class BillboardObject extends Base {
   //   this.options.diffuseColor = v
   //   if (this._elms.diffuseColor) {
   //     this._elms.diffuseColor.forEach((item, i) => {
-  //       let diffuseColorPicker = new ewPlugins('colorpicker', {
+  //       let diffuseColorPicker = new YJColorPicker({
   //         el: item.el,
   //         size: 'mini',//颜色box类型
   //         alpha: false,//是否开启透明度
@@ -1069,7 +1094,7 @@ class BillboardObject extends Base {
   //   this.options.scanColor = v
   //   if (this._elms.scanColor) {
   //     this._elms.scanColor.forEach((item, i) => {
-  //       let scanColorPicker = new ewPlugins('colorpicker', {
+  //       let scanColorPicker = new YJColorPicker({
   //         el: item.el,
   //         size: 'mini',//颜色box类型
   //         alpha: false,//是否开启透明度
@@ -1497,10 +1522,11 @@ class BillboardObject extends Base {
   }
 
   set billboardDefaultImage(v) {
-    setBillboardDefaultUrl(v, this.options.billboard.defaultImage)
+    let url = this.replaceHost(v, this.options.host)
+    setBillboardDefaultUrl(url, this.options.billboard.defaultImage)
     this._elms.billboardDefaultImage &&
       this._elms.billboardDefaultImage.forEach(item => {
-        item.src = v
+        item.src = url
       })
   }
 
@@ -1575,8 +1601,10 @@ class BillboardObject extends Base {
             }
             this.originalOptions = this.deepCopyObj(this.options)
             this._DialogObject.close()
+            let cdoptions = this.deepCopyObj(this.options)
+            cdoptions.host = ''
             this.Dialog.confirmCallBack &&
-              this.Dialog.confirmCallBack(this.originalOptions)
+              this.Dialog.confirmCallBack(cdoptions)
             syncData(this.sdk, this.options.id)
             syncSplitData(this.sdk, this.options.id)
           },
@@ -1631,7 +1659,7 @@ class BillboardObject extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('point-object-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName('labelColor')[0],
         size: 'mini', //颜色box类型
         alpha: true, //是否开启透明度
@@ -1646,7 +1674,7 @@ class BillboardObject extends Base {
         } //点击清空按钮事件回调
       })
 
-      // let diffuseColorPicker = new ewPlugins('colorpicker', {
+      // let diffuseColorPicker = new YJColorPicker({
       //   el: contentElm.getElementsByClassName("diffuseColor")[0],
       //   size: 'mini',//颜色box类型
       //   alpha: false,//是否开启透明度
@@ -1660,7 +1688,7 @@ class BillboardObject extends Base {
       //     this.diffuseColor = 'rgba(255,255,255,1)'
       //   },//点击清空按钮事件回调
       // })
-      // let scanColorPicker = new ewPlugins('colorpicker', {
+      // let scanColorPicker = new YJColorPicker({
       //   el: contentElm.getElementsByClassName("scanColor")[0],
       //   size: 'mini',//颜色box类型
       //   alpha: false,//是否开启透明度
@@ -1812,7 +1840,13 @@ class BillboardObject extends Base {
           case '2':
           case 3:
           case '3':
-            this.getClampToHeight(this.options.positions).then(h => {
+            let objectsToExclude = []
+            for (let [key, value] of this.sdk.entityMap) {
+              if (value.type === 'RadarScanStereoscopic' && value.entity) {
+                objectsToExclude.push(value.entity)
+              }
+            }
+            this.getClampToHeight(this.options.positions, objectsToExclude).then(h => {
               this.alt = Number(h.toFixed(2))
               heightElm.value = this.alt
             })
@@ -1876,7 +1910,13 @@ class BillboardObject extends Base {
                     break
                   case 3:
                   case '3':
-                    this.getClampToHeight(this.options.positions).then(h => {
+                    let objectsToExclude = []
+                    for (let [key, value] of this.sdk.entityMap) {
+                      if (value.type === 'RadarScanStereoscopic' && value.entity) {
+                        objectsToExclude.push(value.entity)
+                      }
+                    }
+                    this.getClampToHeight(this.options.positions, objectsToExclude).then(h => {
                       this.alt = Number(h.toFixed(2))
                     })
                     this.heightMode = 3
@@ -2318,6 +2358,9 @@ class BillboardObject extends Base {
   }
 
   async updateHeight() {
+    if (!this.sdk || !this.sdk.viewer || !this.sdk.viewer.scene) {
+      return
+    }
     let height
     let height2
     let point1 = new Cesium.Cartesian3.fromDegrees(
@@ -2330,9 +2373,14 @@ class BillboardObject extends Base {
       this.options.positions.lat,
       10000000000000
     )
-    let updatedCartesians = await this.sdk.viewer.scene.clampToHeightMostDetailed(
-      [point1]
-    )
+
+    let objectsToExclude = []
+    for (let [key, value] of this.sdk.entityMap) {
+      if (value.type === 'RadarScanStereoscopic' && value.entity) {
+        objectsToExclude.push(value.entity)
+      }
+    }
+    let updatedCartesians = await this.sdk.viewer.scene.clampToHeightMostDetailed([point1], objectsToExclude)
     if (updatedCartesians && updatedCartesians[0]) {
       height = this.cartesian3Towgs84(updatedCartesians[0], this.sdk.viewer).alt
     }
@@ -2471,7 +2519,13 @@ class BillboardObject extends Base {
       }
       // 如果没有高度值，则获取紧贴高度计算
       if (!position.hasOwnProperty('alt')) {
-        position.alt = await this.getClampToHeight(position)
+        let objectsToExclude = []
+        for (let [key, value] of this.sdk.entityMap) {
+          if (value.type === 'RadarScanStereoscopic' && value.entity) {
+            objectsToExclude.push(value.entity)
+          }
+        }
+        position.alt = await this.getClampToHeight(position, objectsToExclude)
       }
       lng = this.options.customView.relativePosition.lng + position.lng
       lat = this.options.customView.relativePosition.lat + position.lat
@@ -2482,7 +2536,13 @@ class BillboardObject extends Base {
         orientation: orientation
       })
     } else {
-      let height = await this.getClampToHeight(this.options.positions)
+      let objectsToExclude = []
+      for (let [key, value] of this.sdk.entityMap) {
+        if (value.type === 'RadarScanStereoscopic' && value.entity) {
+          objectsToExclude.push(value.entity)
+        }
+      }
+      let height = await this.getClampToHeight(this.options.positions, objectsToExclude)
       this.sdk.viewer.camera.flyTo({
         orientation: options.orientation,
         destination: Cesium.Cartesian3.fromDegrees(
@@ -2650,7 +2710,13 @@ class BillboardObject extends Base {
       }
       // 如果没有高度值，则获取紧贴高度计算
       if (!position.hasOwnProperty('alt')) {
-        position.alt = await this.getClampToHeight(position)
+        let objectsToExclude = []
+        for (let [key, value] of this.sdk.entityMap) {
+          if (value.type === 'RadarScanStereoscopic' && value.entity) {
+            objectsToExclude.push(value.entity)
+          }
+        }
+        position.alt = await this.getClampToHeight(position, objectsToExclude)
       }
       relativePosition = {
         lng: cameraPosition84.lng - position.lng,

src/Obj/Base/CircleDiffuse/index.js

@@ -6,7 +6,7 @@ import EventBinding from '../../Element/Dialog/eventBinding';
 import richText from "../../Element/richText";
 import MouseEvent from '../../../Event/index'
 import LabelObject from '../LabelObject'
-import { syncData } from '../../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../../Global/MultiViewportMode'
 import { legp } from '../../Element/datalist';
 import { getFontList, getFontFamilyName } from '../../Element/fontSelect'
 import MouseTip from '../../../MouseTip'
@@ -75,8 +75,8 @@ class CircleDiffuse extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -223,16 +223,31 @@ class CircleDiffuse extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      this.entity.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
+      }
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        this.entity.show = this.options.show 
+        if (this.options.label.show) {
+          this.label.show = this.options.show 
+        }
+      }
+      else {
+        this.entity.show = false
+        if (this.options.label.show) {
+          this.label.show = false
+        }
+      }
+
+      this.isShowView = false
+      
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
       if (this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
-      if (this.options.label.show) {
-        this.label.show = v
-      }
+      
     } else {
       console.error("参数必须为boolean")
     }
@@ -362,6 +377,7 @@ class CircleDiffuse extends Base {
     return this.options.circle
   }
   set circle(v) {
+    console.log(v)
     this.options.circle = v || [{ radius: 10 }]
     for (let i = 0; i < this.options.circle.length; i++) {
       if(this.options.circle[i].radius>999999) {
@@ -427,8 +443,9 @@ class CircleDiffuse extends Base {
     return this.options.label.show
   }
   set labelShow(v) {
+    let sdkD = get2DSdk().sdkD
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
       this.label.show = v
     }
     else {
@@ -462,7 +479,7 @@ class CircleDiffuse extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -562,7 +579,7 @@ class CircleDiffuse extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -573,7 +590,7 @@ class CircleDiffuse extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -589,7 +606,7 @@ class CircleDiffuse extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -615,7 +632,7 @@ class CircleDiffuse extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1104,7 +1121,7 @@ class CircleDiffuse extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('circle-diffuse-edit-tabs', undefined, this.sdk)
 
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1118,7 +1135,7 @@ class CircleDiffuse extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1132,7 +1149,7 @@ class CircleDiffuse extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1146,7 +1163,7 @@ class CircleDiffuse extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,
@@ -1321,7 +1338,7 @@ class CircleDiffuse extends Base {
   }
 
   async remove() {
-    this.label.remove()
+    this.label && this.label.remove()
     this.entity && this.sdk.viewer.entities.remove(this.entity)
     this.entity2 && this.sdk.viewer.entities.remove(this.entity2)
     this.entity = null
@@ -1405,7 +1422,7 @@ class CircleDiffuse extends Base {
                   }
                 }
                 this._radius = radius
-                inputElm.value = value
+                // inputElm.value = value
                 CircleDiffuse.create(this)
               }
             }
@@ -1446,11 +1463,11 @@ class CircleDiffuse extends Base {
 
 
         // 颜色组件
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: circleElm.getElementsByClassName("color")[0],
           size: 'mini',//颜色box类型
           alpha: false,//是否开启透明度
-          defaultColor: this.options.circle[i].color,
+          defaultColor: this.options.circle[i].color || this.options.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (color) => {

src/Obj/Base/CircleObject/index.js

@@ -23,7 +23,7 @@ class CircleObject extends Base {
    * @param options.id {string} 标注id
    * @param options.name {string} 名称
    * @param options.show=true {boolean} 显示/隐藏
-   * @param options.color="#36c4ff" {string} 颜色
+   * @param options.color="#ff000080" {string} 颜色
    * @param options.center {object} 位置
    * @param options.center.lng {object} 经度
    * @param options.center.lat {object} 纬度
@@ -31,21 +31,21 @@ class CircleObject extends Base {
    * @param options.radius=10 {object}半径
    * @param options.line {object} 边框
    * @param options.line.width=2 {string} 边框宽
-   * @param options.line.color="rgba(155, 155, 124, 0.89)" {string} 边框颜色
+   * @param options.line.color="#ff000080" {string} 边框颜色
    * @param options.label {object} 标注
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
    */
   constructor(sdk, options = {}) {
     super(sdk, options);
     this.options.name = options.name || '未命名对象'
-    this.options.color = options.color || "#36c4ff"
+    this.options.color = options.color || "#ff000080"
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
     this.options.radius = (options.radius || options.radius === 0) ? options.radius : 10
     this.options.show = (options.show || options.show === false) ? options.show : true
     this.options.center = options.center || {}
     this.options.line = options.line || {}
-    this.options.line.width = this.options.line.width || 2
-    this.options.line.color = this.options.line.color || 'rgba(155, 155, 124, 0.89)'
+    this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     options.label = options.label || {}
     this._elms = {};
@@ -58,8 +58,8 @@ class CircleObject extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -216,31 +216,31 @@ class CircleObject extends Base {
     return this.options.color
   }
   set color(v) {
-    this.options.color = v
+    this.options.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polygon) {
       return
     }
-    let material = Cesium.Color.fromCssColorString(v)
+    let material = Cesium.Color.fromCssColorString(this.options.color)
     if (this.sdk.viewer.scene.mode === 2) {
       material = new Cesium.CustomColorMaterialSource({
-        color: v
+        color: this.options.color
       })
     }
     this.entity.polygon.material = material
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
             this.color = c
           },//点击确认按钮事件回调
           clear: () => {
-            this.color = 'rgba(255,255,255,1)'
+            this.color = 'rgba(255,0,0,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.color[i] = colorPicker
@@ -252,25 +252,25 @@ class CircleObject extends Base {
     return this.options.line.color
   }
   set lineColor(v) {
-    this.options.line.color = v
+    this.options.line.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polyline) {
       return
     }
-    this.entity.polyline.material = Cesium.Color.fromCssColorString(v)
+    this.entity.polyline.material = Cesium.Color.fromCssColorString(this.options.line.color)
     if (this._elms.lineColor) {
       this._elms.lineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.line.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
             this.lineColor = c
           },//点击确认按钮事件回调
           clear: () => {
-            this.lineColor = 'rgba(255,255,255,1)'
+            this.lineColor = 'rgba(255,0,0,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.lineColor[i] = lineColorPicker
@@ -282,8 +282,8 @@ class CircleObject extends Base {
     return this.options.line.width
   }
   set lineWidth(v) {
-    this.options.line.width = v
-    this.entity.polyline.width = v
+    this.options.line.width = ((v || v === 0) ? v : 3)
+    this.entity.polyline.width = this.options.line.width
     this._elms.lineWidth && this._elms.lineWidth.forEach((item) => {
       item.value = v
     })
@@ -333,7 +333,7 @@ class CircleObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -367,7 +367,7 @@ class CircleObject extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -467,7 +467,7 @@ class CircleObject extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -478,7 +478,7 @@ class CircleObject extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -494,7 +494,7 @@ class CircleObject extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -520,7 +520,7 @@ class CircleObject extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1151,7 +1151,7 @@ class CircleObject extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('circle-object-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1165,7 +1165,7 @@ class CircleObject extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let linecolorPicker = new ewPlugins('colorpicker', {
+      let linecolorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("lineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1179,7 +1179,7 @@ class CircleObject extends Base {
           this.lineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1193,7 +1193,7 @@ class CircleObject extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labellineColorPicker = new ewPlugins('colorpicker', {
+      let labellineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1207,7 +1207,7 @@ class CircleObject extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1221,7 +1221,7 @@ class CircleObject extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,
@@ -1878,7 +1878,7 @@ class CircleObject extends Base {
             entity = null
           }
           endpoint = that.cartesian3Towgs84(cartesian, that.viewer)
-          let radius = that.computeDistance([that.options.center, endpoint])
+          let radius = that.computeDistance2([that.options.center, endpoint])
           that.radius = radius
 
           YJ.Measure.SetMeasureStatus(false)
@@ -1904,7 +1904,7 @@ class CircleObject extends Base {
         that.event.mouse_move((movement, cartesian) => {
           entity && (entity.show = true)
           endpoint = that.cartesian3Towgs84(cartesian, that.viewer)
-          moveRadius = that.computeDistance([that.options.center, endpoint])
+          moveRadius = that.computeDistance2([that.options.center, endpoint])
           fromDegreesArray = that.createCircle(that.options.center, moveRadius)
           that.tip.setPosition(
             cartesian,

src/Obj/Base/CurvelineObject/_element.js

@@ -1,7 +1,7 @@
 import { attributeElm, labelStyleElm1, labelStyleElm2 } from '../../Element/elm_html'
 
 function html(that) {
-    return `
+  return `
     <span class="custom-divider"></span>
     <div class="div-item">
         <div class="row" style="align-items: flex-start;">
@@ -9,22 +9,15 @@ function html(that) {
                 <span class="label">名称</span>
                 <input class="input" maxlength="40" type="text" @model="name">
             </div>
-            <div class="col" style="flex: 0 0 54%;">
+            <div class="col" style="flex: 0 0 56%;">
                 <div>
                     <div class="row">
                         <div class="col input-select-unit-box">
-                            <span class="label">原始长度:</span>
+                            <div class="input-select-unit"></div>
                             <input class="input input-text" readonly="readonly" type="text" style="flex: 0 0 130px;" @model="length">
                             <div class="input-select-unit"></div>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="col input-select-fit-unit-box">
-                            <span class="label">拟合长度:</span>
-                            <input class="input input-text" readonly="readonly" type="text" style="flex: 0 0 130px;" @model="fitLength">
-                            <div class="input-select-fit-unit"></div>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>
@@ -72,7 +65,7 @@ function html(that) {
                             <span class="label">线条颜色</span>
                             <div class="color"></div>
                         </div>
-                        <div class="col">
+                        <div class="col" style="flex: 0 0 33%;">
                             <span class="label">线条宽度</span>
                             <div class="input-number input-number-unit-1" style="width: 80px;">
                                 <input class="input" type="number" title="" min="1" max="999" @model="lineWidth">
@@ -80,7 +73,7 @@ function html(that) {
                                 <span class="arrow"></span>
                             </div>
                         </div>
-                        <div class="col input-select-line-type-box">
+                        <div class="col input-select-line-type-box" style="flex: 0 0 37%;">
                             <span class="label">线条形式</span>
                             <div class="input-select-line-type"></div>
                         </div>
@@ -90,7 +83,7 @@ function html(that) {
                             <span class="label">线段缓冲</span>
                             <input class="btn-switch" type="checkbox" @model="extend">
                         </div>
-                        <div class="col">
+                        <div class="col" style="flex: 0 0 33%;">
                             <span class="label">缓冲宽度</span>
                             <div class="input-number input-number-unit-1" style="width: 80px;">
                                 <input class="input" type="number" title="" min="0" data-min="0.01" max="999999" @model="extendWidth">
@@ -98,21 +91,43 @@ function html(that) {
                                 <span class="arrow"></span>
                             </div>
                         </div>
-                        <div class="col">
+                        <div class="col" style="flex: 0 0 37%;">
                             <span class="label">缓冲颜色</span>
                             <div class="extendColor"></div>
                         </div>
                     </div>
+                    <div class="row" id="dashTextureDom">
+                        <div class="col">
+                            <span class="label">动画顺向</span>
+                            <input class="btn-switch" type="checkbox" @model="rotate">
+                        </div>
+                        <div class="col" style="flex: 0 0 33%;">
+                            <span class="label">流动速率</span>
+                            <div class="input-number input-number-unit-1" style="width: 80px;">
+                                <input class="input" type="number" title="" min="0" max="999999" step="1" @model="speed">
+                                <span class="arrow"></span>
+                            </div>
+                        </div>
+                        <div class="col" style="flex: 0 0 37%;">
+                              <span class="label lineSpace">间距</span>
+                              <div class="input-number input-number-unit-1 lineSpace" style="width: 80px;">
+                                  <input class="input" type="number" title="" min="0" max="4.5" step="0.1" @model="space">
+                                  <span class="unit">倍</span>
+                                  <span class="arrow"></span>
+                              </div>
+                        </div>
+                    </div>
                     <div class="row">
                         <div class="col">
                             <span class="label">首尾相连</span>
                             <input class="btn-switch" type="checkbox" @model="noseToTail">
                         </div>
-                        <div class="col">
+                        <div class="col" style="flex: 0 0 33%;">
                         </div>
-                        <div class="col">
+                        <div class="col" style="flex: 0 0 37%;">
                         </div>
                     </div>
+
                 </DIV-cy-tab-pane>
                 <DIV-cy-tab-pane label="标注风格">
                     ${labelStyleElm1()}

src/Obj/Base/EllipseObject/index.js

@@ -1,5 +1,5 @@
 /**
- * 圆
+ * 椭圆
  */
 import Dialog from '../../Element/Dialog';
 import cy_tabs from "../../Element/cy_html_tabs";
@@ -24,7 +24,7 @@ class EllipseObject extends Base {
    * @param options.name {string} 名称
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.center {object} 位置
-   * @param options.color="#36c4ff" {string} 颜色
+   * @param options.color="rgba(255, 0, 0, 0.5)" {string} 颜色
    * @param options.center.lng {object} 经度
    * @param options.center.lat {object} 维度
    * @param options.semiMinorAxis=10 {number} 短半轴长度
@@ -32,22 +32,22 @@ class EllipseObject extends Base {
    * @param options.bearing=0 {number} 旋转角度
    * @param options.line {object} 边框
    * @param options.line.width=2 {string} 边框宽
-   * @param options.line.color="rgba(155, 155, 124, 0.89)" {string} 边框颜色
+   * @param options.line.color="rgba(255, 0, 0, 1)" {string} 边框颜色
    * @param options.label {object} 标注
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
    */
   constructor(sdk, options = {}) {
     super(sdk, options);
     this.options.name = options.name || '未命名对象'
-    this.options.color = options.color || "#36c4ff"
+    this.options.color = options.color || "rgba(255, 0, 0, 0.5)"
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
     this.options.semiMinorAxis = (options.semiMinorAxis || options.semiMinorAxis === 0) ? options.semiMinorAxis : 10
     this.options.semiMajorAxis = (options.semiMajorAxis || options.semiMajorAxis === 0) ? options.semiMajorAxis : 20
     this.options.show = (options.show || options.show === false) ? options.show : true
     this.options.center = options.center || {}
     this.options.line = options.line || {}
-    this.options.line.width = this.options.line.width || 2
-    this.options.line.color = this.options.line.color || 'rgba(155, 155, 124, 0.89)'
+    this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     options.label = options.label || {}
     this._elms = {};
@@ -60,8 +60,8 @@ class EllipseObject extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -229,32 +229,32 @@ class EllipseObject extends Base {
     return this.options.color
   }
   set color(v) {
-    this.options.color = v
+    this.options.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polygon) {
       return
     }
-    let material = Cesium.Color.fromCssColorString(v)
+    let material = Cesium.Color.fromCssColorString(this.options.color)
     if (this.sdk.viewer.scene.mode === 2) {
       material = new Cesium.CustomColorMaterialSource({
-        color: v
+        color: this.options.color
       })
     }
     this.entity.polygon.material = material
     this.entity.polyline.width = this.lineWidth
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
             this.color = c
           },//点击确认按钮事件回调
           clear: () => {
-            this.color = 'rgba(255,255,255,1)'
+            this.color = 'rgba(255,0,0,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.color[i] = colorPicker
@@ -266,25 +266,25 @@ class EllipseObject extends Base {
     return this.options.line.color
   }
   set lineColor(v) {
-    this.options.line.color = v
+    this.options.line.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polyline) {
       return
     }
-    this.entity.polyline.material = Cesium.Color.fromCssColorString(v)
+    this.entity.polyline.material = Cesium.Color.fromCssColorString(this.options.line.color)
     if (this._elms.lineColor) {
       this._elms.lineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.line.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
             this.lineColor = c
           },//点击确认按钮事件回调
           clear: () => {
-            this.lineColor = 'rgba(255,255,255,1)'
+            this.lineColor = 'rgba(255,0,0,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.lineColor[i] = lineColorPicker
@@ -296,10 +296,10 @@ class EllipseObject extends Base {
     return this.options.line.width
   }
   set lineWidth(v) {
-    this.options.line.width = v
-    this.entity.polyline.width = v
+    this.options.line.width = ((v || v === 0) ? v : 3)
+    this.entity.polyline.width = this.options.line.width
     this._elms.lineWidth && this._elms.lineWidth.forEach((item) => {
-      item.value = v
+      item.value = this.options.line.width
     })
   }
 
@@ -347,7 +347,7 @@ class EllipseObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -381,7 +381,7 @@ class EllipseObject extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -481,7 +481,7 @@ class EllipseObject extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -492,7 +492,7 @@ class EllipseObject extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -508,7 +508,7 @@ class EllipseObject extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -534,7 +534,7 @@ class EllipseObject extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1161,7 +1161,7 @@ class EllipseObject extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('circle-object-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1175,7 +1175,7 @@ class EllipseObject extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let linecolorPicker = new ewPlugins('colorpicker', {
+      let linecolorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("lineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1189,7 +1189,7 @@ class EllipseObject extends Base {
           this.lineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1203,7 +1203,7 @@ class EllipseObject extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labellineColorPicker = new ewPlugins('colorpicker', {
+      let labellineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1217,7 +1217,7 @@ class EllipseObject extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1231,7 +1231,7 @@ class EllipseObject extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/FlowLine/_element.js

@@ -0,0 +1,76 @@
+function html() {
+  return `
+    <span class="custom-divider"></span>
+    <div class="div-item">
+        <div class="row">
+            <div class="col">
+                <span class="label">名称</span>
+                <input class="input" maxlength="40" type="text" @model="name">
+            </div>
+            <div class="col">
+                <span class="label">颜色</span>
+                <div class="flowLine-color"></div>
+            </div>
+        </div>
+    </div>
+    <span class="custom-divider"></span>
+    <div class="div-item">
+        <div class="row">
+            <div class="col">
+                <span class="label">飞线数量</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="1" max="99999" @model="pointNumber">
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col">
+                <span class="label">飞线宽度</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" max="99999" min="1" step="1" @model="width">
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="div-item">
+        <div class="row">
+
+            <div class="col">
+                <span class="label">飞线高度</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="0" max="999999" step="1" @model="height">
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col">
+                <span class="label">飞线高度差</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" max="99999" min="0" step="1" @model="heightDifference">
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="div-item">
+        <div class="row">
+            <div class="col">
+                <span class="label">单次运动时长（s）</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" max="999999999" min="1" step="1" @model="duration">
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col">
+                <span class="label">轨迹透明度</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" max="1" min="0.01" step="0.01" @model="lineBackAlpha">
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <span class="custom-divider"></span>
+    `
+}
+
+export { html }

src/Obj/Base/FlowLine/eventBinding.js

@@ -0,0 +1,92 @@
+class eventBinding {
+  constructor() {
+    this.element = {}
+  }
+  static event = {}
+
+  getEvent(name) {
+    return eventBinding.event[name]
+  }
+
+  getEventAll() {
+    return eventBinding.event
+  }
+
+  setEvent(name, event) {
+    eventBinding.event[name] = event
+  }
+
+  on(that, elements) {
+    for (let i = 0; i < elements.length; i++) {
+      let Event = []
+      let isEvent = false
+      let removeName = []
+      if (!elements[i] || !elements[i].attributes) {
+        continue;
+      }
+      for (let m of elements[i].attributes) {
+        switch (m.name) {
+          case '@model': {
+            isEvent = true
+            if (elements[i].type == 'checkbox') {
+              Event.push((e) => { that[m.value] = e.target.checked })
+              elements[i].checked = that[m.value]
+            }
+            else {
+              Event.push((e) => {
+                let value = e.target.value
+                if (e.target.type == 'number') {
+                  value = Number(value)
+                }
+                that[m.value] = value
+              })
+              if (elements[i].nodeName == 'IMG') {
+                elements[i].src = that[m.value]
+              }
+              else {
+                elements[i].value = that[m.value]
+              }
+            }
+            if (this.element[m.value]) {
+              this.element[m.value].push(elements[i])
+            }
+            else {
+              this.element[m.value] = [elements[i]]
+            }
+            removeName.push(m.name)
+            break;
+          }
+          case '@click': {
+            elements[i].addEventListener('click', (e) => {
+              if (typeof (that.Dialog[m.value]) === 'function') {
+                that.Dialog[m.value](e)
+              }
+            });
+            removeName.push(m.name)
+            // elements[i].attributes.removeNamedItem(m.name)
+            break;
+          }
+        }
+        // elements[i].attributes[m] = undefined
+      }
+      for (let n = 0; n < removeName.length; n++) {
+        elements[i].attributes.removeNamedItem(removeName[n])
+      }
+
+      if (isEvent) {
+        let ventType = 'input'
+        if (elements[i].tagName != 'INPUT' || elements[i].type == 'checkbox') {
+          ventType = 'change'
+        }
+        elements[i].addEventListener(ventType, (e) => {
+          for (let t = 0; t < Event.length; t++) {
+            Event[t](e)
+          }
+        });
+      }
+    }
+  }
+}
+
+const EventBinding = new eventBinding();
+export default EventBinding;

src/Obj/Base/FlowLine/index.js

@@ -0,0 +1,504 @@
+/**
+ * @description 水面
+ */
+import Dialog from '../../Element/Dialog';
+import { html } from "./_element";
+import EventBinding from '../../Element/Dialog/eventBinding';
+import Base from "../index";
+import { syncData } from '../../../Global/MultiViewportMode'
+import DrawRect from '../../../Draw/drawRect'
+import drawPolygon from '../../../Draw/drawPolygon'
+import { setSplitDirection, syncSplitData, setActiveId } from '../../../Global/SplitScreen'
+import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
+import FlowLineMaterialProperty from "../../Materail/FlowLineMaterialProperty";
+
+class FlowLine extends Base {
+  /**
+   * @constructor
+   * @param sdk
+   * @description 流光飞线
+   * @param options {object} 流光飞线属性
+   * @param options.name=未命名对象 {string} 名称
+   * @param options.pointNumber=300 {number} 线数量
+   * @param options.height=200 {number} 线高度
+   * @param options.heightDifference=3000 {number} 线高度差
+   * @param options.width=2 {number} 线宽
+   * @param options.duration=10.0 {number} 单次运动时间
+   * @param options.color=rgba(255,255,255,1) {string} 颜色
+   * @param options.lineBackAlpha=0.05 {number} 轨迹颜色（不能为0）
+   * @param Dialog {object} 弹框对象
+   * @param Dialog.confirmCallBack {function} 弹框确认时的回调
+   * */
+  constructor(sdk, options = {}, _Dialog = {}) {
+    super(sdk, options);
+    this.viewer = this.sdk.viewer
+    this.options.name = options.name || '飞线'
+    this.options.pointNumber = options.pointNumber || 200
+    this.options.height = options.height || 200
+    this.options.heightDifference = options.heightDifference || 3000
+    this.options.width = options.width || 2
+    this.options.duration = options.duration || 10.0
+    this.options.color = options.color || "rgba(255,255,255,1)"
+    this.options.lineBackAlpha = options.lineBackAlpha || 0.05
+    this.options.positions = options.positions || []
+    this.options.show = (options.show || options.show === false) ? options.show : true
+    this.Dialog = _Dialog
+    this._EventBinding = new EventBinding()
+    this._elms = {};
+    this.positionArea = []
+    this.positions = []
+    this.sdk.addIncetance(this.options.id, this)
+    // FlowLine.create(this)
+    FlowLine.drawLine(this)
+  }
+
+  // 创建水面
+  static create(that) {
+    // let Draw = new DrawRect(that.sdk)
+    // Draw.start((a, positions) => {
+    //   that.positions = positions
+    //   that.getLine(that, that.positions)
+    //   that.edit(true)
+    // })
+
+    let Draw = new drawPolygon(that.sdk)
+    Draw.start((a, positions) => {
+      that.positionArea = positions
+      let posis = that.getRandomPointsInCesiumPolygon(positions, that.options.pointNumber)
+      that.positions = posis
+      that.getLine(that, posis)
+      that.edit(true)
+    })
+  }
+  static drawLine(that) {
+    that.positionArea = that.options.positions
+    let posis = that.getRandomPointsInCesiumPolygon(that.options.positions, that.options.pointNumber)
+    that.positions = posis
+    that.getLine(that, posis)
+    // that.edit(true)
+  }
+  getRandomPointsInCesiumPolygon(positions, count) {
+    let lons = [], lats = [], posi = []
+    positions.forEach(item => {
+      lons.push(item.lng)
+      lats.push(item.lat)
+      posi.push([item.lng, item.lat])
+    })
+    posi.push([posi[0][0], posi[0][1]])
+    const minLon = Math.min(...lons), maxLon = Math.max(...lons);
+    const minLat = Math.min(...lats), maxLat = Math.max(...lats);
+
+    const points = [];
+    let that = this
+    while (points.length < count) {
+      const lon = minLon + Math.random() * (maxLon - minLon);
+      const lat = minLat + Math.random() * (maxLat - minLat);
+      // const cartesian = Cesium.Cartesian3.fromDegrees(lon, lat);
+      let point = turf.point([lon, lat]);
+      const polygon = turf.polygon([
+        posi
+      ]);
+
+      const isInside = turf.booleanPointInPolygon(point, polygon);
+      if (isInside) {
+        let posi = Cesium.Cartesian3.fromDegrees(lon, lat);
+        const cartographic = that.viewer.scene.globe.ellipsoid.cartesianToCartographic(posi);
+        const height = cartographic.height;
+
+        points.push([
+          lon,
+          lat,
+          height
+        ]);
+      }
+    }
+    return points;
+  }
+
+
+
+
+  getLine(that, positions) {
+    let num = 0
+    let celiangEntity = null
+    if (that.viewer.entities.getById(that.options.id)) {
+      that.viewer.entities.getById(that.options.id)._children.forEach((item) => {
+        that.viewer.entities.remove(item);
+      });
+      that.viewer.entities.remove(that.viewer.entities.getById(that.options.id))
+    }
+    celiangEntity = that.viewer.entities.add(new Cesium.Entity({ id: that.options.id, show: that.options.show }))
+
+    positions.forEach((item, index) => {
+      let point = item
+      //根据点设置起始点位置
+      // let start = Cesium.Cartesian3.fromDegrees(point[0], point[1], 0)
+      let start = Cesium.Cartesian3.fromDegrees(point[0], point[1], point[2])
+      //根据点设置结束点位置
+      let end = Cesium.Cartesian3.fromDegrees(point[0], point[1], point[2] + that.options.height + Math.random() * that.options.heightDifference)
+      //创建线
+      that.viewer.entities.add({
+        parent: celiangEntity,
+        id: that.options.id + '-' + new Date().getTime() + index,
+        polyline: {
+          positions: [start, end],
+          width: that.options.width,
+          // material:Cesium.Color.RED
+          material: new Cesium.FlowLineMaterialProperty({
+            color: that.options.color,
+            duration: that.options.duration,
+            lineBackAlpha: that.options.lineBackAlpha,
+            num: num
+          })
+        }
+      })
+    });
+
+  }
+
+  get color() {
+    return this.options.color
+  }
+
+  set color(v) {
+    this.options.color = v
+    let entity = this.viewer.entities.getById(this.options.id)
+    if (entity) {
+      entity._children.forEach(item => {
+        item.polyline.material.color = Cesium.Color.fromCssColorString(v)
+      })
+    }
+
+    if (this._elms.color) {
+      this._elms.color.forEach((item, i) => {
+        let picker = new YJColorPicker({
+          el: item.el,
+          size: 'mini',//颜色box类型
+          alpha: true,//是否开启透明度
+          defaultColor: v,
+          disabled: false,//是否禁止打开颜色选择器
+          openPickerAni: 'opacity',//打开颜色选择器动画
+          sure: (c) => {
+            this.color = c
+          },//点击确认按钮事件回调
+          clear: () => {
+            this.color = 'rgba(255,255,255,1)'
+          },//点击清空按钮事件回调
+        })
+        this._elms.color[i] = picker
+      })
+    }
+  }
+
+
+
+  get pointNumber() {
+    return this.options.pointNumber
+  }
+  set pointNumber(v) {
+    this.options.pointNumber = v
+    let entity = this.viewer.entities.getById(this.options.id)
+    if (entity) {
+      let posis = this.getRandomPointsInCesiumPolygon(this.positionArea, this.options.pointNumber)
+      this.positions = posis
+      this.getLine(this, posis)
+    }
+  }
+
+  get height() {
+    return this.options.height
+  }
+
+  set height(v) {
+    this.options.height = v
+    let entity = this.viewer.entities.getById(this.options.id)
+    if (entity) {
+      this.getLine(this, this.positions)
+    }
+  }
+  get show() {
+    return this.options.show
+  }
+
+  set show(v) {
+    this.options.show = v
+    let entity = this.viewer.entities.getById(this.options.id)
+    if (entity) {
+      entity.show = v
+    }
+  }
+
+  get heightDifference() {
+    return this.options.heightDifference
+  }
+
+  set heightDifference(v) {
+    this.options.heightDifference = v
+    let entity = this.viewer.entities.getById(this.options.id)
+    if (entity) {
+      this.getLine(this, this.positions)
+    }
+  }
+
+  get width() {
+    return this.options.width
+  }
+
+  set width(v) {
+    this.options.width = v
+    let entity = this.viewer.entities.getById(this.options.id)
+    if (entity) {
+      entity._children.forEach(item => {
+        item.polyline.width = v
+      })
+    }
+  }
+  get duration() {
+    return this.options.duration
+  }
+  set duration(v) {
+    this.options.duration = v
+    let entity = this.viewer.entities.getById(this.options.id)
+    if (entity) {
+      entity._children.forEach(item => {
+        item.polyline.material.duration = v
+      })
+    }
+  }
+  get lineBackAlpha() {
+    return this.options.lineBackAlpha
+  }
+  set lineBackAlpha(v) {
+    this.options.lineBackAlpha = v
+    let entity = this.viewer.entities.getById(this.options.id)
+    if (entity) {
+      entity._children.forEach(item => {
+        item.polyline.material.lineBackAlpha = v
+      })
+    }
+  }
+
+  /**
+   * @description 编辑框
+   * @param state=false {boolean} 状态: true打开, false关闭
+   */
+  async edit(state = false) {
+    let _this = this
+    this.originalOptions = this.deepCopyObj(this.options)
+
+    // let elms = this.sdk.viewer._container.getElementsByClassName('YJ-custom-base-dialog')
+    // for (let i = elms.length - 1; i >= 0; i--) {
+    //   this.sdk.viewer._container.removeChild(elms[i])
+    // }
+
+    if (this._DialogObject && this._DialogObject.close) {
+      this._DialogObject.close()
+      this._DialogObject = null
+    }
+
+    if (state) {
+      this._DialogObject = await new Dialog(this.sdk, this.originalOptions, {
+        title: '飞线属性', left: '180px', top: '100px',
+        confirmCallBack: (options) => {
+          this.name = this.name.trim()
+          if (!this.name) {
+            // this.name = '未命名对象'
+            this.name = '飞线'
+          }
+          this.originalOptions = this.deepCopyObj(this.options)
+          this._DialogObject.close()
+          this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
+          syncData(this.sdk, this.options.id)
+          syncSplitData(this.sdk, this.options.id)
+        },
+        resetCallBack: () => {
+          this.reset()
+          this.Dialog.resetCallBack && this.Dialog.resetCallBack()
+        },
+        removeCallBack: () => {
+          this.Dialog.removeCallBack && this.Dialog.removeCallBack()
+        },
+        closeCallBack: () => {
+          this.reset()
+          // this.entity.style = new Cesium.Cesium3DTileStyle({
+          //   color: "color('rgba(255,255,255," + this.newData.transparency + ")')",
+          //   show: true,
+          // });
+          this.Dialog.closeCallBack && this.Dialog.closeCallBack()
+        },
+        showCallBack: (show) => {
+          this.show = show
+          this.Dialog.showCallBack && this.Dialog.showCallBack()
+        }
+      }, true)
+      this._DialogObject._element.body.className = this._DialogObject._element.body.className + ' flow-line-surface'
+      let contentElm = document.createElement('div');
+      contentElm.innerHTML = html()
+      this._DialogObject.contentAppChild(contentElm)
+      // 颜色组件
+      let waterColorPicker = new YJColorPicker({
+        el: contentElm.getElementsByClassName("flowLine-color")[0],
+        size: 'mini',//颜色box类型
+        alpha: true,//是否开启透明度
+        defaultColor: this.color,
+        disabled: false,//是否禁止打开颜色选择器
+        openPickerAni: 'opacity',//打开颜色选择器动画
+        sure: (color) => {
+          this.color = color
+        },//点击确认按钮事件回调
+        clear: () => {
+          this.color = 'rgba(255,255,255,1)'
+        },//点击清空按钮事件回调
+      })
+
+      let all_elm = contentElm.getElementsByTagName("*")
+      this._EventBinding.on(this, all_elm)
+      this._elms = this._EventBinding.element
+      this._elms.color = [waterColorPicker]
+    } else {
+      // if (this._element_style) {
+      //   document.getElementsByTagName('head')[0].removeChild(this._element_style)
+      //   this._element_style = null
+      // }
+      // if (this._DialogObject && this._DialogObject.remove) {
+      //   this._DialogObject.remove()
+      //   this._DialogObject = null
+      // }
+    }
+  }
+
+  reset() {
+    if (!this.viewer.entities.getById(this.options.id)) {
+      return
+    }
+    this.name = this.originalOptions.name
+    this.pointNumber = this.originalOptions.pointNumber
+    this.height = this.originalOptions.height
+    this.heightDifference = this.originalOptions.heightDifference
+    this.width = this.originalOptions.width
+    this.duration = this.originalOptions.duration
+    this.color = this.originalOptions.color
+    this.lineBackAlpha = this.originalOptions.lineBackAlpha
+  }
+
+  /**
+   * 飞到对应实体
+   */
+  async flyTo(options = {}) {
+    setActiveViewer(0)
+    closeRotateAround(this.sdk)
+    closeViewFollow(this.sdk)
+
+    if (this.options.customView && this.options.customView.relativePosition && this.options.customView.orientation) {
+      let orientation = {
+        heading: Cesium.Math.toRadians(this.options.customView.orientation.heading || 0.0),
+        pitch: Cesium.Math.toRadians(this.options.customView.orientation.pitch || -60.0),
+        roll: Cesium.Math.toRadians(this.options.customView.orientation.roll || 0.0)
+      }
+
+      let lng = this.options.customView.relativePosition.lng
+      let lat = this.options.customView.relativePosition.lat
+      let alt = this.options.customView.relativePosition.alt
+      let destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
+
+      let position = { lng: 0, lat: 0 }
+      if (this.options.position) {
+        position = { ...this.options.position }
+      }
+      else if (this.options.positions) {
+        position = { ...this.options.positions[0] }
+      }
+      else if (this.options.center) {
+        position = { ...this.options.center }
+      }
+      else if (this.options.start) {
+        position = { ...this.options.start }
+      }
+      else {
+        if (this.options.hasOwnProperty('lng')) {
+          position.lng = this.options.lng
+        }
+        if (this.options.hasOwnProperty('lat')) {
+          position.lat = this.options.lat
+        }
+        if (this.options.hasOwnProperty('alt')) {
+          position.alt = this.options.alt
+        }
+      }
+      // 如果没有高度值，则获取紧贴高度计算
+      // if (!position.hasOwnProperty('alt')) {
+      //   position.alt = await this.getClampToHeight(position)
+      // }
+      lng = this.options.customView.relativePosition.lng + position.lng
+      lat = this.options.customView.relativePosition.lat + position.lat
+      alt = this.options.customView.relativePosition.alt + position.alt
+      destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
+      this.sdk.viewer.camera.flyTo({
+        destination: destination,
+        orientation: orientation
+      })
+    }
+    else {
+      let positionArray = []
+      for (let i = 0; i < this.positions.length; i++) {
+        let a = Cesium.Cartesian3.fromDegrees(
+          this.positions[i][0],
+          this.positions[i][1],
+          this.positions[i][2] + this.options.height + this.options.heightDifference / 2
+        )
+        positionArray.push(a.x, a.y, a.z)
+      }
+      let BoundingSphere = Cesium.BoundingSphere.fromVertices(positionArray)
+      this.viewer.camera.flyToBoundingSphere(BoundingSphere, {
+        offset: {
+          heading: Cesium.Math.toRadians(0.0),
+          pitch: Cesium.Math.toRadians(-20.0),
+          roll: Cesium.Math.toRadians(0.0)
+        }
+      })
+
+    }
+  }
+
+  getSphere() {
+    return new Promise((resolve) => {
+      // entity没有加载完成时 state 不会等于0 所以设置定时器直到获取到为止
+      const interval = setInterval(() => {
+        const sphere = new Cesium.BoundingSphere()
+        const state = this.sdk.viewer._dataSourceDisplay.getBoundingSphere(
+          this.viewer.entities.getById(this.options.id),
+          false,
+          sphere
+        )
+        if (state === Cesium.BoundingSphereState.DONE) {
+          clearInterval(interval)
+        }
+      }, 1000)
+    })
+  }
+
+  /**
+   * 删除
+   */
+  async remove() {
+    if (this.viewer.entities.getById(this.options.id)) {
+      this.viewer.entities.getById(this.options.id)._children.forEach((item) => {
+        this.viewer.entities.remove(item);
+      });
+      this.viewer.entities.remove(this.viewer.entities.getById(this.options.id))
+    }
+    this.positions = []
+    this.entity = null
+
+    if (this._DialogObject && !this._DialogObject.isDestroy) {
+      this._DialogObject.close()
+      this._DialogObject = null
+    }
+    await this.sdk.removeIncetance(this.options.id)
+    await syncData(this.sdk, this.options.id)
+  }
+
+  flicker() { }
+}
+
+export default FlowLine

src/Obj/Base/GeoJson/index.js

@@ -8,6 +8,8 @@
 import { getHost, getToken } from "../../../on";
 import Base from '../index'
 import Tools from '../../../Tools'
+import { syncSplitData } from "../../../Global/SplitScreen";
+import { syncData, getSdk as get2DSdk } from '../../../Global/MultiViewportMode'
 import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../Global/global'
 
 class GeoJson extends Base {
@@ -26,6 +28,7 @@ class GeoJson extends Base {
 
     this.primitive = undefined
     this.positions = []
+    
 
     this.loading = true
   }
@@ -48,6 +51,27 @@ class GeoJson extends Base {
     return this.options.show
   }
 
+  // set show(status) {
+  //   let sdkD = get2DSdk().sdkD
+  //   if (!this.isShowView || !sdkD) {
+  //     this.options.show = status
+  //   }
+  //   if (this.entity) {
+  //     if (!this.showView || this.showView == 3 || !sdkD) {
+  //       for (let i = 0; i < this.entity.entities.values.length; i++) {
+  //         this.entity.entities.values[i].show = this.options.show
+  //       }
+  //     }
+  //     else {
+  //       for (let i = 0; i < this.entity.entities.values.length; i++) {
+  //         this.entity.entities.values[i].show = false
+  //       }
+  //     }
+  //   }
+  //   syncData(this.sdk, this.options.id)
+  //   syncSplitData(this.sdk, this.options.id)
+  //   this.isShowView = false
+  // }
   set show(status) {
     this.options.show = status
     if (this.entity) {
@@ -74,6 +98,7 @@ class GeoJson extends Base {
     })
     let json = await rsp.json()
     this.geojson = json
+    // this.sdk.addIncetance(this.options.id, this)
     return GeoJson.addDataToGlobe(this, json.features)
   }
 

src/Obj/Base/Graffiti/index.js

@@ -37,7 +37,7 @@ class Graffiti extends Draw {
     this.options.color = v
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -77,7 +77,7 @@ class Graffiti extends Draw {
       contentElm.innerHTML = html()
       that._DialogObject.contentAppChild(contentElm)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度

src/Obj/Base/GroundImage/_element.js

@@ -1,5 +1,5 @@
 function html() {
-  return `
+    return `
   <span class="custom-divider"></span>
   <div class="div-item">
     <div class="row">
@@ -7,13 +7,21 @@ function html() {
             <span class="label">名称</span>
             <input class="input" maxlength="40" type="text" @model="name">
         </div>
-        <div class="col">
-        </div>
+        <div class="col"></div>
     </div>
   </div>
   <span class="custom-divider"></span>
   <div class="div-item">
     <div class="row">
+        <div class="col">
+            <button class="anchor btn">调整锚点</button>
+        </div>
+        <div class="col mode-box">
+            <span class="label" style="flex: unset;">军标模式</span>
+            <div class="mode"></div>
+        </div>
+    </div>
+    <div class="row" mode="0">
         <div class="col">
             <span class="label">旋转角度</span>
             <input type="range" max="360" min="0" step="0.1" @model="angle">
@@ -24,16 +32,85 @@ function html() {
             </div>
         </div>
     </div>
-    <div class="row">
+    <div class="row" mode="0">
         <div class="col">
             <span class="label">调整大小</span>
-            <input type="range" max="99999" min="0" step="0.1" @model="scale">
+            <input type="range" max="40000" min="0" step="0.1" @model="scale">
             <div class="input-number input-number-unit-1" style="width: 100px;flex: 0 0 100px;margin-left: 10px;">
-                <input class="input" type="number" title="" min="0" max="99999" step="0.1" @model="scale">
+                <input class="input" type="number" title="" min="0" max="40000" step="0.1" @model="scale">
                 <span class="arrow"></span>
             </div>
         </div>
     </div>
+        <div class="row" mode="1">
+            <div class="col height-mode-box" style="flex: 0 0 155px;margin-right: 10px;">
+                <span class="label" style="flex: 0 0 56px;">高度模式</span>
+                <div class="height-mode"></div>
+            </div>
+            <div class="col" style="margin: 0 10px;">
+                <div class="height-box" style="display: flex; align-items: center;">
+                    <span class="label" style="flex: 0 0 56px;">高度</span>
+                    <div class="input-number input-number-unit-1">
+                        <input class="input height" type="number" title="" min="-9999999" max="999999999">
+                        <span class="unit">m</span>
+                        <span class="arrow"></span>
+                    </div>
+                </div>
+            </div>
+            <div class="col" style="margin-left: 10px;">
+                <span class="label">图标倍数</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" data-min="0.1" max="99" @model="billboardScale">
+                    <span class="unit">倍</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+        <div class="row" mode="1">
+            <div class="col" style="flex: 0 0 155px;margin-right: 10px;">
+                <span class="label">视野缩放</span>
+                <input class="btn-switch" type="checkbox" @model="billboardScaleByDistance">
+            </div>
+            <div class="col" style="margin: 0 10px;">
+                <span class="label">最近距离</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="1" max="99999999" @model="billboardNear">
+                    <span class="unit">m</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col" style="margin-left: 10px;">
+                <span class="label">最远距离</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="1" max="99999999" @model="billboardFar">
+                    <span class="unit">m</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+                <h4 mode="1">文字设置</h4>
+                    <div class="row"  mode="1">
+                        <div class="col" style="flex: 0 0 80px;margin: 0 10px;">
+                            <span class="label" style="flex: none;">显隐</span>
+                            <input class="btn-switch" type="checkbox" @model="labelShow">
+                        </div>
+                        <div class="col font-select-box" style="margin: 0 0px;flex: 0 0 150px;">
+                            <span class="label" style="flex: none;">字体选择</span>
+                            <div class="input input-select font-select"></div>
+                        </div>
+                        <div class="col" style="margin: 0 10px;">
+                            <span class="label">文字大小</span>
+                            <div class="input-number input-number-unit-2">
+                                <input class="input" type="number" title="" min="1" max="99" @model="labelFontSize" style="width: 70px;">
+                                <span class="unit">px</span>
+                                <span class="arrow"></span>
+                            </div>
+                        </div>
+                        <div class="col" style="margin-left: 10px;">
+                            <span class="label">文字颜色</span>
+                            <div class="labelColor"></div>
+                        </div>
+                    </div>
   </div>
   <span class="custom-divider"></span>
   `

src/Obj/Base/GroundSvg/_element.js

@@ -17,6 +17,18 @@ function html(that) {
     </div>
     <span class="custom-divider"></span>
     <div class="div-item">
+        <div class="row">
+            <div class="col" mode="0">
+                <button class="anchor btn">调整锚点</button>
+            </div>
+            <div class="col mode-box">
+                <span class="label" style="flex: unset;">军标模式</span>
+                <div class="mode"></div>
+            </div>
+        </div>
+    </div>
+    <span class="custom-divider" mode="0"></span>
+    <div class="div-item" mode="0">
         <div class="row">
             <div class="col">
                 <span class="label">旋转角度</span>
@@ -50,7 +62,7 @@ function html(that) {
         </div>
     </div>
     <span class="custom-divider"></span>
-    <div class="div-item">
+    <div class="div-item" mode="0">
         <div class="row">
             <div class="col" style="flex: 5;">
                 <span class="label">文字内容</span>
@@ -70,9 +82,9 @@ function html(that) {
                 <div class="textColor"></div>
             </div>
             <div class="col">
-                <span class="label">字体大小</span>
+                <span class="label">文字大小</span>
                 <div class="input-number input-number-unit-2">
-                    <input class="input" type="number" title="" min="1" max="99" @model="textFontSize">
+                    <input class="input" type="number" title="" min="1" max="99" step="1" @model="textFontSize">
                     <span class="unit">px</span>
                     <span class="arrow"></span>
                 </div>
@@ -101,6 +113,98 @@ function html(that) {
             </div>
         </div>
     </div>
+    <div class="div-item" mode="1">
+        <div class="row">
+            <div class="col height-mode-box" style="flex: 0 0 155px;margin-right: 10px;">
+                <span class="label" style="flex: 0 0 56px;">高度模式</span>
+                <div class="height-mode"></div>
+            </div>
+            <div class="col" style="margin: 0 10px;">
+                <div class="height-box" style="display: flex; align-items: center;">
+                    <span class="label" style="flex: 0 0 56px;">高度</span>
+                    <div class="input-number input-number-unit-1">
+                        <input class="input height" type="number" title="" min="-9999999" max="999999999">
+                        <span class="unit">m</span>
+                        <span class="arrow"></span>
+                    </div>
+                </div>
+            </div>
+            <div class="col" style="margin-left: 10px;">
+                <span class="label">图标倍数</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" data-min="0.1" max="99" @model="billboardScale">
+                    <span class="unit">倍</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col" style="flex: 0 0 155px;margin-right: 10px;">
+                <span class="label">视野缩放</span>
+                <input class="btn-switch" type="checkbox" @model="billboardScaleByDistance">
+            </div>
+            <div class="col" style="margin: 0 10px;">
+                <span class="label">最近距离</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="1" max="99999999" @model="billboardNear">
+                    <span class="unit">m</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col" style="margin-left: 10px;">
+                <span class="label">最远距离</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="1" max="99999999" @model="billboardFar">
+                    <span class="unit">m</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+        <h4>文字设置</h4>
+        <div class="row">
+            <div class="col" style="flex: 0 0 80px;margin: 0 10px 0 0;;">
+                <span class="label" style="flex: none;">显隐</span>
+                <input class="btn-switch" type="checkbox" @model="labelShow">
+            </div>
+            <div class="col font-select-box" style="margin: 0 0px;flex: 0 0 160px;">
+                <span class="label" style="flex: none;">字体选择</span>
+                <div class="input input-select font-select"></div>
+            </div>
+            <div class="col" style="margin: 0 10px;">
+                <span class="label">文字大小</span>
+                <div class="input-number input-number-unit-2">
+                    <input class="input label-font-size" type="number" title="" min="1" max="99" step="1" style="width: 70px;">
+                    <span class="unit">px</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col" style="margin-left: 10px;">
+                <span class="label">文字颜色</span>
+                <div class="labelColor"></div>
+            </div>
+        </div>
+        <div class="row" style="justify-content: flex-start;">
+            <div class="col font-select-box" style="margin: 0 0px;flex: 0 0 70px;">
+                <span class="label" style="flex: none;">文字偏移</span>
+            </div>
+            <div class="col" style="margin: 0 10px;flex: 0 0 100px;">
+                <span class="label">x</span>
+                <div class="input-number input-number-unit-2">
+                    <input class="input label-offset-x" type="number" title="" min="-999" max="999" step="1">
+                    <span class="unit">px</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col" style="margin: 0 10px;flex: 0 0 100px;">
+                <span class="label">y</span>
+                <div class="input-number input-number-unit-2">
+                    <input class="input label-offset-y" type="number" title="" min="-999" max="999" step="1">
+                    <span class="unit">px</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+    </div>
     <span class="custom-divider"></span>
     <div class="div-item attribute-info">
         <div class="row">

src/Obj/Base/GroundSvg/index-3.js

@@ -123,7 +123,7 @@ class GroundSvg extends Base {
     }
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -796,7 +796,7 @@ class GroundSvg extends Base {
       await this._DialogObject.contentAppChild(contentElm)
 
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度

src/Obj/Base/LabelObject/index.js

@@ -34,10 +34,10 @@ class LabelObject extends Base {
     }
     this.options.text = textArray.join('\n')
     this.options.fontFamily = options.fontFamily || 0
-    this.font = getFontFamily(this.options.fontFamily) || 'Helvetica'
+    this.font = getFontFamily(this.options.fontFamily) || 'SimHei'
     this.options.fontSize = options.fontSize || 20
     this.options.lineWidth = options.lineWidth || 4
-    this.options.lineColor = options.lineColor || '#fff000'
+    this.options.lineColor = options.lineColor || '#00ffff80'
     this.options.color = options.color || '#ffffff'
     this.options.ground =
       options.ground || options.ground === false ? options.ground : true
@@ -46,8 +46,8 @@ class LabelObject extends Base {
         ? options.pixelOffset
         : 20
     this.options.backgroundColor = options.backgroundColor || [
-      '#42c6ef',
-      '#42c6ef'
+      '#00ffff80',
+      '#00ffff80'
     ]
     this.event = new MouseEvent(this.sdk)
     this.entity
@@ -65,6 +65,11 @@ class LabelObject extends Base {
     }
     this.originalOptions = copyObj(this.options)
 
+    let id = this.options.id + '-label'
+    let oldEntity = this.sdk.viewer.entities.getById(id)
+    if(oldEntity) {
+      this.sdk.viewer.entities.remove(oldEntity)
+    }
     this.entity = this.sdk.viewer.entities.add({
       show: this.options.show,
       id: this.options.id + '-label',
@@ -407,7 +412,7 @@ class LabelObject extends Base {
 
   set fontFamily(v) {
     this.options.fontFamily = v || 0
-    this.font = getFontFamily(this.options.fontFamily) || 'Helvetica'
+    this.font = getFontFamily(this.options.fontFamily) || 'SimHei'
     this.updateBillboardImage()
   }
 
@@ -415,7 +420,7 @@ class LabelObject extends Base {
     return this.options.lineWidth
   }
   set lineWidth(v) {
-    this.options.lineWidth = Number(v)
+    this.options.lineWidth = ((Number(v) || Number(v) === 0) ? Number(v) : 4)
     if (!this.entity) {
       return
     }
@@ -436,14 +441,14 @@ class LabelObject extends Base {
     clearTimeout(this.#updateBillboardImageTimeout)
     this.#updateBillboardImageTimeout = setTimeout(() => {
       clearTimeout(this.#updateBillboardImageTimeout)
-      this.entity.billboard.image = this.getcanvas()
+      this.entity && (this.entity.billboard.image = this.getcanvas())
     }, 500)
   }
   get lineColor() {
     return this.options.pixelOffset
   }
   set lineColor(v) {
-    this.options.lineColor = v
+    this.options.lineColor = v || '#00ffff80'
     if (!this.entity) {
       return
     }

src/Obj/Base/ParticleEffects/Flame/index.js

@@ -7,7 +7,7 @@ import EventBinding from './eventBinding'
 import Base from "../../index";
 import MouseEvent from '../../../../Event/index'
 import { syncPrimitives } from '../../../../Global/MultiViewportMode'
-import { syncData } from '../../../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../../../Global/MultiViewportMode'
 import MouseTip from '../../../../MouseTip'
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../../Global/SplitScreen'
 import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../../Global/global'
@@ -82,18 +82,34 @@ class Flame extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
-        this.entity.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
       }
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = this.options.show
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = this.options.show
+        }
+      }
+      else {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = false
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = false
+        }
+      }
+      
       if (this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
-      if (this.options.label && this.options.label.show) {
-        this.label.show = v
-      }
+      
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
     } else {
       console.error("参数必须为boolean")
     }
@@ -245,7 +261,7 @@ class Flame extends Base {
     this.particleSystem.startColor = Cesium.Color.fromCssColorString(v)
     if (this._elms.startColor) {
       this._elms.startColor.forEach((item, i) => {
-        let picker = new ewPlugins('colorpicker', {
+        let picker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -273,7 +289,7 @@ class Flame extends Base {
     this.particleSystem.endColor = Cesium.Color.fromCssColorString(v)
     if (this._elms.endColor) {
       this._elms.endColor.forEach((item, i) => {
-        let picker = new ewPlugins('colorpicker', {
+        let picker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -496,7 +512,7 @@ class Flame extends Base {
       contentElm.innerHTML = html()
       this._DialogObject.contentAppChild(contentElm)
       // 颜色组件
-      let startColorPicker = new ewPlugins('colorpicker', {
+      let startColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("start_color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -510,7 +526,7 @@ class Flame extends Base {
           this.startColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let endColorPicker = new ewPlugins('colorpicker', {
+      let endColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("end_color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度

src/Obj/Base/ParticleEffects/Fountain/index.js

@@ -6,7 +6,7 @@ import { html } from "./_element";
 import EventBinding from './eventBinding'
 import Base from "../../index";
 import MouseEvent from '../../../../Event/index'
-import { syncData } from '../../../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../../../Global/MultiViewportMode'
 import MouseTip from '../../../../MouseTip'
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../../Global/SplitScreen'
 import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../../Global/global'
@@ -83,18 +83,32 @@ class Fountain extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      if(this.entity && this.sdk.viewer.camera.positionCartographic.height <10000000) {
-        this.entity.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
+      }
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = this.options.show
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = this.options.show
+        }
+      }
+      else {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = false
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = false
+        }
       }
       if(this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
-      if (this.options.label && this.options.label.show) {
-        this.label.show = v
-      }
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
     } else {
       console.error("参数必须为boolean")
     }
@@ -269,7 +283,7 @@ class Fountain extends Base {
     this.particleSystem.startColor = Cesium.Color.fromCssColorString(v)
     if (this._elms.startColor) {
       this._elms.startColor.forEach((item, i) => {
-        let picker = new ewPlugins('colorpicker', {
+        let picker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -297,7 +311,7 @@ class Fountain extends Base {
     this.particleSystem.endColor = Cesium.Color.fromCssColorString(v)
     if (this._elms.endColor) {
       this._elms.endColor.forEach((item, i) => {
-        let picker = new ewPlugins('colorpicker', {
+        let picker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -520,7 +534,7 @@ class Fountain extends Base {
       contentElm.innerHTML = html()
       this._DialogObject.contentAppChild(contentElm)
       // 颜色组件
-      let startColorPicker = new ewPlugins('colorpicker', {
+      let startColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("start_color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -534,7 +548,7 @@ class Fountain extends Base {
           this.startColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let endColorPicker = new ewPlugins('colorpicker', {
+      let endColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("end_color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度

src/Obj/Base/ParticleEffects/Smoke/index.js

@@ -6,7 +6,7 @@ import { html, css } from "./_element";
 import EventBinding from './eventBinding'
 import Base from "../../index";
 import MouseEvent from '../../../../Event/index'
-import { syncData } from '../../../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../../../Global/MultiViewportMode'
 import MouseTip from '../../../../MouseTip'
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../../Global/SplitScreen'
 import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../../Global/global'
@@ -81,18 +81,32 @@ class Smoke extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      if(this.entity && this.sdk.viewer.camera.positionCartographic.height <10000000) {
-        this.entity.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
+      }
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = this.options.show
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = this.options.show
+        }
+      }
+      else {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = false
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = false
+        }
       }
       if(this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
-      if (this.options.label && this.options.label.show) {
-        this.label.show = v
-      }
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
     } else {
       console.error("参数必须为boolean")
     }
@@ -243,7 +257,7 @@ class Smoke extends Base {
     this.particleSystem.startColor = Cesium.Color.fromCssColorString(v)
     if (this._elms.startColor) {
       this._elms.startColor.forEach((item, i) => {
-        let picker = new ewPlugins('colorpicker', {
+        let picker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -271,7 +285,7 @@ class Smoke extends Base {
     this.particleSystem.endColor = Cesium.Color.fromCssColorString(v)
     if (this._elms.endColor) {
       this._elms.endColor.forEach((item, i) => {
-        let picker = new ewPlugins('colorpicker', {
+        let picker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -494,7 +508,7 @@ class Smoke extends Base {
       contentElm.innerHTML = html()
       this._DialogObject.contentAppChild(contentElm)
       // 颜色组件
-      let startColorPicker = new ewPlugins('colorpicker', {
+      let startColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("start_color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -508,7 +522,7 @@ class Smoke extends Base {
           this.startColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let endColorPicker = new ewPlugins('colorpicker', {
+      let endColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("end_color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度

src/Obj/Base/ParticleEffects/Spout/index.js

@@ -5,7 +5,7 @@ import Dialog from '../../../Element/Dialog';
 import { html, css } from "./_element";
 import Base from "../../index";
 import MouseEvent from '../../../../Event/index'
-import { syncData } from '../../../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../../../Global/MultiViewportMode'
 import MouseTip from '../../../../MouseTip'
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../../Global/SplitScreen'
 import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../../Global/global'
@@ -84,18 +84,32 @@ class Spout extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
-        this.entity.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
       }
-      if (this._DialogObject && this._DialogObject.showBtn) {
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = this.options.show
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = this.options.show
+        }
+      }
+      else {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = false
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = false
+        }
+      }
+      if(this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
-      if (this.options.label && this.options.label.show) {
-        this.label.show = v
-      }
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
     } else {
       console.error("参数必须为boolean")
     }
@@ -360,7 +374,7 @@ class Spout extends Base {
     this.particleSystem.startColor = Cesium.Color.fromCssColorString(v)
     if (this._elms.startColor) {
       this._elms.startColor.forEach((item, i) => {
-        let picker = new ewPlugins('colorpicker', {
+        let picker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -388,7 +402,7 @@ class Spout extends Base {
     this.particleSystem.endColor = Cesium.Color.fromCssColorString(v)
     if (this._elms.endColor) {
       this._elms.endColor.forEach((item, i) => {
-        let picker = new ewPlugins('colorpicker', {
+        let picker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -634,7 +648,7 @@ class Spout extends Base {
       contentElm.innerHTML = html()
       this._DialogObject.contentAppChild(contentElm)
       // 颜色组件
-      let startColorPicker = new ewPlugins('colorpicker', {
+      let startColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("start_color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -648,7 +662,7 @@ class Spout extends Base {
           this.startColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let endColorPicker = new ewPlugins('colorpicker', {
+      let endColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("end_color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度

src/Obj/Base/PincerArrowObject/index.js

@@ -24,7 +24,7 @@ class PincerArrowObject extends Base {
    * @param options {object} 属性
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.color="#36c4ff" {string} 颜色
+   * @param options.color="#ff000080" {string} 颜色
    * @param options.height {number} 高度
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
    * @param {Array.<object>} options.positions 坐标数组 [{lon,lat,alt},...]
@@ -34,13 +34,13 @@ class PincerArrowObject extends Base {
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
     this.options.name = options.name || '未命名对象'
-    this.options.color = options.color || "#36c4ff"
+    this.options.color = options.color || "#ff000080"
     this.options.show = (options.show || options.show === false) ? options.show : true
     this.options.positions = options.positions || []
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
     this.options.line = options.line || {}
-    this.options.line.width = this.options.line.width || 2
-    this.options.line.color = this.options.line.color || 'rgba(155, 155, 124, 0.89)'
+    this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     this.options.height = options.height
     this.options.loop = options.loop || false
@@ -62,8 +62,8 @@ class PincerArrowObject extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -122,31 +122,31 @@ class PincerArrowObject extends Base {
     return this.options.color
   }
   set color(v) {
-    this.options.color = v
+    this.options.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polygon) {
       return
     }
-    let material = Cesium.Color.fromCssColorString(v)
+    let material = Cesium.Color.fromCssColorString(this.options.color)
     if (this.sdk.viewer.scene.mode === 2) {
       material = new Cesium.CustomColorMaterialSource({
-        color: v
+        color: this.options.color
       })
     }
     this.entity.polygon.material = material
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
             this.color = c
           },//点击确认按钮事件回调
           clear: () => {
-            this.color = 'rgba(255,255,255,1)'
+            this.color = 'rgba(255,0,0,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.color[i] = colorPicker
@@ -253,25 +253,25 @@ class PincerArrowObject extends Base {
     return this.options.line.color
   }
   set lineColor(v) {
-    this.options.line.color = v
+    this.options.line.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polyline) {
       return
     }
-    this.entity.polyline.material = Cesium.Color.fromCssColorString(v)
+    this.entity.polyline.material = Cesium.Color.fromCssColorString(this.options.line.color)
     if (this._elms.lineColor) {
       this._elms.lineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.line.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
             this.lineColor = c
           },//点击确认按钮事件回调
           clear: () => {
-            this.lineColor = 'rgba(255,255,255,1)'
+            this.lineColor = 'rgba(255,0,0,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.lineColor[i] = lineColorPicker
@@ -283,10 +283,10 @@ class PincerArrowObject extends Base {
     return this.options.line.width
   }
   set lineWidth(v) {
-    this.options.line.width = v
-    this.entity.polyline.width = v
+    this.options.line.width = ((v || v === 0) ? v : 3)
+    this.entity.polyline.width = this.options.line.width
     this._elms.lineWidth && this._elms.lineWidth.forEach((item) => {
-      item.value = v
+      item.value = this.options.line.width
     })
   }
 
@@ -334,7 +334,7 @@ class PincerArrowObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -368,7 +368,7 @@ class PincerArrowObject extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -468,7 +468,7 @@ class PincerArrowObject extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -479,7 +479,7 @@ class PincerArrowObject extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -495,7 +495,7 @@ class PincerArrowObject extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -521,7 +521,7 @@ class PincerArrowObject extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1192,7 +1192,7 @@ class PincerArrowObject extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('pincer-arrow-object-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1206,7 +1206,7 @@ class PincerArrowObject extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let linecolorPicker = new ewPlugins('colorpicker', {
+      let linecolorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("lineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1220,7 +1220,7 @@ class PincerArrowObject extends Base {
           this.lineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1234,7 +1234,7 @@ class PincerArrowObject extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1248,7 +1248,7 @@ class PincerArrowObject extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1262,7 +1262,7 @@ class PincerArrowObject extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/PolygonObject/index.js

@@ -25,7 +25,7 @@ class PolygonObject extends Base {
    * @param options.id {string} 唯一标识
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.color="#36c4ff" {string} 颜色
+   * @param options.color='rgba(255, 0, 0, 0.5)' {string} 颜色
    * @param options.height {number} 高度
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
    * @param options.line {object} 边框
@@ -39,15 +39,15 @@ class PolygonObject extends Base {
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options)
     this.options.name = options.name || '未命名对象'
-    this.options.color = options.color || '#36c4ff'
+    this.options.color = options.color || 'rgba(255, 0, 0, 0.5)'
     this.options.show =
       options.show || options.show === false ? options.show : true
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
     this.options.positions = options.positions || []
     this.options.line = options.line || {}
-    this.options.line.width = this.options.line.width || 2
+    this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
     this.options.line.color =
-      this.options.line.color || 'rgba(155, 155, 124, 0.89)'
+      this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     this.entity
     this.event = new MouseEvent(this.sdk)
@@ -74,8 +74,8 @@ class PolygonObject extends Base {
         options.label.pixelOffset || options.label.pixelOffset === 0
           ? options.label.pixelOffset
           : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near:
         options.label.near || options.label.near === 0
@@ -133,35 +133,35 @@ class PolygonObject extends Base {
     return this.options.color
   }
   set color(v) {
-    this.options.color = v
+    this.options.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polygon) {
       return
     }
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polygon) {
       return
     }
-    let material = Cesium.Color.fromCssColorString(v)
+    let material = Cesium.Color.fromCssColorString(this.options.color)
     if (this.sdk.viewer.scene.mode === 2) {
       this.heightMode = 0
       material = new Cesium.CustomColorMaterialSource({
-        color: v
+        color: this.options.color
       })
     }
     this.entity.polygon.material = material
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini', //颜色box类型
           alpha: true, //是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.color,
           disabled: false, //是否禁止打开颜色选择器
           openPickerAni: 'opacity', //打开颜色选择器动画
           sure: c => {
             this.color = c
           }, //点击确认按钮事件回调
           clear: () => {
-            this.color = 'rgba(255,255,255,1)'
+            this.color = 'rgba(255,0,0,0.5)'
           } //点击清空按钮事件回调
         })
         this._elms.color[i] = colorPicker
@@ -269,25 +269,25 @@ class PolygonObject extends Base {
     return this.options.line.color
   }
   set lineColor(v) {
-    this.options.line.color = v
+    this.options.line.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polyline) {
       return
     }
-    this.entity.polyline.material = Cesium.Color.fromCssColorString(v)
+    this.entity.polyline.material = Cesium.Color.fromCssColorString(this.options.line.color)
     if (this._elms.lineColor) {
       this._elms.lineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini', //颜色box类型
           alpha: true, //是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.line.color,
           disabled: false, //是否禁止打开颜色选择器
           openPickerAni: 'opacity', //打开颜色选择器动画
           sure: c => {
             this.lineColor = c
           }, //点击确认按钮事件回调
           clear: () => {
-            this.lineColor = 'rgba(255,255,255,1)'
+            this.lineColor = 'rgba(255,0,0,0.5)'
           } //点击清空按钮事件回调
         })
         this._elms.lineColor[i] = lineColorPicker
@@ -299,8 +299,8 @@ class PolygonObject extends Base {
     return this.options.line.width
   }
   set lineWidth(v) {
-    this.options.line.width = v
-    this.entity.polyline.width = v
+    this.options.line.width = ((v || v === 0) ? v : 3)
+    this.entity.polyline.width = this.options.line.width
     this._elms.lineWidth &&
       this._elms.lineWidth.forEach(item => {
         item.value = v
@@ -355,7 +355,7 @@ class PolygonObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     } else {
       this.label.show = false
@@ -389,7 +389,7 @@ class PolygonObject extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini', //颜色box类型
           alpha: true, //是否开启透明度
@@ -493,7 +493,7 @@ class PolygonObject extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini', //颜色box类型
           alpha: true, //是否开启透明度
@@ -504,7 +504,7 @@ class PolygonObject extends Base {
             this.labelLineColor = color
           }, //点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           } //点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -520,7 +520,7 @@ class PolygonObject extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini', //颜色box类型
           alpha: true, //是否开启透明度
@@ -548,7 +548,7 @@ class PolygonObject extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini', //颜色box类型
           alpha: true, //是否开启透明度
@@ -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)
@@ -1270,7 +1269,7 @@ class PolygonObject extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('polygon-object-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName('color')[0],
         size: 'mini', //颜色box类型
         alpha: true, //是否开启透明度
@@ -1284,7 +1283,7 @@ class PolygonObject extends Base {
           this.color = 'rgba(255,255,255,1)'
         } //点击清空按钮事件回调
       })
-      let linecolorPicker = new ewPlugins('colorpicker', {
+      let linecolorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName('lineColor')[0],
         size: 'mini', //颜色box类型
         alpha: true, //是否开启透明度
@@ -1298,7 +1297,7 @@ class PolygonObject extends Base {
           this.lineColor = 'rgba(255,255,255,1)'
         } //点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName('labelColor')[0],
         size: 'mini', //颜色box类型
         alpha: true, //是否开启透明度
@@ -1312,7 +1311,7 @@ class PolygonObject extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         } //点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName('labelLineColor')[0],
         size: 'mini', //颜色box类型
         alpha: true, //是否开启透明度
@@ -1326,7 +1325,7 @@ class PolygonObject extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         } //点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName('labelBackgroundColorStart')[0],
         size: 'mini',
         alpha: true,
@@ -1340,7 +1339,7 @@ class PolygonObject extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         }
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName('labelBackgroundColorEnd')[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/PolyhedronObject/eventBinding.js

@@ -21,6 +21,7 @@ class eventBinding {
       let Event = []
       let isEvent = false
       let removeName = []
+      let blurEvent = () => { }
       if (!elements[i] || !elements[i].attributes) {
         continue 
       }
@@ -36,7 +37,8 @@ class eventBinding {
               Event.push((e) => {
                 let value = e.target.value
                 if (e.target.type == 'number') {
-                  if (e.data != '.' && (e.data != '-' || e.target.value)) {
+                  let str = e.target.value + ''
+                  if (e.data != '.' && (e.data != '-' || e.target.value) && !(str.charAt(str.length - 1) == '0' && e.target.value.toString().includes('.')) && e.target.value != '0') {
                     value = Number(value)
                     if((e.target.max) && value>Number(e.target.max)) {
                       value = Number(e.target.max)
@@ -57,6 +59,22 @@ class eventBinding {
                   that[m.value] = value
                 }
               })
+              blurEvent = (e) => {
+                let value = e.target.value
+                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)
+                  }
+                  if ((e.target.min) && value < Number(e.target.min)) {
+                    value = Number(e.target.min)
+                  }
+                  if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+                    value = Number(e.target.dataset.min)
+                  }
+                }
+                that[m.value] = value
+              }
               if(elements[i].nodeName=='IMG') {
                 elements[i].src = that[m.value]
               }
@@ -114,6 +132,7 @@ class eventBinding {
             Event[t](e)
           }
         });
+        elements[i].addEventListener('blur', blurEvent)
       }
     }
   }

src/Obj/Base/PolyhedronObject/index.js

@@ -24,7 +24,7 @@ class PolyhedronObject extends Base {
    * @param options.id {string} 唯一标识
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.color="#0df7f8" {string} 颜色
+   * @param options.color="#ff0000" {string} 颜色
    * @param options.height=10 {number} 高
    * @param {Array.<object>} options.positions 经纬度和高度的列表，值交替 [{lon,lat,alt},...]
    * @param _Dialog {object} 弹框事件
@@ -32,7 +32,7 @@ class PolyhedronObject extends Base {
    * */
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
-    this.options.color = options.color || "#0df7f8"
+    this.options.color = options.color || "#ff0000"
     this.options.show = (options.show || options.show === false) ? options.show : true
     this.options.height = (options.height || options.height === 0) ? options.height : 10
     if (this.options.height <= 0.01) {
@@ -54,8 +54,8 @@ class PolyhedronObject extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -381,7 +381,7 @@ class PolyhedronObject extends Base {
     return this.options.color
   }
   set color(v) {
-    this.options.color = v
+    this.options.color = v || '#ff0000'
     if(!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polygon) {
       return
     }
@@ -394,11 +394,11 @@ class PolyhedronObject extends Base {
     this.entity.polygon.material = material
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
@@ -517,7 +517,7 @@ class PolyhedronObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -551,7 +551,7 @@ class PolyhedronObject extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -651,7 +651,7 @@ class PolyhedronObject extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -662,7 +662,7 @@ class PolyhedronObject extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -678,7 +678,7 @@ class PolyhedronObject extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -704,7 +704,7 @@ class PolyhedronObject extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1105,7 +1105,7 @@ class PolyhedronObject extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('polygon-object-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1119,7 +1119,7 @@ class PolyhedronObject extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1133,7 +1133,7 @@ class PolyhedronObject extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1147,7 +1147,7 @@ class PolyhedronObject extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1161,7 +1161,7 @@ class PolyhedronObject extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/PolyhedronObject2/index.js

@@ -53,8 +53,8 @@ class PolyhedronObject extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -347,7 +347,7 @@ class PolyhedronObject extends Base {
     this.entity.polygon.material = Cesium.Color.fromCssColorString(v)
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -488,7 +488,7 @@ class PolyhedronObject extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -588,7 +588,7 @@ class PolyhedronObject extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -599,7 +599,7 @@ class PolyhedronObject extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -615,7 +615,7 @@ class PolyhedronObject extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -641,7 +641,7 @@ class PolyhedronObject extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -890,7 +890,7 @@ class PolyhedronObject extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('polygon-object-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -904,7 +904,7 @@ class PolyhedronObject extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -918,7 +918,7 @@ class PolyhedronObject extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -932,7 +932,7 @@ class PolyhedronObject extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -946,7 +946,7 @@ class PolyhedronObject extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/PolylineObject/_element.js

@@ -1,7 +1,7 @@
 import { attributeElm, labelStyleElm1, labelStyleElm2 } from '../../Element/elm_html'
 
 function html(that) {
-    return `
+  return `
     <span class="custom-divider"></span>
     <div class="div-item">
         <div class="row" style="align-items: flex-start;">
@@ -9,22 +9,15 @@ function html(that) {
                 <span class="label">名称</span>
                 <input class="input" maxlength="40" type="text" @model="name">
             </div>
-            <div class="col" style="flex: 0 0 54%;">
+            <div class="col" style="flex: 0 0 56%;">
                 <div>
                     <div class="row">
                         <div class="col input-select-unit-box">
-                            <span class="label">原始长度:</span>
+                            <div class="input-select-unit"></div>
                             <input class="input input-text" readonly="readonly" type="text" style="flex: 0 0 130px;" @model="length">
                             <div class="input-select-unit"></div>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="col input-select-fit-unit-box">
-                            <span class="label">拟合长度:</span>
-                            <input class="input input-text" readonly="readonly" type="text" style="flex: 0 0 130px;" @model="fitLength">
-                            <div class="input-select-fit-unit"></div>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>
@@ -48,7 +41,7 @@ function html(that) {
                                 <span class="unit">m</span>
                                 <span class="arrow"></span>
                             </div>
-                            <button class="confirm height-confirm" style="margin-left: 5px;">确认</button>
+                            <button class="confirm height-confirm" style="margin-left: 5px;">应用</button>
                         </div>
                     </div>
                     <div class="row">
@@ -72,7 +65,7 @@ function html(that) {
                             <span class="label">线条颜色</span>
                             <div class="color"></div>
                         </div>
-                        <div class="col">
+                        <div class="col" style="flex: 0 0 33%;">
                             <span class="label">线条宽度</span>
                             <div class="input-number input-number-unit-1" style="width: 80px;">
                                 <input class="input" type="number" title="" min="1" max="999" @model="lineWidth">
@@ -80,7 +73,7 @@ function html(that) {
                                 <span class="arrow"></span>
                             </div>
                         </div>
-                        <div class="col input-select-line-type-box">
+                        <div class="col input-select-line-type-box" style="flex: 0 0 37%;">
                             <span class="label">线条形式</span>
                             <div class="input-select-line-type"></div>
                         </div>
@@ -90,11 +83,11 @@ function html(that) {
                             <span class="label">首尾相连</span>
                             <input class="btn-switch" type="checkbox" @model="noseToTail">
                         </div>
-                        <div class="col">
+                        <div class="col" style="flex: 0 0 33%;">
                             <span class="label">线段圆滑</span>
                             <input class="btn-switch" type="checkbox" @model="smooth">
                         </div>
-                        <div class="col">
+                        <div class="col" style="flex: 0 0 37%;">
                         </div>
                     </div>
                     <div class="row">
@@ -102,7 +95,7 @@ function html(that) {
                             <span class="label">线段缓冲</span>
                             <input class="btn-switch" type="checkbox" @model="extend">
                         </div>
-                        <div class="col">
+                        <div class="col" style="flex: 0 0 33%;">
                             <span class="label">缓冲宽度</span>
                             <div class="input-number input-number-unit-1" style="width: 80px;">
                                 <input class="input" type="number" title="" min="0" data-min="0.01" max="999999" @model="extendWidth">
@@ -110,11 +103,32 @@ function html(that) {
                                 <span class="arrow"></span>
                             </div>
                         </div>
-                        <div class="col">
+                        <div class="col" style="flex: 0 0 37%;">
                             <span class="label">缓冲颜色</span>
                             <div class="extendColor"></div>
                         </div>
                     </div>
+                    <div class="row" id="dashTextureDom">
+                        <div class="col">
+                            <span class="label">首尾反向</span>
+                            <input class="btn-switch" type="checkbox" @model="rotate">
+                        </div>
+                        <div class="col" style="flex: 0 0 33%;">
+                            <span class="label">流动速率</span>
+                            <div class="input-number input-number-unit-1" style="width: 80px;">
+                                <input class="input" type="number" title="" min="0" max="999999" step="1" @model="speed">
+                                <span class="arrow"></span>
+                            </div>
+                        </div>
+                        <div class="col" style="flex: 0 0 37%;">
+                              <span class="label lineSpace">线条间距</span>
+                              <div class="input-number input-number-unit-1 lineSpace" style="width: 80px;">
+                                  <input class="input" type="number" title="" min="0" max="4.5" step="0.1" @model="space">
+                                  <span class="unit">倍</span>
+                                  <span class="arrow"></span>
+                              </div>
+                        </div>
+                    </div>
                 </DIV-cy-tab-pane>
                 <DIV-cy-tab-pane label="标注风格">
                     ${labelStyleElm1()}

src/Obj/Base/PolylineObject/eventBinding.js

@@ -22,7 +22,7 @@ class eventBinding {
       let isEvent = false
       let removeName = []
       if (!elements[i] || !elements[i].attributes) {
-        continue 
+        continue
       }
       for (let m of elements[i].attributes) {
         switch (m.name) {
@@ -38,13 +38,15 @@ class eventBinding {
                 if (e.target.type == 'number') {
                   if (e.data != '.' && (e.data != '-' || e.target.value)) {
                     value = Number(value)
-                    if((e.target.max) && value>Number(e.target.max)) {
+                    if ((e.target.max) && value > Number(e.target.max)) {
                       value = Number(e.target.max)
+                      e.target.value = value
                     }
-                    if((e.target.min) && value<Number(e.target.min)) {
+                    if ((e.target.min) && value < Number(e.target.min)) {
                       value = Number(e.target.min)
+                      e.target.value = value
                     }
-                    if((e.target.dataset.min) && value<Number(e.target.dataset.min)) {
+                    if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
                       value = Number(e.target.dataset.min)
                     }
                     that[m.value] = value
@@ -54,14 +56,14 @@ class eventBinding {
                   that[m.value] = value
                 }
               })
-              if(elements[i].nodeName=='IMG') {
+              if (elements[i].nodeName == 'IMG') {
                 elements[i].src = that[m.value]
               }
               else {
                 elements[i].value = that[m.value]
               }
             }
-            if(this.element[m.value]) {
+            if (this.element[m.value]) {
               this.element[m.value].push(elements[i])
             }
             else {
@@ -84,7 +86,7 @@ class eventBinding {
             isEvent = true
             Event.push((e) => {
               let value = e.target.value
-              if(e.target.type == 'number' && value!='') {
+              if (e.target.type == 'number' && value != '') {
                 value = Number(value)
                 e.target.value = value
               }
@@ -97,7 +99,7 @@ class eventBinding {
         }
         // elements[i].attributes[m] = undefined
       }
-      for(let n=0;n<removeName.length;n++) {
+      for (let n = 0; n < removeName.length; n++) {
         elements[i].attributes.removeNamedItem(removeName[n])
       }
 
@@ -117,4 +119,4 @@ class eventBinding {
 }
 
 const EventBinding = new eventBinding();
-export default EventBinding;
+export default EventBinding;

src/Obj/Base/RadarScan/index.js

@@ -6,7 +6,7 @@ import EventBinding from '../../Element/Dialog/eventBinding';
 import richText from "../../Element/richText";
 import MouseEvent from '../../../Event/index'
 import LabelObject from '../LabelObject'
-import { syncData } from '../../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../../Global/MultiViewportMode'
 import { legp } from '../../Element/datalist';
 import { getFontList, getFontFamilyName } from '../../Element/fontSelect'
 import MouseTip from '../../../MouseTip'
@@ -53,8 +53,8 @@ class RadarScan extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -246,16 +246,29 @@ class RadarScan extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      this.entity.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
+      }
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        this.entity.show = this.options.show
+        if (this.options.label.show && this.label) {
+          this.label.show = this.options.show
+        }
+      }
+      else {
+        this.entity.show = false
+        if (this.options.label.show && this.label) {
+          this.label.show = false
+        }
+      }
       if (this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
-      if (this.options.label.show && this.label) {
-        this.label.show = v
-      }
+      
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
     } else {
       console.error("参数必须为boolean")
     }
@@ -425,7 +438,7 @@ class RadarScan extends Base {
     this.changeMaterial()
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -448,8 +461,9 @@ class RadarScan extends Base {
     return this.options.label.show
   }
   set labelShow(v) {
+    let sdkD = get2DSdk().sdkD
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
       this.label.show = v
     }
     else {
@@ -483,7 +497,7 @@ class RadarScan extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -583,7 +597,7 @@ class RadarScan extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -594,7 +608,7 @@ class RadarScan extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -610,7 +624,7 @@ class RadarScan extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -636,7 +650,7 @@ class RadarScan extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1124,7 +1138,7 @@ class RadarScan extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('radar-scan-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1138,7 +1152,7 @@ class RadarScan extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1152,7 +1166,7 @@ class RadarScan extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1166,7 +1180,7 @@ class RadarScan extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1180,7 +1194,7 @@ class RadarScan extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,
@@ -1374,7 +1388,7 @@ class RadarScan extends Base {
   }
 
   async remove() {
-    this.label.remove()
+    this.label && this.label.remove()
     this.entity && this.sdk.viewer.entities.remove(this.entity)
     this.entity2 && this.sdk.viewer.entities.remove(this.entity2)
     this.entity = null

src/Obj/Base/RadarScanStereoscopic/index.js

@@ -58,8 +58,8 @@ class RadarScanStereoscopic extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -86,6 +86,10 @@ class RadarScanStereoscopic extends Base {
     RadarScanStereoscopic.radarSolidScan(this)
   }
 
+  get type() {
+    return 'RadarScanStereoscopic'
+  }
+
   static radarSolidScan(that) {
     let viewer = that.sdk.viewer
     let options = that.options
@@ -369,7 +373,7 @@ class RadarScanStereoscopic extends Base {
     this.entity.ellipsoid.outlineColor = Cesium.Color.fromCssColorString(v)
     if (this._elms.colorOut) {
       this._elms.colorOut.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -396,7 +400,7 @@ class RadarScanStereoscopic extends Base {
     this.entity.wall.material = Cesium.Color.fromCssColorString(v)
     if (this._elms.colorIn) {
       this._elms.colorIn.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -420,7 +424,7 @@ class RadarScanStereoscopic extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -454,7 +458,7 @@ class RadarScanStereoscopic extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -554,7 +558,7 @@ class RadarScanStereoscopic extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -565,7 +569,7 @@ class RadarScanStereoscopic extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -581,7 +585,7 @@ class RadarScanStereoscopic extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -607,7 +611,7 @@ class RadarScanStereoscopic extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1026,7 +1030,7 @@ class RadarScanStereoscopic extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('radar-scan-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorOutPicker = new ewPlugins('colorpicker', {
+      let colorOutPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("colorOut")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1040,7 +1044,7 @@ class RadarScanStereoscopic extends Base {
           this.colorOut = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let colorInPicker = new ewPlugins('colorpicker', {
+      let colorInPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("colorIn")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1054,7 +1058,7 @@ class RadarScanStereoscopic extends Base {
           this.colorIn = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1068,7 +1072,7 @@ class RadarScanStereoscopic extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1082,7 +1086,7 @@ class RadarScanStereoscopic extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1096,7 +1100,7 @@ class RadarScanStereoscopic extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/Road/index.js

@@ -27,7 +27,7 @@ class Corridor extends Base {
       fromDegreesArray.push(positions[i].lng, positions[i].lat)
     }
 
-    let length = this.computeDistance(positions)
+    let length = this.computeDistance2(positions)
 
     let geometry = new Cesium.CorridorGeometry({
       positions: Cesium.Cartesian3.fromDegreesArray(fromDegreesArray),

src/Obj/Base/Road/index3.js

@@ -31,7 +31,7 @@ class Corridor extends Base {
       fromDegreesArray.push(positions[i].lng, positions[i].lat)
     }
 
-    let length = this.computeDistance(positions)
+    let length = this.computeDistance2(positions)
 
     let geometry = new Cesium.CorridorGeometry({
       positions: Cesium.Cartesian3.fromDegreesArray(fromDegreesArray),

src/Obj/Base/SectorObject/index.js

@@ -23,7 +23,7 @@ class SectorObject extends Base {
    * @param options.id {string} 标注id
    * @param options.name {string} 名称
    * @param options.show=true {boolean} 显示/隐藏
-   * @param options.color="#36c4ff" {string} 颜色
+   * @param options.color="rgba(255, 0, 0, 0.5)" {string} 颜色
    * @param options.center {object} 位置
    * @param options.center.lng {object} 经度
    * @param options.center.lat {object} 维度
@@ -31,7 +31,7 @@ class SectorObject extends Base {
    * @param options.startAngle=10 {number} 起始方向
    * @param options.endAngle=0 {number} 结束方向
    * @param options.line {object} 边框
-   * @param options.line.width=2 {string} 边框宽
+   * @param options.line.width=3 {string} 边框宽
    * @param options.line.color="rgba(155, 155, 124, 0.89)" {string} 边框颜色
    * @param options.label {object} 标注
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
@@ -39,15 +39,15 @@ class SectorObject extends Base {
   constructor(sdk, options = {}) {
     super(sdk, options);
     this.options.name = options.name || '未命名对象'
-    this.options.color = options.color || "#36c4ff"
+    this.options.color = options.color || "rgba(255, 0, 0, 0.5)"
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
     this.options.semiMinorAxis = (options.semiMinorAxis || options.semiMinorAxis === 0) ? options.semiMinorAxis : 10
     this.options.semiMajorAxis = (options.semiMajorAxis || options.semiMajorAxis === 0) ? options.semiMajorAxis : 20
     this.options.show = (options.show || options.show === false) ? options.show : true
     this.options.center = options.center || {}
     this.options.line = options.line || {}
-    this.options.line.width = this.options.line.width || 2
-    this.options.line.color = this.options.line.color || 'rgba(155, 155, 124, 0.89)'
+    this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     options.label = options.label || {}
     this._elms = {};
@@ -60,8 +60,8 @@ class SectorObject extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -226,32 +226,32 @@ class SectorObject extends Base {
     return this.options.color
   }
   set color(v) {
-    this.options.color = v
+    this.options.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polygon) {
       return
     }
-    let material = Cesium.Color.fromCssColorString(v)
+    let material = Cesium.Color.fromCssColorString(this.options.color)
     if (this.sdk.viewer.scene.mode === 2) {
       material = new Cesium.CustomColorMaterialSource({
-        color: v
+        color: this.options.color
       })
     }
     this.entity.polygon.material = material
     this.entity.polyline.width = this.lineWidth
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
             this.color = c
           },//点击确认按钮事件回调
           clear: () => {
-            this.color = 'rgba(255,255,255,1)'
+            this.color = 'rgba(255,0,0,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.color[i] = colorPicker
@@ -263,25 +263,25 @@ class SectorObject extends Base {
     return this.options.line.color
   }
   set lineColor(v) {
-    this.options.line.color = v
+    this.options.line.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polyline) {
       return
     }
-    this.entity.polyline.material = Cesium.Color.fromCssColorString(v)
+    this.entity.polyline.material = Cesium.Color.fromCssColorString(this.options.line.color)
     if (this._elms.lineColor) {
       this._elms.lineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.line.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
             this.lineColor = c
           },//点击确认按钮事件回调
           clear: () => {
-            this.lineColor = 'rgba(255,255,255,1)'
+            this.lineColor = 'rgba(255,0,0,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.lineColor[i] = lineColorPicker
@@ -293,10 +293,10 @@ class SectorObject extends Base {
     return this.options.line.width
   }
   set lineWidth(v) {
-    this.options.line.width = v
-    this.entity.polyline.width = v
+    this.options.line.width = ((v || v === 0) ? v : 3)
+    this.entity.polyline.width = this.options.line.width
     this._elms.lineWidth && this._elms.lineWidth.forEach((item) => {
-      item.value = v
+      item.value = this.options.line.width
     })
   }
 
@@ -344,7 +344,7 @@ class SectorObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -378,7 +378,7 @@ class SectorObject extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -478,7 +478,7 @@ class SectorObject extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -489,7 +489,7 @@ class SectorObject extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -505,7 +505,7 @@ class SectorObject extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -531,7 +531,7 @@ class SectorObject extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1175,7 +1175,7 @@ class SectorObject extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('circle-object-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1189,7 +1189,7 @@ class SectorObject extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let linecolorPicker = new ewPlugins('colorpicker', {
+      let linecolorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("lineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1203,7 +1203,7 @@ class SectorObject extends Base {
           this.lineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1217,7 +1217,7 @@ class SectorObject extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labellineColorPicker = new ewPlugins('colorpicker', {
+      let labellineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1231,7 +1231,7 @@ class SectorObject extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1245,7 +1245,7 @@ class SectorObject extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,
@@ -1560,7 +1560,7 @@ class SectorObject extends Base {
   _addRr() {
     if (this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value) {
       this.options.attribute.vr.content.push({
-        name: '全景图' ,
+        name: '全景图',
         url: this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value
       })
       this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value = ''
@@ -1573,7 +1573,7 @@ class SectorObject extends Base {
 
   addAttributeRr(vr) {
     this.options.attribute.vr.content.push({
-      name: '全景图' ,
+      name: '全景图',
       url: vr
     })
     this.attributeVr = this.options.attribute.vr.content
@@ -1922,6 +1922,19 @@ class SectorObject extends Base {
         that.cartesian3Towgs84(positions[1], that.sdk.viewer),
         that.cartesian3Towgs84(positions[positions.length - 4], that.sdk.viewer)
       ]
+      let objectsToExclude = [...that.sdk.viewer.entities.values]
+      that
+        .getClampToHeight({
+          lng: that.options.center.lng,
+          lat: that.options.center.lat
+        }, objectsToExclude)
+        .then(height => {
+          that.label.position = [
+            that.options.center.lng,
+            that.options.center.lat,
+            height
+          ]
+        })
       setTimeout(() => {
         createNodePoints(positions[1], 'sector-start')
         createNodePoints(positions[positions.length - 4], 'sector-end')

src/Obj/Base/StraightArrowObject/index.js

@@ -24,7 +24,7 @@ class StraightArrowObject extends Base {
    * @param options {object} 属性
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.color="#36c4ff" {string} 颜色
+   * @param options.color="#ff000080" {string} 颜色
    * @param options.height {number} 高度
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
    * @param {Array.<object>} options.positions 坐标数组 [{lon,lat,alt},...]
@@ -34,13 +34,13 @@ class StraightArrowObject extends Base {
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
     this.options.name = options.name || '未命名对象'
-    this.options.color = options.color || "#36c4ff"
+    this.options.color = options.color || "#ff000080"
     this.options.show = (options.show || options.show === false) ? options.show : true
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
     this.options.positions = options.positions || []
     this.options.line = options.line || {}
-    this.options.line.width = this.options.line.width || 2
-    this.options.line.color = this.options.line.color || 'rgba(155, 155, 124, 0.89)'
+    this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     this.entity
     this.event = new MouseEvent(this.sdk)
@@ -60,8 +60,8 @@ class StraightArrowObject extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -109,24 +109,24 @@ class StraightArrowObject extends Base {
     return this.options.color
   }
   set color(v) {
-    this.options.color = v
+    this.options.color = v || 'rgba(255, 0, 0, 0.5)'
     if (!this.sdk || !this.sdk.viewer || !this.entity || !this.entity.polygon) {
       return
     }
-    let material = Cesium.Color.fromCssColorString(v)
+    let material = Cesium.Color.fromCssColorString(this.options.color)
     if (this.sdk.viewer.scene.mode === 2) {
       material = new Cesium.CustomColorMaterialSource({
-        color: v
+        color: this.options.color
       })
     }
     this.entity.polygon.material = material
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
@@ -247,7 +247,7 @@ class StraightArrowObject extends Base {
     this.entity.polyline.material = Cesium.Color.fromCssColorString(v)
     if (this._elms.lineColor) {
       this._elms.lineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -321,7 +321,7 @@ class StraightArrowObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -355,7 +355,7 @@ class StraightArrowObject extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -455,7 +455,7 @@ class StraightArrowObject extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -466,7 +466,7 @@ class StraightArrowObject extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -482,7 +482,7 @@ class StraightArrowObject extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -508,7 +508,7 @@ class StraightArrowObject extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1178,7 +1178,7 @@ class StraightArrowObject extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('assemble-object-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1192,7 +1192,7 @@ class StraightArrowObject extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let linecolorPicker = new ewPlugins('colorpicker', {
+      let linecolorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("lineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1206,7 +1206,7 @@ class StraightArrowObject extends Base {
           this.lineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1220,7 +1220,7 @@ class StraightArrowObject extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labellineColorPicker = new ewPlugins('colorpicker', {
+      let labellineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1234,7 +1234,7 @@ class StraightArrowObject extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1248,7 +1248,7 @@ class StraightArrowObject extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/TextBox/index.js

@@ -0,0 +1,212 @@
+/**
+ * 文本框
+ */
+import Base from "../index";
+import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
+class TextBox extends Base {
+  /**
+   * @constructor
+   * @param sdk
+   * @description 文本框
+   * @param options {object} 属性
+   * @param options.id=id
+   * @param options.position=[]位置
+   * @param options.text=文本框内容
+   * @param options.show=true {boolean}是否显示
+   * @param callback=方法回调
+   * @param Dialog {object} 弹框对象
+   * @param Dialog.confirmCallBack {function} 弹框确认时的回调
+   * */
+  constructor(sdk, options = {}, callback = null) {
+    // this.sdk = { ...sdk }
+    // this.options = { ...options }
+    super(sdk, options)
+    this.options.position = options.position || []
+    this.options.text = options.text || ''
+    this.options.show = (options.show || options.show === false) ? options.show : true
+    this.clickTextDom = undefined
+    this.handler = undefined
+    this.textDom = undefined
+    this.create(this)
+    this.sdk.addIncetance(this.options.id, this)
+    this.callback = callback
+  }
+
+  async create(that) {
+    let viewer = that.sdk.viewer
+    // 创建div元素
+    let dom = document.createElement('span');
+    dom.id = that.options.id
+    dom.className = 'popup-textarea'
+    // 创建textarea元素
+    var textarea = document.createElement('textarea');
+    textarea.className = 'textarea'
+    textarea.value = that.options.text;
+    // 设置textarea的属性，例如行数和列数
+    textarea.rows = 6;
+    textarea.style.resize = 'none'
+    // 将textarea添加到div中
+    dom.appendChild(textarea);
+    (!that.options.show) && (dom.style.display = 'none')
+    // 将div添加到body中
+    // document.body.appendChild(dom);
+
+    // 配置CSS样式和内容结构
+    viewer.cesiumWidget.container.appendChild(dom);
+    let posi = Cesium.Cartesian3.fromDegrees(that.options.position.lng.toFixed(4), that.options.position.lat.toFixed(4), that.options.position.alt.toFixed(4))
+
+    that.handler = function () {
+      const position = Cesium.SceneTransforms.wgs84ToWindowCoordinates(
+        viewer.scene, posi
+      );
+      if (position) {
+        let width = dom.clientWidth * 1
+        let height = dom.clientHeight * 1
+        dom.style.left = `${position.x - width / 2}px`;
+        dom.style.top = `${position.y - height}px`;
+      }
+    }
+    viewer.scene.postRender.addEventListener(that.handler);
+    that.textDom = dom;
+
+  }
+  async setHandeler(data) {
+    let that = this
+    const ray = this.sdk.viewer.camera.getPickRay(new Cesium.Cartesian2(data.x, data.y));
+    var cartesian = this.sdk.viewer.scene.globe.pick(ray, this.sdk.viewer.scene);
+    if (Cesium.defined(cartesian)) {
+      that.sdk.viewer.scene.postRender.removeEventListener(that.handler);
+
+      var cartographic = Cesium.Cartographic.fromCartesian(cartesian);
+      var longitude = Cesium.Math.toDegrees(cartographic.longitude);
+      var latitude = Cesium.Math.toDegrees(cartographic.latitude);
+      that.position = {
+        lng: longitude,
+        lat: latitude,
+        alt: cartographic.height
+      }
+      let posi = Cesium.Cartesian3.fromDegrees(longitude.toFixed(4), latitude.toFixed(4), cartographic.height.toFixed(4))
+
+      that.handler = function () {
+        const position = Cesium.SceneTransforms.wgs84ToWindowCoordinates(
+          that.sdk.viewer.scene, posi
+        );
+        if (position) {
+          let width = that.textDom.clientWidth * 1
+          let height = that.textDom.clientHeight * 1
+          that.textDom.style.left = `${position.x - width / 2}px`;
+          that.textDom.style.top = `${position.y - height}px`;
+        }
+      }
+      that.sdk.viewer.scene.postRender.addEventListener(that.handler);
+    }
+  }
+  async getwords(words) {
+    this.options.text = words
+    this.callback(this.options)
+  }
+  async returnFun() {
+    return this.handler
+  }
+  get show() {
+    return this.options.show
+  }
+  set show(v) {
+    this.options.show = v
+    this.textDom && (this.textDom.style.display = v ? 'block' : 'none');
+  }
+  get position() {
+    return this.options.position
+  }
+  set position(v) {
+    this.options.position = v
+  }
+  async flyTo(options = {}) {
+    setActiveViewer(0)
+    closeRotateAround(this.sdk)
+    closeViewFollow(this.sdk)
+
+    if (this.options.customView && this.options.customView.relativePosition && this.options.customView.orientation) {
+      let orientation = {
+        heading: Cesium.Math.toRadians(this.options.customView.orientation.heading || 0.0),
+        pitch: Cesium.Math.toRadians(this.options.customView.orientation.pitch || -60.0),
+        roll: Cesium.Math.toRadians(this.options.customView.orientation.roll || 0.0)
+      }
+
+      let lng = this.options.customView.relativePosition.lng
+      let lat = this.options.customView.relativePosition.lat
+      let alt = this.options.customView.relativePosition.alt
+      let destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
+
+      let position = { lng: 0, lat: 0 }
+      if (this.options.position) {
+        position = { ...this.options.position }
+      }
+      else if (this.options.position) {
+        position = { ...this.options.position[0] }
+      }
+      else if (this.options.center) {
+        position = { ...this.options.center }
+      }
+      else if (this.options.start) {
+        position = { ...this.options.start }
+      }
+      else {
+        if (this.options.hasOwnProperty('lng')) {
+          position.lng = this.options.lng
+        }
+        if (this.options.hasOwnProperty('lat')) {
+          position.lat = this.options.lat
+        }
+        if (this.options.hasOwnProperty('alt')) {
+          position.alt = this.options.alt
+        }
+      }
+      // 如果没有高度值，则获取紧贴高度计算
+      // if (!position.hasOwnProperty('alt')) {
+      //   position.alt = await this.getClampToHeight(position)
+      // }
+      lng = this.options.customView.relativePosition.lng + position.lng
+      lat = this.options.customView.relativePosition.lat + position.lat
+      alt = this.options.customView.relativePosition.alt + position.alt
+      destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
+      this.sdk.viewer.camera.flyTo({
+        destination: destination,
+        orientation: orientation
+      })
+    }
+    else {
+      let positionArray = []
+      let a = Cesium.Cartesian3.fromDegrees(
+        this.position.lng,
+        this.position.lat,
+        this.position.alt
+      )
+      positionArray.push(a.x, a.y, a.z)
+
+      let BoundingSphere = Cesium.BoundingSphere.fromVertices(positionArray)
+      this.viewer.camera.flyToBoundingSphere(BoundingSphere, {
+        offset: {
+          heading: Cesium.Math.toRadians(0.0),
+          pitch: Cesium.Math.toRadians(-20.0),
+          roll: Cesium.Math.toRadians(0.0)
+        }
+      })
+
+    }
+  }
+
+  async remove() {
+    if (this.handler) {
+      this.sdk.viewer.scene.postRender.removeEventListener(this.handler);
+      this.handler = undefined
+    }
+    if (this.textDom && this.textDom.parentNode) {
+      this.sdk.viewer.cesiumWidget.container.removeChild(this.textDom);
+    }
+  }
+
+  flicker() { }
+}
+
+export default TextBox

src/Obj/Base/TextObject/3DText/index.js

@@ -52,7 +52,7 @@ class Text3D extends Base {
     })
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -236,7 +236,7 @@ class Text3D extends Base {
       // 创建标签页
       // let tabsElm = new cy_tabs('radar-scan-edit-tabs')
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -250,7 +250,7 @@ class Text3D extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -264,7 +264,7 @@ class Text3D extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -278,7 +278,7 @@ class Text3D extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -292,7 +292,7 @@ class Text3D extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/TextObject/GroundText/index.js

@@ -263,7 +263,7 @@ class GroundText extends Base {
     })
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini', //颜色box类型
           alpha: true, //是否开启透明度
@@ -401,7 +401,7 @@ class GroundText extends Base {
       this._elms = this._EventBinding.element
 
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName('color')[0],
         size: 'mini', //颜色box类型
         alpha: true, //是否开启透明度
@@ -649,7 +649,7 @@ class GroundText extends Base {
       ctx.font = 200 + 'px serif'
       ctx.fillStyle = 'rgba(255, 255, 255, 0)'
       ctx.fillRect(0, 0, maxWidth + 30, 210)
-      ctx.fillStyle = this.options.color
+      ctx.fillStyle = 'rgba(255, 255, 255, 1)'
       ctx.font = '200px serif'
       ctx.fillText(textArray[i], 0, 210 * (i + 1))
     }

src/Obj/Base/TextObject/GroundText/index2.js

@@ -164,7 +164,7 @@ class GroundText extends Base {
     })
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini', //颜色box类型
           alpha: true, //是否开启透明度
@@ -302,7 +302,7 @@ class GroundText extends Base {
       this._elms = this._EventBinding.element
 
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName('color')[0],
         size: 'mini', //颜色box类型
         alpha: true, //是否开启透明度

src/Obj/Base/TextObject/StandText/index.js

@@ -94,7 +94,7 @@ class StandText extends Base {
       let minimumHeights = []
       let maximumHeights = []
       let material = this.getMaterial()
-      let width = this.computeDistance(positions)
+      let width = this.computeDistance2(positions)
       let extrudedHeight = this.aspectRatio ? (width / this.aspectRatio) : 0
       for (let i = 0; i < positions.length; i++) {
         fromDegreesArray.push(positions[i].lng, positions[i].lat)
@@ -118,7 +118,7 @@ class StandText extends Base {
     this.entity.wall.material = this.getMaterial()
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -303,7 +303,7 @@ class StandText extends Base {
     let minimumHeights = []
     let maximumHeights = []
     let material = that.getMaterial()
-    let width = that.computeDistance(positions)
+    let width = that.computeDistance2(positions)
     let extrudedHeight = that.aspectRatio ? (width / that.aspectRatio) : 0
     // aspectRatio
     for (let i = 0; i < positions.length; i++) {
@@ -403,7 +403,7 @@ class StandText extends Base {
       // 创建标签页
       // let tabsElm = new cy_tabs('radar-scan-edit-tabs')
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -417,71 +417,11 @@ class StandText extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
-        el: contentElm.getElementsByClassName("labelColor")[0],
-        size: 'mini',//颜色box类型
-        alpha: true,//是否开启透明度
-        defaultColor: this.labelColor,
-        disabled: false,//是否禁止打开颜色选择器
-        openPickerAni: 'opacity',//打开颜色选择器动画
-        sure: (color) => {
-          this.labelColor = color
-        },//点击确认按钮事件回调
-        clear: () => {
-          this.labelColor = 'rgba(255,255,255,1)'
-        },//点击清空按钮事件回调
-      })
-      let lineColorPicker = new ewPlugins('colorpicker', {
-        el: contentElm.getElementsByClassName("labelLineColor")[0],
-        size: 'mini',//颜色box类型
-        alpha: true,//是否开启透明度
-        defaultColor: this.labelLineColor,
-        disabled: false,//是否禁止打开颜色选择器
-        openPickerAni: 'opacity',//打开颜色选择器动画
-        sure: (color) => {
-          this.labelLineColor = color
-        },//点击确认按钮事件回调
-        clear: () => {
-          this.labelLineColor = 'rgba(255,255,255,1)'
-        },//点击清空按钮事件回调
-      })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
-        el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
-        size: 'mini',
-        alpha: true,
-        defaultColor: this.labelBackgroundColorStart,
-        disabled: false,
-        openPickerAni: 'opacity',
-        sure: (color) => {
-          this.labelBackgroundColorStart = color
-        },
-        clear: () => {
-          this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
-        },
-      })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
-        el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
-        size: 'mini',
-        alpha: true,
-        defaultColor: this.labelBackgroundColorEnd,
-        disabled: false,
-        openPickerAni: 'opacity',
-        sure: (color) => {
-          this.labelBackgroundColorEnd = color
-        },
-        clear: () => {
-          this.labelBackgroundColorEnd = 'rgba(255,255,255,1)'
-        },
-      })
 
       let all_elm = contentElm.getElementsByTagName("*")
       this._EventBinding.on(this, all_elm)
       this._elms = this._EventBinding.element
       this._elms.color = [colorPicker]
-      this._elms.labelColor = [labelColorPicker]
-      this._elms.labelLineColor = [lineColorPicker]
-      this._elms.labelBackgroundColorStart = [labelBackgroundColorStartPicker]
-      this._elms.labelBackgroundColorEnd = [labelBackgroundColorEndPicker]
     } else {
       if (this._DialogObject && this._DialogObject.remove) {
         this._DialogObject.remove()
@@ -503,7 +443,7 @@ class StandText extends Base {
     let fromDegreesArray = []
     let minimumHeights = []
     let maximumHeights = []
-    let width = this.computeDistance(positions)
+    let width = this.computeDistance2(positions)
     let extrudedHeight = this.aspectRatio ? (width / this.aspectRatio) : 0
     // aspectRatio
     for (let i = 0; i < positions.length; i++) {
@@ -568,7 +508,7 @@ class StandText extends Base {
       ctx.font = 200 + "px serif";
       ctx.fillStyle = 'rgba(255, 255, 255, 0)'
       ctx.fillRect(0, 0, maxWidth + 30, 210)
-      ctx.fillStyle = this.options.color;
+      ctx.fillStyle = 'rgba(255, 255, 255, 1)';
       ctx.font = "200px serif";
       ctx.fillText(textArray[i], 0, 210 * (i+1));
     }
@@ -602,7 +542,7 @@ class StandText extends Base {
       let fromDegreesArray = []
       let minimumHeights = []
       let maximumHeights = []
-      let width = that.computeDistance(positions)
+      let width = that.computeDistance2(positions)
       let extrudedHeight = that.aspectRatio ? (width / that.aspectRatio) : 0
       for (let i = 0; i < positions.length; i++) {
         fromDegreesArray.push(positions[i].lng, positions[i].lat)
@@ -635,7 +575,7 @@ class StandText extends Base {
           fromDegreesArray = []
           minimumHeights = []
           maximumHeights = []
-          width = that.computeDistance(positions)
+          width = that.computeDistance2(positions)
           extrudedHeight = that.aspectRatio ? (width / that.aspectRatio) : 0
           for (let i = 0; i < positions.length; i++) {
             fromDegreesArray.push(positions[i].lng, positions[i].lat)
@@ -680,7 +620,7 @@ class StandText extends Base {
         fromDegreesArray = []
         minimumHeights = []
         maximumHeights = []
-        width = that.computeDistance(positions)
+        width = that.computeDistance2(positions)
         extrudedHeight = that.aspectRatio ? (width / that.aspectRatio) : 0
         for (let i = 0; i < positions.length; i++) {
           fromDegreesArray.push(positions[i].lng, positions[i].lat)
@@ -710,7 +650,7 @@ class StandText extends Base {
           fromDegreesArray = []
           minimumHeights = []
           maximumHeights = []
-          width = that.computeDistance(positions)
+          width = that.computeDistance2(positions)
           extrudedHeight = that.aspectRatio ? (width / that.aspectRatio) : 0
           for (let i = 0; i < positions.length; i++) {
             fromDegreesArray.push(positions[i].lng, positions[i].lat)

src/Obj/Base/TrajectoryMotion/index.js

@@ -99,8 +99,8 @@ class TrajectoryMotion extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -144,37 +144,55 @@ class TrajectoryMotion extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      if (this.originalOptions) {
-        this.originalOptions.show = v
+      let sdkD = get2DView()
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
+        if (this.originalOptions) {
+          this.originalOptions.show = v
+        }
       }
-      if (v) {
+      if (this.options.show) {
         if (this.firstPersonView) {
           this.model.show = false
         }
         else {
-          this.model.show = this.modelShow
+          this.model.show = (!this.showView || this.showView == 3 || !sdkD) ? this.modelShow : false
         }
 
-        this.line.polyline.material = this.lineShow ? new Cesium.PolylineDashMaterialProperty({
-          color: new Cesium.Color.fromCssColorString('#00ffff'),
-          dashLength: 20,
-        }) : new Cesium.PolylineDashMaterialProperty({
-          color: new Cesium.Color.fromCssColorString('#00ffff00'),
-          dashLength: 20,
-        })
+        if ((!this.showView || this.showView == 3 || !sdkD)) {
+          this.line.polyline.material = this.lineShow ? new Cesium.PolylineDashMaterialProperty({
+            color: new Cesium.Color.fromCssColorString('#00ffff'),
+            dashLength: 20,
+          }) : new Cesium.PolylineDashMaterialProperty({
+            color: new Cesium.Color.fromCssColorString('#00ffff00'),
+            dashLength: 20,
+          })
+        }
+        else {
+          this.line.polyline.material = new Cesium.PolylineDashMaterialProperty({
+            color: new Cesium.Color.fromCssColorString('#00ffff00'),
+            dashLength: 20,
+          })
+        }
         for (let i = 0; i < this.keyPoints.length; i++) {
-          this.keyPoints[i].show = this.keyPointShow
+          this.keyPoints[i].show = (!this.showView || this.showView == 3 || !sdkD) ? this.keyPointShow : false
         }
         if (this.realTimeRoute) {
-          this.realTimeLine && (this.realTimeLine.show = true)
+          this.realTimeLine && (this.realTimeLine.show = (!this.showView || this.showView == 3 || !sdkD) ? true : false)
         }
-        this.label && (this.label.show = this.options.label.show)
+        this.label && (this.label.show = (!this.showView || this.showView == 3 || !sdkD) ? this.options.label.show : false)
       }
       else {
-        this.model.show = v
+        this.model.show = (!this.showView || this.showView == 3 || !sdkD) ? this.options.show : false
+        let show = this.options.show
+        if ((!this.showView || this.showView == 3 || !sdkD)) {
+          show = this.options.show
+        }
+        else {
+          show = false
+        }
         this.realTimeLine && (this.realTimeLine.show = false)
-        this.line.polyline.material = v ? new Cesium.PolylineDashMaterialProperty({
+        this.line.polyline.material = show ? new Cesium.PolylineDashMaterialProperty({
           color: new Cesium.Color.fromCssColorString('#00ffff'),
           dashLength: 20,
         }) : new Cesium.PolylineDashMaterialProperty({
@@ -182,7 +200,7 @@ class TrajectoryMotion extends Base {
           dashLength: 20,
         })
         for (let i = 0; i < this.keyPoints.length; i++) {
-          this.keyPoints[i].show = v
+          this.keyPoints[i].show = (!this.showView || this.showView == 3) ? show : false
         }
         this.label && (this.label.show = false)
         this.viewFollow = false
@@ -193,6 +211,7 @@ class TrajectoryMotion extends Base {
       }
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
     } else {
       console.error("参数必须为boolean")
     }
@@ -636,7 +655,7 @@ class TrajectoryMotion extends Base {
         })
         this.TweenAnimate.pause()
         setTimeout(() => {
-          _this.model.isMove = false
+          _this.model && (_this.model.isMove = false)
         }, 200);
       }
     }
@@ -655,9 +674,17 @@ class TrajectoryMotion extends Base {
     return this.options.model.show
   }
   set modelShow(v) {
+    let sdkD = get2DView()
     this.options.model.show = v
+    let show = v
+    if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
+      show = v
+    }
+    else {
+      show = false
+    }
     if (this.model && this.show) {
-      this.model.show = v
+      this.model.show = show
     }
     this._elms.modelShow && this._elms.modelShow.forEach((item) => {
       item.checked = v
@@ -723,8 +750,16 @@ class TrajectoryMotion extends Base {
       this.realTimeRoute = false
     }
     this.options.line.show = v
+    let show = v
+    let sdkD = get2DView()
+    if ((!this.showView || this.showView == 3 || !sdkD)) {
+      show = v
+    }
+    else {
+      show = false
+    }
     if (this.line && this.show) {
-      this.line.polyline.material = v ? new Cesium.PolylineDashMaterialProperty({
+      this.line.polyline.material = show ? new Cesium.PolylineDashMaterialProperty({
         color: new Cesium.Color.fromCssColorString('#00ffff'),
         dashLength: 20, //短划线长度
       }) : new Cesium.PolylineDashMaterialProperty({
@@ -941,6 +976,7 @@ class TrajectoryMotion extends Base {
 
   set firstPersonView(v) {
     // this.state = true
+    let sdkD = get2DView()
     let splitSdk = getSdk()
     if (get2DView() || splitSdk.sdkD || !this.show) {
       v = false
@@ -994,7 +1030,14 @@ class TrajectoryMotion extends Base {
     else {
       CameraController(this.sdk, true)
       if (this.model && this.modelShow && this.show) {
-        this.model.show = true
+        let show = true
+        if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
+          show = true
+        }
+        else {
+          show = false
+        }
+        this.model.show = show
       }
       if (this._DialogObject && this._DialogObject._element.content) {
         let e_firstPerson = this._DialogObject._element.content.querySelectorAll("button[name='firstPerson']")
@@ -1116,8 +1159,16 @@ class TrajectoryMotion extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
+    let sdkD = get2DView()
+    let show = v
+    if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
+      show = v
+    }
+    else {
+      show = false
+    }
     if (this.show) {
-      this.label && (this.label.show = v)
+      this.label && (this.label.show = show)
       if (this.options.label.position) {
         setTimeout(() => {
           if (this.options.label.position.alt) {
@@ -1162,7 +1213,7 @@ class TrajectoryMotion extends Base {
     this.label && (this.label.color = v)
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1305,9 +1356,10 @@ class TrajectoryMotion extends Base {
   }
   // 创建模型
   static async addModel(that) {
+    let url = that.replaceHost(that.options.model.url, that.options.host)
     let options = {
       id: that.options.id,
-      url: that.options.model.url,
+      url: url,
       show: that.options.show ? that.options.model.show : false,
       scale: that.options.model.scale,
       // minimumPixelSize: that.options.model.pixelSize,
@@ -1479,7 +1531,7 @@ class TrajectoryMotion extends Base {
     else {
       setPosition(startDistance)
       setTimeout(() => {
-        _this.model.isMove = false
+        _this.model && (_this.model.isMove = false)
       }, 500);
 
 
@@ -1861,7 +1913,9 @@ class TrajectoryMotion extends Base {
           // this.options.viewFollowOrientation.roll = Cesium.Math.toDegrees(this.sdk.viewer.camera.roll)
           // this.options.viewFollowOrientation.direction = this.sdk.viewer.camera.direction
           this._DialogObject.close()
-          this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
+          let cdoptions = this.deepCopyObj(this.options)
+          cdoptions.host = ''
+          this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(cdoptions)
           syncData(this.sdk, this.options.id)
           syncSplitData(this.sdk, this.options.id)
         },
@@ -1885,10 +1939,10 @@ class TrajectoryMotion extends Base {
           this.tip && this.tip.destroy()
           this.tip = null
           this.ControllerObject.destroy()
-          if(this.firstPersonView !== this.originalOptions.firstPersonView) {
+          if (this.firstPersonView !== this.originalOptions.firstPersonView) {
             this.firstPersonView = this.originalOptions.firstPersonView;
           }
-          if(this.firstPersonView && this.modelShow) {
+          if (this.firstPersonView && this.modelShow) {
             this.model && (this.model.show = false)
           }
         },
@@ -1914,7 +1968,7 @@ class TrajectoryMotion extends Base {
         this._DialogObject._element.content.getElementsByClassName('model-rotate-btn')[0].className = 'btn model-rotate-btn'
       }
 
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -2033,7 +2087,7 @@ class TrajectoryMotion extends Base {
       rubricElm.style.color = '#ff5733';
       rubricElm.style.display = 'none'
 
-      rubricElm.innerHTML = `场景正北方向为轨迹前进正方向<div x-arrow="" class="custom__popper__arrow" style="left: 59px;"></div>`
+      rubricElm.innerHTML = `场景正东方向为轨迹前进正方向<div x-arrow="" class="custom__popper__arrow" style="left: 59px;"></div>`
       let iconRubric = contentElm.getElementsByClassName('icon-rubric')[0]
       iconRubric.addEventListener('mouseenter', (e) => {
         rubricElm.style.display = 'block'
@@ -2161,10 +2215,10 @@ class TrajectoryMotion extends Base {
     this.modelAnimate = this.originalOptions.model.animate;
     this.delay = this.originalOptions.delay;
     (this.ground !== this.originalOptions.ground) && (this.ground = this.originalOptions.ground);
-    if(this.firstPersonView !== this.originalOptions.firstPersonView) {
+    if (this.firstPersonView !== this.originalOptions.firstPersonView) {
       this.firstPersonView = this.originalOptions.firstPersonView;
     }
-    if(this.firstPersonView && this.modelShow) {
+    if (this.firstPersonView && this.modelShow) {
       this.model && (this.model.show = false)
     }
     this.labelShow = this.originalOptions.label.show
@@ -2226,7 +2280,6 @@ class TrajectoryMotion extends Base {
           this._DialogObject._element.content.getElementsByClassName('model-rotate-btn')[0].innerHTML = '结束调整'
           this._DialogObject._element.content.getElementsByClassName('model-rotate-btn')[0].className = 'btn model-rotate-btn is-active'
         }
-        console.log(this._DialogObject._element.content, this._DialogObject._element.content.getElementsByClassName('model-rotate-btn')[0])
         this.state = false
         this.editObj = new EditGltf(this.sdk, this.model)
         this.editObj.editRtation()
@@ -2285,7 +2338,7 @@ class TrajectoryMotion extends Base {
 
   async changeModelUrl(url) {
     this.sdk.viewer.scene.primitives.remove(this.model)
-    this.options.model.url = url
+    this.options.model.url = this.replaceHost(url, this.options.host)
     let matrix = this.model.modelMatrix
     let position = this.model.position
     let options = {

src/Obj/Base/WallRealStereoscopic/_element.js

@@ -41,7 +41,7 @@ function html(that) {
                 <div class="corner-type"></div>
             </div>
             <div class="col material-box">
-                <span class="label">材质样式</span>
+                <span class="label">墙体样式</span>
                 <div class="material"></div>
             </div>
         </div>

src/Obj/Base/WallRealStereoscopic/eventBinding.js

@@ -21,6 +21,7 @@ class eventBinding {
       let Event = []
       let isEvent = false
       let removeName = []
+      let blurEvent = ()=>{}
       if (!elements[i] ||!elements[i].attributes) {
         continue; 
       }
@@ -37,14 +38,14 @@ class eventBinding {
                 let value = e.target.value
                 if (e.target.type == 'number') {
                   if (e.data != '.' && (e.data != '-' || e.target.value)) {
-                    value = Number(value)
-                    if((e.target.max) && value>Number(e.target.max)) {
+                    let v = Number(value)
+                    if((e.target.max) && v>Number(e.target.max)) {
                       value = Number(e.target.max)
                     }
-                    if((e.target.min) && value<Number(e.target.min)) {
+                    if((e.target.min) && v<Number(e.target.min)) {
                       value = Number(e.target.min)
                     }
-                    if((e.target.dataset.min) && value<Number(e.target.dataset.min)) {
+                    if((e.target.dataset.min) && v<Number(e.target.dataset.min)) {
                       value = Number(e.target.dataset.min)
                     }
                     that[m.value] = value
@@ -54,6 +55,22 @@ class eventBinding {
                   that[m.value] = value
                 }
               })
+              blurEvent = (e) => {
+                let value = e.target.value
+                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)
+                  }
+                  if ((e.target.min) && value < Number(e.target.min)) {
+                    value = Number(e.target.min)
+                  }
+                  if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+                    value = Number(e.target.dataset.min)
+                  }
+                }
+                that[m.value] = value
+              }
               if(elements[i].nodeName=='IMG') {
                 elements[i].src = that[m.value]
               }
@@ -111,6 +128,9 @@ class eventBinding {
             Event[t](e)
           }
         });
+        elements[i].addEventListener('blur', (e) => {
+          blurEvent(e)
+        });
       }
     }
   }

src/Obj/Base/WallRealStereoscopic/index.js

@@ -32,7 +32,7 @@ class WallRealStereoscopic extends Base {
    * @param options['nose-to-tail']=false {boolean} 首尾相连
    * @param options.extrudedHeight=2.4 {number} 拉伸高度
    * @param options.cornerType=0 {string} 拐角类型;0：直角；1：斜角；2：圆角
-   * @param options.material=0 {number} 材质，0：纯色墙；1：砖墙1；2：砖墙2；3：砖墙3
+   * @param options.material=0 {number} 材质，0：纯色墙；1：红砖；2：黄砖；3：灰瓷
    * @param {Array.<object>} positions 经纬度和高度的列表，值交替 [{lon,lat,alt},...]
    * @param _Dialog {object} 弹框事件
    * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
@@ -60,8 +60,8 @@ class WallRealStereoscopic extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -142,7 +142,7 @@ class WallRealStereoscopic extends Base {
 
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: false,//是否开启透明度
@@ -253,7 +253,7 @@ class WallRealStereoscopic extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -287,7 +287,7 @@ class WallRealStereoscopic extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -387,7 +387,7 @@ class WallRealStereoscopic extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -398,7 +398,7 @@ class WallRealStereoscopic extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -414,7 +414,7 @@ class WallRealStereoscopic extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -440,7 +440,7 @@ class WallRealStereoscopic extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1368,20 +1368,20 @@ class WallRealStereoscopic extends Base {
           icon: 'icon-wall'
         },
         {
-          name: '<i class="icon icon-wall-brick1"></i>砖墙1',
-          value: '砖墙1',
+          name: '<i class="icon icon-wall-brick1"></i>红砖墙',
+          value: '红砖墙',
           key: 1,
           icon: 'icon-wall-brick1'
         },
         {
-          name: '<i class="icon icon-wall-brick2"></i>砖墙2',
-          value: '砖墙2',
+          name: '<i class="icon icon-wall-brick2"></i>黄砖墙',
+          value: '黄砖墙',
           key: 2,
           icon: 'icon-wall-brick2'
         },
         {
-          name: '<i class="icon icon-wall-brick3"></i>砖墙3',
-          value: '砖墙3',
+          name: '<i class="icon icon-wall-brick3"></i>灰瓷墙',
+          value: '灰瓷墙',
           key: 3,
           icon: 'icon-wall-brick3'
         }
@@ -1414,7 +1414,7 @@ class WallRealStereoscopic extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('radar-scan-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: false,//是否开启透明度
@@ -1428,7 +1428,7 @@ class WallRealStereoscopic extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1442,7 +1442,7 @@ class WallRealStereoscopic extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1456,7 +1456,7 @@ class WallRealStereoscopic extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1470,7 +1470,7 @@ class WallRealStereoscopic extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/WallRealStereoscopic/index2.js

@@ -47,8 +47,8 @@ class WallStereoscopic extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -92,7 +92,7 @@ class WallStereoscopic extends Base {
     this.entity.corridor.material = Cesium.Color.fromCssColorString(v)
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -176,7 +176,7 @@ class WallStereoscopic extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -276,7 +276,7 @@ class WallStereoscopic extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -287,7 +287,7 @@ class WallStereoscopic extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -303,7 +303,7 @@ class WallStereoscopic extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -329,7 +329,7 @@ class WallStereoscopic extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -627,7 +627,7 @@ class WallStereoscopic extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('radar-scan-edit-tabs',undefined,this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -641,7 +641,7 @@ class WallStereoscopic extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -655,7 +655,7 @@ class WallStereoscopic extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -669,7 +669,7 @@ class WallStereoscopic extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -683,7 +683,7 @@ class WallStereoscopic extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/WallRealStereoscopic2/index.js

@@ -58,8 +58,8 @@ class WallRealStereoscopic extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -135,7 +135,7 @@ class WallRealStereoscopic extends Base {
 
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: false,//是否开启透明度
@@ -262,7 +262,7 @@ class WallRealStereoscopic extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -362,7 +362,7 @@ class WallRealStereoscopic extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -373,7 +373,7 @@ class WallRealStereoscopic extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -389,7 +389,7 @@ class WallRealStereoscopic extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -415,7 +415,7 @@ class WallRealStereoscopic extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -1363,7 +1363,7 @@ class WallRealStereoscopic extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('radar-scan-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: false,//是否开启透明度
@@ -1377,7 +1377,7 @@ class WallRealStereoscopic extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1391,7 +1391,7 @@ class WallRealStereoscopic extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -1405,7 +1405,7 @@ class WallRealStereoscopic extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -1419,7 +1419,7 @@ class WallRealStereoscopic extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/WallRealStereoscopic2/index2.js

@@ -47,8 +47,8 @@ class WallStereoscopic extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -92,7 +92,7 @@ class WallStereoscopic extends Base {
     this.entity.corridor.material = Cesium.Color.fromCssColorString(v)
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -176,7 +176,7 @@ class WallStereoscopic extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -276,7 +276,7 @@ class WallStereoscopic extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -287,7 +287,7 @@ class WallStereoscopic extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -303,7 +303,7 @@ class WallStereoscopic extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -329,7 +329,7 @@ class WallStereoscopic extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -627,7 +627,7 @@ class WallStereoscopic extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('radar-scan-edit-tabs',undefined,this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -641,7 +641,7 @@ class WallStereoscopic extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -655,7 +655,7 @@ class WallStereoscopic extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -669,7 +669,7 @@ class WallStereoscopic extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -683,7 +683,7 @@ class WallStereoscopic extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/WallStereoscopic/eventBinding.js

@@ -21,8 +21,9 @@ class eventBinding {
       let Event = []
       let isEvent = false
       let removeName = []
-      if (!elements[i] ||!elements[i].attributes) {
-        continue; 
+      let blurEvent = () => { }
+      if (!elements[i] || !elements[i].attributes) {
+        continue;
       }
       for (let m of elements[i].attributes) {
         switch (m.name) {
@@ -37,11 +38,11 @@ class eventBinding {
                 let value = e.target.value
                 if (e.target.type == 'number') {
                   if (e.data != '.' && (e.data != '-' || e.target.value)) {
-                    value = Number(value)
-                    if((e.target.max) && value>Number(e.target.max)) {
+                    let v = Number(value)
+                    if ((e.target.max) && v > Number(e.target.max)) {
                       value = Number(e.target.max)
                     }
-                    if((e.target.min) && value<Number(e.target.min)) {
+                    if ((e.target.min) && v < Number(e.target.min)) {
                       value = Number(e.target.min)
                     }
                     that[m.value] = value
@@ -51,14 +52,32 @@ class eventBinding {
                   that[m.value] = value
                 }
               })
-              if(elements[i].nodeName=='IMG') {
+              blurEvent = (e) => {
+                let value = e.target.value
+                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)
+                  }
+                  if ((e.target.min) && value < Number(e.target.min)) {
+                    value = Number(e.target.min)
+                  }
+                  if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+                    value = Number(e.target.dataset.min)
+                  }
+                }
+                that[m.value] = value
+              }
+
+
+              if (elements[i].nodeName == 'IMG') {
                 elements[i].src = that[m.value]
               }
               else {
                 elements[i].value = that[m.value]
               }
             }
-            if(this.element[m.value]) {
+            if (this.element[m.value]) {
               this.element[m.value].push(elements[i])
             }
             else {
@@ -81,7 +100,7 @@ class eventBinding {
             isEvent = true
             Event.push((e) => {
               let value = e.target.value
-              if(e.target.type == 'number' && value!='') {
+              if (e.target.type == 'number' && value != '') {
                 value = Number(value)
                 e.target.value = value
               }
@@ -94,7 +113,7 @@ class eventBinding {
         }
         // elements[i].attributes[m] = undefined
       }
-      for(let n=0;n<removeName.length;n++) {
+      for (let n = 0; n < removeName.length; n++) {
         elements[i].attributes.removeNamedItem(removeName[n])
       }
 
@@ -108,6 +127,9 @@ class eventBinding {
             Event[t](e)
           }
         });
+        elements[i].addEventListener('blur', (e) => {
+          blurEvent(e)
+        });
       }
     }
   }

src/Obj/Base/WallStereoscopic/index.js

@@ -32,10 +32,10 @@ class WallStereoscopic extends Base {
    * */
   constructor(sdk, options, _Dialog = {}) {
     super(sdk, options);
-    this.options.color = options.color || "#00d9ff"
+    this.options.color = options.color || "#ff0000"
     this.options.extrudedHeight = options.extrudedHeight || 2.4
     this.options.positions = options.positions
-    this.options.material = Number(options.material) || 0
+    this.options.material = (Number(options.material) || Number(options.material) === 0) ? Number(options.material) : 3
     this.options.duration = (options.duration || options.duration === 0) ? options.duration : 1000
     this.options.show = (options.show || options.show === false) ? options.show : true
     this.options['nose-to-tail'] = options['nose-to-tail'] || false
@@ -51,8 +51,8 @@ class WallStereoscopic extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -88,6 +88,10 @@ class WallStereoscopic extends Base {
     }
   }
 
+  get type() {
+    return 'wallStereoscopic'
+  }
+
   static createLabel(that) {
     // 标签
     that.label = new LabelObject(that.sdk, {
@@ -113,15 +117,15 @@ class WallStereoscopic extends Base {
     return this.options.color
   }
   set color(v) {
-    this.options.color = v
+    this.options.color = v || '#ff0000'
     this.entity.polylineVolume.material = this.getMaterial()
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
-          defaultColor: v,
+          defaultColor: this.options.color,
           disabled: false,//是否禁止打开颜色选择器
           openPickerAni: 'opacity',//打开颜色选择器动画
           sure: (c) => {
@@ -140,10 +144,10 @@ class WallStereoscopic extends Base {
     return this.options.material
   }
   set material(v) {
-    this.options.material = Number(v)
+    this.options.material = (Number(v) || Number(v) === 0) ? Number(v) : 3
     this.entity.polylineVolume.material = this.getMaterial()
     this._elms.material && this._elms.material.forEach((item) => {
-      item.value = v
+      item.value = this.options.material
     })
   }
 
@@ -191,7 +195,7 @@ class WallStereoscopic extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -225,7 +229,7 @@ class WallStereoscopic extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -325,7 +329,7 @@ class WallStereoscopic extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -336,7 +340,7 @@ class WallStereoscopic extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -352,7 +356,7 @@ class WallStereoscopic extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -378,7 +382,7 @@ class WallStereoscopic extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -900,7 +904,7 @@ class WallStereoscopic extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('radar-scan-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -914,7 +918,7 @@ class WallStereoscopic extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -928,7 +932,7 @@ class WallStereoscopic extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -942,7 +946,7 @@ class WallStereoscopic extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -956,7 +960,7 @@ class WallStereoscopic extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/WallStereoscopic/index2.js

@@ -47,8 +47,8 @@ class WallStereoscopic extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -92,7 +92,7 @@ class WallStereoscopic extends Base {
     this.entity.corridor.material = Cesium.Color.fromCssColorString(v)
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -176,7 +176,7 @@ class WallStereoscopic extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -276,7 +276,7 @@ class WallStereoscopic extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -287,7 +287,7 @@ class WallStereoscopic extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -303,7 +303,7 @@ class WallStereoscopic extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -329,7 +329,7 @@ class WallStereoscopic extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -633,7 +633,7 @@ class WallStereoscopic extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('radar-scan-edit-tabs',undefined,this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -647,7 +647,7 @@ class WallStereoscopic extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -661,7 +661,7 @@ class WallStereoscopic extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -675,7 +675,7 @@ class WallStereoscopic extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -689,7 +689,7 @@ class WallStereoscopic extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/WallStereoscopic2/index.js

@@ -47,8 +47,8 @@ class WallStereoscopic2 extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -112,7 +112,7 @@ class WallStereoscopic2 extends Base {
     this.entity.polylineVolume.material = this.getMaterial()
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -195,7 +195,7 @@ class WallStereoscopic2 extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -295,7 +295,7 @@ class WallStereoscopic2 extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -306,7 +306,7 @@ class WallStereoscopic2 extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -322,7 +322,7 @@ class WallStereoscopic2 extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -348,7 +348,7 @@ class WallStereoscopic2 extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -889,7 +889,7 @@ class WallStereoscopic2 extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('radar-scan-edit-tabs', undefined, this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -903,7 +903,7 @@ class WallStereoscopic2 extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -917,7 +917,7 @@ class WallStereoscopic2 extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -931,7 +931,7 @@ class WallStereoscopic2 extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -945,7 +945,7 @@ class WallStereoscopic2 extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/WallStereoscopic2/index2.js

@@ -47,8 +47,8 @@ class WallStereoscopic extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
-      lineColor: options.label.lineColor || '#fff000',
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
+      lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
       far: (options.label.far || options.label.far === 0) ? options.label.far : 100000,
@@ -92,7 +92,7 @@ class WallStereoscopic extends Base {
     this.entity.corridor.material = Cesium.Color.fromCssColorString(v)
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let colorPicker = new ewPlugins('colorpicker', {
+        let colorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -176,7 +176,7 @@ class WallStereoscopic extends Base {
     this.label.color = v
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
-        let labelColorPicker = new ewPlugins('colorpicker', {
+        let labelColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -276,7 +276,7 @@ class WallStereoscopic extends Base {
     this.label.lineColor = v
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
-        let lineColorPicker = new ewPlugins('colorpicker', {
+        let lineColorPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -287,7 +287,7 @@ class WallStereoscopic extends Base {
             this.labelLineColor = color
           },//点击确认按钮事件回调
           clear: () => {
-            this.labelLineColor = 'rgba(255,255,255,1)'
+            this.labelLineColor = 'rgba(0,255,255,0.5)'
           },//点击清空按钮事件回调
         })
         this._elms.labelLineColor[i] = lineColorPicker
@@ -303,7 +303,7 @@ class WallStereoscopic extends Base {
     this.label.backgroundColor = [v, this.label.backgroundColor[1]]
     if (this._elms.labelBackgroundColorStart) {
       this._elms.labelBackgroundColorStart.forEach((item, i) => {
-        let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -329,7 +329,7 @@ class WallStereoscopic extends Base {
     this.label.backgroundColor = [this.label.backgroundColor[0], v]
     if (this._elms.labelBackgroundColorEnd) {
       this._elms.labelBackgroundColorEnd.forEach((item, i) => {
-        let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+        let labelBackgroundColorEndPicker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -627,7 +627,7 @@ class WallStereoscopic extends Base {
       // 创建标签页
       let tabsElm = new cy_tabs('radar-scan-edit-tabs',undefined,this.sdk)
       // 颜色组件
-      let colorPicker = new ewPlugins('colorpicker', {
+      let colorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -641,7 +641,7 @@ class WallStereoscopic extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new ewPlugins('colorpicker', {
+      let labelColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -655,7 +655,7 @@ class WallStereoscopic extends Base {
           this.labelColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let lineColorPicker = new ewPlugins('colorpicker', {
+      let lineColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelLineColor")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度
@@ -669,7 +669,7 @@ class WallStereoscopic extends Base {
           this.labelLineColor = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelBackgroundColorStartPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorStartPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
         size: 'mini',
         alpha: true,
@@ -683,7 +683,7 @@ class WallStereoscopic extends Base {
           this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
         },
       })
-      let labelBackgroundColorEndPicker = new ewPlugins('colorpicker', {
+      let labelBackgroundColorEndPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
         size: 'mini',
         alpha: true,

src/Obj/Base/WaterSurface/eventBinding.js

@@ -35,7 +35,8 @@ class eventBinding {
             else {
               Event.push((e) => {
                 let value = e.target.value
-                if (e.target.type == 'number') {
+                let str = e.target.value + ''
+                if (e.target.type == 'number' && !(str.charAt(str.length - 1) == '0' && e.target.value.toString().includes('.'))) {
                   value = Number(value)
                 }
                 that[m.value] = value

src/Obj/Base/WaterSurface/index.js

@@ -105,7 +105,7 @@ class WaterSurface extends Base {
     this.entity && (this.entity.appearance.material.uniforms.baseWaterColor = Cesium.Color.fromCssColorString(v))
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
-        let picker = new ewPlugins('colorpicker', {
+        let picker = new YJColorPicker({
           el: item.el,
           size: 'mini',//颜色box类型
           alpha: true,//是否开启透明度
@@ -232,7 +232,7 @@ class WaterSurface extends Base {
       contentElm.innerHTML = html()
       this._DialogObject.contentAppChild(contentElm)
       // 颜色组件
-      let waterColorPicker = new ewPlugins('colorpicker', {
+      let waterColorPicker = new YJColorPicker({
         el: contentElm.getElementsByClassName("water-color")[0],
         size: 'mini',//颜色box类型
         alpha: true,//是否开启透明度

src/Obj/Base/index.js

@@ -6,13 +6,17 @@
  * @update: 2023-12-01 12:12
  */
 import Tools from "../../Tools";
+import { getHost, getToken } from "../../on";
 import { regLeftClickCallback, regRightClickCallback, regMoveCallback } from "../../Global/ClickCallback";
 import { regLeftClickCallback as regLeftClickCallback2, regRightClickCallback as regRightClickCallback2, regMoveCallback as regMoveCallback2 } from "../../Global/SplitScreen/ClickCallback";
+import { regLeftClickCallback as regLeftClickCallback3, regRightClickCallback as regRightClickCallback3, regMoveCallback as regMoveCallback3 } from "../../Global/MultiViewportMode/ClickCallback";
 import { setSplitDirection, syncSplitData, getSdk } from "../../Global/SplitScreen";
-import { syncData } from '../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../Global/MultiViewportMode'
 import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../Global/global'
 
 class Base extends Tools {
+  #_showView
+  #_isShowView
   constructor(sdk, options = {}) {
     super(sdk, options);
     if (!sdk || !sdk.viewer) {
@@ -27,6 +31,8 @@ class Base extends Tools {
     this.clickCallBack = null
     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)
@@ -53,6 +59,60 @@ class Base extends Tools {
   //   setSplitDirection(this._splitDirection, this.options.id)
   // }
 
+  get showView() {
+    return this.#_showView
+  }
+
+  set showView(v) {
+
+
+    let sdk2D = get2DSdk().sdkD
+    if (!sdk2D) {
+      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
+    }
+    if (this.sdk === sdk2D) {
+      this.#_showView = 0
+      return
+    }
+    if (v != 2 && v != 3) {
+      this.#_showView = 0
+    }
+    else {
+      this.#_showView = v
+    }
+
+    this.isShowView = true
+
+    // if(!this.show) {
+    //   return
+    // }
+
+    if (!this.#_showView) {
+      this.show = true
+    }
+    else {
+      if (v == 2) {
+        this.show = false
+      }
+      else {
+        this.show = true
+      }
+    }
+  }
+
+
+
   get name() {
     return this.options.name
   }
@@ -70,19 +130,60 @@ class Base extends Tools {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      if (this.originalOptions) {
-        this.originalOptions.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
+        if (this.originalOptions) {
+          this.originalOptions.show = v
+        }
       }
-      this.entity && (this.entity.show = v)
+      this.entity._showView = this.showView
+      if (this.type == 'layer') {
+        if (this.entity) {
+          this.entity._objectState = this.options.show
+        }
+      }
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        this.entity && (this.entity.show = this.options.show)
+        if (this.options.label && this.options.label.show && this.label) {
+          this.label.show = this.options.show
+        }
+      }
+      else {
+        this.entity && (this.entity.show = false)
+        if (this.options.label && this.options.label.show && this.label) {
+          this.label.show = false
+        }
+      }
+
       if (this._DialogObject && this._DialogObject.showBtn) {
-        this._DialogObject.showBtn.checked = v
-      }
-      if (this.options.label && this.options.label.show && this.label) {
-        this.label.show = v
+        this._DialogObject.showBtn.checked = this.options.show
       }
+
+
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
+
+      if (this.type == 'layer' && sdkD) {
+        let layer2d = sdkD.viewer.imageryLayers._layers[this.layerIndex]
+        let layer3d = this.entity
+
+        if (!layer2d) {
+          return
+        }
+        if (layer3d._objectState) {
+          if (!layer3d._showView || layer3d._showView == 2) {
+            layer2d.show = true
+          }
+          if (layer3d._showView == 3) {
+            layer2d.show = false
+          }
+        }
+        else {
+          layer2d.show = this.options.show
+        }
+      }
     } else {
       console.error("参数必须为boolean")
     }
@@ -190,7 +291,7 @@ class Base extends Tools {
       let destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
 
       let position = { lng: 0, lat: 0 }
-      if (this.options.position) {
+      if (this.options.position && Object.prototype.toString.call(this.options.position) === '[object Object]') {
         position = { ...this.options.position }
       }
       else if (this.options.positions) {
@@ -261,12 +362,17 @@ class Base extends Tools {
       console.error('val:', val, '不是一个function')
     } else {
       let sdkD = getSdk().sdkD
-      if(sdkD && this.sdk === sdkD) {
+      let sdk2D = get2DSdk().sdkD
+      if (sdkD && this.sdk === sdkD) {
         if (this.clickCallBack == null && this.options && this.options.id) {
           regLeftClickCallback2(this.options.id, this.leftClickCB, this)
         }
       }
-      else {
+      else if (sdk2D && this.sdk === sdk2D) {
+        if (this.clickCallBack == null && this.options && this.options.id) {
+          regLeftClickCallback3(this.options.id, this.leftClickCB, this)
+        }
+      } else {
         if (this.clickCallBack == null && this.options && this.options.id) {
           regLeftClickCallback(this.options.id, this.leftClickCB, this)
         }
@@ -284,12 +390,17 @@ class Base extends Tools {
       console.error('val:', val, '不是一个function')
     } else {
       let sdkD = getSdk().sdkD
-      if(sdkD && this.sdk === sdkD) {
+      let sdk2D = get2DSdk().sdkD
+      if (sdkD && this.sdk === sdkD) {
         if (this.rightClickCallBack == null && this.entity && this.entity.id) {
           regRightClickCallback2(this.entity.id, this.rightClickCB, this)
         }
       }
-      else {
+      else if (sdk2D && this.sdk === sdk2D) {
+        if (this.clickCallBack == null && this.options && this.options.id) {
+          regRightClickCallback3(this.options.id, this.leftClickCB, this)
+        }
+      } else {
         if (this.rightClickCallBack == null && this.entity && this.entity.id) {
           regRightClickCallback(this.entity.id, this.rightClickCB, this)
         }
@@ -307,12 +418,17 @@ class Base extends Tools {
       console.error('val:', val, '不是一个function')
     } else {
       let sdkD = getSdk().sdkD
-      if(sdkD && this.sdk === sdkD) {
+      let sdk2D = get2DSdk().sdkD
+      if (sdkD && this.sdk === sdkD) {
         if (this.mouseMoveCallBack == null && this.entity && this.entity.id) {
           regMoveCallback2(this.entity.id, this.mouseMoveCB, this)
         }
       }
-      else {
+      else if (sdk2D && this.sdk === sdk2D) {
+        if (this.clickCallBack == null && this.options && this.options.id) {
+          regMoveCallback3(this.options.id, this.leftClickCB, this)
+        }
+      } else {
         if (this.mouseMoveCallBack == null && this.entity && this.entity.id) {
           regMoveCallback(this.entity.id, this.mouseMoveCB, this)
         }
@@ -336,7 +452,7 @@ class Base extends Tools {
 
       let position = { lng: 0, lat: 0 }
       let relativePosition = { ...cameraPosition84 }
-      if (this.options.position) {
+      if (this.options.position && Object.prototype.toString.call(this.options.position) === '[object Object]') {
         position = { ...this.options.position }
       }
       else if (this.options.positions) {

src/Obj/Element/Dialog/eventBinding.js

@@ -45,8 +45,14 @@ class EventBinding {
                     let value = e.target.value
                     value = Number(value)
                     if (e.data != '.' && (e.data != '-' || e.target.value)) {
-                      if (((!e.target.max) && (!e.target.min)) || ((value <= Number(e.target.max)) && value >= Number(e.target.min))) {
-                        that[m.value] = value
+                      if ((e.target.max) && value > Number(e.target.max)) {
+                        value = Number(e.target.max)
+                      }
+                      if ((e.target.min) && value < Number(e.target.min)) {
+                        value = Number(e.target.min)
+                      }
+                      if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+                        value = Number(e.target.dataset.min)
                       }
                     }
                   }
@@ -61,7 +67,7 @@ class EventBinding {
                     if ((e.target.min) && value < Number(e.target.min)) {
                       value = Number(e.target.min)
                     }
-                    if((e.target.dataset.min) && value<Number(e.target.dataset.min)) {
+                    if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
                       value = Number(e.target.dataset.min)
                     }
                   }
@@ -121,4 +127,4 @@ class EventBinding {
   }
 }
 
-export default EventBinding;
+export default EventBinding;

src/Obj/Element/Dialog/index.js

@@ -2,13 +2,10 @@ import BaseDialog from '../../../BaseDialog';
 
 class Dialog extends BaseDialog {
   constructor(sdk, info, options, only) {
-    super(sdk.viewer._container, options);
+    super(sdk.viewer._container, options, only);
     this.sdk = sdk
     this.viewer = sdk.viewer
     this.info = info
-    if (only) {
-      this.closeAll()
-    }
     this._init()
   }
 
@@ -81,6 +78,7 @@ class Dialog extends BaseDialog {
       this.footAppChild(div)
       if (this.options.updateHeightCallBack) {
         let heightBtn = document.createElement('button');
+        heightBtn.className = 'update-height'
         heightBtn.innerHTML = '<svg class="icon-updateheigh"><use xlink:href="#yj-icon-updateheight"></use></svg>更新高程'
         heightBtn.style.width = 'auto'
         heightBtn.addEventListener('click', () => {