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

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/MultiViewportMode/index.js

@@ -49,7 +49,11 @@ 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
@@ -136,7 +140,7 @@ async function syncData2(sdk, id, entityId) {
         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
         }
@@ -227,7 +231,7 @@ 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')) {
+      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
         }

src/Global/efflect/Sunshine/index.js

@@ -80,6 +80,10 @@ export default class Sunshine {
   }
   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)
   }

src/Global/efflect/Sunshine/timeLIne.js

@@ -9,7 +9,7 @@ export default class TimeLine {
     this.timelineCon = document.getElementsByClassName('timeline-container')[0];
     this.speed = speed;
     this.animationId;
-    this.startTime = Date.now();
+    this.startTime = performance.now();
     this.manualPosition = null;
     this.isDragging = false;
     this.pauseed = false;
@@ -28,9 +28,7 @@ export default class TimeLine {
         document.getElementsByClassName('time-marks')[0].appendChild(label)
       }
     }
-
+    that.startTime = performance.now() - ((that.manualPosition || 0) * 86400 * 1000 / that.speed);
-
-    that.startTime = Date.now() - ((that.manualPosition || 0) * 86400 * 1000 / that.speed);
 
     that.timeline.addEventListener('mousedown', (e) => {
       if (e.srcElement.className === 'handle') {
@@ -57,21 +55,22 @@ export default class TimeLine {
     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.pausedTime = Date.now(); // 记录暂停时刻
         that.sdk.viewer.clock.shouldAnimate = false
       } else {//播放
+        let now = performance.now()
+        const pausedDuration = now - that.pausedTime;
         document.getElementById('timePause').textContent = '暂停';
         that.manualPosition = null
-        const pausedDuration = Date.now() - that.pausedTime;
         that.startTime += pausedDuration; // 补偿暂停期间的时间差
 
         if (that.changeDate) {//切换日期后让时间从0开始
           if (that.changeDateGrag) {
             that.changeDateGrag = undefined
           } else {
-            that.startTime = Date.now()
+            that.startTime = now
           }
           that.changeDate = undefined
         }
@@ -88,14 +87,14 @@ export default class TimeLine {
         that.isDragging = false;
         if (that.manualPosition !== null) {
           // that.sdk.viewer.clock.shouldAnimate = true
-          that.startTime = Date.now() - (that.manualPosition * 86400 * 1000 / that.speed);
+          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 = Date.now(); // 记录暂停时刻
+            that.pausedTime = performance.now(); // 记录暂停时刻
             func(that.currentTime.textContent)
           }
 
@@ -113,9 +112,9 @@ export default class TimeLine {
   update() {
     if (this.manualPosition !== null) return;
     if (this.changeDate) {//切换日期后让时间从0开始
-      this.startTime = Date.now()
+      this.startTime = performance.now()
     }
-    let elapsed = (Date.now() - this.startTime) * this.speed;
+    let elapsed = (performance.now() - this.startTime) * this.speed;
     // if (this.elapsed) {
     //   elapsed = elapsed + this.elapsed
     //   this.elapsed = undefined
@@ -133,23 +132,23 @@ export default class TimeLine {
     }
   }
   setSpeed(v) {
+    let now = performance.now()
     if (!this.pauseed) {
       const currentProgress = this.manualPosition ??
-        (Date.now() - this.startTime) * this.speed / (86400 * 1000);
+        (performance.now() - this.startTime) * this.speed / (86400 * 1000);
       this.speed = v;
-      this.startTime = Date.now() - (currentProgress * 86400 * 1000 / this.speed);
+      this.startTime = performance.now() - (currentProgress * 86400 * 1000 / this.speed);
 
     } else {
-      let pausedDuration = Date.now() - this.pausedTime;
+      let pausedDuration = now - this.pausedTime;
       this.startTime += pausedDuration; // 补偿暂停期间的时间差
-
       const currentProgress = this.manualPosition ??
-        (Date.now() - this.startTime) * this.speed / (86400 * 1000);
+        (now - this.startTime) * this.speed / (86400 * 1000);
       this.speed = v;
-      this.startTime = Date.now() - (currentProgress * 86400 * 1000 / this.speed);
+      this.startTime = now - (currentProgress * 86400 * 1000 / this.speed);
 
-      this.pausedTime = Date.now(); // 记录切换speed暂停时刻
+      this.pausedTime = now; // 记录切换speed暂停时刻
-      this.speed = v;
+      // this.speed = v;
     }
     this.manualPosition = null;
 
@@ -158,7 +157,7 @@ export default class TimeLine {
   }
   updateTime() {
     this.manualPosition = null;
-    this.startTime = Date.now() - ((this.manualPosition || 0) * 86400 * 1000 / this.speed);
+    this.startTime = performance.now() - ((this.manualPosition || 0) * 86400 * 1000 / this.speed);
     this.pauseed && (this.changeDate = true)
     this.changeDateGrag = undefined
     this.update();

src/Global/mouseRightMenu/index.js

@@ -100,14 +100,14 @@ function MouseRightMenu(sdk, status, callBack) {
           that = sdk.entityMap.get(entityId)
         }
 
-        if (that && that.picking) {
+        // if (that && that.picking) {
-          addedMenu = `
+        //   addedMenu = `
-        <span class="divider" style="display: block;border-top: 1px solid #ddd;margin: 5px;"></span>
+        // <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;">
+        // <ul class="added" style="list-style: none;padding: 0;margin: 0;font-size: 12px;">
-          <li style="padding: 3px 10px;cursor: pointer;">属性</li>
+        //   <li style="padding: 3px 10px;cursor: pointer;">属性</li>
-        </ul>
+        // </ul>
-        `
+        // `
-        }
+        // }
         let position = tools.cartesian3Towgs84(cartesian, sdk.viewer)
         menuElm = document.createElement('div')
         menuElm.id = 'custom-menu'
@@ -121,6 +121,9 @@ function MouseRightMenu(sdk, status, callBack) {
         <ul class="base" style="list-style: none;padding: 0;margin: 0;font-size: 12px;">
           <li style="padding: 3px 10px;cursor: pointer;">绕鼠标点旋转</li>
         </ul>
+        <ul class="base" style="list-style: none;padding: 0;margin: 0;font-size: 12px;">
+          <li style="padding: 3px 10px;cursor: pointer;">文本框</li>
+        </ul>
         ${addedMenu}
       `
         _element.appendChild(menuElm)
@@ -175,6 +178,7 @@ function MouseRightMenu(sdk, status, callBack) {
                 break
               case '文本框':
                 object.position = position
+                key = 'textBox'
                 break
             }
             eventListener[sdk.div_id].callBack(key, object)

src/In/index.js

@@ -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'
@@ -187,6 +188,7 @@ 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('录屏对象')
@@ -260,7 +262,8 @@ if (!window.YJ) {
       Dialog,
       FlowLine,
       // Road2,
-      TextBox
+      TextBox,
+      BatchModel
     },
     YJEarth,
     Tools,
@@ -378,6 +381,7 @@ if (!window.YJ) {
       DrawAssemble,
       DrawSector,
       DrawTakeOff,
+      DrawThreeRect
     },
     // 分析
     Analysis: {

src/Measure/MeasureDistance/index.js

@@ -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])
+    let height = await this.getClampToHeight(p1, [...this.sdk.viewer.entities.values])
-    p1.alt = p2[0].height
+    p1.alt = height
     return {position: p1, index}
   }
 

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'
 
@@ -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/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

@@ -433,31 +433,31 @@ class BillboardObject extends Base {
         value: '链接',
         key: 'link'
       },
-      {
-        name: 'IP摄像头',
-        value: 'IP摄像头',
-        key: 'camera'
-      },
       // {
-      //   name: 'ISC摄像头',
+      //   name: 'IP摄像头',
-      //   value: 'ISC摄像头',
+      //   value: 'IP摄像头',
-      //   key: 'isc'
+      //   key: 'camera'
+      // },
+      // // {
+      // //   name: 'ISC摄像头',
+      // //   value: 'ISC摄像头',
+      // //   key: 'isc'
+      // // },
+      // // {
+      // //   name: '传感器',
+      // //   value: '传感器',
+      // //   key: 'sensor'
+      // // },
+      // {
+      //   name: '全景图',
+      //   value: '全景图',
+      //   key: 'vr'
       // },
       // {
-      //   name: '传感器',
+      //   name: '物资',
-      //   value: '传感器',
+      //   value: '物资',
-      //   key: 'sensor'
+      //   key: 'goods'
-      // },
+      // }
-      {
-        name: '全景图',
-        value: '全景图',
-        key: 'vr'
-      },
-      {
-        name: '物资',
-        value: '物资',
-        key: 'goods'
-      }
     ]
   }
 

src/Obj/Base/CurvelineObject/index.js

@@ -122,6 +122,7 @@ class CurvelineObject extends Base {
     this.operate = {}
     this.nodePoints = []
     this.unitNum = 0
+    this.inputSpeed = (options.speed && Math.pow(options.speed, -1) * 100) || 10
     this.Dialog = _Dialog
     if (!this.options.positions || this.options.positions.length < 2) {
       this._error = '线段最少需要两个坐标！'
@@ -151,7 +152,10 @@ class CurvelineObject extends Base {
   set color(v) {
     this.options.color = v || '#ff0000'
     // this.entity.polyline.material = this.getMaterial(v, this.options.type)
-    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    let params = { ...this.options }
+    params.speed = this.inputSpeed
+    // this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, params)
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
         let colorPicker = new YJColorPicker({
@@ -177,9 +181,13 @@ class CurvelineObject extends Base {
   }
 
   set speed(v) {
-    // this.options.speed = v
+    this.options.speed = v
-    this.options.speed = v !== 0 ? Math.pow(v, -1) * 100 : 0
+    // this.options.speed = v !== 0 ? Math.pow(v, -1) * 100 : 0
-    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    this.inputSpeed = v !== 0 ? Math.pow(v, -1) * 100 : 0
+    let params = { ...this.options }
+    params.speed = this.inputSpeed
+    // this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, params)
   }
   get dashSize() {
     return this.options.dashSize
@@ -187,7 +195,10 @@ class CurvelineObject extends Base {
 
   set dashSize(v) {
     this.options.dashSize = v
-    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    let params = { ...this.options }
+    params.speed = this.inputSpeed
+    // this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, params)
   }
 
   get rotate() {
@@ -212,7 +223,10 @@ class CurvelineObject extends Base {
 
   set space(v) {
     this.options.space = v
-    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    let params = { ...this.options }
+    params.speed = this.inputSpeed
+    // this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, params)
   }
 
   get length() {
@@ -446,13 +460,15 @@ class CurvelineObject extends Base {
         break
       }
     }
+    let params = { ...this.options }
+    params.speed = this.inputSpeed
     this.entity &&
       this.entity.polyline &&
       (this.entity.polyline.material = this.getMaterial(
         this.options.color,
         this.options.type,
         this.entity,
-        this.options
+        params
       ))
   }
   get noseToTail() {
@@ -1332,18 +1348,21 @@ class CurvelineObject extends Base {
         positions: Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArray),
         width: that.options.width,
         clampToGround: ground,
-        material: that.getMaterial(that.options.color, that.options.type),
+        // material: that.getMaterial(that.options.color, that.options.type),
         zIndex: that.sdk._entityZIndex
       }
     })
 
     that.entity.polyline.oriWidth = that.options.width
     that.judgeLine(that.entity, that.options)
+
+    let params = { ...that.options }
+    params.speed = that.inputSpeed
     that.entity.polyline.material = that.getMaterial(
       that.options.color,
       that.options.type,
       that.entity,
-      that.options
+      params
     )
 
     that.sdk._entityZIndex++

src/Obj/Base/PolylineObject/index.js

@@ -125,6 +125,7 @@ class PolylineObject extends Base {
     this.operate = {}
     this.nodePoints = []
     this.unitNum = 0
+    this.inputSpeed = (options.speed && Math.pow(options.speed, -1) * 100) || 10
     this.Dialog = _Dialog
     if (!this.options.positions || this.options.positions.length < 2) {
       this._error = '线段最少需要两个坐标！'
@@ -153,7 +154,10 @@ class PolylineObject extends Base {
   }
   set color(v) {
     this.options.color = v || '#ff0000'
-    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    let params = { ...this.options }
+    params.speed = this.inputSpeed
+    // this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, params)
     if (this._elms.color) {
       this._elms.color.forEach((item, i) => {
         let colorPicker = new YJColorPicker({
@@ -180,9 +184,13 @@ class PolylineObject extends Base {
   }
 
   set speed(v) {
-    // this.options.speed = v
+    this.options.speed = v
-    this.options.speed = v !== 0 ? Math.pow(v, -1) * 100 : 0
+    this.inputSpeed = v !== 0 ? Math.pow(v, -1) * 100 : 0
-    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    let params = { ...this.options }
+    params.speed = this.inputSpeed
+    // this.options.speed = v !== 0 ? Math.pow(v, -1) * 100 : 0
+    // this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, params)
   }
   get dashSize() {
     return this.options.dashSize
@@ -190,7 +198,10 @@ class PolylineObject extends Base {
 
   set dashSize(v) {
     this.options.dashSize = v
-    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    let params = { ...this.options }
+    params.speed = this.inputSpeed
+    // this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, params)
   }
 
   get rotate() {
@@ -206,7 +217,10 @@ class PolylineObject extends Base {
       })
 
     this.options.rotate = v
-    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    let params = { ...this.options }
+    params.speed = this.inputSpeed
+    // this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, params)
   }
 
   get space() {
@@ -215,7 +229,10 @@ class PolylineObject extends Base {
 
   set space(v) {
     this.options.space = v
-    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    let params = { ...this.options }
+    params.speed = this.inputSpeed
+    // this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, this.options)
+    this.entity.polyline.material = this.getMaterial(this.options.color, this.options.type, this.entity, params)
   }
 
   get length() {
@@ -458,13 +475,15 @@ class PolylineObject extends Base {
         break
       }
     }
+    let params = { ...this.options }
+    params.speed = this.inputSpeed
     this.entity &&
       this.entity.polyline &&
       (this.entity.polyline.material = this.getMaterial(
         this.options.color,
         this.options.type,
         this.entity,
-        this.options
+        params
       ))
   }
   get noseToTail() {
@@ -825,7 +844,6 @@ class PolylineObject extends Base {
   set labelLineColor(v) {
     this.options.label.lineColor = v
     this.label.lineColor = v
-    let _this = this
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
         let lineColorPicker = new YJColorPicker({
@@ -840,6 +858,29 @@ class PolylineObject extends Base {
           }, //点击确认按钮事件回调
           clear: () => {
             this.labelLineColor = 'rgba(0,255,255,0.5)'
+          } //点击清空按钮事件回调
+        })
+        this._elms.labelLineColor[i] = lineColorPicker
+      })
+    }
+  }
+
+  get labelBackgroundColorStart() {
+    return this.options.label.backgroundColor[0]
+  }
+  set labelBackgroundColorStart(v) {
+    this.options.label.backgroundColor[0] = v
+    this.label.backgroundColor = [v, this.label.backgroundColor[1]]
+    if (this._elms.labelBackgroundColorStart) {
+      this._elms.labelBackgroundColorStart.forEach((item, i) => {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
+          el: item.el,
+          size: 'mini', //颜色box类型
+          alpha: true, //是否开启透明度
+          defaultColor: this.labelBackgroundColorStart,
+          disabled: false, //是否禁止打开颜色选择器
+          openPickerAni: 'opacity', //打开颜色选择器动画
+          sure: color => {
             this.labelBackgroundColorStart = color
           }, //点击确认按钮事件回调
           clear: () => {
@@ -848,10 +889,11 @@ class PolylineObject extends Base {
         })
         this._elms.labelBackgroundColorStart[
           i
-        ] = _this.labelBackgroundColorStartPicker
+        ] = labelBackgroundColorStartPicker
       })
     }
   }
+  
   get labelBackgroundColorEnd() {
     return this.options.label.backgroundColor[1]
   }
@@ -1349,11 +1391,13 @@ class PolylineObject extends Base {
 
     that.entity.polyline.oriWidth = that.options.width
     that.judgeLine(that.entity, that.options)
+    let params = { ...that.options }
+    params.speed = that.inputSpeed
     that.entity.polyline.material = that.getMaterial(
       that.options.color,
       that.options.type,
       that.entity,
-      that.options
+      params
     )
     that.sdk._entityZIndex++
     PolylineObject.createLabel(that)

src/Obj/Base/TextBox/index.js

@@ -4,15 +4,32 @@
 import Base from "../index";
 import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
 class TextBox extends Base {
-  constructor(sdk, options = {}) {
+  /**
+   * @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) {
@@ -24,17 +41,19 @@ class TextBox extends Base {
     // 创建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.positions.lng, that.options.positions.lat, that.options.positions.alt)
+    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(
@@ -48,7 +67,8 @@ class TextBox extends Base {
       }
     }
     viewer.scene.postRender.addEventListener(that.handler);
-    that.textDom = dom
+    that.textDom = dom;
+
   }
   async setHandeler(data) {
     let that = this
@@ -60,12 +80,12 @@ class TextBox extends Base {
       var cartographic = Cesium.Cartographic.fromCartesian(cartesian);
       var longitude = Cesium.Math.toDegrees(cartographic.longitude);
       var latitude = Cesium.Math.toDegrees(cartographic.latitude);
-      that.positions = {
+      that.position = {
         lng: longitude,
         lat: latitude,
         alt: cartographic.height
       }
-      let posi = Cesium.Cartesian3.fromDegrees(longitude, latitude, 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(
@@ -81,6 +101,10 @@ class TextBox extends Base {
       that.sdk.viewer.scene.postRender.addEventListener(that.handler);
     }
   }
+  async getwords(words) {
+    this.options.text = words
+    this.callback(this.options)
+  }
   async returnFun() {
     return this.handler
   }
@@ -91,11 +115,11 @@ class TextBox extends Base {
     this.options.show = v
     this.textDom && (this.textDom.style.display = v ? 'block' : 'none');
   }
-  get positions() {
+  get position() {
-    return this.options.positions
+    return this.options.position
   }
-  set positions(v) {
+  set position(v) {
-    this.options.positions = v
+    this.options.position = v
   }
   async flyTo(options = {}) {
     setActiveViewer(0)
@@ -118,8 +142,8 @@ class TextBox extends Base {
       if (this.options.position) {
         position = { ...this.options.position }
       }
-      else if (this.options.positions) {
+      else if (this.options.position) {
-        position = { ...this.options.positions[0] }
+        position = { ...this.options.position[0] }
       }
       else if (this.options.center) {
         position = { ...this.options.center }
@@ -154,9 +178,9 @@ class TextBox extends Base {
     else {
       let positionArray = []
       let a = Cesium.Cartesian3.fromDegrees(
-        this.positions.lng,
+        this.position.lng,
-        this.positions.lat,
+        this.position.lat,
-        this.positions.alt
+        this.position.alt
       )
       positionArray.push(a.x, a.y, a.z)
 

src/Obj/Base/TrajectoryMotion/index.js

@@ -2087,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'

src/Obj/Base/WallStereoscopic/index.js

@@ -88,6 +88,10 @@ class WallStereoscopic extends Base {
     }
   }
 
+  get type() {
+    return 'wallStereoscopic'
+  }
+
   static createLabel(that) {
     // 标签
     that.label = new LabelObject(that.sdk, {

src/Obj/Base/index.js

@@ -290,7 +290,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) {
@@ -436,7 +436,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/richText.js

@@ -56,8 +56,8 @@ class richText {
       MENU_CONF: {
         uploadImage: {
           fieldName: 'file',
-          maxFileSize: 50 * 1024 * 1024,
+          // maxFileSize: 50 * 1024 * 1024,
-          base64LimitSize: 50 * 1024 * 1024, // 50M 以下插入 base64
+          // base64LimitSize: 50 * 1024 * 1024, // 50M 以下插入 base64
           server: this.uploadImageServer,
           // // 上传之前触发
           // onBeforeUpload(file) { // TS 语法
@@ -95,18 +95,18 @@ class richText {
           //   console.log(`${file.name} 上传出错`, err, res)
           // },
 
-          // // 自定义上传
+          // 自定义上传
-          // async customUpload(file, insertFn) {  // TS 语法
+          async customUpload(file, insertFn) {  // TS 语法
-          //   // async customUpload(file, insertFn) {                   // JS 语法
+            // async customUpload(file, insertFn) {                   // JS 语法
-          //   // file 即选中的文件
+            // file 即选中的文件
-          //   // 自己实现上传，并得到图片 url alt href
+            // 自己实现上传，并得到图片 url alt href
-          //   // 最后插入图片
+            // 最后插入图片
-          //   console.log(file, insertFn)
+            let url = await _this.upload(file)
-          //   insertFn(url, file.name)
+            insertFn((_this.host = _this.host || getHost()) + '/' + url)
-          // }
+          }
         },
         uploadVideo: {
-          maxFileSize: 500 * 1024 * 1024,
+          // maxFileSize: 500 * 1024 * 1024,
           server: this.uploadVideoServer,
           allowedFileTypes: ['video/mp4', 'video/mp3', 'video/ogg', 'video/webm', 'video/avi'],
           // 自定义上传

src/Obj/Materail/WallMaterialProperty.js

@@ -70,7 +70,7 @@ function StreamWall1() {
       fragColor.rgb = color.rgb / 1.0;\n\
       fragColor = czm_gammaCorrect(fragColor);\n\
       material.alpha = colorImage.a * color.a;\n\
-      material.diffuse = (colorImage.rgb+color.rgb)/2.0;\n\
+      material.diffuse = color.rgb/20.0;\n\
       material.emission = fragColor.rgb;\n\
       return material;\n\
       }";
@@ -208,6 +208,14 @@ function StreamWall2() {
           Property.equals(this.repeat, other._repeat) &&
           Property.equals(this.repeats, other._repeats)
       };
+      // let code2 = 'material.diffuse = color.rgb*1.0;'
+      // if (uniforms.is2D) {
+      //   code2 = `
+      //     material.diffuse = color.rgb*0.0;
+      //     material.emission = color.rgb * 1.0;
+      //   `
+      // }
+      // console.log(code2, uniforms.is2D)
       // 将定义的材质对象添加到cesium的材质队列中
       Material._materialCache.addMaterial(MaterialType, {
         fabric: {
@@ -230,8 +238,8 @@ function StreamWall2() {
               else {
                 material.alpha = 1.0;
               }
-              material.diffuse = colorImage.rgb*color.rgb*0.0;
+              material.diffuse = color.rgb*0.0;
-              material.emission = colorImage.rgb*color.rgb * 1.4;
+              material.emission = color.rgb * 1.0;
               return material;
           }`,
           components: {

src/Tools/index.js

@@ -598,7 +598,6 @@ class Tools {
     if (entity) {
       arr[type + ''] ? (entity.polyline.width = entity.polyline.oriWidth + arr[type + '']) : (entity.polyline.width = entity.polyline.oriWidth)
     }
-
     switch (Number(type)) {
 
       case 1: //虚线

src/YJEarth/index.js

@@ -485,6 +485,7 @@ class YJEarth {
         _this.clickTextDom.removeEventListener('mousedown', mousedown);
         document.removeEventListener('mousemove', mousemove);
         document.removeEventListener('mouseup', mouseup);
+        _this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
 
         _this.clickTextDom.style['pointer-events'] = 'none'
         _this.clickTextDom = undefined