修改

src/Global/Contour/index.js

@@ -30,6 +30,7 @@ let halfIntervalContourColor = '#64b6d9'
 let supplementaryContourShow = false
 let supplementaryContourWidth = 1.0
 let supplementaryContourColor = '#d084d1'
+let paramData = {}
 
 
 activeHeightElm = document.createElement('div')
@@ -72,6 +73,55 @@ function accordingToCameraHeight() {
     // console.log(cameraHeight)
   }
 
+}
+
+function startDraw(sdk, showData) {
+  show = showData
+
+  Object.keys(paramData).forEach(item => {
+    material.uniforms[item] = paramData[item]
+  })
+
+  if (show) {
+    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,
+        },
+      }
+      flyTo(sdk, options, 0.5)
+    }
+    showContour(sdk)
+  } else {
+    hideContour(sdk)
+  }
+}
+function reset() {
+  // if (handler) {
+  //   handler.destroy()
+  // }
+  secondaryLinesCount = 19
+  // show = true
+  equalHeightDistance = 10
+  activeColor = '#ffd000'
+  indexContourShow = true
+  indexContourWidth = 2.5
+  indexContourColor = '#43cf7c'
+  intermediateContourShow = true
+  intermediateContourWidth = 1.8
+  intermediateContourColor = '#ff0000'
+  halfIntervalContourShow = false
+  halfIntervalContourWidth = 1.0
+  halfIntervalContourColor = '#64b6d9'
+  supplementaryContourShow = false
+  supplementaryContourWidth = 1.0
+  supplementaryContourColor = '#d084d1'
+
+
 }
 async function dialog(sdk) {
   _sdk = sdk
@@ -106,44 +156,44 @@ async function dialog(sdk) {
   sdk.viewer.scene.postRender.addEventListener(accordingToCameraHeight)
 
   // 显示
-  let showBtn = contentElm.getElementsByClassName('show')[0]
-  showBtn.checked = show
-  if (showBtn.checked) {
-    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,
-        },
-      }
-      flyTo(sdk, options, 0.5)
-    }
-    showContour(sdk)
-  }
-  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,
-          },
-        }
-        flyTo(sdk, options, 0.5)
-      }
-      showContour(sdk)
-    } else {
-      show = false
-      hideContour(sdk)
-    }
-  })
+  // let showBtn = contentElm.getElementsByClassName('show')[0]
+  // showBtn.checked = show
+  // if (showBtn.checked) {
+  //   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,
+  //       },
+  //     }
+  //     flyTo(sdk, options, 0.5)
+  //   }
+  //   showContour(sdk)
+  // }
+  // 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,
+  //     },
+  //   }
+  //   flyTo(sdk, options, 0.5)
+  // }
+  // showContour(sdk)
+  // } else {
+  // show = false
+  // hideContour(sdk)
+  // }
+  // })
   // 等高距
   let equalHeightDistanceInput = contentElm.getElementsByClassName('equal-height-distance')[0]
   equalHeightDistanceInput.value = equalHeightDistance
@@ -152,7 +202,8 @@ async function dialog(sdk) {
     equalHeightDistance = value
     equalHeightDistanceInput.value = value
     if (material) {
-      material.uniforms.spacing = equalHeightDistance * 5
+      // material.uniforms.spacing = equalHeightDistance * 5
+      paramData.spacing = equalHeightDistance * 5
     }
   })
 
@@ -188,13 +239,15 @@ async function dialog(sdk) {
     sure: color => {
       activeColor = color
       if (material) {
-        material.uniforms.activeColor = Cesium.Color.fromCssColorString(activeColor)
+        // material.uniforms.activeColor = Cesium.Color.fromCssColorString(activeColor)
+        paramData.activeColor = Cesium.Color.fromCssColorString(activeColor)
       }
     },
     clear: () => {
       activeColor = 'rgba(255,255,255,1)'
       if (material) {
-        material.uniforms.activeColor = Cesium.Color.fromCssColorString(activeColor)
+        // material.uniforms.activeColor = Cesium.Color.fromCssColorString(activeColor)
+        paramData.activeColor = Cesium.Color.fromCssColorString(activeColor)
       }
     }
   })
@@ -205,7 +258,8 @@ async function dialog(sdk) {
   indexContourSwitch.addEventListener('change', (e) => {
     indexContourShow = e.target.checked
     if (material) {
-      material.uniforms.indexContourShow = indexContourShow
+      // material.uniforms.indexContourShow = indexContourShow
+      paramData.indexContourShow = indexContourShow
     }
   })
   // 计曲线颜色
@@ -219,13 +273,15 @@ async function dialog(sdk) {
     sure: color => {
       indexContourColor = color
       if (material) {
-        material.uniforms.indexContourColor = Cesium.Color.fromCssColorString(indexContourColor)
+        // material.uniforms.indexContourColor = Cesium.Color.fromCssColorString(indexContourColor)
+        paramData.indexContourColor = Cesium.Color.fromCssColorString(indexContourColor)
       }
     },
     clear: () => {
       indexContourColor = 'rgba(255,255,255,1)'
       if (material) {
-        material.uniforms.indexContourColor = Cesium.Color.fromCssColorString(indexContourColor)
+        // material.uniforms.indexContourColor = Cesium.Color.fromCssColorString(indexContourColor)
+        paramData.indexContourColor = Cesium.Color.fromCssColorString(indexContourColor)
       }
     }
   })
@@ -237,7 +293,8 @@ async function dialog(sdk) {
     indexContourWidth = value
     indexContourWidthInput.value = value
     if (material) {
-      material.uniforms.indexContourWidth = indexContourWidth
+      // material.uniforms.indexContourWidth = indexContourWidth
+      paramData.indexContourWidth = indexContourWidth
     }
   })
 
@@ -247,7 +304,8 @@ async function dialog(sdk) {
   intermediateContourSwitch.addEventListener('change', (e) => {
     intermediateContourShow = e.target.checked
     if (material) {
-      material.uniforms.intermediateContourShow = intermediateContourShow
+      // material.uniforms.intermediateContourShow = intermediateContourShow
+      paramData.intermediateContourShow = intermediateContourShow
     }
   })
   // 首曲线颜色
@@ -261,13 +319,15 @@ async function dialog(sdk) {
     sure: color => {
       intermediateContourColor = color
       if (material) {
-        material.uniforms.intermediateContourColor = Cesium.Color.fromCssColorString(intermediateContourColor)
+        // material.uniforms.intermediateContourColor = Cesium.Color.fromCssColorString(intermediateContourColor)
+        paramData.intermediateContourColor = Cesium.Color.fromCssColorString(intermediateContourColor)
       }
     },
     clear: () => {
       intermediateContourColor = 'rgba(255,255,255,1)'
       if (material) {
-        material.uniforms.intermediateContourColor = Cesium.Color.fromCssColorString(intermediateContourColor)
+        // material.uniforms.intermediateContourColor = Cesium.Color.fromCssColorString(intermediateContourColor)
+        paramData.intermediateContourColor = Cesium.Color.fromCssColorString(intermediateContourColor)
       }
     }
   })
@@ -279,7 +339,8 @@ async function dialog(sdk) {
     intermediateContourWidth = value
     intermediateContourWidthInput.value = value
     if (material) {
-      material.uniforms.intermediateContourWidth = intermediateContourWidth
+      // material.uniforms.intermediateContourWidth = intermediateContourWidth
+      paramData.intermediateContourWidth = intermediateContourWidth
     }
   })
 
@@ -289,7 +350,8 @@ async function dialog(sdk) {
   halfIntervalContourSwitch.addEventListener('change', (e) => {
     halfIntervalContourShow = e.target.checked
     if (material) {
-      material.uniforms.halfIntervalContourShow = halfIntervalContourShow
+      // material.uniforms.halfIntervalContourShow = halfIntervalContourShow
+      paramData.halfIntervalContourShow = halfIntervalContourShow
     }
   })
   // 间曲线颜色
@@ -303,13 +365,15 @@ async function dialog(sdk) {
     sure: color => {
       halfIntervalContourColor = color
       if (material) {
-        material.uniforms.halfIntervalContourColor = Cesium.Color.fromCssColorString(halfIntervalContourColor)
+        // material.uniforms.halfIntervalContourColor = Cesium.Color.fromCssColorString(halfIntervalContourColor)
+        paramData.halfIntervalContourColor = Cesium.Color.fromCssColorString(halfIntervalContourColor)
       }
     },
     clear: () => {
       halfIntervalContourColor = 'rgba(255,255,255,1)'
       if (material) {
-        material.uniforms.halfIntervalContourColor = Cesium.Color.fromCssColorString(halfIntervalContourColor)
+        // material.uniforms.halfIntervalContourColor = Cesium.Color.fromCssColorString(halfIntervalContourColor)
+        paramData.halfIntervalContourColor = Cesium.Color.fromCssColorString(halfIntervalContourColor)
       }
     }
   })
@@ -321,7 +385,8 @@ async function dialog(sdk) {
     halfIntervalContourWidth = value
     halfIntervalContourWidthInput.value = value
     if (material) {
-      material.uniforms.halfIntervalContourWidth = halfIntervalContourWidth
+      // material.uniforms.halfIntervalContourWidth = halfIntervalContourWidth
+      paramData.halfIntervalContourWidth = halfIntervalContourWidth
     }
   })
 
@@ -331,7 +396,8 @@ async function dialog(sdk) {
   supplementaryContourSwitch.addEventListener('change', (e) => {
     supplementaryContourShow = e.target.checked
     if (material) {
-      material.uniforms.supplementaryContourShow = supplementaryContourShow
+      // material.uniforms.supplementaryContourShow = supplementaryContourShow
+      paramData.supplementaryContourShow = supplementaryContourShow
     }
   })
   // 助曲线颜色
@@ -345,13 +411,15 @@ async function dialog(sdk) {
     sure: color => {
       supplementaryContourColor = color
       if (material) {
-        material.uniforms.supplementaryContourColor = Cesium.Color.fromCssColorString(supplementaryContourColor)
+        // material.uniforms.supplementaryContourColor = Cesium.Color.fromCssColorString(supplementaryContourColor)
+        paramData.supplementaryContourColor = Cesium.Color.fromCssColorString(supplementaryContourColor)
       }
     },
     clear: () => {
       supplementaryContourColor = 'rgba(255,255,255,1)'
       if (material) {
-        material.uniforms.supplementaryContourColor = Cesium.Color.fromCssColorString(supplementaryContourColor)
+        // material.uniforms.supplementaryContourColor = Cesium.Color.fromCssColorString(supplementaryContourColor)
+        paramData.supplementaryContourColor = Cesium.Color.fromCssColorString(supplementaryContourColor)
       }
     }
   })
@@ -363,7 +431,8 @@ async function dialog(sdk) {
     supplementaryContourWidth = value
     supplementaryContourWidthInput.value = value
     if (material) {
-      material.uniforms.supplementaryContourWidth = supplementaryContourWidth
+      // material.uniforms.supplementaryContourWidth = supplementaryContourWidth
+      paramData.supplementaryContourWidth = supplementaryContourWidth
     }
   })
 
@@ -638,4 +707,4 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
   });
 }
 
-export { dialog }
+export { dialog, startDraw, reset }

src/In/index.js

@@ -69,7 +69,7 @@ import {
 } from '../Global/MultiViewportMode'
 import { MouseCoordinate } from '../Global/MouseCoordinate'
 import { MouseRightMenu } from '../Global/mouseRightMenu'
-import { dialog as ContourDialog } from '../Global/Contour'
+import { dialog as ContourDialog, startDraw as ContourStartDraw, reset as ContourReset } from '../Global/Contour'
 import { on as SplitScreenOn, off as SplitScreenOff, setActiveId as SplitScreenSetActiveId, getSdk } from '../Global/SplitScreen'
 import LocateCurrent from '../Obj/Base/LocateCurrent'
 
@@ -346,7 +346,9 @@ if (!window.YJ) {
         setActiveId: SplitScreenSetActiveId,
         getSdk
       },
-      Contour: ContourDialog
+      Contour: ContourDialog,
+      ContourStartDraw,
+      ContourReset
     }, //测量
     Measure: {
       GetMeasureStatus: () => {

src/Obj/Analysis/Flat/index.js

@@ -1,125 +1,125 @@
 import Base from "../../Base/index";
 import Dialog from '../../../BaseDialog'
-import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../Global/global'
+import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
 
 let FlatList = {}
 class Flat extends Base {
-    /**
-     * @constructor
-     * @description 模型压平
-     * @param sdk 
-     * @param {Cesium.Cesium3DTileset} tileset 三维模型
-     * @param {Object} options 
-     * @param {string} attr.id id
-     * @param {Cesium.Cartesian3[]} attr.positions 压平面坐标
-     */
-    constructor(sdk, tileset, options = {}, _Dialog = {}) {
-        super(sdk)
-        if (!tileset || !this.sdk || !this.sdk.viewer) return;
-        this.options = { ...options }
-        this.options.id = options.id || this.randomString()
-        this.options.name = options.name || '压平面'
-        this.options.positions = options.positions || []
-        this.options.show = (options.show || options.show === false) ? options.show : true
-        this.tileset = tileset;
-        this.Dialog = _Dialog
+  /**
+   * @constructor
+   * @description 模型压平
+   * @param sdk
+   * @param {Cesium.Cesium3DTileset} tileset 三维模型
+   * @param {Object} options
+   * @param {string} attr.id id
+   * @param {Cesium.Cartesian3[]} attr.positions 压平面坐标
+   */
+  constructor(sdk, tileset, options = {}, _Dialog = {}) {
+    super(sdk)
+    if (!tileset || !this.sdk || !this.sdk.viewer) return;
+    this.options = { ...options }
+    this.options.id = options.id || this.randomString()
+    this.options.name = options.name || '压平面'
+    this.options.positions = options.positions || []
+    this.options.show = (options.show || options.show === false) ? options.show : true
+    this.tileset = tileset;
+    this.Dialog = _Dialog
 
-        if (!this.options.height && this.options.height !== 0) {
-            let height = this.options.positions[0].alt
-            for (let i = 0; i < this.options.positions.length; i++) {
-                if (height > this.options.positions[i].alt) {
-                    height = this.options.positions[i].alt
-                }
-            }
-            this.options.height = height
+    if (!this.options.height && this.options.height !== 0) {
+      let height = this.options.positions[0].alt
+      for (let i = 0; i < this.options.positions.length; i++) {
+        if (height > this.options.positions[i].alt) {
+          height = this.options.positions[i].alt
         }
-
-        if (FlatList[this.tileset.id]) {
-            FlatList[this.tileset.id].push({ ...this.options })
-        }
-        else {
-            FlatList[this.tileset.id] = [{ ...this.options }]
-        }
-
-        this.center = tileset.boundingSphere.center.clone();
-        this.center84 = this.cartesian3Towgs84(this.center, this.sdk.viewer)
-        this.matrix = Cesium.Transforms.eastNorthUpToFixedFrame(this.center.clone());
-        this.localMatrix = Cesium.Matrix4.inverse(this.matrix, new Cesium.Matrix4());
-        // this.entity = {
-        //     id: this.options.id
-        // }
-        this.addFlat()
-        // Flat.createPolygon(this)
+      }
+      this.options.height = height
     }
 
-    get show() {
-        return this.options.show
+    if (FlatList[this.tileset.id]) {
+      FlatList[this.tileset.id].push({ ...this.options })
+    }
+    else {
+      FlatList[this.tileset.id] = [{ ...this.options }]
     }
 
-    set show(v) {
-        this.options.show = v
-        for (let i = 0; i < FlatList[this.tileset.id].length; i++) {
-            if (FlatList[this.tileset.id][i].id == this.options.id) {
-                FlatList[this.tileset.id][i].show = v
-            }
+    this.center = tileset.boundingSphere.center.clone();
+    this.center84 = this.cartesian3Towgs84(this.center, this.sdk.viewer)
+    this.matrix = Cesium.Transforms.eastNorthUpToFixedFrame(this.center.clone());
+    this.localMatrix = Cesium.Matrix4.inverse(this.matrix, new Cesium.Matrix4());
+    // this.entity = {
+    //     id: this.options.id
+    // }
+    this.addFlat()
+    // Flat.createPolygon(this)
+  }
+
+  get show() {
+    return this.options.show
+  }
+
+  set show(v) {
+    this.options.show = v
+    for (let i = 0; i < FlatList[this.tileset.id].length; i++) {
+      if (FlatList[this.tileset.id][i].id == this.options.id) {
+        FlatList[this.tileset.id][i].show = v
+      }
+    }
+    this.addFlat()
+  }
+
+  get height() {
+    return this.options.height
+  }
+
+  set height(v) {
+    this.options.height = Number(v)
+    for (let i = 0; i < FlatList[this.tileset.id].length; i++) {
+      if (FlatList[this.tileset.id][i].id == this.options.id) {
+        FlatList[this.tileset.id][i].height = Number(v)
+      }
+    }
+    this.addFlat()
+  }
+
+  get name() {
+    return this.options.name
+  }
+
+  set name(v) {
+    this.options.name = v
+    for (let i = 0; i < FlatList[this.tileset.id].length; i++) {
+      if (FlatList[this.tileset.id][i].id == this.options.id) {
+        FlatList[this.tileset.id][i].name = v
+      }
+    }
+  }
+
+  addFlat() {
+    let localPositionsArr = []
+    for (let i = 0; i < FlatList[this.tileset.id].length; i++) {
+      let item = FlatList[this.tileset.id][i];
+      if (item.show) {
+        const positions = item.positions;
+        let height = item.height
+        let fromDegreesArray = []
+        for (let i = 0; i < positions.length; i++) {
+          fromDegreesArray.push(positions[i].lng, positions[i].lat)
         }
-        this.addFlat()
+        FlatList[this.tileset.id][i].flatHeight = height - this.center84.alt
+        let localCoor = this.cartesiansToLocal(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray));
+        localPositionsArr.push(localCoor);
+      }
     }
 
-    get height() {
-        return this.options.height
-    }
-
-    set height(v) {
-        this.options.height = Number(v)
-        for (let i = 0; i < FlatList[this.tileset.id].length; i++) {
-            if (FlatList[this.tileset.id][i].id == this.options.id) {
-                FlatList[this.tileset.id][i].height = Number(v)
-            }
-        }
-        this.addFlat()
-    }
-
-    get name() {
-        return this.options.name
-    }
-
-    set name(v) {
-        this.options.name = v
-        for (let i = 0; i < FlatList[this.tileset.id].length; i++) {
-            if (FlatList[this.tileset.id][i].id == this.options.id) {
-                FlatList[this.tileset.id][i].name = v
-            }
-        }
-    }
-
-    addFlat() {
-        let localPositionsArr = []
-        for (let i = 0; i < FlatList[this.tileset.id].length; i++) {
-            let item = FlatList[this.tileset.id][i];
-            if (item.show) {
-                const positions = item.positions;
-                let height = item.height
-                let fromDegreesArray = []
-                for (let i = 0; i < positions.length; i++) {
-                    fromDegreesArray.push(positions[i].lng, positions[i].lat)
-                }
-                FlatList[this.tileset.id][i].flatHeight = height - this.center84.alt
-                let localCoor = this.cartesiansToLocal(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray));
-                localPositionsArr.push(localCoor);
-            }
-        }
-
-        const funstr = this.getIsinPolygonFun(localPositionsArr);
-        let str = ``;
-        for (let i = 0; i < localPositionsArr.length; i++) {
-            const coors = localPositionsArr[i];
-            const n = coors.length;
-            let instr = ``;
-            coors.forEach((coordinate, index) => {
-                instr += `points_${n}[${index}] = vec2(${coordinate[0]}, ${coordinate[1]});\n`;
-            })
-            str += `
+    const funstr = this.getIsinPolygonFun(localPositionsArr);
+    let str = ``;
+    for (let i = 0; i < localPositionsArr.length; i++) {
+      const coors = localPositionsArr[i];
+      const n = coors.length;
+      let instr = ``;
+      coors.forEach((coordinate, index) => {
+        instr += `points_${n}[${index}] = vec2(${coordinate[0]}, ${coordinate[1]});\n`;
+      })
+      str += `
               ${instr}
               if(isPointInPolygon_${n}(position2D)){
                   vec4 tileset_local_position_transformed = vec4(tileset_local_position.x, tileset_local_position.y, ground_z + ${FlatList[this.tileset.id][i].flatHeight}, 1.0);
@@ -130,68 +130,68 @@ class Flat extends Base {
                   return;
               }`;
 
-        }
-
-        this.updateShader(funstr, str);
     }
 
-    // static createPolygon(that) {
-    //     let color = '#ffffff'
-    //     let linecolor = '#000000'
-    //     let positions = that.options.positions
-    //     let fromDegreesArray = []
-    //     for (let i = 0; i < positions.length; i++) {
-    //         fromDegreesArray.push(positions[i].lng, positions[i].lat, that.options.height)
-    //     }
-    //     that.positions = Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArray)
-    //     that.entity = that.sdk.viewer.entities.add({
-    //         show: that.options.show,
-    //         id: that.options.id,
-    //         polyline: {
-    //             positions: [...that.positions, that.positions[0], that.positions[1]],
-    //             width: 2,
-    //             material: Cesium.Color.fromCssColorString(linecolor),
-    //             depthFailMaterial: new Cesium.PolylineDashMaterialProperty({
-    //                 color: Cesium.Color.YELLOW
-    //             }),
-    //             clampToGround: false,
-    //             zIndex: that.sdk._entityZIndex
-    //         },
-    //     })
-    //     that.sdk._entityZIndex++
-    // }
+    this.updateShader(funstr, str);
+  }
 
-    remove() {
-        FlatList[this.tileset.id] = FlatList[this.tileset.id].filter((attr) => {
-            return attr.id != this.options.id;
-        })
+  // static createPolygon(that) {
+  //     let color = '#ffffff'
+  //     let linecolor = '#000000'
+  //     let positions = that.options.positions
+  //     let fromDegreesArray = []
+  //     for (let i = 0; i < positions.length; i++) {
+  //         fromDegreesArray.push(positions[i].lng, positions[i].lat, that.options.height)
+  //     }
+  //     that.positions = Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArray)
+  //     that.entity = that.sdk.viewer.entities.add({
+  //         show: that.options.show,
+  //         id: that.options.id,
+  //         polyline: {
+  //             positions: [...that.positions, that.positions[0], that.positions[1]],
+  //             width: 2,
+  //             material: Cesium.Color.fromCssColorString(linecolor),
+  //             depthFailMaterial: new Cesium.PolylineDashMaterialProperty({
+  //                 color: Cesium.Color.YELLOW
+  //             }),
+  //             clampToGround: false,
+  //             zIndex: that.sdk._entityZIndex
+  //         },
+  //     })
+  //     that.sdk._entityZIndex++
+  // }
 
-        let localPositionsArr = [];
-        for (let i = 0; i < FlatList[this.tileset.id].length; i++) {
-            let item = FlatList[this.tileset.id][i];
-            if (item.show) {
-                const positions = item.positions;
-                let height = item.height
-                let fromDegreesArray = []
-                for (let i = 0; i < positions.length; i++) {
-                    fromDegreesArray.push(positions[i].lng, positions[i].lat)
-                }
-                FlatList[this.tileset.id][i].flatHeight = height - this.center84.alt
-                let localCoor = this.cartesiansToLocal(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray));
-                localPositionsArr.push(localCoor);
-            }
+  remove() {
+    FlatList[this.tileset.id] = FlatList[this.tileset.id].filter((attr) => {
+      return attr.id != this.options.id;
+    })
+
+    let localPositionsArr = [];
+    for (let i = 0; i < FlatList[this.tileset.id].length; i++) {
+      let item = FlatList[this.tileset.id][i];
+      if (item.show) {
+        const positions = item.positions;
+        let height = item.height
+        let fromDegreesArray = []
+        for (let i = 0; i < positions.length; i++) {
+          fromDegreesArray.push(positions[i].lng, positions[i].lat)
         }
+        FlatList[this.tileset.id][i].flatHeight = height - this.center84.alt
+        let localCoor = this.cartesiansToLocal(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray));
+        localPositionsArr.push(localCoor);
+      }
+    }
 
-        const funstr = this.getIsinPolygonFun(localPositionsArr);
-        let str = ``;
-        for (let i = 0; i < localPositionsArr.length; i++) {
-            const coors = localPositionsArr[i];
-            const n = coors.length;
-            let instr = ``;
-            coors.forEach((coordinate, index) => {
-                instr += `points_${n}[${index}] = vec2(${coordinate[0]}, ${coordinate[1]});\n`;
-            })
-            str += `
+    const funstr = this.getIsinPolygonFun(localPositionsArr);
+    let str = ``;
+    for (let i = 0; i < localPositionsArr.length; i++) {
+      const coors = localPositionsArr[i];
+      const n = coors.length;
+      let instr = ``;
+      coors.forEach((coordinate, index) => {
+        instr += `points_${n}[${index}] = vec2(${coordinate[0]}, ${coordinate[1]});\n`;
+      })
+      str += `
               ${instr}
               if(isPointInPolygon_${n}(position2D)){
                 vec4 tileset_local_position_transformed = vec4(tileset_local_position.x, tileset_local_position.y, ground_z + ${FlatList[this.tileset.id][i].flatHeight}, 1.0);
@@ -201,21 +201,21 @@ class Flat extends Base {
                 return;
               }`;
 
-        }
-        this.updateShader(funstr, str);
     }
+    this.updateShader(funstr, str);
+  }
 
-    // 根据数组长度，构建 判断点是否在面内 的压平函数
-    getIsinPolygonFun(polygons) {
-        let pmap = polygons.map((polygon) => polygon.length);
-        let uniqueArray = this.getUniqueArray(pmap);
-        let str = ``;
-        uniqueArray.forEach(length => {
-            str += `
+  // 根据数组长度，构建 判断点是否在面内 的压平函数
+  getIsinPolygonFun(polygons) {
+    let pmap = polygons.map((polygon) => polygon.length);
+    let uniqueArray = this.getUniqueArray(pmap);
+    let str = ``;
+    uniqueArray.forEach(length => {
+      str += `
               vec2 points_${length}[${length}];
               bool isPointInPolygon_${length}(vec2 point){
               int nCross = 0; // 交点数
-              const int n = ${length}; 
+              const int n = ${length};
               for(int i = 0; i < n; i++){
                   vec2 p1 = points_${length}[i];
                   vec2 p2 = points_${length}[int(mod(float(i+1),float(n)))];
@@ -236,27 +236,27 @@ class Flat extends Base {
               return int(mod(float(nCross), float(2))) == 1;
               }
           `
-        })
-        return str
-    }
+    })
+    return str
+  }
 
-    updateShader(vtx1, vtx2) {
-        let flatCustomShader = new Cesium.CustomShader({
-            uniforms: {
-                u_tileset_localToWorldMatrix: {
-                    type: Cesium.UniformType.MAT4,
-                    value: this.matrix,
-                },
-                u_tileset_worldToLocalMatrix: {
-                    type: Cesium.UniformType.MAT4,
-                    value: this.localMatrix,
-                },
-                u_flatHeight: {
-                    type: Cesium.UniformType.FLOAT,
-                    value: this.flatHeight,
-                },
-            },
-            vertexShaderText: `
+  updateShader(vtx1, vtx2) {
+    let flatCustomShader = new Cesium.CustomShader({
+      uniforms: {
+        u_tileset_localToWorldMatrix: {
+          type: Cesium.UniformType.MAT4,
+          value: this.matrix,
+        },
+        u_tileset_worldToLocalMatrix: {
+          type: Cesium.UniformType.MAT4,
+          value: this.localMatrix,
+        },
+        u_flatHeight: {
+          type: Cesium.UniformType.FLOAT,
+          value: this.flatHeight,
+        },
+      },
+      vertexShaderText: `
           // 所有isPointInPolygon函数
           ${vtx1}
           void vertexMain(VertexInput vsInput, inout czm_modelVertexOutput vsOutput){
@@ -268,216 +268,225 @@ class Flat extends Base {
               // 多个多边形区域
               ${vtx2}
           }`,
-        });
-        this.tileset.customShader = flatCustomShader;
-        this.sdk.viewer.scene.requestRender();
+    });
+    this.tileset.customShader = flatCustomShader;
+    this.sdk.viewer.scene.requestRender();
 
+  }
+
+  // 数组去重，不能处理嵌套的数组
+  getUniqueArray = (arr) => {
+    return arr.filter(function (item, index, arr) {
+      //当前元素，在原始数组中的第一个索引==当前索引值，否则返回当前元素
+      return arr.indexOf(item, 0) === index;
+    });
+  }
+
+
+  // 世界坐标转数组局部坐标
+  cartesiansToLocal(positions) {
+    let arr = [];
+    for (let i = 0; i < positions.length; i++) {
+      let position = positions[i];
+      let localp = Cesium.Matrix4.multiplyByPoint(
+        this.localMatrix,
+        position.clone(),
+        new Cesium.Cartesian3()
+      )
+      arr.push([localp.x, localp.y]);
     }
+    return arr;
+  }
 
-    // 数组去重，不能处理嵌套的数组
-    getUniqueArray = (arr) => {
-        return arr.filter(function (item, index, arr) {
-            //当前元素，在原始数组中的第一个索引==当前索引值，否则返回当前元素
-            return arr.indexOf(item, 0) === index;
-        });
+  /**
+ * 飞到
+*/
+  async flyTo() {
+    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.line && this.options.line.positions) {
+        position = { ...this.options.line.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
+      })
     }
-
-
-    // 世界坐标转数组局部坐标
-    cartesiansToLocal(positions) {
-        let arr = [];
-        for (let i = 0; i < positions.length; i++) {
-            let position = positions[i];
-            let localp = Cesium.Matrix4.multiplyByPoint(
-                this.localMatrix,
-                position.clone(),
-                new Cesium.Cartesian3()
-            )
-            arr.push([localp.x, localp.y]);
+    else {
+      let positionArray = []
+      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.center84.alt)
+        positionArray.push(a.x, a.y, a.z)
+      }
+      let BoundingSphere = Cesium.BoundingSphere.fromVertices(positionArray)
+      this.sdk.viewer.camera.flyToBoundingSphere(BoundingSphere, {
+        offset: {
+          heading: Cesium.Math.toRadians(0.0),
+          pitch: Cesium.Math.toRadians(-90.0),
+          roll: Cesium.Math.toRadians(0.0)
         }
-        return arr;
+      })
     }
+  }
 
-    /**
-   * 飞到
-  */
-    async flyTo() {
-        setActiveViewer(0)
-        closeRotateAround(this.sdk)
-  closeViewFollow(this.sdk)
+  async edit(state) {
+    if (state) {
+      this.originalOptions = this.deepCopyObj(this.options)
+      // this._DialogObject = await new Dialog(this.sdk.viewer._container, {
+      //     title: '压平面属性', left: '180px', top: '100px',
+      //     removeCallBack: () => {
+      //         this.Dialog.removeCallBack && this.Dialog.removeCallBack()
+      //     },
+      //     closeCallBack: () => {
+      //         this.reset()
+      //         this.Dialog.closeCallBack && this.Dialog.closeCallBack()
+      //     }
+      // })
+      // await this._DialogObject.init()
+      // 内容部分
+      // let contentElm = document.createElement('div');
+      // contentElm.innerHTML = `
+      //     <span class="custom-divider"></span>
+      //     <div class="div-item">
+      //         <div class="row">
+      //             <div class="col">
+      //                 <span class="label" style="width: 56px;flex: 0 0 56px;">名称</span>
+      //                 <input class="input input-name">
+      //             </div>
+      //         </div>
+      //         <div class="row">
+      //             <div class="col">
+      //                 <span class="label" style="width: 56px;flex: 0 0 56px;">压平高度</span>
+      //                 <div class="input-number input-number-unit-1">
+      //                     <input class="input flat-height" type="number" title="" min="-9999999" max="999999999">
+      //                     <span class="unit">m</span>
+      //                     <span class="arrow"></span>
+      //                 </div>
+      //             </div>
+      //         </div>
+      //     </div>
+      // `
+      // this._DialogObject.contentAppChild(contentElm)
+      let contentElm = document.getElementsByClassName('flatPlane')[0]
+      let name_elm = contentElm.getElementsByClassName('input-name')[0]
+      name_elm.value = this.options.name
+      name_elm.addEventListener('input', () => {
+        this.name = name_elm.value
+      })
 
-        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.line && this.options.line.positions) {
-                position = { ...this.options.line.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.options.positions.length; i++) {
-                let a = Cesium.Cartesian3.fromDegrees(this.options.positions[i].lng, this.options.positions[i].lat, this.center84.alt)
-                positionArray.push(a.x, a.y, a.z)
-            }
-            let BoundingSphere = Cesium.BoundingSphere.fromVertices(positionArray)
-            this.sdk.viewer.camera.flyToBoundingSphere(BoundingSphere, {
-                offset: {
-                    heading: Cesium.Math.toRadians(0.0),
-                    pitch: Cesium.Math.toRadians(-90.0),
-                    roll: Cesium.Math.toRadians(0.0)
-                }
-            })
-        }
-    }
-
-    async edit(state) {
-        if (state) {
-            this.originalOptions = this.deepCopyObj(this.options)
-            this._DialogObject = await new Dialog(this.sdk.viewer._container, {
-                title: '压平面属性', left: '180px', top: '100px',
-                removeCallBack: () => {
-                    this.Dialog.removeCallBack && this.Dialog.removeCallBack()
-                },
-                closeCallBack: () => {
-                    this.reset()
-                    this.Dialog.closeCallBack && this.Dialog.closeCallBack()
-                }
-            })
-            await this._DialogObject.init()
-            // 内容部分
-            let contentElm = document.createElement('div');
-            contentElm.innerHTML = `
-                <span class="custom-divider"></span>
-                <div class="div-item">
-                    <div class="row">
-                        <div class="col">
-                            <span class="label" style="width: 56px;flex: 0 0 56px;">名称</span>
-                            <input class="input input-name">
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col">
-                            <span class="label" style="width: 56px;flex: 0 0 56px;">压平高度</span>
-                            <div class="input-number input-number-unit-1">
-                                <input class="input flat-height" type="number" title="" min="-9999999" max="999999999">
-                                <span class="unit">m</span>
-                                <span class="arrow"></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            `
-            this._DialogObject.contentAppChild(contentElm)
-            let name_elm = contentElm.getElementsByClassName('input-name')[0]
-            name_elm.value = this.options.name
-            name_elm.addEventListener('input', () => {
-                this.name = name_elm.value
-            })
-
-            let height_elm = contentElm.getElementsByClassName('flat-height')[0]
-            height_elm.value = this.options.height
-            height_elm.addEventListener('input', () => {
-                this.height = Number(height_elm.value)
-                this.addFlat()
-            })
-
-            let confirmElm = document.createElement('button');
-            confirmElm.className = 'btn'
-            confirmElm.innerHTML = '确认'
-            this._DialogObject.footAppChild(confirmElm)
-            confirmElm.addEventListener('click', () => {
-                if (!this.options.name) {
-                    this.options.name = '压平面'
-                }
-                this.originalOptions = this.deepCopyObj(this.options)
-                this._DialogObject.close()
-                this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.options)
-            })
-
-            // let flatElm = document.createElement('button');
-            // flatElm.className = 'btn'
-            // flatElm.innerHTML = '<svg class="icon-edit"><use xlink:href="#yj-icon-edit"></use></svg>二次编辑'
-            // flatElm.style.width = 'auto'
-            // flatElm.style.position = 'absolute'
-            // flatElm.style.left = '10px'
-            // this._DialogObject.footAppChild(flatElm)
-            // flatElm.addEventListener('click', () => {
-            //     console.log('二次编辑')
-            // })
-        }
-        else {
-            if (this._DialogObject && this._DialogObject.close) {
-                this._DialogObject.close()
-                this._DialogObject = null
-            }
-        }
-    }
-
-    reset() {
-        this.options = this.deepCopyObj(this.originalOptions)
-        this.name = this.options.name
-        this.height = this.options.height
+      let height_elm = contentElm.getElementsByClassName('flat-height')[0]
+      height_elm.value = this.options.height
+      height_elm.addEventListener('input', () => {
+        this.height = Number(height_elm.value)
         this.addFlat()
-    }
+      })
 
-    flatEdit(state) {
-        if (state) {
-            let positions = that.options.positions
-            let fromDegreesArray = []
-            for (let i = 0; i < positions.length; i++) {
-                fromDegreesArray.push(positions[i].lng, positions[i].lat, FlatList[this.tileset.id])
-            }
-            that.positions = Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArray)
-        }
-    }
+      // let confirmElm = document.createElement('button');
+      // confirmElm.className = 'btn'
+      // confirmElm.innerHTML = '确认'
+      // this._DialogObject.footAppChild(confirmElm)
+      // confirmElm.addEventListener('click', () => {
+      //   if (!this.options.name) {
+      //     this.options.name = '压平面'
+      //   }
+      //   this.originalOptions = this.deepCopyObj(this.options)
+      //   this._DialogObject.close()
+      //   this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.options)
+      // })
 
-    flicker() { }
+      // let flatElm = document.createElement('button');
+      // flatElm.className = 'btn'
+      // flatElm.innerHTML = '<svg class="icon-edit"><use xlink:href="#yj-icon-edit"></use></svg>二次编辑'
+      // flatElm.style.width = 'auto'
+      // flatElm.style.position = 'absolute'
+      // flatElm.style.left = '10px'
+      // this._DialogObject.footAppChild(flatElm)
+      // flatElm.addEventListener('click', () => {
+      //     console.log('二次编辑')
+      // })
+    }
+    else {
+      if (this._DialogObject && this._DialogObject.close) {
+        this._DialogObject.close()
+        this._DialogObject = null
+      }
+    }
+  }
+
+  sure() {
+    if (!this.options.name) {
+      this.options.name = '压平面'
+    }
+    this.originalOptions = this.deepCopyObj(this.options)
+    // this._DialogObject.close()
+    // this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.options)
+  }
+  reset() {
+    this.options = this.deepCopyObj(this.originalOptions)
+    this.name = this.options.name
+    this.height = this.options.height
+    this.addFlat()
+  }
+
+  flatEdit(state) {
+    if (state) {
+      let positions = that.options.positions
+      let fromDegreesArray = []
+      for (let i = 0; i < positions.length; i++) {
+        fromDegreesArray.push(positions[i].lng, positions[i].lat, FlatList[this.tileset.id])
+      }
+      that.positions = Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArray)
+    }
+  }
+
+  flicker() { }
 
 }
 
-export default Flat;
+export default Flat;

src/Obj/Analysis/ViewShed/index.js

@@ -434,7 +434,7 @@ class ViewShedStage extends Tools {
 
   clear() {
     YJ.Measure.SetMeasureStatus(false)
-    this.end()
+    // this.end()
     this.tip && this.tip.destroy()
     this.event && this.event.destroy()
     this.tip = null
@@ -492,6 +492,7 @@ class ViewShedStage extends Tools {
         text: '上一次测量未结束',
         type: 'warning',
       });
+      return
     }
     else {
       this.editevent && this.editevent.destroy()

src/Obj/Base/AssembleObject/index.js

@@ -28,7 +28,6 @@ class AssembleObject extends Base {
    * @param options.color='rgba(255, 0, 0, 0.5)' {string} 颜色
    * @param options.height {number} 高度
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
-   * @param options.areaUnit='平方米' {string} 面积单位
    * @param options.line {object} 边框
    * @param options.line.width=2 {string} 边框宽
    * @param options.line.color="rgba(155, 155, 124, 0.89)" {string} 边框颜色
@@ -80,7 +79,6 @@ class AssembleObject extends Base {
     this.options.line = options.line || {}
     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)
     this.operate = {}
@@ -105,13 +103,11 @@ class AssembleObject extends Base {
     this.options.attribute = options.attribute || {}
     this.options.attribute.link = this.options.attribute.link || {}
     this.options.attribute.link.content = this.options.attribute.link.content || []
-    this.options.attribute.camera = this.options.attribute.camera || {}
-    this.options.attribute.camera.content = this.options.attribute.camera.content || []
-    this.options.attribute.vr = this.options.attribute.vr || {}
-    this.options.attribute.vr.content = this.options.attribute.vr.content || []
-    this.options.attribute.goods = this.options.attribute.goods || {}
-    this.options.attribute.goods.content = this.options.attribute.goods.content || []
-    this.options.attributeType = options.attributeType || 'richText'
+
+    delete this.options.attribute.camera
+    delete this.options.attribute.vr
+    delete this.options.attribute.goods
+
     this.nodePoints = []
     if (!this.options.positions || this.options.positions.length < 3) {
       this._error = '集结地最少需要三个坐标！'
@@ -189,7 +185,7 @@ class AssembleObject extends Base {
         return
       }
       let heightModeName = ''
-      AssembleObject.closeNodeEdit(this)
+      this.closeNodeEdit()
       let ground = false
       let disabled = false
       this.renewPositions()
@@ -314,45 +310,6 @@ class AssembleObject extends Base {
     })
   }
 
-  get area() {
-    return this.options.area
-  }
-
-  set area(v) {
-    this.options.area = v
-    this._elms.area && this._elms.area.forEach((item) => {
-      item.value = v
-    })
-  }
-
-  get areaUnit() {
-    return this.options['area-unit']
-  }
-  set areaUnit(v) {
-    this.options['area-unit'] = v
-    this._elms.areaUnit && this._elms.areaUnit.forEach((item) => {
-      item.value = v
-    })
-    if (this.options.areaByMeter) {
-      switch (v) {
-        case '平方米':
-          this.area = this.options.areaByMeter
-          break;
-        case '平方千米':
-          this.area = Number((this.options.areaByMeter / 1000000).toFixed(8))
-          break;
-        case '亩':
-          this.area = Number((this.options.areaByMeter / 666.6666667).toFixed(4))
-          break;
-        case '公顷':
-          this.area = Number((this.options.areaByMeter / 10000).toFixed(6))
-          break;
-        default:
-          this.area = this.options.areaByMeter
-      }
-    }
-  }
-
   get labelShow() {
     return this.options.label.show
   }
@@ -564,319 +521,6 @@ class AssembleObject extends Base {
     }
   }
 
-  get attributeType() {
-    return this.options.attributeType
-  }
-
-  set attributeType(v) {
-    this.options.attributeType = v
-    this._elms.attributeType && this._elms.attributeType.forEach((item) => {
-      item.value = v
-    })
-    let attributeContent = this._DialogObject._element.content.getElementsByClassName('attribute-content')
-    for (let i = 0; i < attributeContent.length; i++) {
-      if (attributeContent[i].className.indexOf('attribute-content-' + v) > -1) {
-        attributeContent[i].style.display = 'block';
-      }
-      else {
-        attributeContent[i].style.display = 'none';
-      }
-    }
-  }
-
-  get attributeLink() {
-    return this.options.attribute.link.content
-  }
-
-  set attributeLink(v) {
-    this.options.attribute.link.content = v
-    if (!this._DialogObject || !this._DialogObject._element || !this._DialogObject._element.content || this._DialogObject._element.content.getElementsByClassName('attribute-content-link').length == 0) {
-      return
-    }
-    let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-link')[1].getElementsByClassName('table')[0]
-    let tableContent = table.getElementsByClassName('table-body')[0]
-    tableContent.innerHTML = ''
-    if (this.options.attribute.link.content.length > 0) {
-      table.getElementsByClassName('table-empty')[0].style.display = 'none'
-    }
-    else {
-      table.getElementsByClassName('table-empty')[0].style.display = 'flex'
-    }
-    for (let i = 0; i < this.options.attribute.link.content.length; i++) {
-      let tr = `
-      <div class="tr">
-          <div class="td">` + this.options.attribute.link.content[i].name + `</div>
-          <div class="td">` + this.options.attribute.link.content[i].url + `</div>
-          <div class="td">
-              <button @click="linkEdit">编辑</button>
-              <button @click="linkDelete">删除</button>
-          </div>
-      </div>`
-      let trElm = document.createRange().createContextualFragment(tr)
-      tableContent.appendChild(trElm)
-    }
-    let item = tableContent.getElementsByClassName('tr')
-    let fun = {
-      linkEdit: async (index) => {
-        this.attributeLink = await this.options.attribute.link.content
-        let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-link')[1].getElementsByClassName('table')[0]
-        let tableContent = table.getElementsByClassName('table-body')[0]
-        let item = tableContent.getElementsByClassName('tr')
-        for (let i = 0; i < item.length; i++) {
-          if (index === i) {
-            let height = item[i].offsetHeight
-            let html = `
-              <div class="td">
-                <input class="input" type="text">
-              </div>
-              <div class="td">
-                <textarea class="input link-edit" type="text"></textarea>
-              </div>
-              <div class="td">
-                  <button @click="confirmEdit">确认</button>
-                  <button @click="cancelEdit">取消</button>
-              </div>`
-            item[i].innerHTML = html
-            let textareaElm = item[i].getElementsByClassName('link-edit')[0]
-            textareaElm.style.height = (height - 10) + 'px'
-            let td = item[i].getElementsByClassName('td')
-            td[0].getElementsByClassName('input')[0].value = this.options.attribute.link.content[index].name
-            td[1].getElementsByClassName('input')[0].value = this.options.attribute.link.content[index].url
-            let btn = item[i].getElementsByTagName('button')
-            for (let n = 0; n < btn.length; n++) {
-              if (!btn[n] || !btn[n].attributes) {
-                continue
-              }
-              for (let m of btn[n].attributes) {
-                if (m.name === '@click') {
-                  btn[n].addEventListener('click', (e) => {
-                    if (typeof (fun[m.value]) === 'function') {
-                      fun[m.value]({ name: td[0].getElementsByClassName('input')[0].value, url: td[1].getElementsByClassName('input')[0].value }, i)
-                    }
-                  });
-                  btn[n].attributes.removeNamedItem(m.name)
-                  break
-                }
-              }
-            }
-            break
-          }
-        }
-      },
-      linkDelete: (i) => {
-        this.options.attribute.link.content.splice(i, 1)
-        this.attributeLink = this.options.attribute.link.content
-      },
-
-      confirmEdit: (value, i) => {
-        let name = value.name && value.name.replace(/\s/g, "")
-        let url = value.url && value.url.replace(/\s/g, "")
-        if (name && url) {
-          this.options.attribute.link.content[i] = value
-        }
-        else {
-          window.ELEMENT && window.ELEMENT.Message({
-            message: '名称或链接不能为空！',
-            type: 'warning',
-            duration: 1500
-          });
-        }
-        this.attributeLink = this.options.attribute.link.content
-      },
-      cancelEdit: () => {
-        this.attributeLink = this.options.attribute.link.content
-      },
-      fileSelect: (value, i) => {
-        let fileElm = item[i].getElementsByClassName('file-select')[0]
-        fileElm.click()
-        fileElm.removeEventListener('change', fileSelect)
-        fileElm.addEventListener('change', fileSelect)
-      }
-    }
-    let fileSelect = (event) => {
-      if (event.target.value) {
-        let td = item[event.target.getAttribute('index')].getElementsByClassName('td')
-        td[1].getElementsByClassName('input')[0].value = event.target.value
-        event.target.value = null
-      }
-    }
-    for (let i = 0; i < item.length; i++) {
-      let btn = item[i].getElementsByTagName('button')
-      for (let n = 0; n < btn.length; n++) {
-        if (!btn[n] || !btn[n].attributes) {
-          continue
-        }
-        for (let m of btn[n].attributes) {
-          if (m.name === '@click') {
-            btn[n].addEventListener('click', (e) => {
-              if (typeof (fun[m.value]) === 'function') {
-                fun[m.value](i)
-              }
-            });
-            btn[n].attributes.removeNamedItem(m.name)
-            break
-          }
-        }
-      }
-    }
-
-
-
-
-  }
-
-  get attributeCamera() {
-    return this.options.attribute.camera.content
-  }
-  set attributeCamera(v) {
-    this.options.attribute.camera.content = v
-  }
-
-  get attributeVr() {
-    return this.options.attribute.vr.content
-  }
-
-  set attributeVr(v) {
-    this.options.attribute.vr.content = v
-    if (!this._DialogObject || !this._DialogObject._element || !this._DialogObject._element.content || this._DialogObject._element.content.getElementsByClassName('attribute-content-vr').length == 0) {
-      return
-    }
-    let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-vr')[1].getElementsByClassName('table')[0]
-    let tableContent = table.getElementsByClassName('table-body')[0]
-    tableContent.innerHTML = ''
-    if (this.options.attribute.vr.content.length > 0) {
-      table.getElementsByClassName('table-empty')[0].style.display = 'none'
-    }
-    else {
-      table.getElementsByClassName('table-empty')[0].style.display = 'flex'
-    }
-    for (let i = 0; i < this.options.attribute.vr.content.length; i++) {
-      let tr = `
-      <div class="tr">
-          <div class="td">` + this.options.attribute.vr.content[i].name + `</div>
-          <div class="td">` + this.options.attribute.vr.content[i].url + `</div>
-          <div class="td">
-              <button @click="vrEdit">编辑</button>
-              <button @click="vrDelete">删除</button>
-          </div>
-      </div>`
-      let trElm = document.createRange().createContextualFragment(tr)
-      tableContent.appendChild(trElm)
-    }
-    let item = tableContent.getElementsByClassName('tr')
-    let fun = {
-      vrEdit: async (index) => {
-        this.attributeVr = await this.options.attribute.vr.content
-        let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-vr')[1].getElementsByClassName('table')[0]
-        let tableContent = table.getElementsByClassName('table-body')[0]
-        let item = tableContent.getElementsByClassName('tr')
-        for (let i = 0; i < item.length; i++) {
-          if (index === i) {
-            let height = item[i].offsetHeight
-            let html = `
-              <div class="td">
-                <input class="input" type="text">
-              </div>
-              <div class="td">
-                <textarea class="input link-edit" type="text"></textarea>
-              </div>
-              <div class="td">
-                  <button @click="confirmEdit">确认</button>
-                  <button @click="cancelEdit">取消</button>
-              </div>`
-            item[i].innerHTML = html
-            let textareaElm = item[i].getElementsByClassName('link-edit')[0]
-            textareaElm.style.height = (height - 10) + 'px'
-            let td = item[i].getElementsByClassName('td')
-            td[0].getElementsByClassName('input')[0].value = this.options.attribute.vr.content[index].name
-            td[1].getElementsByClassName('input')[0].value = this.options.attribute.vr.content[index].url
-            let btn = item[i].getElementsByTagName('button')
-            for (let n = 0; n < btn.length; n++) {
-              if (!btn[n] || !btn[n].attributes) {
-                continue
-              }
-              for (let m of btn[n].attributes) {
-                if (m.name === '@click') {
-                  btn[n].addEventListener('click', (e) => {
-                    if (typeof (fun[m.value]) === 'function') {
-                      fun[m.value]({ name: td[0].getElementsByClassName('input')[0].value, url: td[1].getElementsByClassName('input')[0].value }, i)
-                    }
-                  });
-                  btn[n].attributes.removeNamedItem(m.name)
-                  break
-                }
-              }
-            }
-            break
-          }
-        }
-      },
-      vrDelete: (i) => {
-        this.options.attribute.vr.content.splice(i, 1)
-        this.attributeVr = this.options.attribute.vr.content
-      },
-
-      confirmEdit: (value, i) => {
-        let name = value.name && value.name.replace(/\s/g, "")
-        let url = value.url && value.url.replace(/\s/g, "")
-        if (name && url) {
-          this.options.attribute.vr.content[i] = value
-        }
-        else {
-          window.ELEMENT && window.ELEMENT.Message({
-            message: '名称或链接不能为空！',
-            type: 'warning',
-            duration: 1500
-          });
-        }
-        this.attributeVr = this.options.attribute.vr.content
-      },
-      cancelEdit: () => {
-        this.attributeVr = this.options.attribute.vr.content
-      },
-      fileSelect: (value, i) => {
-        let fileElm = item[i].getElementsByClassName('file-select')[0]
-        fileElm.click()
-        fileElm.removeEventListener('change', fileSelect)
-        fileElm.addEventListener('change', fileSelect)
-      }
-    }
-    let fileSelect = (event) => {
-      if (event.target.value) {
-        let td = item[event.target.getAttribute('index')].getElementsByClassName('td')
-        td[1].getElementsByClassName('input')[0].value = event.target.value
-        event.target.value = null
-      }
-    }
-    for (let i = 0; i < item.length; i++) {
-      let btn = item[i].getElementsByTagName('button')
-      for (let n = 0; n < btn.length; n++) {
-        if (!btn[n] || !btn[n].attributes) {
-          continue
-        }
-        for (let m of btn[n].attributes) {
-          if (m.name === '@click') {
-            btn[n].addEventListener('click', (e) => {
-              if (typeof (fun[m.value]) === 'function') {
-                fun[m.value](i)
-              }
-            });
-            btn[n].attributes.removeNamedItem(m.name)
-            break
-          }
-        }
-      }
-    }
-  }
-
-  get attributeGoods() {
-    return this.options.attribute.goods.content
-  }
-
-  set attributeGoods(v) {
-    this.options.attribute.goods.content = v
-  }
-
   static create(that) {
     let positions = that.options.positions
     let fromDegreesArray = []
@@ -919,9 +563,10 @@ class AssembleObject extends Base {
         break
     }
 
-    if (!that.options.label.position) {
-      that.options.label.position = { lng: centroid.geometry.coordinates[0], lat: centroid.geometry.coordinates[1], alt: that.height + height }
-    }
+    // if (!that.options.label.position) {
+    //   that.options.label.position = { lng: centroid.geometry.coordinates[0], lat: centroid.geometry.coordinates[1], alt: that.height + height }
+    // }
+    that.options.label.position = { lng: centroid.geometry.coordinates[0], lat: centroid.geometry.coordinates[1], alt: that.height + height }
 
     let fromDegreesArray2 = []
     for (let i = 0; i < points[0].length; i++) {
@@ -939,7 +584,7 @@ class AssembleObject extends Base {
         color: that.options.color
       })
     }
-    that.options.label.ground = ground
+    // that.options.label.ground = ground
     that.positionsH = Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArray2)
 
     that.entity = that.sdk.viewer.entities.add({
@@ -967,23 +612,8 @@ class AssembleObject extends Base {
     for (let i = 0; i < positionsA.length; i++) {
       pos84.push(that.cartesian3Towgs84(positionsA[i], that.sdk.viewer))
     }
-    that.options.areaByMeter = that.computeArea(pos84);
-    switch (that.options['area-unit']) {
-      case '平方米':
-        that.options.area = that.options.areaByMeter
-        break;
-      case '平方千米':
-        that.options.area = Number((that.options.areaByMeter / 1000000).toFixed(8))
-        break;
-      case '亩':
-        that.options.area = Number((that.options.areaByMeter / 666.6666667).toFixed(4))
-        break;
-      case '公顷':
-        that.options.area = Number((that.options.areaByMeter / 10000).toFixed(6))
-        break;
-      default:
-        that.options.area = that.options.areaByMeter
-    }
+    that.areaByMeter = that.computeArea(pos84);
+    that.areaChangeCallBack && that.areaChangeCallBack()
     syncData(that.sdk, that.options.id)
     if (that.options.show) {
       setSplitDirection(0, that.options.id)
@@ -1007,12 +637,13 @@ class AssembleObject extends Base {
       scaleByDistance: that.options.label.scaleByDistance,
       near: that.options.label.near,
       far: that.options.label.far,
-      ground: that.options.label.ground,
+      // ground: that.options.label.ground,
     })
   }
 
   // 编辑框
   async edit(state) {
+    return
     if (this._error) {
       return
     }
@@ -1446,7 +1077,6 @@ class AssembleObject extends Base {
         if (unitDataLegpObject) {
           unitDataLegpObject.legp_search(unitData)
           let unitDataLegpElm = this._DialogObject._element.content.getElementsByClassName('input-select-unit')[0].getElementsByTagName('input')[0]
-          unitDataLegpElm.value = this.options['area-unit']
           for (let i = 0; i < unitData.length; i++) {
             if (unitData[i].value === unitDataLegpElm.value) {
               unitDataLegpObject.legp_searchActive(unitData[i].value)
@@ -1511,8 +1141,6 @@ class AssembleObject extends Base {
     this.color = this.originalOptions.color
     this.lineColor = this.originalOptions.line.color
     this.lineWidth = this.originalOptions.line.width
-    this.area = this.originalOptions.area
-    this.areaUnit = this.originalOptions['area-unit']
     this.labelShow = this.originalOptions.label.show
     this.labelColor = this.originalOptions.label.color
     this.labelFontSize = this.originalOptions.label.fontSize
@@ -1525,12 +1153,6 @@ class AssembleObject extends Base {
     this.labelLineColor = this.originalOptions.label.lineColor
     this.labelBackgroundColorStart = this.originalOptions.label.backgroundColor[0]
     this.labelBackgroundColorEnd = this.originalOptions.label.backgroundColor[1]
-    this.attributeLink = this.options.attribute.link.content
-    this.attributeCamera = this.options.attribute.camera.content
-    this.attributeVr = this.options.attribute.vr.content
-    this.attributeGoods = this.options.attribute.goods.content
-    this.cameraSelect && this.cameraSelect()
-    this.goodsSelect && this.goodsSelect()
 
 
     for (let i = 0; i < this.options.positions.length; i++) {
@@ -1572,51 +1194,6 @@ class AssembleObject extends Base {
     await syncData(this.sdk, this.options.id)
   }
 
-  _addLink() {
-    // document.getElementsByClassName
-    if (this._DialogObject._element.content.getElementsByClassName('link_add')[0] && this._DialogObject._element.content.getElementsByClassName('link_add')[0].value) {
-      this.options.attribute.link.content.push({
-        name: '链接',
-        url: this._DialogObject._element.content.getElementsByClassName('link_add')[0].value
-      })
-      this._DialogObject._element.content.getElementsByClassName('link_add')[0].value = ''
-      this.attributeLink = this.options.attribute.link.content
-    }
-    else {
-      this.Dialog.clickAddLink && this.Dialog.clickAddLink()
-    }
-  }
-
-  addAttributeLink(link) {
-    this.options.attribute.link.content.push({
-      name: '链接',
-      url: link
-    })
-    this.attributeLink = this.options.attribute.link.content
-  }
-
-  _addRr() {
-    if (this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value) {
-      this.options.attribute.vr.content.push({
-        name: '全景图' ,
-        url: this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value
-      })
-      this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value = ''
-      this.attributeVr = this.options.attribute.vr.content
-    }
-    else {
-      this.Dialog.clickAddVr && this.Dialog.clickAddVr()
-    }
-  }
-
-  addAttributeRr(vr) {
-    this.options.attribute.vr.content.push({
-      name: '全景图' ,
-      url: vr
-    })
-    this.attributeVr = this.options.attribute.vr.content
-  }
-
   /**
  * 飞到
 */
@@ -1818,6 +1395,11 @@ class AssembleObject extends Base {
         this.positions = newpositions
         this.previous = null
         this.positionEditing = false
+
+        if(this._positionEditingCallback) {
+          this._positionEditingCallback()
+          this._positionEditingCallback = null
+        }
       })
       this.event.mouse_right((movement, cartesian) => {
         this.positionEditing = false
@@ -1919,131 +1501,47 @@ class AssembleObject extends Base {
   get positionEditing() {
     return this.operate.positionEditing
   }
-
-  static EventBinding(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') {
-                  if (e.data != '.' && (e.data != '-' || e.target.value)) {
-                    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)
-                    }
-                    that[m.value] = value
-                  }
-                }
-                else {
-                  that[m.value] = value
-                }
-              })
-              if (elements[i].nodeName == 'IMG') {
-                elements[i].src = that[m.value]
-              }
-              else {
-                elements[i].value = that[m.value]
-              }
-            }
-            if (that._elms[m.value]) {
-              that._elms[m.value].push(elements[i])
-            }
-            else {
-              that._elms[m.value] = [elements[i]]
-            }
-            removeName.push(m.name)
-            break;
-          }
-          case '@click': {
-            elements[i].addEventListener('click', (e) => {
-              if (typeof (that[m.value]) === 'function') {
-                that[m.value](e)
-              }
-            });
-            removeName.push(m.name)
-            // elements[i].attributes.removeNamedItem(m.name)
-            break;
-          }
-          case '@change': {
-            isEvent = true
-            Event.push((e) => {
-              let value = e.target.value
-              if (e.target.type == 'number' && value != '') {
-                value = Number(value)
-                e.target.value = value
-              }
-              if (typeof (that[m.value]) === 'function') {
-                that[m.value](e, value)
-              }
-            })
-            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)
-          }
-        });
-      }
-    }
+  openPositionEditing(cd) {
+    this.positionEditing = true
+    this._positionEditingCallback = cd
+  }
+  get areaChangeCallBack() {
+    return this._areaChangeCallBack
   }
 
-  static nodeEdit(that, cb = () => { }) {
-    that.positionEditing = false
+  set areaChangeCallBack (cd) {
+    this._areaChangeCallBack = cd
+  }
+
+  nodeEdit(cb = () => { }) {
+    this.positionEditing = false
     if (YJ.Measure.GetMeasureStatus()) {
       cb('上一次测量未结束')
     } else {
       YJ.Measure.SetMeasureStatus(true)
-      that.tip = new MouseTip('请选择一个顶点，右键取消', that.sdk)
-      that.event = new MouseEvent(that.sdk)
-      that.nodePoints = []
+      let _this = this
+      this.tip = new MouseTip('请选择一个顶点，右键取消', this.sdk)
+      this.event = new MouseEvent(this.sdk)
+      this.nodePoints = []
       let selectPoint
       let originalPosition
       let fromDegreesArray = []
-      for (let i = 0; i < that.options.positions.length; i++) {
-        fromDegreesArray.push(that.options.positions[i].lng, that.options.positions[i].lat)
+      for (let i = 0; i < this.options.positions.length; i++) {
+        fromDegreesArray.push(this.options.positions[i].lng, this.options.positions[i].lat)
       }
 
       let moveEvent = (movement, cartesian) => {
         if (selectPoint) {
-          that.options.positions[selectPoint.index] = that.cartesian3Towgs84(cartesian, that.sdk.viewer)
-          if (that._elms.lng && that._elms.lng[selectPoint.index]) {
-            that._elms.lng[selectPoint.index].innerHTML = that.options.positions[selectPoint.index].lng.toFixed(8)
+          this.options.positions[selectPoint.index] = this.cartesian3Towgs84(cartesian, this.sdk.viewer)
+          if (this._elms.lng && this._elms.lng[selectPoint.index]) {
+            this._elms.lng[selectPoint.index].innerHTML = this.options.positions[selectPoint.index].lng.toFixed(8)
           }
-          if (that._elms.lat && that._elms.lat[selectPoint.index]) {
-            that._elms.lat[selectPoint.index].innerHTML = that.options.positions[selectPoint.index].lat.toFixed(8)
+          if (this._elms.lat && this._elms.lat[selectPoint.index]) {
+            this._elms.lat[selectPoint.index].innerHTML = this.options.positions[selectPoint.index].lat.toFixed(8)
           }
-          that.renewPositions()
+          this.renewPositions()
         }
-        that.tip.setPosition(
+        this.tip.setPosition(
           cartesian,
           movement.position ? movement.position.x : movement.endPosition.x,
           movement.position ? movement.position.y : movement.endPosition.y
@@ -2052,25 +1550,25 @@ class AssembleObject extends Base {
 
       let leftEvent = (movement, cartesian) => {
         moveEvent(movement, cartesian)
-        let position84 = that.cartesian3Towgs84(cartesian, that.sdk.viewer)
+        let position84 = this.cartesian3Towgs84(cartesian, this.sdk.viewer)
         if (selectPoint) {
           let index = selectPoint.index
-          let entity = that.sdk.viewer.entities.add({
+          let entity = this.sdk.viewer.entities.add({
             name: 'node-secondary-edit-point',
             index: index,
-            position: Cesium.Cartesian3.fromDegrees(that.options.positions[selectPoint.index].lng, that.options.positions[selectPoint.index].lat, position84.alt),
+            position: Cesium.Cartesian3.fromDegrees(this.options.positions[selectPoint.index].lng, this.options.positions[selectPoint.index].lat, position84.alt),
             billboard: {
-              image: that.getSourceRootPath() + '/img/point.png',
+              image: this.getSourceRootPath() + '/img/point.png',
               width: 15,
               height: 15,
               disableDepthTestDistance: Number.POSITIVE_INFINITY,
               color: Cesium.Color.WHITE.withAlpha(0.99)
             },
           })
-          that.nodePoints.splice(selectPoint.index, 0, entity)
+          this.nodePoints.splice(selectPoint.index, 0, entity)
           selectPoint = null
 
-          that.tip.set_text('请选择一个顶点，右键取消')
+          this.tip.set_text('请选择一个顶点，右键取消')
         }
         else {
           let position = movement.position
@@ -2080,49 +1578,50 @@ class AssembleObject extends Base {
               y: (movement.position1.y + movement.position2.y) / 2
             }
           }
-          var pick = that.sdk.viewer.scene.pick(position);
+          var pick = this.sdk.viewer.scene.pick(position);
           if (pick && pick.id && pick.id.name && pick.id.name === 'node-secondary-edit-point') {
             selectPoint = pick.id
-            originalPosition = that.cartesian3Towgs84(pick.id.position.getValue(), that.sdk.viewer)
-            that.nodePoints.splice(pick.id.index, 1)
-            that.sdk.viewer.entities.remove(pick.id)
-            that.tip.set_text('左键确认，右键取消')
+            originalPosition = this.cartesian3Towgs84(pick.id.position.getValue(), this.sdk.viewer)
+            this.nodePoints.splice(pick.id.index, 1)
+            this.sdk.viewer.entities.remove(pick.id)
+            this.tip.set_text('左键确认，右键取消')
           }
         }
-        that.renewPositions()
+        this.renewPositions()
+        cb('', [...this.options.positions])
       }
       let rightEvent = () => {
-        that.event.mouse_move(() => { })
-        that.event.mouse_left(() => { })
-        that.event.mouse_right(() => { })
-        that.event.gesture_pinck_start(() => { })
+        this.event.mouse_move(() => { })
+        this.event.mouse_left(() => { })
+        this.event.mouse_right(() => { })
+        this.event.gesture_pinck_start(() => { })
         if (selectPoint) {
           if (!originalPosition) {
-            that.options.positions.pop()
+            this.options.positions.pop()
           }
           else {
-            that.options.positions[selectPoint.index] = originalPosition
+            this.options.positions[selectPoint.index] = originalPosition
           }
-          if (that._elms.lng && that._elms.lng[selectPoint.index]) {
-            that._elms.lng[selectPoint.index].innerHTML = that.options.positions[selectPoint.index].lng.toFixed(8)
+          if (this._elms.lng && this._elms.lng[selectPoint.index]) {
+            this._elms.lng[selectPoint.index].innerHTML = this.options.positions[selectPoint.index].lng.toFixed(8)
           }
-          if (that._elms.lat && that._elms.lat[selectPoint.index]) {
-            that._elms.lat[selectPoint.index].innerHTML = that.options.positions[selectPoint.index].lat.toFixed(8)
+          if (this._elms.lat && this._elms.lat[selectPoint.index]) {
+            this._elms.lat[selectPoint.index].innerHTML = this.options.positions[selectPoint.index].lat.toFixed(8)
           }
         }
-        that.heightMode = that.heightMode
-        that.previous = null
+        this.heightMode = this.heightMode
+        this.previous = null
       }
 
-      that.entity.polyline.clampToGround = true
-      that.entity.polyline.arcType = Cesium.ArcType.GEODESIC
-      that.entity.polygon.perPositionHeight = false
-      that.entity.polygon.hierarchy = new Cesium.CallbackProperty(function () {
-        let arr = that.computeAssemble(that.options.positions)
+      this.entity.polyline.clampToGround = true
+      this.entity.polyline.arcType = Cesium.ArcType.GEODESIC
+      this.entity.polygon.perPositionHeight = false
+      this.entity.polygon.hierarchy = new Cesium.CallbackProperty(function () {
+        let arr = _this.computeAssemble(_this.options.positions)
         return new Cesium.PolygonHierarchy(arr)
       }, false)
-      that.entity.polyline.positions = new Cesium.CallbackProperty(function () {
-        let arr = that.computeAssemble(that.options.positions)
+      this.entity.polyline.positions = new Cesium.CallbackProperty(function () {
+        let arr = _this.computeAssemble(_this.options.positions)
         if (arr.length >= 3) {
           return [...arr, arr[0], arr[1]]
         }
@@ -2134,23 +1633,23 @@ class AssembleObject extends Base {
 
       let points = [[]]
       let pos84 = []
-      for (let i = 0; i < that.positionsH.length; i++) {
-        let position = that.cartesian3Towgs84(that.positionsH[i], that.sdk.viewer)
+      for (let i = 0; i < this.positionsH.length; i++) {
+        let position = this.cartesian3Towgs84(this.positionsH[i], this.sdk.viewer)
         pos84.push(position)
         points[0].push([position.lng, position.lat])
       }
-      let position = that.cartesian3Towgs84(that.positionsH[0], that.sdk.viewer)
+      let position = this.cartesian3Towgs84(this.positionsH[0], this.sdk.viewer)
       points[0].push([position.lng, position.lat])
       let polygon = turf.polygon(points)
       let centroid = turf.pointOnFeature(polygon)
-      let objectsToExclude = [...that.sdk.viewer.entities.values]
-      that
+      let objectsToExclude = [...this.sdk.viewer.entities.values]
+      this
         .getClampToHeight({
           lng: centroid.geometry.coordinates[0],
           lat: centroid.geometry.coordinates[1]
         }, objectsToExclude)
         .then(height => {
-          that.label.position = [
+          this.label.position = [
             centroid.geometry.coordinates[0],
             centroid.geometry.coordinates[1],
             height
@@ -2159,15 +1658,15 @@ class AssembleObject extends Base {
 
 
       setTimeout(() => {
-        that.event.mouse_left(leftEvent)
+        this.event.mouse_left(leftEvent)
 
-        that.event.mouse_right(rightEvent)
+        this.event.mouse_right(rightEvent)
 
-        that.event.mouse_move(moveEvent)
+        this.event.mouse_move(moveEvent)
 
-        that.event.gesture_pinck_start((movement, cartesian) => {
+        this.event.gesture_pinck_start((movement, cartesian) => {
           let startTime = new Date()
-          that.event.gesture_pinck_end(() => {
+          this.event.gesture_pinck_end(() => {
             let endTime = new Date()
             let pos = {
               position: {
@@ -2187,31 +1686,31 @@ class AssembleObject extends Base {
         createNodePoints()
       }, 200);
       async function createNodePoints() {
-        let objectsToExclude = [...that.sdk.viewer.entities.values]
-        for (let i = 0; i < that.options.positions.length; i++) {
-          let height = await that.getClampToHeight(that.options.positions[i], objectsToExclude)
-          let entity = that.sdk.viewer.entities.add({
+        let objectsToExclude = [..._this.sdk.viewer.entities.values]
+        for (let i = 0; i < _this.options.positions.length; i++) {
+          let height = await _this.getClampToHeight(_this.options.positions[i], objectsToExclude)
+          let entity = _this.sdk.viewer.entities.add({
             name: 'node-secondary-edit-point',
             index: i,
-            position: Cesium.Cartesian3.fromDegrees(that.options.positions[i].lng, that.options.positions[i].lat, height),
+            position: Cesium.Cartesian3.fromDegrees(_this.options.positions[i].lng, _this.options.positions[i].lat, height),
             billboard: {
-              image: that.getSourceRootPath() + '/img/point.png',
+              image: _this.getSourceRootPath() + '/img/point.png',
               width: 15,
               height: 15,
               disableDepthTestDistance: Number.POSITIVE_INFINITY,
               color: Cesium.Color.WHITE.withAlpha(0.99)
             },
           })
-          that.nodePoints.push(entity)
+          _this.nodePoints.push(entity)
         }
       }
-      // for (let i = 0; i < that.options.positions.length; i++) {
-      //   let entity = that.sdk.viewer.entities.add({
+      // for (let i = 0; i < this.options.positions.length; i++) {
+      //   let entity = this.sdk.viewer.entities.add({
       //     name: 'node-secondary-edit-point',
       //     index: i,
-      //     position: Cesium.Cartesian3.fromDegrees(that.options.positions[i].lng, that.options.positions[i].lat),
+      //     position: Cesium.Cartesian3.fromDegrees(this.options.positions[i].lng, this.options.positions[i].lat),
       //     billboard: {
-      //       image: that.getSourceRootPath() + '/img/point.png',
+      //       image: this.getSourceRootPath() + '/img/point.png',
       //       width: 15,
       //       height: 15,
       //       disableDepthTestDistance: Number.POSITIVE_INFINITY,
@@ -2222,17 +1721,17 @@ class AssembleObject extends Base {
     }
   }
 
-  static closeNodeEdit(that) {
+  closeNodeEdit() {
     YJ.Measure.SetMeasureStatus(false)
-    that.event && that.event.destroy()
-    that.tip && that.tip.destroy()
-    that.tip = null
+    this.event && this.event.destroy()
+    this.tip && this.tip.destroy()
+    this.tip = null
 
-    for (let i = 0; i < that.nodePoints.length; i++) {
-      that.sdk.viewer.entities.remove(that.nodePoints[i])
+    for (let i = 0; i < this.nodePoints.length; i++) {
+      this.sdk.viewer.entities.remove(this.nodePoints[i])
     }
-    that.nodePoints = []
-    that.picking = true
+    this.nodePoints = []
+    this.picking = true
   }
 
   setPosition(v) {
@@ -2323,7 +1822,7 @@ class AssembleObject extends Base {
   }
 
   // 更新坐标
-  renewPositions(position84) {
+  renewPositions(position84, cd) {
     if (this._error || !this.sdk.viewer) {
       return
     }
@@ -2410,8 +1909,8 @@ class AssembleObject extends Base {
     }
 
     // 计算投影面积
-    this.options.areaByMeter = this.computeArea(pos84)
-    this.areaUnit = this.areaUnit
+    this.areaByMeter = this.computeArea(pos84)
+    this.areaChangeCallBack && this.areaChangeCallBack()
     return fromDegreesArray
   }
 }

src/Obj/Base/AttackArrowObject/index.js

@@ -83,7 +83,6 @@ class AttackArrowObject extends Base {
     this.options.line = options.line || {}
     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)
     this.operate = {}
@@ -112,13 +111,11 @@ class AttackArrowObject extends Base {
     this.options.attribute = options.attribute || {}
     this.options.attribute.link = this.options.attribute.link || {}
     this.options.attribute.link.content = this.options.attribute.link.content || []
-    this.options.attribute.camera = this.options.attribute.camera || {}
-    this.options.attribute.camera.content = this.options.attribute.camera.content || []
-    this.options.attribute.vr = this.options.attribute.vr || {}
-    this.options.attribute.vr.content = this.options.attribute.vr.content || []
-    this.options.attribute.goods = this.options.attribute.goods || {}
-    this.options.attribute.goods.content = this.options.attribute.goods.content || []
-    this.options.attributeType = options.attributeType || 'richText'
+
+    delete this.options.attribute.camera
+    delete this.options.attribute.vr
+    delete this.options.attribute.goods
+
 
     if (!this.options.positions || this.options.positions.length < 3) {
       this._error = '箭头面最少需要三个坐标！'
@@ -196,7 +193,7 @@ class AttackArrowObject extends Base {
         return
       }
       let heightModeName = ''
-      AttackArrowObject.closeNodeEdit(this)
+      this.closeNodeEdit()
       let ground = false
       let disabled = false
       this.renewPositions()
@@ -322,45 +319,6 @@ class AttackArrowObject extends Base {
     })
   }
 
-  get area() {
-    return this.options.area
-  }
-
-  set area(v) {
-    this.options.area = v
-    this._elms.area && this._elms.area.forEach((item) => {
-      item.value = v
-    })
-  }
-
-  get areaUnit() {
-    return this.options['area-unit']
-  }
-  set areaUnit(v) {
-    this.options['area-unit'] = v
-    this._elms.areaUnit && this._elms.areaUnit.forEach((item) => {
-      item.value = v
-    })
-    if (this.options.areaByMeter) {
-      switch (v) {
-        case '平方米':
-          this.area = this.options.areaByMeter
-          break;
-        case '平方千米':
-          this.area = Number((this.options.areaByMeter / 1000000).toFixed(8))
-          break;
-        case '亩':
-          this.area = Number((this.options.areaByMeter / 666.6666667).toFixed(4))
-          break;
-        case '公顷':
-          this.area = Number((this.options.areaByMeter / 10000).toFixed(6))
-          break;
-        default:
-          this.area = this.options.areaByMeter
-      }
-    }
-  }
-
   get labelShow() {
     return this.options.label.show
   }
@@ -572,319 +530,6 @@ class AttackArrowObject extends Base {
     }
   }
 
-  get attributeType() {
-    return this.options.attributeType
-  }
-
-  set attributeType(v) {
-    this.options.attributeType = v
-    this._elms.attributeType && this._elms.attributeType.forEach((item) => {
-      item.value = v
-    })
-    let attributeContent = this._DialogObject._element.content.getElementsByClassName('attribute-content')
-    for (let i = 0; i < attributeContent.length; i++) {
-      if (attributeContent[i].className.indexOf('attribute-content-' + v) > -1) {
-        attributeContent[i].style.display = 'block';
-      }
-      else {
-        attributeContent[i].style.display = 'none';
-      }
-    }
-  }
-
-  get attributeLink() {
-    return this.options.attribute.link.content
-  }
-
-  set attributeLink(v) {
-    this.options.attribute.link.content = v
-    if (!this._DialogObject || !this._DialogObject._element || !this._DialogObject._element.content || this._DialogObject._element.content.getElementsByClassName('attribute-content-link').length == 0) {
-      return
-    }
-    let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-link')[1].getElementsByClassName('table')[0]
-    let tableContent = table.getElementsByClassName('table-body')[0]
-    tableContent.innerHTML = ''
-    if (this.options.attribute.link.content.length > 0) {
-      table.getElementsByClassName('table-empty')[0].style.display = 'none'
-    }
-    else {
-      table.getElementsByClassName('table-empty')[0].style.display = 'flex'
-    }
-    for (let i = 0; i < this.options.attribute.link.content.length; i++) {
-      let tr = `
-      <div class="tr">
-          <div class="td">` + this.options.attribute.link.content[i].name + `</div>
-          <div class="td">` + this.options.attribute.link.content[i].url + `</div>
-          <div class="td">
-              <button @click="linkEdit">编辑</button>
-              <button @click="linkDelete">删除</button>
-          </div>
-      </div>`
-      let trElm = document.createRange().createContextualFragment(tr)
-      tableContent.appendChild(trElm)
-    }
-    let item = tableContent.getElementsByClassName('tr')
-    let fun = {
-      linkEdit: async (index) => {
-        this.attributeLink = await this.options.attribute.link.content
-        let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-link')[1].getElementsByClassName('table')[0]
-        let tableContent = table.getElementsByClassName('table-body')[0]
-        let item = tableContent.getElementsByClassName('tr')
-        for (let i = 0; i < item.length; i++) {
-          if (index === i) {
-            let height = item[i].offsetHeight
-            let html = `
-              <div class="td">
-                <input class="input" type="text">
-              </div>
-              <div class="td">
-                <textarea class="input link-edit" type="text"></textarea>
-              </div>
-              <div class="td">
-                  <button @click="confirmEdit">确认</button>
-                  <button @click="cancelEdit">取消</button>
-              </div>`
-            item[i].innerHTML = html
-            let textareaElm = item[i].getElementsByClassName('link-edit')[0]
-            textareaElm.style.height = (height - 10) + 'px'
-            let td = item[i].getElementsByClassName('td')
-            td[0].getElementsByClassName('input')[0].value = this.options.attribute.link.content[index].name
-            td[1].getElementsByClassName('input')[0].value = this.options.attribute.link.content[index].url
-            let btn = item[i].getElementsByTagName('button')
-            for (let n = 0; n < btn.length; n++) {
-              if (!btn[n] || !btn[n].attributes) {
-                continue
-              }
-              for (let m of btn[n].attributes) {
-                if (m.name === '@click') {
-                  btn[n].addEventListener('click', (e) => {
-                    if (typeof (fun[m.value]) === 'function') {
-                      fun[m.value]({ name: td[0].getElementsByClassName('input')[0].value, url: td[1].getElementsByClassName('input')[0].value }, i)
-                    }
-                  });
-                  btn[n].attributes.removeNamedItem(m.name)
-                  break
-                }
-              }
-            }
-            break
-          }
-        }
-      },
-      linkDelete: (i) => {
-        this.options.attribute.link.content.splice(i, 1)
-        this.attributeLink = this.options.attribute.link.content
-      },
-
-      confirmEdit: (value, i) => {
-        let name = value.name && value.name.replace(/\s/g, "")
-        let url = value.url && value.url.replace(/\s/g, "")
-        if (name && url) {
-          this.options.attribute.link.content[i] = value
-        }
-        else {
-          window.ELEMENT && window.ELEMENT.Message({
-            message: '名称或链接不能为空！',
-            type: 'warning',
-            duration: 1500
-          });
-        }
-        this.attributeLink = this.options.attribute.link.content
-      },
-      cancelEdit: () => {
-        this.attributeLink = this.options.attribute.link.content
-      },
-      fileSelect: (value, i) => {
-        let fileElm = item[i].getElementsByClassName('file-select')[0]
-        fileElm.click()
-        fileElm.removeEventListener('change', fileSelect)
-        fileElm.addEventListener('change', fileSelect)
-      }
-    }
-    let fileSelect = (event) => {
-      if (event.target.value) {
-        let td = item[event.target.getAttribute('index')].getElementsByClassName('td')
-        td[1].getElementsByClassName('input')[0].value = event.target.value
-        event.target.value = null
-      }
-    }
-    for (let i = 0; i < item.length; i++) {
-      let btn = item[i].getElementsByTagName('button')
-      for (let n = 0; n < btn.length; n++) {
-        if (!btn[n] || !btn[n].attributes) {
-          continue
-        }
-        for (let m of btn[n].attributes) {
-          if (m.name === '@click') {
-            btn[n].addEventListener('click', (e) => {
-              if (typeof (fun[m.value]) === 'function') {
-                fun[m.value](i)
-              }
-            });
-            btn[n].attributes.removeNamedItem(m.name)
-            break
-          }
-        }
-      }
-    }
-
-
-
-
-  }
-
-  get attributeCamera() {
-    return this.options.attribute.camera.content
-  }
-  set attributeCamera(v) {
-    this.options.attribute.camera.content = v
-  }
-
-  get attributeVr() {
-    return this.options.attribute.vr.content
-  }
-
-  set attributeVr(v) {
-    this.options.attribute.vr.content = v
-    if (!this._DialogObject || !this._DialogObject._element || !this._DialogObject._element.content || this._DialogObject._element.content.getElementsByClassName('attribute-content-vr').length == 0) {
-      return
-    }
-    let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-vr')[1].getElementsByClassName('table')[0]
-    let tableContent = table.getElementsByClassName('table-body')[0]
-    tableContent.innerHTML = ''
-    if (this.options.attribute.vr.content.length > 0) {
-      table.getElementsByClassName('table-empty')[0].style.display = 'none'
-    }
-    else {
-      table.getElementsByClassName('table-empty')[0].style.display = 'flex'
-    }
-    for (let i = 0; i < this.options.attribute.vr.content.length; i++) {
-      let tr = `
-      <div class="tr">
-          <div class="td">` + this.options.attribute.vr.content[i].name + `</div>
-          <div class="td">` + this.options.attribute.vr.content[i].url + `</div>
-          <div class="td">
-              <button @click="vrEdit">编辑</button>
-              <button @click="vrDelete">删除</button>
-          </div>
-      </div>`
-      let trElm = document.createRange().createContextualFragment(tr)
-      tableContent.appendChild(trElm)
-    }
-    let item = tableContent.getElementsByClassName('tr')
-    let fun = {
-      vrEdit: async (index) => {
-        this.attributeVr = await this.options.attribute.vr.content
-        let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-vr')[1].getElementsByClassName('table')[0]
-        let tableContent = table.getElementsByClassName('table-body')[0]
-        let item = tableContent.getElementsByClassName('tr')
-        for (let i = 0; i < item.length; i++) {
-          if (index === i) {
-            let height = item[i].offsetHeight
-            let html = `
-              <div class="td">
-                <input class="input" type="text">
-              </div>
-              <div class="td">
-                <textarea class="input link-edit" type="text"></textarea>
-              </div>
-              <div class="td">
-                  <button @click="confirmEdit">确认</button>
-                  <button @click="cancelEdit">取消</button>
-              </div>`
-            item[i].innerHTML = html
-            let textareaElm = item[i].getElementsByClassName('link-edit')[0]
-            textareaElm.style.height = (height - 10) + 'px'
-            let td = item[i].getElementsByClassName('td')
-            td[0].getElementsByClassName('input')[0].value = this.options.attribute.vr.content[index].name
-            td[1].getElementsByClassName('input')[0].value = this.options.attribute.vr.content[index].url
-            let btn = item[i].getElementsByTagName('button')
-            for (let n = 0; n < btn.length; n++) {
-              if (!btn[n] || !btn[n].attributes) {
-                continue
-              }
-              for (let m of btn[n].attributes) {
-                if (m.name === '@click') {
-                  btn[n].addEventListener('click', (e) => {
-                    if (typeof (fun[m.value]) === 'function') {
-                      fun[m.value]({ name: td[0].getElementsByClassName('input')[0].value, url: td[1].getElementsByClassName('input')[0].value }, i)
-                    }
-                  });
-                  btn[n].attributes.removeNamedItem(m.name)
-                  break
-                }
-              }
-            }
-            break
-          }
-        }
-      },
-      vrDelete: (i) => {
-        this.options.attribute.vr.content.splice(i, 1)
-        this.attributeVr = this.options.attribute.vr.content
-      },
-
-      confirmEdit: (value, i) => {
-        let name = value.name && value.name.replace(/\s/g, "")
-        let url = value.url && value.url.replace(/\s/g, "")
-        if (name && url) {
-          this.options.attribute.vr.content[i] = value
-        }
-        else {
-          window.ELEMENT && window.ELEMENT.Message({
-            message: '名称或链接不能为空！',
-            type: 'warning',
-            duration: 1500
-          });
-        }
-        this.attributeVr = this.options.attribute.vr.content
-      },
-      cancelEdit: () => {
-        this.attributeVr = this.options.attribute.vr.content
-      },
-      fileSelect: (value, i) => {
-        let fileElm = item[i].getElementsByClassName('file-select')[0]
-        fileElm.click()
-        fileElm.removeEventListener('change', fileSelect)
-        fileElm.addEventListener('change', fileSelect)
-      }
-    }
-    let fileSelect = (event) => {
-      if (event.target.value) {
-        let td = item[event.target.getAttribute('index')].getElementsByClassName('td')
-        td[1].getElementsByClassName('input')[0].value = event.target.value
-        event.target.value = null
-      }
-    }
-    for (let i = 0; i < item.length; i++) {
-      let btn = item[i].getElementsByTagName('button')
-      for (let n = 0; n < btn.length; n++) {
-        if (!btn[n] || !btn[n].attributes) {
-          continue
-        }
-        for (let m of btn[n].attributes) {
-          if (m.name === '@click') {
-            btn[n].addEventListener('click', (e) => {
-              if (typeof (fun[m.value]) === 'function') {
-                fun[m.value](i)
-              }
-            });
-            btn[n].attributes.removeNamedItem(m.name)
-            break
-          }
-        }
-      }
-    }
-  }
-
-  get attributeGoods() {
-    return this.options.attribute.goods.content
-  }
-
-  set attributeGoods(v) {
-    this.options.attribute.goods.content = v
-  }
-
   static create(that) {
     let positions = that.options.positions
     let fromDegreesArray = []
@@ -928,10 +573,11 @@ class AttackArrowObject extends Base {
         break
     }
 
-    if (!that.options.label.position) {
-      that.options.label.position = { lng: centroid.geometry.coordinates[0], lat: centroid.geometry.coordinates[1], alt: that.height + height }
-    }
-    that.options.label.ground = ground
+    // if (!that.options.label.position) {
+    //   that.options.label.position = { lng: centroid.geometry.coordinates[0], lat: centroid.geometry.coordinates[1], alt: that.height + height }
+    // }
+    that.options.label.position = { lng: centroid.geometry.coordinates[0], lat: centroid.geometry.coordinates[1], alt: that.height + height }
+    // that.options.label.ground = ground
 
     let fromDegreesArray2 = []
     for (let i = 0; i < points[0].length; i++) {
@@ -977,23 +623,8 @@ class AttackArrowObject extends Base {
     for (let i = 0; i < positionsA.length; i++) {
       pos84.push(that.cartesian3Towgs84(positionsA[i], that.sdk.viewer))
     }
-    that.options.areaByMeter = that.computeArea(pos84);
-    switch (that.options['area-unit']) {
-      case '平方米':
-        that.options.area = that.options.areaByMeter
-        break;
-      case '平方千米':
-        that.options.area = Number((that.options.areaByMeter / 1000000).toFixed(8))
-        break;
-      case '亩':
-        that.options.area = Number((that.options.areaByMeter / 666.6666667).toFixed(4))
-        break;
-      case '公顷':
-        that.options.area = Number((that.options.areaByMeter / 10000).toFixed(6))
-        break;
-      default:
-        that.options.area = that.options.areaByMeter
-    }
+    that.areaByMeter = that.computeArea(pos84);
+    that.areaChangeCallBack && that.areaChangeCallBack()
     syncData(that.sdk, that.options.id)
     if (that.options.show) {
 
@@ -1020,12 +651,13 @@ class AttackArrowObject extends Base {
       scaleByDistance: that.options.label.scaleByDistance,
       near: that.options.label.near,
       far: that.options.label.far,
-      ground: that.options.label.ground,
+      // ground: that.options.label.ground,
     })
   }
 
   // 编辑框
   async edit(state) {
+    return
     if (this._error) {
       return
     }
@@ -1527,8 +1159,6 @@ class AttackArrowObject extends Base {
     this.color = this.originalOptions.color
     this.lineColor = this.originalOptions.line.color
     this.lineWidth = this.originalOptions.line.width
-    this.area = this.originalOptions.area
-    this.areaUnit = this.originalOptions['area-unit']
     this.labelShow = this.originalOptions.label.show
     this.labelColor = this.originalOptions.label.color
     this.labelFontSize = this.originalOptions.label.fontSize
@@ -1541,12 +1171,6 @@ class AttackArrowObject extends Base {
     this.labelLineColor = this.originalOptions.label.lineColor
     this.labelBackgroundColorStart = this.originalOptions.label.backgroundColor[0]
     this.labelBackgroundColorEnd = this.originalOptions.label.backgroundColor[1]
-    this.attributeLink = this.options.attribute.link.content
-    this.attributeVr = this.options.attribute.vr.content
-    this.attributeCamera = this.options.attribute.camera.content
-    this.attributeGoods = this.options.attribute.goods.content
-    this.cameraSelect && this.cameraSelect()
-    this.goodsSelect && this.goodsSelect()
 
     for (let i = 0; i < this.options.positions.length; i++) {
       if (this._elms.lng && this._elms.lng[i]) {
@@ -1597,51 +1221,6 @@ class AttackArrowObject extends Base {
     await syncData(this.sdk, this.options.id)
   }
 
-  _addLink() {
-    // document.getElementsByClassName
-    if (this._DialogObject._element.content.getElementsByClassName('link_add')[0] && this._DialogObject._element.content.getElementsByClassName('link_add')[0].value) {
-      this.options.attribute.link.content.push({
-        name: '链接',
-        url: this._DialogObject._element.content.getElementsByClassName('link_add')[0].value
-      })
-      this._DialogObject._element.content.getElementsByClassName('link_add')[0].value = ''
-      this.attributeLink = this.options.attribute.link.content
-    }
-    else {
-      this.Dialog.clickAddLink && this.Dialog.clickAddLink()
-    }
-  }
-
-  addAttributeLink(link) {
-    this.options.attribute.link.content.push({
-      name: '链接',
-      url: link
-    })
-    this.attributeLink = this.options.attribute.link.content
-  }
-
-  _addRr() {
-    if (this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value) {
-      this.options.attribute.vr.content.push({
-        name: '全景图' ,
-        url: this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value
-      })
-      this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value = ''
-      this.attributeVr = this.options.attribute.vr.content
-    }
-    else {
-      this.Dialog.clickAddVr && this.Dialog.clickAddVr()
-    }
-  }
-
-  addAttributeRr(vr) {
-    this.options.attribute.vr.content.push({
-      name: '全景图' ,
-      url: vr
-    })
-    this.attributeVr = this.options.attribute.vr.content
-  }
-
   /**
  * 飞到
 */
@@ -1747,16 +1326,6 @@ class AttackArrowObject extends Base {
     }
   }
 
-  /**
-   * 打开富文本框
-   */
-  openRichTextEditor(e) {
-    // var ue = UE.getEditor('app');
-    richText.open(this.options.id, this.options.name, this.options.richTextContent)
-    richText.primaryCallBack = (content) => {
-      this.options.richTextContent = content
-    }
-  }
 
   /**@desc 打开平移功能
    *
@@ -1844,6 +1413,11 @@ class AttackArrowObject extends Base {
           positions: [...this.positions]
         }
         this.positionEditing = false
+
+        if(this._positionEditingCallback) {
+          this._positionEditingCallback()
+          this._positionEditingCallback = null
+        }
       })
       this.event.mouse_right((movement, cartesian) => {
         this.positionEditing = false
@@ -1946,6 +1520,18 @@ class AttackArrowObject extends Base {
     return this.operate.positionEditing
   }
 
+  openPositionEditing(cd) {
+    this.positionEditing = true
+    this._positionEditingCallback = cd
+  }
+  get areaChangeCallBack() {
+    return this._areaChangeCallBack
+  }
+
+  set areaChangeCallBack (cd) {
+    this._areaChangeCallBack = cd
+  }
+
   static EventBinding(that, elements) {
     for (let i = 0; i < elements.length; i++) {
       let Event = []
@@ -2045,28 +1631,29 @@ class AttackArrowObject extends Base {
     }
   }
 
-  static nodeEdit(that, cb = () => { }) {
-    that.positionEditing = false
+  nodeEdit(cb = () => { }) {
+    this.positionEditing = false
     setTimeout(() => {
       if (YJ.Measure.GetMeasureStatus()) {
         cb('上一次测量未结束')
       } else {
-        that.removeAnimate()
+        this.removeAnimate()
         YJ.Measure.SetMeasureStatus(true)
-        that.event && that.event.destroy()
-        that.tip && that.tip.destroy()
-        that.tip = new MouseTip('请选择一个顶点，右键取消', that.sdk)
-        that.event = new MouseEvent(that.sdk)
-        that.nodePoints = []
+        let _this = this
+        this.event && this.event.destroy()
+        this.tip && this.tip.destroy()
+        this.tip = new MouseTip('请选择一个顶点，右键取消', this.sdk)
+        this.event = new MouseEvent(this.sdk)
+        this.nodePoints = []
         let selectPoint
         let originalPosition
 
         let moveEvent = (movement, cartesian) => {
           if (selectPoint) {
-            that.options.positions[selectPoint.index] = that.cartesian3Towgs84(cartesian, that.sdk.viewer)
-            that.renewPositions()
+            this.options.positions[selectPoint.index] = this.cartesian3Towgs84(cartesian, this.sdk.viewer)
+            this.renewPositions()
           }
-          that.tip.setPosition(
+          this.tip.setPosition(
             cartesian,
             movement.position ? movement.position.x : movement.endPosition.x,
             movement.position ? movement.position.y : movement.endPosition.y
@@ -2075,17 +1662,17 @@ class AttackArrowObject extends Base {
         let leftEvent = (movement, cartesian) => {
           moveEvent(movement, cartesian)
           if (selectPoint) {
-            that.options.positions[selectPoint.index] = that.cartesian3Towgs84(cartesian, that.sdk.viewer)
+            this.options.positions[selectPoint.index] = this.cartesian3Towgs84(cartesian, this.sdk.viewer)
             let index = selectPoint.index
-            if (selectPoint.index === that.options.positions.length - 1) {
+            if (selectPoint.index === this.options.positions.length - 1) {
               index = index + 1
             }
-            let entity = that.sdk.viewer.entities.add({
+            let entity = this.sdk.viewer.entities.add({
               name: 'node-secondary-edit-point',
               index: index,
-              position: Cesium.Cartesian3.fromDegrees(that.options.positions[selectPoint.index].lng, that.options.positions[selectPoint.index].lat, that.options.positions[selectPoint.index].alt),
+              position: Cesium.Cartesian3.fromDegrees(this.options.positions[selectPoint.index].lng, this.options.positions[selectPoint.index].lat, this.options.positions[selectPoint.index].alt),
               billboard: {
-                image: that.getSourceRootPath() + '/img/point.png',
+                image: this.getSourceRootPath() + '/img/point.png',
                 width: 15,
                 height: 15,
                 disableDepthTestDistance: Number.POSITIVE_INFINITY,
@@ -2094,86 +1681,87 @@ class AttackArrowObject extends Base {
             })
             selectPoint = entity
 
-            originalPosition = that.options.positions[selectPoint.index]
-            that.nodePoints.splice(selectPoint.index, 0, entity)
+            originalPosition = this.options.positions[selectPoint.index]
+            this.nodePoints.splice(selectPoint.index, 0, entity)
 
-            if (index < that.options.positions.length) {
+            if (index < this.options.positions.length) {
               selectPoint = null
-              that.tip.set_text('请选择一个顶点，右键取消')
+              this.tip.set_text('请选择一个顶点，右键取消')
             }
             else {
-              that.options.positions.splice(selectPoint.index, 0, that.options.positions[selectPoint.index])
-              that.options.positions[selectPoint.index] = that.cartesian3Towgs84(cartesian, that.sdk.viewer)
+              this.options.positions.splice(selectPoint.index, 0, this.options.positions[selectPoint.index])
+              this.options.positions[selectPoint.index] = this.cartesian3Towgs84(cartesian, this.sdk.viewer)
             }
-            that.renewPositions()
+            this.renewPositions()
+            cb('', [...this.options.positions])
           }
           else {
-            var pick = that.sdk.viewer.scene.pick(movement.position || movement.endPosition);
+            var pick = this.sdk.viewer.scene.pick(movement.position || movement.endPosition);
             if (pick && pick.id && pick.id.name && pick.id.name === 'node-secondary-edit-point') {
               selectPoint = pick.id
-              originalPosition = that.cartesian3Towgs84(pick.id.position.getValue(), that.sdk.viewer)
-              that.nodePoints.splice(pick.id.index, 1)
-              that.sdk.viewer.entities.remove(pick.id)
-              that.tip.set_text('左键确认，右键结束，CTRL+右键撤销')
+              originalPosition = this.cartesian3Towgs84(pick.id.position.getValue(), this.sdk.viewer)
+              this.nodePoints.splice(pick.id.index, 1)
+              this.sdk.viewer.entities.remove(pick.id)
+              this.tip.set_text('左键确认，右键结束，CTRL+右键撤销')
             }
           }
         }
         let rightEvent = (movement, cartesian) => {
-          that.event.mouse_move(() => { })
-          that.event.mouse_left(() => { })
-          that.event.mouse_right(() => { })
-          that.event.gesture_pinck_start(() => { })
+          this.event.mouse_move(() => { })
+          this.event.mouse_left(() => { })
+          this.event.mouse_right(() => { })
+          this.event.gesture_pinck_start(() => { })
           if (selectPoint) {
             if (!originalPosition) {
-              that.options.positions.pop()
+              this.options.positions.pop()
             }
             else {
-              that.options.positions[selectPoint.index] = originalPosition
-              if (that.options.positions.length > 3 && selectPoint.index === that.options.positions.length - 1) {
-                that.options.positions.splice(selectPoint.index + 1, 1)
+              this.options.positions[selectPoint.index] = originalPosition
+              if (this.options.positions.length > 3 && selectPoint.index === this.options.positions.length - 1) {
+                this.options.positions.splice(selectPoint.index + 1, 1)
               }
             }
-            if (that._elms.lng && that._elms.lng[selectPoint.index]) {
-              that._elms.lng[selectPoint.index].innerHTML = that.options.positions[selectPoint.index].lng.toFixed(8)
+            if (this._elms.lng && this._elms.lng[selectPoint.index]) {
+              this._elms.lng[selectPoint.index].innerHTML = this.options.positions[selectPoint.index].lng.toFixed(8)
             }
-            if (that._elms.lat && that._elms.lat[selectPoint.index]) {
-              that._elms.lat[selectPoint.index].innerHTML = that.options.positions[selectPoint.index].lat.toFixed(8)
+            if (this._elms.lat && this._elms.lat[selectPoint.index]) {
+              this._elms.lat[selectPoint.index].innerHTML = this.options.positions[selectPoint.index].lat.toFixed(8)
             }
           }
-          that.heightMode = that.heightMode
-          that.previous = null
+          this.heightMode = this.heightMode
+          this.previous = null
         }
 
-        that.entity.polyline.clampToGround = true
-        that.entity.polyline.arcType = Cesium.ArcType.GEODESIC
-        that.entity.polygon.perPositionHeight = false
-        that.entity.polygon.hierarchy = new Cesium.CallbackProperty(function () {
-          return new Cesium.PolygonHierarchy(that.positionsH)
+        this.entity.polyline.clampToGround = true
+        this.entity.polyline.arcType = Cesium.ArcType.GEODESIC
+        this.entity.polygon.perPositionHeight = false
+        this.entity.polygon.hierarchy = new Cesium.CallbackProperty(function () {
+          return new Cesium.PolygonHierarchy(_this.positionsH)
         }, false)
-        that.entity.polyline.positions = new Cesium.CallbackProperty(function () {
-          return [...that.positionsH, that.positionsH[0], that.positionsH[1]]
+        this.entity.polyline.positions = new Cesium.CallbackProperty(function () {
+          return [..._this.positionsH, _this.positionsH[0], _this.positionsH[1]]
         }, false)
 
 
         let points = [[]]
         let pos84 = []
-        for (let i = 0; i < that.positionsH.length; i++) {
-          let position = that.cartesian3Towgs84(that.positionsH[i], that.sdk.viewer)
+        for (let i = 0; i < this.positionsH.length; i++) {
+          let position = this.cartesian3Towgs84(this.positionsH[i], this.sdk.viewer)
           pos84.push(position)
           points[0].push([position.lng, position.lat])
         }
-        let position = that.cartesian3Towgs84(that.positionsH[0], that.sdk.viewer)
+        let position = this.cartesian3Towgs84(this.positionsH[0], this.sdk.viewer)
         points[0].push([position.lng, position.lat])
         let polygon = turf.polygon(points)
         let centroid = turf.pointOnFeature(polygon)
-        let objectsToExclude = [...that.sdk.viewer.entities.values]
-        that
+        let objectsToExclude = [...this.sdk.viewer.entities.values]
+        this
           .getClampToHeight({
             lng: centroid.geometry.coordinates[0],
             lat: centroid.geometry.coordinates[1]
           }, objectsToExclude)
           .then(height => {
-            that.label.position = [
+            this.label.position = [
               centroid.geometry.coordinates[0],
               centroid.geometry.coordinates[1],
               height
@@ -2181,36 +1769,36 @@ class AttackArrowObject extends Base {
           })
 
         setTimeout(() => {
-          that.event.mouse_left(leftEvent)
+          this.event.mouse_left(leftEvent)
 
-          that.event.mouse_right(rightEvent)
+          this.event.mouse_right(rightEvent)
 
-          that.event.mouse_move(moveEvent)
+          this.event.mouse_move(moveEvent)
 
-          that.event.mouse_right_keyboard_ctrl((movement, cartesian) => {
+          this.event.mouse_right_keyboard_ctrl((movement, cartesian) => {
             if (selectPoint) {
-              that.options.positions.pop()
-              that.sdk.viewer.entities.remove(that.nodePoints[that.nodePoints.length - 1])
-              that.nodePoints.pop()
+              this.options.positions.pop()
+              this.sdk.viewer.entities.remove(this.nodePoints[this.nodePoints.length - 1])
+              this.nodePoints.pop()
               if (!selectPoint.index) {
                 // selectPoint = null
               }
-              else if (selectPoint.index === that.options.positions.length) {
-                if (that.nodePoints[selectPoint.index - 1]) {
-                  selectPoint = that.nodePoints[selectPoint.index - 1]
+              else if (selectPoint.index === this.options.positions.length) {
+                if (this.nodePoints[selectPoint.index - 1]) {
+                  selectPoint = this.nodePoints[selectPoint.index - 1]
                 }
                 else {
                   selectPoint.index = selectPoint.index - 1
                 }
               }
 
-              that.renewPositions()
+              this.renewPositions()
             }
           })
 
-          that.event.gesture_pinck_start((movement, cartesian) => {
+          this.event.gesture_pinck_start((movement, cartesian) => {
             let startTime = new Date()
-            that.event.gesture_pinck_end(() => {
+            this.event.gesture_pinck_end(() => {
               let endTime = new Date()
               let pos = {
                 position: {
@@ -2230,31 +1818,31 @@ class AttackArrowObject extends Base {
           createNodePoints()
         }, 200);
         async function createNodePoints() {
-          let objectsToExclude = [...that.sdk.viewer.entities.values]
-          for (let i = 0; i < that.options.positions.length; i++) {
-            let height = await that.getClampToHeight(that.options.positions[i], objectsToExclude)
-            let entity = that.sdk.viewer.entities.add({
+          let objectsToExclude = [..._this.sdk.viewer.entities.values]
+          for (let i = 0; i < _this.options.positions.length; i++) {
+            let height = await _this.getClampToHeight(_this.options.positions[i], objectsToExclude)
+            let entity = _this.sdk.viewer.entities.add({
               name: 'node-secondary-edit-point',
               index: i,
-              position: Cesium.Cartesian3.fromDegrees(that.options.positions[i].lng, that.options.positions[i].lat, height),
+              position: Cesium.Cartesian3.fromDegrees(_this.options.positions[i].lng, _this.options.positions[i].lat, height),
               billboard: {
-                image: that.getSourceRootPath() + '/img/point.png',
+                image: _this.getSourceRootPath() + '/img/point.png',
                 width: 15,
                 height: 15,
                 disableDepthTestDistance: Number.POSITIVE_INFINITY,
                 color: Cesium.Color.WHITE.withAlpha(0.99)
               },
             })
-            that.nodePoints.push(entity)
+            _this.nodePoints.push(entity)
           }
         }
-        // for (let i = 0; i < that.options.positions.length; i++) {
-        //   let entity = that.sdk.viewer.entities.add({
+        // for (let i = 0; i < this.options.positions.length; i++) {
+        //   let entity = this.sdk.viewer.entities.add({
         //     name: 'node-secondary-edit-point',
         //     index: i,
-        //     position: Cesium.Cartesian3.fromDegrees(that.options.positions[i].lng, that.options.positions[i].lat),
+        //     position: Cesium.Cartesian3.fromDegrees(this.options.positions[i].lng, this.options.positions[i].lat),
         //     billboard: {
-        //       image: that.getSourceRootPath() + '/img/point.png',
+        //       image: this.getSourceRootPath() + '/img/point.png',
         //       width: 15,
         //       height: 15,
         //       disableDepthTestDistance: Number.POSITIVE_INFINITY,
@@ -2266,17 +1854,17 @@ class AttackArrowObject extends Base {
     }, 0);
   }
 
-  static closeNodeEdit(that) {
+  closeNodeEdit() {
     YJ.Measure.SetMeasureStatus(false)
-    that.event && that.event.destroy()
-    that.tip && that.tip.destroy()
-    that.tip = null
+    this.event && this.event.destroy()
+    this.tip && this.tip.destroy()
+    this.tip = null
 
-    for (let i = 0; i < that.nodePoints.length; i++) {
-      that.sdk.viewer.entities.remove(that.nodePoints[i])
+    for (let i = 0; i < this.nodePoints.length; i++) {
+      this.sdk.viewer.entities.remove(this.nodePoints[i])
     }
-    that.nodePoints = []
-    that.picking = true
+    this.nodePoints = []
+    this.picking = true
   }
 
   setPosition(v) {
@@ -2679,8 +2267,8 @@ class AttackArrowObject extends Base {
 
     // 计算投影面积
     if (!this.spreadState) {
-      this.options.areaByMeter = this.computeArea(pos84)
-      this.areaUnit = this.areaUnit
+      this.areaByMeter = this.computeArea(pos84)
+      this.areaChangeCallBack && this.areaChangeCallBack()
     }
     return fromDegreesArray
   }

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

@@ -16,7 +16,7 @@ class Layer extends BaseLayer {
     super(sdk, options)
     this.object = {}
     this.options.host = this.options.host || getHost()
-
+    this.on()
   }
 
   get type() {
@@ -24,21 +24,7 @@ class Layer extends BaseLayer {
   }
 
   on() {
-    return this.add()
-  }
-
-
-  async add() {
-    let res = await this.requestResource()
-    let text = await res.text()
-    text = JSON.parse(text)
-    if ([0, 200].includes(text.code)) {
-      return this.loadLayer(text.data)
-    } else {
-      return new Promise((res, reject) => {
-        reject(text.msg || text.message)
-      })
-    }
+    return this.loadLayer(this.options)
   }
 
   async loadLayer(data) {
@@ -64,11 +50,11 @@ class Layer extends BaseLayer {
         Cesium.Math.toRadians(this.object.north)
       ),
     }
-    // if (this.object.scheme_name === "GeographicTilingScheme") {
+    // if (this.object.schemaName === "GeographicTilingScheme") {
     //   console.log("添加GeographicTilingScheme")
     //   params.tilingScheme = new Cesium.GeographicTilingScheme()
     // }
-    // if (this.object.scheme_name === "amapMercatorTilingScheme") {
+    // if (this.object.schemaName === "amapMercatorTilingScheme") {
     //   console.log("添加amapMercatorTilingScheme")
     //   params.tilingScheme = this.amapMercatorTilingScheme()
     // }
@@ -80,19 +66,19 @@ class Layer extends BaseLayer {
     // } else {
     //   tms = new Cesium.UrlTemplateImageryProvider(params)
     // }
-    switch (this.object.scheme_name) {
+    switch (this.object.schemaName) {
       case "amapMercatorTilingScheme":
         params.tilingScheme = this.amapMercatorTilingScheme()
         break;
       case "":
         break;
       default:
-        params.tilingScheme = new Cesium[this.object.scheme_name]()
+        params.tilingScheme = new Cesium[this.object.schemaName]()
         break;
     }
     switch (this.object.load_method) {
       case "tms":
-        if(this.object.url.endsWith("tilemapresource.xml")){
+        if (this.object.url.endsWith("tilemapresource.xml")) {
           let arr = this.object.url.split("/")
           arr.pop()
           let url = arr.join("/")
@@ -116,7 +102,7 @@ class Layer extends BaseLayer {
         break;
     }
 
-    if(!this.sdk || !this.sdk.viewer) {
+    if (!this.sdk || !this.sdk.viewer) {
       return
     }
     if (this.options.hasOwnProperty("layer_index")) {
@@ -137,7 +123,7 @@ class Layer extends BaseLayer {
     this.alpha = this.options.alpha
     this.brightness = this.options.brightness
 
-    if(this.options.show) {
+    if (this.options.show) {
       setSplitDirection(0, this.options.id)
     }
   }

src/Obj/Base/BaseSource/BaseTileset/BIM/index.js

@@ -46,6 +46,7 @@ class BIM extends BaseTileset {
       this.exportProperty(this.exportStateArray)
     }
     this.features = new Map()
+    this.on()
   }
 
   get type() {

src/Obj/Base/BaseSource/BaseTileset/Tileset/index.js

@@ -13,7 +13,6 @@ import { syncSplitData } from '../../../../../Global/SplitScreen'
 import Dialog from '../../../../Element/Dialog';
 
 class Tileset extends BaseTileset {
-  #updateModelTimeout;
   /**
  * @constructor
  * @description 加载Tileset模型
@@ -32,6 +31,7 @@ class Tileset extends BaseTileset {
   constructor(earth, options = {}, _Dialog = {}) {
     super(earth, options)
     this.picking = false
+    this.on()
     this.Dialog = _Dialog
     this._elms = {};
     this._EventBinding = new EventBinding()
@@ -42,7 +42,7 @@ class Tileset extends BaseTileset {
   }
 
   on() {
-    return this.add()
+    return this.loadTileset(this.options)
   }
 
   get name() {
@@ -198,7 +198,26 @@ class Tileset extends BaseTileset {
           this.oldData.type = this.type
           this.oldData.accuracy = this.newData.accuracy
           this._DialogObject.close()
-          this.Dialog.confirmCallBack && this.Dialog.confirmCallBack({ ...this.oldData, type: this.type })
+          let newOptions = {
+            id: this.newData.id,
+            name: this.newData.name,
+            height: this.newData.height,
+            accuracy: this.newData.accuracy,
+            transparency: this.newData.transparency,
+            scale: this.newData.scale,
+            url: this.newData.url,
+            orientation: {
+              roll: this.newData.roll,
+              heading: this.newData.heading,
+              pitch: this.newData.pitch
+            },
+            position: {
+              lng: this.newData.lng,
+              lat: this.newData.lat,
+              alt: this.newData.height
+            }
+          }
+          this.Dialog.confirmCallBack && this.Dialog.confirmCallBack({ ...newOptions })
           syncSplitData(this.sdk, this.oldData.id)
         },
         resetCallBack: () => {
@@ -307,9 +326,9 @@ class Tileset extends BaseTileset {
     }
     this.editObj && this.editObj.update()
 
-    clearTimeout(this.#updateModelTimeout)
-    this.#updateModelTimeout = setTimeout(() => {
-      clearTimeout(this.#updateModelTimeout)
+    clearTimeout(this._updateModelTimeout)
+    this._updateModelTimeout = setTimeout(() => {
+      clearTimeout(this._updateModelTimeout)
       let center = this.cartesian3Towgs84(this.entity.boundingSphere.center, this.sdk.viewer)
       let circle = turf.circle([center.lng, center.lat], this.entity.boundingSphere.radius / 1000, { steps: 360, units: 'kilometers' });
       for (let [key, entity] of this.sdk.entityMap) {

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

@@ -32,6 +32,8 @@ class BaseTileset extends BaseSource {
    * */
   constructor(sdk, options) {
     super(sdk, options);
+    this._loadEvent = void 0
+    this._loaded = false
     this.setDefaultValue()
     this.watchs = []
     this.positionCallBack = null
@@ -40,6 +42,7 @@ class BaseTileset extends BaseSource {
     this._DialogObject = null
     this._element_style = null
     this.options.accuracy = options.accuracy ? Number(options.accuracy.toFixed(1)) : 1
+    this.options.orientation = this.options.orientation || {}
     this.options.position = this.options.position || {}
     this.oldData = {
       id: this.options.id,
@@ -51,9 +54,9 @@ class BaseTileset extends BaseSource {
       lng: this.options.position.lng,
       lat: this.options.position.lat,
       scale: (this.options.scale || this.options.scale === 0) ? this.options.scale : 1,
-      roll: this.options.roll || 0,
-      heading: this.options.heading || 0,
-      pitch: this.options.pitch || 0
+      roll: this.options.orientation.roll || 0,
+      heading: this.options.orientation.heading || 0,
+      pitch: this.options.orientation.pitch || 0
     }
     this.newData = {
       id: this.options.id,
@@ -65,40 +68,15 @@ class BaseTileset extends BaseSource {
       lng: this.options.position.lng,
       lat: this.options.position.lat,
       scale: (this.options.scale || this.options.scale === 0) ? this.options.scale : 1,
-      roll: this.options.roll || 0,
-      heading: this.options.heading || 0,
-      pitch: this.options.pitch || 0
+      roll: this.options.orientation.roll || 0,
+      heading: this.options.orientation.heading || 0,
+      pitch: this.options.orientation.pitch || 0
     }
     this.tileset = undefined
     this.editObj = new Controller(this.sdk)
     this.editObj.controllerCallBack = this.rotationEditingCallBack
   }
 
-  async add() {
-    if (this.options.url) {
-      return this.loadTileset({
-        url: this.options.url
-      })
-    } else {
-      let res = await this.requestResource()
-      let text = await res.text()
-      text = JSON.parse(text)
-      if ([0, 200].includes(text.code)) {
-        if (text.data.url.length)
-          return this.loadTileset(text.data)
-        else
-          return new Promise((res, reject) => {
-            reject('资源不存在')
-          })
-      } else {
-        return new Promise((res, reject) => {
-          reject(text.msg || text.message)
-        })
-      }
-    }
-
-  }
-
   loadSceneTree() {
 
   }
@@ -392,6 +370,12 @@ class BaseTileset extends BaseSource {
     this.pitch = this.oldData.pitch
     this.transparency = this.oldData.transparency
 
+    this.loaded = true
+    this._loaded = true
+    if (this._loadEvent) {
+      this._loadEvent(this.entity)
+    }
+
     syncSplitData(this.sdk, this.options.id)
 
     regMoveCallback(this.entity.id, this.mouseMoveCB, this)
@@ -469,7 +453,7 @@ class BaseTileset extends BaseSource {
 
 
   on() {
-    return this.add()
+    return this.loadTileset(this.options)
   }
 
   setDefaultValue() {
@@ -645,6 +629,15 @@ class BaseTileset extends BaseSource {
       console.error("参数必须为boolean")
     }
   }
+
+  load(callback) {
+    if (this._loaded) {
+      callback();
+    }
+    else {
+      this._loadEvent = callback
+    }
+  }
 }
 
 export default BaseTileset

src/Obj/Base/CircleDiffuse/index.js

@@ -12,7 +12,7 @@ import { getFontList, getFontFamilyName } from '../../Element/fontSelect'
 import MouseTip from '../../../MouseTip'
 import CircleDiffuseMaterialProperty from '../../Materail/CircleRippleMaterialProperty'
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../Global/SplitScreen'
-import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../Global/global'
+import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
 
 class CircleDiffuse extends Base {
   /**
@@ -67,7 +67,7 @@ class CircleDiffuse extends Base {
     super(sdk, options);
     this.options.lng = options.lng
     this.options.lat = options.lat
-    this.options.color = options.color || '#1FA8E3'
+    this.options.color = options.color || '#ff0000'
     this.options.transparency = (options.transparency || options.transparency === 0) ? options.transparency : 1
     if (this.options.transparency > 1) {
       this.options.transparency = 1
@@ -86,7 +86,7 @@ class CircleDiffuse extends Base {
 
     this.options.circle = options.circle || [{ radius: 10 }]
     for (let i = 0; i < this.options.circle.length; i++) {
-      if(this.options.circle[i].radius>999999) {
+      if (this.options.circle[i].radius > 999999) {
         this.options.circle[i].radius = 999999
       }
     }
@@ -97,7 +97,6 @@ class CircleDiffuse extends Base {
     options.label = options.label || {}
     this._elms = {};
     this.options.label = {
-      text: this.options.name,
       show: options.label.show || false,
       position: options.label.position,
       fontSize: (options.label.fontSize || options.label.fontSize === 0) ? options.label.fontSize : 20,
@@ -114,17 +113,12 @@ class CircleDiffuse extends Base {
     this.options.instruct = options.instruct || ''
     this.options.operatingPoint = options.operatingPoint || ''
     this.options.attribute = options.attribute || {}
-    this.options.attribute.vr = this.options.attribute.vr || {}
-    this.options.attribute.vr.content = this.options.attribute.vr.content || []
     this.options.attribute.link = this.options.attribute.link || {}
     this.options.attribute.link.content = this.options.attribute.link.content || []
-    this.options.attribute.camera = this.options.attribute.camera || {}
-    this.options.attribute.camera.content = this.options.attribute.camera.content || []
-    this.options.attribute.ISC = this.options.attribute.ISC || {}
-    this.options.attribute.ISC.content = this.options.attribute.ISC.content || []
-    this.options.attribute.goods = this.options.attribute.goods || {}
-    this.options.attribute.goods.content = this.options.attribute.goods.content || []
-    this.options.attributeType = options.attributeType || 'richText'
+
+    delete this.options.attribute.camera
+    delete this.options.attribute.vr
+    delete this.options.attribute.goods
 
     let radius = 0
     for (let i = 0; i < this.options.circle.length; i++) {
@@ -258,9 +252,9 @@ class CircleDiffuse extends Base {
         this.options.show = v
       }
       if (!this.showView || this.showView == 3 || !sdkD) {
-        this.entity.show = this.options.show 
+        this.entity.show = this.options.show
         if (this.options.label.show) {
-          this.label.show = this.options.show 
+          this.label.show = this.options.show
         }
       }
       else {
@@ -271,13 +265,13 @@ class CircleDiffuse extends Base {
       }
 
       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
       }
-      
+
     } else {
       console.error("参数必须为boolean")
     }
@@ -356,8 +350,7 @@ class CircleDiffuse extends Base {
       setTimeout(() => {
         this.picking = true
       }, 500);
-      if(this.label && this.label.entity && this.label.entity.billboard)
-      {
+      if (this.label && this.label.entity && this.label.entity.billboard) {
         this.label.entity.billboard.color = Cesium.Color.fromCssColorString(`rgba(255,255,255,1)`)
       }
       if (this.event) {
@@ -407,14 +400,18 @@ class CircleDiffuse extends Base {
     return this.options.circle
   }
   set circle(v) {
-    console.log(v)
     this.options.circle = v || [{ radius: 10 }]
+    let radius = 0
     for (let i = 0; i < this.options.circle.length; i++) {
-      if(this.options.circle[i].radius>999999) {
+      if (Number(this.options.circle[i].radius) > 999999) {
         this.options.circle[i].radius = 999999
       }
+      if (Number(this.options.circle[i].radius) > radius) {
+        radius = Number(this.options.circle[i].radius)
+      }
     }
-    this._createCircleElm()
+    this._radius = radius
+    CircleDiffuse.create(this)
   }
 
   get speed() {
@@ -672,352 +669,10 @@ class CircleDiffuse extends Base {
     }
   }
 
-  get instruct() {
-    return this.options.instruct
-  }
-  set instruct(v) {
-    this.options.instruct = v
-    this._elms.instruct && this._elms.instruct.forEach((item) => {
-      item.value = v
-    })
-  }
-
-  get operatingPoint() {
-    return this.options.operatingPoint
-  }
-  set operatingPoint(v) {
-    this.options.operatingPoint = v
-    this._elms.operatingPoint && this._elms.operatingPoint.forEach((item) => {
-      item.value = v
-    })
-  }
-
-  get attributeType() {
-    return this.options.attributeType
-  }
-
-  set attributeType(v) {
-    this.options.attributeType = v
-    this._elms.attributeType && this._elms.attributeType.forEach((item) => {
-      item.value = v
-    })
-    let attributeContent = this._DialogObject._element.content.getElementsByClassName('attribute-content')
-    for (let i = 0; i < attributeContent.length; i++) {
-      if (attributeContent[i].className.indexOf('attribute-content-' + v) > -1) {
-        attributeContent[i].style.display = 'block';
-      }
-      else {
-        attributeContent[i].style.display = 'none';
-      }
-    }
-  }
-
-  get attributeLink() {
-    return this.options.attribute.link.content
-  }
-
-  set attributeLink(v) {
-    this.options.attribute.link.content = v
-    if (!this._DialogObject || !this._DialogObject._element || !this._DialogObject._element.content || this._DialogObject._element.content.getElementsByClassName('attribute-content-link').length == 0) {
-      return
-    }
-    let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-link')[1].getElementsByClassName('table')[0]
-    let tableContent = table.getElementsByClassName('table-body')[0]
-    tableContent.innerHTML = ''
-    if (this.options.attribute.link.content.length > 0) {
-      table.getElementsByClassName('table-empty')[0].style.display = 'none'
-    }
-    else {
-      table.getElementsByClassName('table-empty')[0].style.display = 'flex'
-    }
-    for (let i = 0; i < this.options.attribute.link.content.length; i++) {
-      let tr = `
-      <div class="tr">
-          <div class="td">` + this.options.attribute.link.content[i].name + `</div>
-          <div class="td">` + this.options.attribute.link.content[i].url + `</div>
-          <div class="td">
-              <button @click="linkEdit">编辑</button>
-              <button @click="linkDelete">删除</button>
-          </div>
-      </div>`
-      let trElm = document.createRange().createContextualFragment(tr)
-      tableContent.appendChild(trElm)
-    }
-    let item = tableContent.getElementsByClassName('tr')
-    let fun = {
-      linkEdit: async (index) => {
-        this.attributeLink = await this.options.attribute.link.content
-        let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-link')[1].getElementsByClassName('table')[0]
-        let tableContent = table.getElementsByClassName('table-body')[0]
-        let item = tableContent.getElementsByClassName('tr')
-        for (let i = 0; i < item.length; i++) {
-          if (index === i) {
-            let height = item[i].offsetHeight
-            let html = `
-              <div class="td">
-                <input class="input" type="text">
-              </div>
-              <div class="td">
-              <textarea class="input link-edit" type="text"></textarea>
-              </div>
-              <div class="td">
-                  <button @click="confirmEdit">确认</button>
-                  <button @click="cancelEdit">取消</button>
-              </div>`
-            item[i].innerHTML = html
-            let textareaElm = item[i].getElementsByClassName('link-edit')[0]
-            textareaElm.style.height = (height - 10) + 'px'
-            let td = item[i].getElementsByClassName('td')
-            td[0].getElementsByClassName('input')[0].value = this.options.attribute.link.content[index].name
-            td[1].getElementsByClassName('input')[0].value = this.options.attribute.link.content[index].url
-            let btn = item[i].getElementsByTagName('button')
-            for (let n = 0; n < btn.length; n++) {
-              if (!btn[n] || !btn[n].attributes) {
-                continue 
-              }
-              for (let m of btn[n].attributes) {
-                if (m.name === '@click') {
-                  btn[n].addEventListener('click', (e) => {
-                    if (typeof (fun[m.value]) === 'function') {
-                      fun[m.value]({ name: td[0].getElementsByClassName('input')[0].value, url: td[1].getElementsByClassName('input')[0].value }, i)
-                    }
-                  });
-                  btn[n].attributes.removeNamedItem(m.name)
-                  break
-                }
-              }
-            }
-            break
-          }
-        }
-      },
-      linkDelete: (i) => {
-        this.options.attribute.link.content.splice(i, 1)
-        this.attributeLink = this.options.attribute.link.content
-      },
-
-      confirmEdit: (value, i) => {
-        let name = value.name && value.name.replace(/\s/g, "")
-        let url = value.url && value.url.replace(/\s/g, "")
-        if (name && url) {
-          this.options.attribute.link.content[i] = value
-        }
-        else {
-          window.ELEMENT && window.ELEMENT.Message({
-            message: '名称或链接不能为空！',
-            type: 'warning',
-            duration: 1500
-          });
-        }
-        this.attributeLink = this.options.attribute.link.content
-      },
-      cancelEdit: () => {
-        this.attributeLink = this.options.attribute.link.content
-      },
-      fileSelect: (value, i) => {
-        let fileElm = item[i].getElementsByClassName('file-select')[0]
-        fileElm.click()
-        fileElm.removeEventListener('change', fileSelect)
-        fileElm.addEventListener('change', fileSelect)
-      }
-    }
-    let fileSelect = (event) => {
-      if (event.target.value) {
-        let td = item[event.target.getAttribute('index')].getElementsByClassName('td')
-        td[1].getElementsByClassName('input')[0].value = event.target.value
-        event.target.value = null
-      }
-    }
-    for (let i = 0; i < item.length; i++) {
-      let btn = item[i].getElementsByTagName('button')
-      for (let n = 0; n < btn.length; n++) {
-        if (!btn[n] ||!btn[n].attributes) {
-          continue 
-        }
-        for (let m of btn[n].attributes) {
-          if (m.name === '@click') {
-            btn[n].addEventListener('click', (e) => {
-              if (typeof (fun[m.value]) === 'function') {
-                fun[m.value](i)
-              }
-            });
-            btn[n].attributes.removeNamedItem(m.name)
-            break
-          }
-        }
-      }
-    }
-
-
-
-
-  }
-
-  get attributeCamera() {
-    return this.options.attribute.camera.content
-  }
-
-  set attributeCamera(v) {
-    this.options.attribute.camera.content = v
-  }
-
-  get attributeISC() {
-    return this.options.attribute.ISC.content
-  }
-
-  set attributeISC(v) {
-    this.options.attribute.ISC.content = v
-  }
-
-  get attributeVr() {
-    return this.options.attribute.vr.content
-  }
-
-  set attributeVr(v) {
-    this.options.attribute.vr.content = v
-    if (!this._DialogObject || !this._DialogObject._element || !this._DialogObject._element.content || this._DialogObject._element.content.getElementsByClassName('attribute-content-vr').length == 0) {
-      return
-    }
-    let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-vr')[1].getElementsByClassName('table')[0]
-    let tableContent = table.getElementsByClassName('table-body')[0]
-    tableContent.innerHTML = ''
-    if (this.options.attribute.vr.content.length > 0) {
-      table.getElementsByClassName('table-empty')[0].style.display = 'none'
-    }
-    else {
-      table.getElementsByClassName('table-empty')[0].style.display = 'flex'
-    }
-    for (let i = 0; i < this.options.attribute.vr.content.length; i++) {
-      let tr = `
-      <div class="tr">
-          <div class="td">` + this.options.attribute.vr.content[i].name + `</div>
-          <div class="td">` + this.options.attribute.vr.content[i].url + `</div>
-          <div class="td">
-              <button @click="vrEdit">编辑</button>
-              <button @click="vrDelete">删除</button>
-          </div>
-      </div>`
-      let trElm = document.createRange().createContextualFragment(tr)
-      tableContent.appendChild(trElm)
-    }
-    let item = tableContent.getElementsByClassName('tr')
-    let fun = {
-      vrEdit: async (index) => {
-        this.attributeVr = await this.options.attribute.vr.content
-        let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-vr')[1].getElementsByClassName('table')[0]
-        let tableContent = table.getElementsByClassName('table-body')[0]
-        let item = tableContent.getElementsByClassName('tr')
-        for (let i = 0; i < item.length; i++) {
-          if (index === i) {
-            let height = item[i].offsetHeight
-            let html = `
-              <div class="td">
-                <input class="input" type="text">
-              </div>
-              <div class="td">
-                <textarea class="input link-edit" type="text"></textarea>
-              </div>
-              <div class="td">
-                  <button @click="confirmEdit">确认</button>
-                  <button @click="cancelEdit">取消</button>
-              </div>`
-            item[i].innerHTML = html
-            let textareaElm = item[i].getElementsByClassName('link-edit')[0]
-            textareaElm.style.height = (height - 10) + 'px'
-            let td = item[i].getElementsByClassName('td')
-            td[0].getElementsByClassName('input')[0].value = this.options.attribute.vr.content[index].name
-            td[1].getElementsByClassName('input')[0].value = this.options.attribute.vr.content[index].url
-            let btn = item[i].getElementsByTagName('button')
-            for (let n = 0; n < btn.length; n++) {
-              if (!btn[n] ||!btn[n].attributes) {
-                continue 
-              }
-              for (let m of btn[n].attributes) {
-                if (m.name === '@click') {
-                  btn[n].addEventListener('click', (e) => {
-                    if (typeof (fun[m.value]) === 'function') {
-                      fun[m.value]({ name: td[0].getElementsByClassName('input')[0].value, url: td[1].getElementsByClassName('input')[0].value }, i)
-                    }
-                  });
-                  btn[n].attributes.removeNamedItem(m.name)
-                  break
-                }
-              }
-            }
-            break
-          }
-        }
-      },
-      vrDelete: (i) => {
-        this.options.attribute.vr.content.splice(i, 1)
-        this.attributeVr = this.options.attribute.vr.content
-      },
-
-      confirmEdit: (value, i) => {
-        let name = value.name && value.name.replace(/\s/g, "")
-        let url = value.url && value.url.replace(/\s/g, "")
-        if (name && url) {
-          this.options.attribute.vr.content[i] = value
-        }
-        else {
-          window.ELEMENT && window.ELEMENT.Message({
-            message: '名称或链接不能为空！',
-            type: 'warning',
-            duration: 1500
-          });
-        }
-        this.attributeVr = this.options.attribute.vr.content
-      },
-      cancelEdit: () => {
-        this.attributeVr = this.options.attribute.vr.content
-      },
-      fileSelect: (value, i) => {
-        let fileElm = item[i].getElementsByClassName('file-select')[0]
-        fileElm.click()
-        fileElm.removeEventListener('change', fileSelect)
-        fileElm.addEventListener('change', fileSelect)
-      }
-    }
-    let fileSelect = (event) => {
-      if (event.target.value) {
-        let td = item[event.target.getAttribute('index')].getElementsByClassName('td')
-        td[1].getElementsByClassName('input')[0].value = event.target.value
-        event.target.value = null
-      }
-    }
-    for (let i = 0; i < item.length; i++) {
-      let btn = item[i].getElementsByTagName('button')
-      for (let n = 0; n < btn.length; n++) {
-        if (!btn[n] ||!btn[n].attributes) {
-          continue 
-        }
-        for (let m of btn[n].attributes) {
-          if (m.name === '@click') {
-            btn[n].addEventListener('click', (e) => {
-              if (typeof (fun[m.value]) === 'function') {
-                fun[m.value](i)
-              }
-            });
-            btn[n].attributes.removeNamedItem(m.name)
-            break
-          }
-        }
-      }
-    }
-  }
-
-  get attributeGoods() {
-    return this.options.attribute.goods.content
-  }
-
-  set attributeGoods(v) {
-    this.options.attribute.goods.content = v
-  }
-
   async flyTo(options = {}) {
     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 = {
@@ -1084,6 +739,7 @@ class CircleDiffuse extends Base {
 
   // 编辑框
   async edit(state) {
+    return
     let _this = this
     this.originalOptions = this.deepCopyObj(this.options)
 
@@ -1340,13 +996,6 @@ class CircleDiffuse extends Base {
     this.labelBackgroundColorEnd = this.originalOptions.label.backgroundColor[1]
     this.instruct = this.originalOptions.instruct
     this.operatingPoint = this.originalOptions.operatingPoint
-    this.attributeLink = this.options.attribute.link.content
-    this.attributeVr = this.options.attribute.vr.content
-    this.attributeCamera = this.options.attribute.camera.content
-    this.attributeGoods = this.options.attribute.goods.content
-    this.attributeISC = this.options.attribute.ISC.content
-    this.cameraSelect && this.cameraSelect()
-    this.goodsSelect && this.goodsSelect()
 
     let radius = 0
     for (let i = 0; i < this.options.circle.length; i++) {
@@ -1374,224 +1023,6 @@ class CircleDiffuse extends Base {
     await syncData(this.sdk, this.options.id)
   }
 
-  instructSubmit() {
-    this.Dialog.instructSubmit && this.Dialog.instructSubmit(this.options.id, this.options.label.text, this.instruct)
-    this.originalOptions.instruct = this.instruct
-  }
-
-  operatingPointSubmit() {
-    this.Dialog.operatingPointSubmit && this.Dialog.operatingPointSubmit(this.options.id, this.options.label.text, this.operatingPoint)
-    this.originalOptions.operatingPoint = this.operatingPoint
-  }
-
-  _createCircleElm() {
-    if (this._DialogObject && this._DialogObject._element && this._DialogObject._element.content) {
-      let unitDataLegpElm = this._DialogObject._element.content.getElementsByClassName('input-radius-unit')[0].getElementsByTagName('input')[0]
-      let unit = unitDataLegpElm ? unitDataLegpElm.value : '米'
-      let circleContentElm = this._DialogObject._element.content.getElementsByClassName('circle-content-box')[0]
-      circleContentElm.innerHTML = ''
-      for (let i = 0; i < this.options.circle.length; i++) {
-        let circleElm = document.createElement('div');
-        circleElm.className = 'row'
-        let addString = ''
-        let deleteString = '<button class="circle-minus"><svg class="icon-minus"><use xlink:href="#yj-icon-minus"></use></svg></button>'
-        if (i === 0 && i === this.options.circle.length - 1) {
-          deleteString = ''
-        }
-        if (i === this.options.circle.length - 1) {
-          addString = `<button class="circle-add" style="margin-left: 5px;"><svg class="icon-add2"><use xlink:href="#yj-icon-add2"></use></svg></button>`
-        }
-        circleElm.innerHTML = `
-            <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" style="width: 130px;">
-                    <span class="unit">${unit === '米' ? 'm' : 'km'}</span>
-                    <span class="arrow"></span>
-                </div>
-            </div>
-            <div class="col" style="flex-direction: row-reverse;">
-                <div class="color"></div>
-                <span class="label">扩散颜色</span>
-            </div>
-            <div class="col" style="flex-direction: row-reverse;">
-                ${addString}
-                ${deleteString}
-            </div>
-        `
-        let inputElm = circleElm.getElementsByClassName('input')[0]
-        inputElm.value = this.options.circle[i].radius / (unit === '米' ? 1 : 1000)
-        inputElm.addEventListener('input', (e) => {
-          let unitDataLegpElm = this._DialogObject._element.content.getElementsByClassName('input-radius-unit')[0].getElementsByTagName('input')[0]
-          let unit = unitDataLegpElm.value
-          if (e.target.value || e.target.value === 0) {
-            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) / (unit === '米' ? 1 : 1000))) && value >= Number(e.target.min))) {
-                if (unit === '米') {
-                  value = Math.floor(value * 100) / 100
-                }
-                else {
-                  value = Math.floor(value * 100000) / 100000
-                }
-                this.options.circle[i].radius = value * (unit === '米' ? 1 : 1000)
-                let radius = 0
-                for (let i = 0; i < this.options.circle.length; i++) {
-                  if (Number(this.options.circle[i].radius) > radius) {
-                    radius = Number(this.options.circle[i].radius)
-                  }
-                }
-                this._radius = radius
-                // inputElm.value = value
-                CircleDiffuse.create(this)
-              }
-            }
-          }
-        })
-        inputElm.addEventListener('blur', (e) => {
-          let unitDataLegpElm = this._DialogObject._element.content.getElementsByClassName('input-radius-unit')[0].getElementsByTagName('input')[0]
-          let unit = unitDataLegpElm.value
-          if (e.target.value || e.target.value === 0) {
-            let value = e.target.value
-            value = Number(value)
-            if ((e.target.max) && value > (Number(e.target.max) / (unit === '米' ? 1 : 1000))) {
-              value = (Number(e.target.max) / (unit === '米' ? 1 : 1000))
-            }
-            if ((e.target.min) && value < Number(e.target.min)) {
-              value = Number(e.target.min)
-            }
-            if (unit === '米') {
-              value = Math.floor(value * 100) / 100
-            }
-            else {
-              value = Math.floor(value * 100000) / 100000
-            }
-            this.options.circle[i].radius = value * (unit === '米' ? 1 : 1000)
-            let radius = 0
-            for (let i = 0; i < this.options.circle.length; i++) {
-              if (Number(this.options.circle[i].radius) > radius) {
-                radius = Number(this.options.circle[i].radius)
-              }
-            }
-            this._radius = radius
-            inputElm.value = value
-            CircleDiffuse.create(this)
-          }
-        })
-
-
-
-
-        // 颜色组件
-        let colorPicker = new YJColorPicker({
-          el: circleElm.getElementsByClassName("color")[0],
-          size: 'mini',//颜色box类型
-          alpha: false,//是否开启透明度
-          defaultColor: this.options.circle[i].color || this.options.color,
-          disabled: false,//是否禁止打开颜色选择器
-          openPickerAni: 'opacity',//打开颜色选择器动画
-          sure: (color) => {
-            this.options.circle[i].color = color
-            CircleDiffuse.create(this)
-          },//点击确认按钮事件回调
-          clear: () => {
-            this.options.circle[i].color = 'rgba(255,255,255,1)'
-            CircleDiffuse.create(this)
-          },//点击清空按钮事件回调
-        })
-        // 减
-        let minusElm = circleElm.getElementsByClassName('circle-minus')[0]
-        minusElm && minusElm.addEventListener('click', () => {
-          this.options.circle.splice(i, 1)
-          let radius = 0
-          for (let i = 0; i < this.options.circle.length; i++) {
-            if (Number(this.options.circle[i].radius) > radius) {
-              radius = Number(this.options.circle[i].radius)
-            }
-          }
-          this._radius = radius
-          CircleDiffuse.create(this)
-          this._createCircleElm()
-        })
-        // 加
-        let addElm = circleElm.getElementsByClassName('circle-add')[0]
-        addElm && addElm.addEventListener('click', () => {
-          this.options.circle.push({
-            radius: 0,
-            color: 'rgba(255,255,255,1)'
-          })
-          let radius = 0
-          for (let i = 0; i < this.options.circle.length; i++) {
-            if (Number(this.options.circle[i].radius) > radius) {
-              radius = Number(this.options.circle[i].radius)
-            }
-          }
-          this._radius = radius
-          CircleDiffuse.create(this)
-          this._createCircleElm()
-        })
-
-        circleContentElm.appendChild(circleElm)
-      }
-    }
-  }
-
-  _addLink() {
-    // document.getElementsByClassName
-    if (this._DialogObject._element.content.getElementsByClassName('link_add')[0].value) {
-      this.options.attribute.link.content.push({
-        name: '链接',
-        url: this._DialogObject._element.content.getElementsByClassName('link_add')[0].value
-      })
-      this._DialogObject._element.content.getElementsByClassName('link_add')[0].value = ''
-      this.attributeLink = this.options.attribute.link.content
-    }
-    else {
-      this.Dialog.clickAddLink && this.Dialog.clickAddLink()
-    }
-  }
-
-  addAttributeLink(link) {
-    this.options.attribute.link.content.push({
-      name: '链接',
-      url: link
-    })
-    this.attributeLink = this.options.attribute.link.content
-  }
-
-  _addRr() {
-    if (this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value) {
-      this.options.attribute.vr.content.push({
-        name: '全景图' ,
-        url: this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value
-      })
-      this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value = ''
-      this.attributeVr = this.options.attribute.vr.content
-    }
-    else {
-      this.Dialog.clickAddVr && this.Dialog.clickAddVr()
-    }
-  }
-
-  addAttributeRr(vr) {
-    this.options.attribute.vr.content.push({
-      name: '全景图' ,
-      url: vr
-    })
-    this.attributeVr = this.options.attribute.vr.content
-  }
-
-  /**
-   * 打开富文本框
-   */
-  openRichTextEditor(e) {
-    richText.open(this.options.id, this.options.name, this.options.richTextContent)
-    richText.primaryCallBack = (content) => {
-      this.options.richTextContent = content
-    }
-  }
-
   setDIV(options = { domid: "", x: 10, y: 10 }) {
     options.x = (options.x || options.x === 0) ? options.x : 10
     options.y = (options.y || options.y === 0) ? options.y : 10

src/Obj/Base/CircleObject/index.js

@@ -33,7 +33,6 @@ class CircleObject extends Base {
    * @param options.line.width=3 {number} 边框宽
    * @param options.line.color="#ff000080" {string} 边框颜色
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
-   * @param options.areaUnit='平方米' {string} 面积单位
    * @param options.customView {object} 默认视角
    * @param options.customView.orientation {object} 默认视角方位
    * @param options.customView.orientation.heading {number} 航向角
@@ -87,7 +86,6 @@ class CircleObject extends Base {
     this.options.line = options.line || {}
     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 = {};
     this.options.label = {
@@ -108,13 +106,13 @@ class CircleObject extends Base {
     this.options.attribute = options.attribute || {}
     this.options.attribute.link = this.options.attribute.link || {}
     this.options.attribute.link.content = this.options.attribute.link.content || []
-    this.options.attribute.vr = this.options.attribute.vr || {}
-    this.options.attribute.vr.content = this.options.attribute.vr.content || []
-    this.options.attribute.camera = this.options.attribute.camera || {}
-    this.options.attribute.camera.content = this.options.attribute.camera.content || []
-    this.options.attribute.goods = this.options.attribute.goods || {}
-    this.options.attribute.goods.content = this.options.attribute.goods.content || []
-    this.options.attributeType = options.attributeType || 'richText'
+
+    delete this.options.attribute.camera
+    delete this.options.attribute.vr
+    delete this.options.attribute.goods
+
+
+
     this.event = new MouseEvent(this.sdk)
     this.nodePoints = []
     this.operate = {}
@@ -140,7 +138,7 @@ class CircleObject extends Base {
         return
       }
       let heightModeName = ''
-      CircleObject.closeNodeEdit(this)
+      this.closeNodeEdit()
       let ground = false
       let disabled = false
       this.renewPositions()
@@ -227,7 +225,7 @@ class CircleObject extends Base {
     return this.options.radius
   }
   set radius(v) {
-    this.options.radius = v
+    this.options.radius = Number(v)
     this.renewPositions()
     this.entity.polygon.hierarchy = new Cesium.PolygonHierarchy(this.positions)
     this.entity.polyline.positions = [
@@ -330,45 +328,6 @@ class CircleObject extends Base {
     })
   }
 
-  get area() {
-    return this.options.area
-  }
-
-  set area(v) {
-    this.options.area = v
-    this._elms.area && this._elms.area.forEach((item) => {
-      item.value = v
-    })
-  }
-
-  get areaUnit() {
-    return this.options['area-unit']
-  }
-  set areaUnit(v) {
-    this.options['area-unit'] = v
-    this._elms.areaUnit && this._elms.areaUnit.forEach((item) => {
-      item.value = v
-    })
-    if (this.options.areaByMeter) {
-      switch (v) {
-        case '平方米':
-          this.area = this.options.areaByMeter
-          break;
-        case '平方千米':
-          this.area = Number((this.options.areaByMeter / 1000000).toFixed(8))
-          break;
-        case '亩':
-          this.area = Number((this.options.areaByMeter / 666.6666667).toFixed(4))
-          break;
-        case '公顷':
-          this.area = Number((this.options.areaByMeter / 10000).toFixed(6))
-          break;
-        default:
-          this.area = this.options.areaByMeter
-      }
-    }
-  }
-
   get labelShow() {
     return this.options.label.show
   }
@@ -580,320 +539,6 @@ class CircleObject extends Base {
     }
   }
 
-  get attributeType() {
-    return this.options.attributeType
-  }
-
-  set attributeType(v) {
-    this.options.attributeType = v
-    this._elms.attributeType && this._elms.attributeType.forEach((item) => {
-      item.value = v
-    })
-    let attributeContent = this._DialogObject._element.content.getElementsByClassName('attribute-content')
-    for (let i = 0; i < attributeContent.length; i++) {
-      if (attributeContent[i].className.indexOf('attribute-content-' + v) > -1) {
-        attributeContent[i].style.display = 'block';
-      }
-      else {
-        attributeContent[i].style.display = 'none';
-      }
-    }
-  }
-
-  get attributeLink() {
-    return this.options.attribute.link.content
-  }
-
-  set attributeLink(v) {
-    this.options.attribute.link.content = v
-    if (!this._DialogObject || !this._DialogObject._element || !this._DialogObject._element.content || this._DialogObject._element.content.getElementsByClassName('attribute-content-link').length == 0) {
-      return
-    }
-    let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-link')[1].getElementsByClassName('table')[0]
-    let tableContent = table.getElementsByClassName('table-body')[0]
-    tableContent.innerHTML = ''
-    if (this.options.attribute.link.content.length > 0) {
-      table.getElementsByClassName('table-empty')[0].style.display = 'none'
-    }
-    else {
-      table.getElementsByClassName('table-empty')[0].style.display = 'flex'
-    }
-    for (let i = 0; i < this.options.attribute.link.content.length; i++) {
-      let tr = `
-      <div class="tr">
-          <div class="td">` + this.options.attribute.link.content[i].name + `</div>
-          <div class="td">` + this.options.attribute.link.content[i].url + `</div>
-          <div class="td">
-              <button @click="linkEdit">编辑</button>
-              <button @click="linkDelete">删除</button>
-          </div>
-      </div>`
-      let trElm = document.createRange().createContextualFragment(tr)
-      tableContent.appendChild(trElm)
-    }
-    let item = tableContent.getElementsByClassName('tr')
-    let fun = {
-      linkEdit: async (index) => {
-        this.attributeLink = await this.options.attribute.link.content
-        let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-link')[1].getElementsByClassName('table')[0]
-        let tableContent = table.getElementsByClassName('table-body')[0]
-        let item = tableContent.getElementsByClassName('tr')
-        for (let i = 0; i < item.length; i++) {
-          if (index === i) {
-            let height = item[i].offsetHeight
-            let html = `
-              <div class="td">
-                <input class="input" type="text">
-              </div>
-              <div class="td">
-                <textarea class="input link-edit" type="text"></textarea>
-              </div>
-              <div class="td">
-                  <button @click="confirmEdit">确认</button>
-                  <button @click="cancelEdit">取消</button>
-              </div>`
-            item[i].innerHTML = html
-            let textareaElm = item[i].getElementsByClassName('link-edit')[0]
-            textareaElm.style.height = (height - 10) + 'px'
-            let td = item[i].getElementsByClassName('td')
-            td[0].getElementsByClassName('input')[0].value = this.options.attribute.link.content[index].name
-            td[1].getElementsByClassName('input')[0].value = this.options.attribute.link.content[index].url
-            let btn = item[i].getElementsByTagName('button')
-            for (let n = 0; n < btn.length; n++) {
-              if (!btn[n] || !btn[n].attributes) {
-                continue
-              }
-              for (let m of btn[n].attributes) {
-                if (m.name === '@click') {
-                  btn[n].addEventListener('click', (e) => {
-                    if (typeof (fun[m.value]) === 'function') {
-                      fun[m.value]({ name: td[0].getElementsByClassName('input')[0].value, url: td[1].getElementsByClassName('input')[0].value }, i)
-                    }
-                  });
-                  btn[n].attributes.removeNamedItem(m.name)
-                  break
-                }
-              }
-            }
-            break
-          }
-        }
-      },
-      linkDelete: (i) => {
-        this.options.attribute.link.content.splice(i, 1)
-        this.attributeLink = this.options.attribute.link.content
-      },
-
-      confirmEdit: (value, i) => {
-        let name = value.name && value.name.replace(/\s/g, "")
-        let url = value.url && value.url.replace(/\s/g, "")
-        if (name && url) {
-          this.options.attribute.link.content[i] = value
-        }
-        else {
-          window.ELEMENT && window.ELEMENT.Message({
-            message: '名称或链接不能为空！',
-            type: 'warning',
-            duration: 1500
-          });
-        }
-        this.attributeLink = this.options.attribute.link.content
-      },
-      cancelEdit: () => {
-        this.attributeLink = this.options.attribute.link.content
-      },
-      fileSelect: (value, i) => {
-        let fileElm = item[i].getElementsByClassName('file-select')[0]
-        fileElm.click()
-        fileElm.removeEventListener('change', fileSelect)
-        fileElm.addEventListener('change', fileSelect)
-      }
-    }
-    let fileSelect = (event) => {
-      if (event.target.value) {
-        let td = item[event.target.getAttribute('index')].getElementsByClassName('td')
-        td[1].getElementsByClassName('input')[0].value = event.target.value
-        event.target.value = null
-      }
-    }
-    for (let i = 0; i < item.length; i++) {
-      let btn = item[i].getElementsByTagName('button')
-      for (let n = 0; n < btn.length; n++) {
-        if (!btn[n] || !btn[n].attributes) {
-          continue
-        }
-        for (let m of btn[n].attributes) {
-          if (m.name === '@click') {
-            btn[n].addEventListener('click', (e) => {
-              if (typeof (fun[m.value]) === 'function') {
-                fun[m.value](i)
-              }
-            });
-            btn[n].attributes.removeNamedItem(m.name)
-            break
-          }
-        }
-      }
-    }
-
-
-
-
-  }
-
-  get attributeCamera() {
-    return this.options.attribute.camera.content
-  }
-
-  set attributeCamera(v) {
-    this.options.attribute.camera.content = v
-  }
-
-  get attributeVr() {
-    return this.options.attribute.vr.content
-  }
-
-  set attributeVr(v) {
-    this.options.attribute.vr.content = v
-    if (!this._DialogObject || !this._DialogObject._element || !this._DialogObject._element.content || this._DialogObject._element.content.getElementsByClassName('attribute-content-vr').length == 0) {
-      return
-    }
-    let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-vr')[1].getElementsByClassName('table')[0]
-    let tableContent = table.getElementsByClassName('table-body')[0]
-    tableContent.innerHTML = ''
-    if (this.options.attribute.vr.content.length > 0) {
-      table.getElementsByClassName('table-empty')[0].style.display = 'none'
-    }
-    else {
-      table.getElementsByClassName('table-empty')[0].style.display = 'flex'
-    }
-    for (let i = 0; i < this.options.attribute.vr.content.length; i++) {
-      let tr = `
-      <div class="tr">
-          <div class="td">` + this.options.attribute.vr.content[i].name + `</div>
-          <div class="td">` + this.options.attribute.vr.content[i].url + `</div>
-          <div class="td">
-              <button @click="vrEdit">编辑</button>
-              <button @click="vrDelete">删除</button>
-          </div>
-      </div>`
-      let trElm = document.createRange().createContextualFragment(tr)
-      tableContent.appendChild(trElm)
-    }
-    let item = tableContent.getElementsByClassName('tr')
-    let fun = {
-      vrEdit: async (index) => {
-        this.attributeVr = await this.options.attribute.vr.content
-        let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-vr')[1].getElementsByClassName('table')[0]
-        let tableContent = table.getElementsByClassName('table-body')[0]
-        let item = tableContent.getElementsByClassName('tr')
-        for (let i = 0; i < item.length; i++) {
-          if (index === i) {
-            let height = item[i].offsetHeight
-            let html = `
-              <div class="td">
-                <input class="input" type="text">
-              </div>
-              <div class="td">
-              <textarea class="input link-edit" type="text"></textarea>
-              </div>
-              <div class="td">
-                  <button @click="confirmEdit">确认</button>
-                  <button @click="cancelEdit">取消</button>
-              </div>`
-            item[i].innerHTML = html
-            let textareaElm = item[i].getElementsByClassName('link-edit')[0]
-            textareaElm.style.height = (height - 10) + 'px'
-            let td = item[i].getElementsByClassName('td')
-            td[0].getElementsByClassName('input')[0].value = this.options.attribute.vr.content[index].name
-            td[1].getElementsByClassName('input')[0].value = this.options.attribute.vr.content[index].url
-            let btn = item[i].getElementsByTagName('button')
-            for (let n = 0; n < btn.length; n++) {
-              if (!btn[n] || !btn[n].attributes) {
-                continue
-              }
-              for (let m of btn[n].attributes) {
-                if (m.name === '@click') {
-                  btn[n].addEventListener('click', (e) => {
-                    if (typeof (fun[m.value]) === 'function') {
-                      fun[m.value]({ name: td[0].getElementsByClassName('input')[0].value, url: td[1].getElementsByClassName('input')[0].value }, i)
-                    }
-                  });
-                  btn[n].attributes.removeNamedItem(m.name)
-                  break
-                }
-              }
-            }
-            break
-          }
-        }
-      },
-      vrDelete: (i) => {
-        this.options.attribute.vr.content.splice(i, 1)
-        this.attributeVr = this.options.attribute.vr.content
-      },
-
-      confirmEdit: (value, i) => {
-        let name = value.name && value.name.replace(/\s/g, "")
-        let url = value.url && value.url.replace(/\s/g, "")
-        if (name && url) {
-          this.options.attribute.vr.content[i] = value
-        }
-        else {
-          window.ELEMENT && window.ELEMENT.Message({
-            message: '名称或链接不能为空！',
-            type: 'warning',
-            duration: 1500
-          });
-        }
-        this.attributeVr = this.options.attribute.vr.content
-      },
-      cancelEdit: () => {
-        this.attributeVr = this.options.attribute.vr.content
-      },
-      fileSelect: (value, i) => {
-        let fileElm = item[i].getElementsByClassName('file-select')[0]
-        fileElm.click()
-        fileElm.removeEventListener('change', fileSelect)
-        fileElm.addEventListener('change', fileSelect)
-      }
-    }
-    let fileSelect = (event) => {
-      if (event.target.value) {
-        let td = item[event.target.getAttribute('index')].getElementsByClassName('td')
-        td[1].getElementsByClassName('input')[0].value = event.target.value
-        event.target.value = null
-      }
-    }
-    for (let i = 0; i < item.length; i++) {
-      let btn = item[i].getElementsByTagName('button')
-      for (let n = 0; n < btn.length; n++) {
-        if (!btn[n] || !btn[n].attributes) {
-          continue
-        }
-        for (let m of btn[n].attributes) {
-          if (m.name === '@click') {
-            btn[n].addEventListener('click', (e) => {
-              if (typeof (fun[m.value]) === 'function') {
-                fun[m.value](i)
-              }
-            });
-            btn[n].attributes.removeNamedItem(m.name)
-            break
-          }
-        }
-      }
-    }
-  }
-
-  get attributeGoods() {
-    return this.options.attribute.goods.content
-  }
-
-  set attributeGoods(v) {
-    this.options.attribute.goods.content = v
-  }
-
   static create(that) {
     let fromDegreesArray = that.createCircle(that.options.center, that.options.radius)
     let ground
@@ -914,9 +559,10 @@ class CircleObject extends Base {
         ground = true
         break
     }
-    if (!that.options.label.position) {
-      that.options.label.position = { lng: that.options.center.lng, lat: that.options.center.lat, alt: that.options.center.alt + height }
-    }
+    // if (!that.options.label.position) {
+    //   that.options.label.position = { lng: that.options.center.lng, lat: that.options.center.lat, alt: that.options.center.alt + height }
+    // }
+    that.options.label.position = { lng: that.options.center.lng, lat: that.options.center.lat, alt: that.options.center.alt + height }
 
     let material = Cesium.Color.fromCssColorString(that.options.color)
     if (that.sdk.viewer.scene.mode === 2) {
@@ -930,7 +576,7 @@ class CircleObject extends Base {
     for (let i = 0; i < fromDegreesArray.length; i += 2) {
       fromDegreesArray2.push(fromDegreesArray[i], fromDegreesArray[i + 1], that.options.center.alt + height)
     }
-    that.options.label.ground = ground
+    // that.options.label.ground = ground
     that.positions = Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArray2)
     positionsA = Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)
     that.entity = that.sdk.viewer.entities.add({
@@ -953,23 +599,8 @@ class CircleObject extends Base {
     })
     that.sdk._entityZIndex++
     CircleObject.createLabel(that)
-    that.options.areaByMeter = Number((Cesium.Math.PI * that.options.radius * that.options.radius).toFixed(2));
-    switch (that.options['area-unit']) {
-      case '平方米':
-        that.options.area = that.options.areaByMeter
-        break;
-      case '平方千米':
-        that.options.area = Number((that.options.areaByMeter / 1000000).toFixed(8))
-        break;
-      case '亩':
-        that.options.area = Number((that.options.areaByMeter / 666.6666667).toFixed(4))
-        break;
-      case '公顷':
-        that.options.area = Number((that.options.areaByMeter / 10000).toFixed(6))
-        break;
-      default:
-        that.options.area = that.options.areaByMeter
-    }
+    that.areaByMeter = Number((Cesium.Math.PI * that.options.radius * that.options.radius).toFixed(2));
+    that.areaChangeCallBack && that.areaChangeCallBack()
 
     syncData(that.sdk, that.options.id)
     if (that.options.show) {
@@ -995,12 +626,12 @@ class CircleObject extends Base {
       scaleByDistance: that.options.label.scaleByDistance,
       near: that.options.label.near,
       far: that.options.label.far,
-      ground: that.options.label.ground,
     })
   }
 
   // 编辑框
   async edit(state) {
+    return
     let _this = this
     this.originalOptions = this.deepCopyObj(this.options)
 
@@ -1492,8 +1123,6 @@ class CircleObject extends Base {
     this.name = this.originalOptions.name
     this.radius = this.originalOptions.radius
     this.color = this.originalOptions.color
-    this.area = this.originalOptions.area
-    this.areaUnit = this.originalOptions['area-unit']
     this.labelShow = this.originalOptions.label.show
     this.labelFontSize = this.originalOptions.label.fontSize
     this.labelFontFamily = this.originalOptions.label.fontFamily
@@ -1509,12 +1138,6 @@ class CircleObject extends Base {
     this.lineColor = this.originalOptions.line.color
     this.labelBackgroundColorStart = this.originalOptions.label.backgroundColor[0]
     this.labelBackgroundColorEnd = this.originalOptions.label.backgroundColor[1]
-    this.attributeLink = this.options.attribute.link.content
-    this.attributeVr = this.options.attribute.vr.content
-    this.attributeCamera = this.options.attribute.camera.content
-    this.attributeGoods = this.options.attribute.goods.content
-    this.cameraSelect && this.cameraSelect()
-    this.goodsSelect && this.goodsSelect()
 
     this.heightMode = this.originalOptions.heightMode
 
@@ -1554,51 +1177,6 @@ class CircleObject extends Base {
     await syncData(this.sdk, this.options.id)
   }
 
-  _addLink() {
-    // document.getElementsByClassName
-    if (this._DialogObject._element.content.getElementsByClassName('link_add')[0].value) {
-      this.options.attribute.link.content.push({
-        name: '链接',
-        url: this._DialogObject._element.content.getElementsByClassName('link_add')[0].value
-      })
-      this._DialogObject._element.content.getElementsByClassName('link_add')[0].value = ''
-      this.attributeLink = this.options.attribute.link.content
-    }
-    else {
-      this.Dialog.clickAddLink && this.Dialog.clickAddLink()
-    }
-  }
-
-  addAttributeLink(link) {
-    this.options.attribute.link.content.push({
-      name: '链接',
-      url: link
-    })
-    this.attributeLink = this.options.attribute.link.content
-  }
-
-  _addRr() {
-    if (this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value) {
-      this.options.attribute.vr.content.push({
-        name: '全景图' ,
-        url: this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value
-      })
-      this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value = ''
-      this.attributeVr = this.options.attribute.vr.content
-    }
-    else {
-      this.Dialog.clickAddVr && this.Dialog.clickAddVr()
-    }
-  }
-
-  addAttributeRr(vr) {
-    this.options.attribute.vr.content.push({
-      name: '全景图' ,
-      url: vr
-    })
-    this.attributeVr = this.options.attribute.vr.content
-  }
-
   /**
    * 飞到
   */
@@ -1803,6 +1381,11 @@ class CircleObject extends Base {
           positions: { ...this.options.center }
         }
         this.positionEditing = false
+
+        if(this._positionEditingCallback) {
+          this._positionEditingCallback()
+          this._positionEditingCallback = null
+        }
       })
       this.event.mouse_right((movement, cartesian) => {
         this.positionEditing = false
@@ -1866,88 +1449,104 @@ class CircleObject extends Base {
     return this.operate.positionEditing
   }
 
-  static nodeEdit(that, cb = () => { }) {
-    that.positionEditing = false
+  openPositionEditing(cd) {
+    this.positionEditing = true
+    this._positionEditingCallback = cd
+  }
+
+  get areaChangeCallBack() {
+    return this._areaChangeCallBack
+  }
+
+  set areaChangeCallBack (cd) {
+    this._areaChangeCallBack = cd
+  }
+
+  nodeEdit(cb = () => { }) {
+    this.positionEditing = false
     if (YJ.Measure.GetMeasureStatus()) {
     } else {
-      that.event && that.event.destroy()
-      that.event = new MouseEvent(that.sdk)
+      let _this = this
+      this.event && this.event.destroy()
+      this.event = new MouseEvent(this.sdk)
       YJ.Measure.SetMeasureStatus(true)
-      that.tip = new MouseTip('左键确认，右键取消', that.sdk)
-      that.event = new MouseEvent(that.sdk)
-      that.nodePoints = []
+      this.tip = new MouseTip('左键确认，右键取消', this.sdk)
+      this.event = new MouseEvent(this.sdk)
+      this.nodePoints = []
       let selectPoint
       let originalPosition
       let newpositions = []
       let fromDegreesArray = []
-      let endpoint = { ...that.options.center }
+      let endpoint = { ...this.options.center }
       let moveRadius = null
       let entity
-      fromDegreesArray = that.createCircle(that.options.center, that.options.radius)
+      fromDegreesArray = this.createCircle(this.options.center, this.options.radius)
 
 
 
-      that.entity.polyline.clampToGround = true
-      that.entity.polyline.arcType = Cesium.ArcType.GEODESIC
-      that.entity.polygon.perPositionHeight = false
-      that.entity.polygon.hierarchy = new Cesium.CallbackProperty(function () {
+      this.entity.polyline.clampToGround = true
+      this.entity.polyline.arcType = Cesium.ArcType.GEODESIC
+      this.entity.polygon.perPositionHeight = false
+      this.entity.polygon.hierarchy = new Cesium.CallbackProperty(function () {
         return new Cesium.PolygonHierarchy(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray))
       }, false)
-      that.entity.polyline.positions = new Cesium.CallbackProperty(function () {
+      this.entity.polyline.positions = new Cesium.CallbackProperty(function () {
         return Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)
       }, false)
       setTimeout(() => {
-        let objectsToExclude = [...that.sdk.viewer.entities.values]
-        that
+        let objectsToExclude = [...this.sdk.viewer.entities.values]
+        this
           .getClampToHeight({
-            lng: that.options.center.lng,
-            lat: that.options.center.lat
+            lng: this.options.center.lng,
+            lat: this.options.center.lat
           }, objectsToExclude)
           .then(height => {
-            that.label.position = [
-              that.options.center.lng,
-              that.options.center.lat,
+            this.label.position = [
+              this.options.center.lng,
+              this.options.center.lat,
               height
             ]
           })
       }, 50);
 
       setTimeout(() => {
-        that.event.mouse_left((movement, cartesian) => {
+        this.event.mouse_left((movement, cartesian) => {
           if (entity) {
-            that.sdk.viewer.entities.remove(entity)
+            this.sdk.viewer.entities.remove(entity)
             entity = null
           }
-          endpoint = that.cartesian3Towgs84(cartesian, that.viewer)
-          let radius = that.computeDistance2([that.options.center, endpoint])
-          that.radius = radius
+          endpoint = this.cartesian3Towgs84(cartesian, this.viewer)
+          let radius = this.computeDistance2([this.options.center, endpoint])
+          this.radius = radius
 
           YJ.Measure.SetMeasureStatus(false)
-          that.event.destroy()
-          that.tip.destroy()
+          this.event.destroy()
+          this.tip.destroy()
 
-          that.heightMode = that.heightMode
+          this.heightMode = this.heightMode
+
+          cb('', {...this.options.center})
         })
 
-        that.event.mouse_right((movement, cartesian) => {
+        this.event.mouse_right((movement, cartesian) => {
           if (entity) {
-            that.sdk.viewer.entities.remove(entity)
+            this.sdk.viewer.entities.remove(entity)
             entity = null
           }
 
           YJ.Measure.SetMeasureStatus(false)
-          that.event.destroy()
-          that.tip.destroy()
+          this.event.destroy()
+          this.tip.destroy()
 
-          that.heightMode = that.heightMode
+          this.heightMode = this.heightMode
         })
 
-        that.event.mouse_move((movement, cartesian) => {
+        this.event.mouse_move((movement, cartesian) => {
           entity && (entity.show = true)
-          endpoint = that.cartesian3Towgs84(cartesian, that.viewer)
-          moveRadius = that.computeDistance2([that.options.center, endpoint])
-          fromDegreesArray = that.createCircle(that.options.center, moveRadius)
-          that.tip.setPosition(
+          endpoint = this.cartesian3Towgs84(cartesian, this.viewer)
+          moveRadius = this.computeDistance2([this.options.center, endpoint])
+          fromDegreesArray = this.createCircle(this.options.center, moveRadius)
+          this.tip.setPosition(
             cartesian,
             movement.endPosition.x,
             movement.endPosition.y
@@ -1956,28 +1555,28 @@ class CircleObject extends Base {
         createNodePoints()
       }, 200);
       async function createNodePoints() {
-        let objectsToExclude = [...that.sdk.viewer.entities.values]
-        let height = await that.getClampToHeight(that.options.center, objectsToExclude)
-        let entity = that.sdk.viewer.entities.add({
+        let objectsToExclude = [..._this.sdk.viewer.entities.values]
+        let height = await _this.getClampToHeight(_this.options.center, objectsToExclude)
+        let entity = _this.sdk.viewer.entities.add({
           name: 'node-secondary-edit-point',
-          position: Cesium.Cartesian3.fromDegrees(that.options.center.lng, that.options.center.lat, height),
+          position: Cesium.Cartesian3.fromDegrees(_this.options.center.lng, _this.options.center.lat, height),
           billboard: {
-            image: that.getSourceRootPath() + '/img/point.png',
+            image: _this.getSourceRootPath() + '/img/point.png',
             width: 15,
             height: 15,
             disableDepthTestDistance: Number.POSITIVE_INFINITY,
             color: Cesium.Color.WHITE.withAlpha(0.99)
           },
         })
-        that.nodePoints.push(entity)
+        _this.nodePoints.push(entity)
       }
 
-      entity = that.sdk.viewer.entities.add(
+      entity = this.sdk.viewer.entities.add(
         new Cesium.Entity({
           show: false,
           position: new Cesium.CallbackProperty((e) => {
             if (endpoint) {
-              let c = that.computeMidpoint(that.options.center, endpoint)
+              let c = this.computeMidpoint(this.options.center, endpoint)
               return Cesium.Cartesian3.fromDegrees(c.lng, c.lat, endpoint.alt)
             } else {
               return Cesium.Cartesian3()
@@ -2000,7 +1599,7 @@ class CircleObject extends Base {
           },
           polyline: {
             positions: new Cesium.CallbackProperty((e) => {
-              return Cesium.Cartesian3.fromDegreesArray([that.options.center.lng, that.options.center.lat, endpoint.lng, endpoint.lat])
+              return Cesium.Cartesian3.fromDegreesArray([this.options.center.lng, this.options.center.lat, endpoint.lng, endpoint.lat])
             }, false),
             width: 2,
             material:
@@ -2010,22 +1609,22 @@ class CircleObject extends Base {
           }
         })
       )
-      that.nodePoints.push(entity)
+      this.nodePoints.push(entity)
 
     }
   }
 
-  static closeNodeEdit(that) {
+  closeNodeEdit() {
     YJ.Measure.SetMeasureStatus(false)
-    that.event && that.event.destroy()
-    that.tip && that.tip.destroy()
-    that.tip = null
+    this.event && this.event.destroy()
+    this.tip && this.tip.destroy()
+    this.tip = null
 
-    for (let i = 0; i < that.nodePoints.length; i++) {
-      that.sdk.viewer.entities.remove(that.nodePoints[i])
+    for (let i = 0; i < this.nodePoints.length; i++) {
+      this.sdk.viewer.entities.remove(this.nodePoints[i])
     }
-    that.nodePoints = []
-    that.picking = true
+    this.nodePoints = []
+    this.picking = true
   }
 
 
@@ -2205,8 +1804,8 @@ class CircleObject extends Base {
     }
 
     // 计算投影面积
-    this.options.areaByMeter = Number((Cesium.Math.PI * this.options.radius * this.options.radius).toFixed(2))
-    this.areaUnit = this.areaUnit
+    this.areaByMeter = Number((Cesium.Math.PI * this.options.radius * this.options.radius).toFixed(2))
+    this.areaChangeCallBack && this.areaChangeCallBack()
     return fromDegreesArray
   }
 }

src/Obj/Base/LabelObject/index.js

@@ -13,12 +13,11 @@ import {
 } from '../../../Global/cluster/cluster'
 
 class LabelObject extends Base {
-  #updateBillboardImageTimeout
-  #canvas = document.createElement('canvas')
-  #canvas2 = document.createElement('canvas')
   constructor(sdk, options = {}, model) {
     super(sdk, options)
     this.model = model
+    this._canvas = document.createElement('canvas')
+    this._canvas2 = document.createElement('canvas')
     this.options.near = options.near || options.near === 0 ? options.near : 2000
     this.options.far = options.far || options.far === 0 ? options.far : 100000
     this.options.scaleByDistance = options.scaleByDistance || false
@@ -69,7 +68,7 @@ class LabelObject extends Base {
 
     let id = this.options.id + '-label'
     let oldEntity = this.sdk.viewer.entities.getById(id)
-    if(oldEntity) {
+    if (oldEntity) {
       this.sdk.viewer.entities.remove(oldEntity)
     }
     this.entity = this.sdk.viewer.entities.add({
@@ -492,8 +491,8 @@ class LabelObject extends Base {
   // }
 
   getcanvas() {
-    const ctx = this.#canvas.getContext('2d')
-    ctx.clearRect(0, 0, this.#canvas.width, this.#canvas.height);
+    const ctx = this._canvas.getContext('2d')
+    ctx.clearRect(0, 0, this._canvas.width, this._canvas.height);
     ctx.font = this.options.fontSize + 'px ' + this.font
     let texts = this.options.text.split('\n')
     let canvasWidth = 0
@@ -511,8 +510,8 @@ class LabelObject extends Base {
     if (canvasWidth < this.options.lineWidth) {
       canvasWidth = this.options.lineWidth
     }
-    this.#canvas.width = canvasWidth
-    this.#canvas.height = this.options.pixelOffset + canvasHeight
+    this._canvas.width = canvasWidth
+    this._canvas.height = this.options.pixelOffset + canvasHeight
     const linearGradient = ctx.createLinearGradient(
       0,
       0,
@@ -559,14 +558,14 @@ class LabelObject extends Base {
     ctx.stroke()
     ctx.closePath()
 
-    const ctx2 = this.#canvas2.getContext('2d')
-    this.#canvas2.width = this.#canvas.width + 10
-    this.#canvas2.height = this.#canvas.height + 10
-    ctx2.drawImage(this.#canvas, 5, 5);
+    const ctx2 = this._canvas2.getContext('2d')
+    this._canvas2.width = this._canvas.width + 10
+    this._canvas2.height = this._canvas.height + 10
+    ctx2.drawImage(this._canvas, 5, 5);
 
     // const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
     // ctx.putImageData(imageData, 40, 40);
-    return this.#canvas2.toDataURL("image/png")
+    return this._canvas2.toDataURL("image/png")
   }
 
   remove() {

src/Obj/Base/PincerArrowObject/index.js

@@ -28,7 +28,6 @@ class PincerArrowObject extends Base {
    * @param options.color='rgba(255, 0, 0, 0.5)' {string} 颜色
    * @param options.height {number} 高度
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
-   * @param options.areaUnit='平方米' {string} 面积单位
    * @param options.line {object} 边框
    * @param options.line.width=2 {string} 边框宽
    * @param options.line.color="rgba(155, 155, 124, 0.89)" {string} 边框颜色
@@ -83,7 +82,6 @@ class PincerArrowObject extends Base {
     this.options.line = options.line || {}
     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
     this.options.spreadState = options.spreadState || false
@@ -113,13 +111,10 @@ class PincerArrowObject extends Base {
     this.options.attribute = options.attribute || {}
     this.options.attribute.link = this.options.attribute.link || {}
     this.options.attribute.link.content = this.options.attribute.link.content || []
-    this.options.attribute.camera = this.options.attribute.camera || {}
-    this.options.attribute.camera.content = this.options.attribute.camera.content || []
-    this.options.attribute.vr = this.options.attribute.vr || {}
-    this.options.attribute.vr.content = this.options.attribute.vr.content || []
-    this.options.attribute.goods = this.options.attribute.goods || {}
-    this.options.attribute.goods.content = this.options.attribute.goods.content || []
-    this.options.attributeType = options.attributeType || 'richText'
+
+    delete this.options.attribute.camera
+    delete this.options.attribute.vr
+    delete this.options.attribute.goods
 
     if (!this.options.positions || this.options.positions.length < 5) {
       this._error = '双箭头最少需要五个坐标！'
@@ -208,7 +203,7 @@ class PincerArrowObject extends Base {
         return
       }
       let heightModeName = ''
-      PincerArrowObject.closeNodeEdit(this)
+      this.closeNodeEdit()
       let ground = false
       let disabled = false
       this.renewPositions()
@@ -332,45 +327,6 @@ class PincerArrowObject extends Base {
     })
   }
 
-  get area() {
-    return this.options.area
-  }
-
-  set area(v) {
-    this.options.area = v
-    this._elms.area && this._elms.area.forEach((item) => {
-      item.value = v
-    })
-  }
-
-  get areaUnit() {
-    return this.options['area-unit']
-  }
-  set areaUnit(v) {
-    this.options['area-unit'] = v
-    this._elms.areaUnit && this._elms.areaUnit.forEach((item) => {
-      item.value = v
-    })
-    if (this.options.areaByMeter) {
-      switch (v) {
-        case '平方米':
-          this.area = this.options.areaByMeter
-          break;
-        case '平方千米':
-          this.area = Number((this.options.areaByMeter / 1000000).toFixed(8))
-          break;
-        case '亩':
-          this.area = Number((this.options.areaByMeter / 666.6666667).toFixed(4))
-          break;
-        case '公顷':
-          this.area = Number((this.options.areaByMeter / 10000).toFixed(6))
-          break;
-        default:
-          this.area = this.options.areaByMeter
-      }
-    }
-  }
-
   get labelShow() {
     return this.options.label.show
   }
@@ -582,320 +538,6 @@ class PincerArrowObject extends Base {
     }
   }
 
-  get attributeType() {
-    return this.options.attributeType
-  }
-
-  set attributeType(v) {
-    this.options.attributeType = v
-    this._elms.attributeType && this._elms.attributeType.forEach((item) => {
-      item.value = v
-    })
-    let attributeContent = this._DialogObject._element.content.getElementsByClassName('attribute-content')
-    for (let i = 0; i < attributeContent.length; i++) {
-      if (attributeContent[i].className.indexOf('attribute-content-' + v) > -1) {
-        attributeContent[i].style.display = 'block';
-      }
-      else {
-        attributeContent[i].style.display = 'none';
-      }
-    }
-  }
-
-  get attributeLink() {
-    return this.options.attribute.link.content
-  }
-
-  set attributeLink(v) {
-    this.options.attribute.link.content = v
-    if (!this._DialogObject || !this._DialogObject._element || !this._DialogObject._element.content || this._DialogObject._element.content.getElementsByClassName('attribute-content-link').length == 0) {
-      return
-    }
-    let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-link')[1].getElementsByClassName('table')[0]
-    let tableContent = table.getElementsByClassName('table-body')[0]
-    tableContent.innerHTML = ''
-    if (this.options.attribute.link.content.length > 0) {
-      table.getElementsByClassName('table-empty')[0].style.display = 'none'
-    }
-    else {
-      table.getElementsByClassName('table-empty')[0].style.display = 'flex'
-    }
-    for (let i = 0; i < this.options.attribute.link.content.length; i++) {
-      let tr = `
-      <div class="tr">
-          <div class="td">` + this.options.attribute.link.content[i].name + `</div>
-          <div class="td">` + this.options.attribute.link.content[i].url + `</div>
-          <div class="td">
-              <button @click="linkEdit">编辑</button>
-              <button @click="linkDelete">删除</button>
-          </div>
-      </div>`
-      let trElm = document.createRange().createContextualFragment(tr)
-      tableContent.appendChild(trElm)
-    }
-    let item = tableContent.getElementsByClassName('tr')
-    let fun = {
-      linkEdit: async (index) => {
-        this.attributeLink = await this.options.attribute.link.content
-        let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-link')[1].getElementsByClassName('table')[0]
-        let tableContent = table.getElementsByClassName('table-body')[0]
-        let item = tableContent.getElementsByClassName('tr')
-        for (let i = 0; i < item.length; i++) {
-          if (index === i) {
-            let height = item[i].offsetHeight
-            let html = `
-              <div class="td">
-                <input class="input" type="text">
-              </div>
-              <div class="td">
-                <textarea class="input link-edit" type="text"></textarea>
-              </div>
-              <div class="td">
-                  <button @click="confirmEdit">确认</button>
-                  <button @click="cancelEdit">取消</button>
-              </div>`
-            item[i].innerHTML = html
-            let textareaElm = item[i].getElementsByClassName('link-edit')[0]
-            textareaElm.style.height = (height - 10) + 'px'
-            let td = item[i].getElementsByClassName('td')
-            td[0].getElementsByClassName('input')[0].value = this.options.attribute.link.content[index].name
-            td[1].getElementsByClassName('input')[0].value = this.options.attribute.link.content[index].url
-            let btn = item[i].getElementsByTagName('button')
-            for (let n = 0; n < btn.length; n++) {
-              if (!btn[n] || !btn[n].attributes) {
-                continue
-              }
-              for (let m of btn[n].attributes) {
-                if (m.name === '@click') {
-                  btn[n].addEventListener('click', (e) => {
-                    if (typeof (fun[m.value]) === 'function') {
-                      fun[m.value]({ name: td[0].getElementsByClassName('input')[0].value, url: td[1].getElementsByClassName('input')[0].value }, i)
-                    }
-                  });
-                  btn[n].attributes.removeNamedItem(m.name)
-                  break
-                }
-              }
-            }
-            break
-          }
-        }
-      },
-      linkDelete: (i) => {
-        this.options.attribute.link.content.splice(i, 1)
-        this.attributeLink = this.options.attribute.link.content
-      },
-
-      confirmEdit: (value, i) => {
-        let name = value.name && value.name.replace(/\s/g, "")
-        let url = value.url && value.url.replace(/\s/g, "")
-        if (name && url) {
-          this.options.attribute.link.content[i] = value
-        }
-        else {
-          window.ELEMENT && window.ELEMENT.Message({
-            message: '名称或链接不能为空！',
-            type: 'warning',
-            duration: 1500
-          });
-        }
-        this.attributeLink = this.options.attribute.link.content
-      },
-      cancelEdit: () => {
-        this.attributeLink = this.options.attribute.link.content
-      },
-      fileSelect: (value, i) => {
-        let fileElm = item[i].getElementsByClassName('file-select')[0]
-        fileElm.click()
-        fileElm.removeEventListener('change', fileSelect)
-        fileElm.addEventListener('change', fileSelect)
-      }
-    }
-    let fileSelect = (event) => {
-      if (event.target.value) {
-        let td = item[event.target.getAttribute('index')].getElementsByClassName('td')
-        td[1].getElementsByClassName('input')[0].value = event.target.value
-        event.target.value = null
-      }
-    }
-    for (let i = 0; i < item.length; i++) {
-      let btn = item[i].getElementsByTagName('button')
-      for (let n = 0; n < btn.length; n++) {
-        if (!btn[n] || !btn[n].attributes) {
-          continue
-        }
-        for (let m of btn[n].attributes) {
-          if (m.name === '@click') {
-            btn[n].addEventListener('click', (e) => {
-              if (typeof (fun[m.value]) === 'function') {
-                fun[m.value](i)
-              }
-            });
-            btn[n].attributes.removeNamedItem(m.name)
-            break
-          }
-        }
-      }
-    }
-
-
-
-
-  }
-
-  get attributeCamera() {
-    return this.options.attribute.camera.content
-  }
-
-  set attributeCamera(v) {
-    this.options.attribute.camera.content = v
-  }
-
-  get attributeVr() {
-    return this.options.attribute.vr.content
-  }
-
-  set attributeVr(v) {
-    this.options.attribute.vr.content = v
-    if (!this._DialogObject || !this._DialogObject._element || !this._DialogObject._element.content || this._DialogObject._element.content.getElementsByClassName('attribute-content-vr').length == 0) {
-      return
-    }
-    let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-vr')[1].getElementsByClassName('table')[0]
-    let tableContent = table.getElementsByClassName('table-body')[0]
-    tableContent.innerHTML = ''
-    if (this.options.attribute.vr.content.length > 0) {
-      table.getElementsByClassName('table-empty')[0].style.display = 'none'
-    }
-    else {
-      table.getElementsByClassName('table-empty')[0].style.display = 'flex'
-    }
-    for (let i = 0; i < this.options.attribute.vr.content.length; i++) {
-      let tr = `
-      <div class="tr">
-          <div class="td">` + this.options.attribute.vr.content[i].name + `</div>
-          <div class="td">` + this.options.attribute.vr.content[i].url + `</div>
-          <div class="td">
-              <button @click="vrEdit">编辑</button>
-              <button @click="vrDelete">删除</button>
-          </div>
-      </div>`
-      let trElm = document.createRange().createContextualFragment(tr)
-      tableContent.appendChild(trElm)
-    }
-    let item = tableContent.getElementsByClassName('tr')
-    let fun = {
-      vrEdit: async (index) => {
-        this.attributeVr = await this.options.attribute.vr.content
-        let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-vr')[1].getElementsByClassName('table')[0]
-        let tableContent = table.getElementsByClassName('table-body')[0]
-        let item = tableContent.getElementsByClassName('tr')
-        for (let i = 0; i < item.length; i++) {
-          if (index === i) {
-            let height = item[i].offsetHeight
-            let html = `
-              <div class="td">
-                <input class="input" type="text">
-              </div>
-              <div class="td">
-                <textarea class="input link-edit" type="text"></textarea>
-              </div>
-              <div class="td">
-                  <button @click="confirmEdit">确认</button>
-                  <button @click="cancelEdit">取消</button>
-              </div>`
-            item[i].innerHTML = html
-            let textareaElm = item[i].getElementsByClassName('link-edit')[0]
-            textareaElm.style.height = (height - 10) + 'px'
-            let td = item[i].getElementsByClassName('td')
-            td[0].getElementsByClassName('input')[0].value = this.options.attribute.vr.content[index].name
-            td[1].getElementsByClassName('input')[0].value = this.options.attribute.vr.content[index].url
-            let btn = item[i].getElementsByTagName('button')
-            for (let n = 0; n < btn.length; n++) {
-              if (!btn[n] || !btn[n].attributes) {
-                continue
-              }
-              for (let m of btn[n].attributes) {
-                if (m.name === '@click') {
-                  btn[n].addEventListener('click', (e) => {
-                    if (typeof (fun[m.value]) === 'function') {
-                      fun[m.value]({ name: td[0].getElementsByClassName('input')[0].value, url: td[1].getElementsByClassName('input')[0].value }, i)
-                    }
-                  });
-                  btn[n].attributes.removeNamedItem(m.name)
-                  break
-                }
-              }
-            }
-            break
-          }
-        }
-      },
-      vrDelete: (i) => {
-        this.options.attribute.vr.content.splice(i, 1)
-        this.attributeVr = this.options.attribute.vr.content
-      },
-
-      confirmEdit: (value, i) => {
-        let name = value.name && value.name.replace(/\s/g, "")
-        let url = value.url && value.url.replace(/\s/g, "")
-        if (name && url) {
-          this.options.attribute.vr.content[i] = value
-        }
-        else {
-          window.ELEMENT && window.ELEMENT.Message({
-            message: '名称或链接不能为空！',
-            type: 'warning',
-            duration: 1500
-          });
-        }
-        this.attributeVr = this.options.attribute.vr.content
-      },
-      cancelEdit: () => {
-        this.attributeVr = this.options.attribute.vr.content
-      },
-      fileSelect: (value, i) => {
-        let fileElm = item[i].getElementsByClassName('file-select')[0]
-        fileElm.click()
-        fileElm.removeEventListener('change', fileSelect)
-        fileElm.addEventListener('change', fileSelect)
-      }
-    }
-    let fileSelect = (event) => {
-      if (event.target.value) {
-        let td = item[event.target.getAttribute('index')].getElementsByClassName('td')
-        td[1].getElementsByClassName('input')[0].value = event.target.value
-        event.target.value = null
-      }
-    }
-    for (let i = 0; i < item.length; i++) {
-      let btn = item[i].getElementsByTagName('button')
-      for (let n = 0; n < btn.length; n++) {
-        if (!btn[n] || !btn[n].attributes) {
-          continue
-        }
-        for (let m of btn[n].attributes) {
-          if (m.name === '@click') {
-            btn[n].addEventListener('click', (e) => {
-              if (typeof (fun[m.value]) === 'function') {
-                fun[m.value](i)
-              }
-            });
-            btn[n].attributes.removeNamedItem(m.name)
-            break
-          }
-        }
-      }
-    }
-  }
-
-  get attributeGoods() {
-    return this.options.attribute.goods.content
-  }
-
-  set attributeGoods(v) {
-    this.options.attribute.goods.content = v
-  }
-
   static create(that) {
     let positions = that.options.positions
     let fromDegreesArray = []
@@ -939,9 +581,10 @@ class PincerArrowObject extends Base {
         break
     }
 
-    if (!that.options.label.position) {
-      that.options.label.position = { lng: centroid.geometry.coordinates[0], lat: centroid.geometry.coordinates[1], alt: that.height + height }
-    }
+    // if (!that.options.label.position) {
+    //   that.options.label.position = { lng: centroid.geometry.coordinates[0], lat: centroid.geometry.coordinates[1], alt: that.height + height }
+    // }
+    that.options.label.position = { lng: centroid.geometry.coordinates[0], lat: centroid.geometry.coordinates[1], alt: that.height + height }
 
     let fromDegreesArray2 = []
     for (let i = 0; i < points[0].length; i++) {
@@ -959,7 +602,7 @@ class PincerArrowObject extends Base {
         color: that.options.color
       })
     }
-    that.options.label.ground = ground
+    // that.options.label.ground = ground
 
     that.positionsH = Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArray2)
 
@@ -987,23 +630,8 @@ class PincerArrowObject extends Base {
     for (let i = 0; i < positionsA.length; i++) {
       pos84.push(that.cartesian3Towgs84(positionsA[i], that.sdk.viewer))
     }
-    that.options.areaByMeter = that.computeArea(pos84);
-    switch (that.options['area-unit']) {
-      case '平方米':
-        that.options.area = that.options.areaByMeter
-        break;
-      case '平方千米':
-        that.options.area = Number((that.options.areaByMeter / 1000000).toFixed(8))
-        break;
-      case '亩':
-        that.options.area = Number((that.options.areaByMeter / 666.6666667).toFixed(4))
-        break;
-      case '公顷':
-        that.options.area = Number((that.options.areaByMeter / 10000).toFixed(6))
-        break;
-      default:
-        that.options.area = that.options.areaByMeter
-    }
+    that.areaByMeter = that.computeArea(pos84);
+    that.areaChangeCallBack && that.areaChangeCallBack()
     syncData(that.sdk, that.options.id)
     if (that.options.show) {
 
@@ -1030,12 +658,13 @@ class PincerArrowObject extends Base {
       scaleByDistance: that.options.label.scaleByDistance,
       near: that.options.label.near,
       far: that.options.label.far,
-      ground: that.options.label.ground,
+      // ground: that.options.label.ground,
     })
   }
 
   // 编辑框
   async edit(state) {
+    return
     if (this._error) {
       return
     }
@@ -1534,8 +1163,6 @@ class PincerArrowObject extends Base {
     this.color = this.originalOptions.color
     this.lineColor = this.originalOptions.line.color
     this.lineWidth = this.originalOptions.line.width
-    this.area = this.originalOptions.area
-    this.areaUnit = this.originalOptions['area-unit']
     this.labelShow = this.originalOptions.label.show
     this.labelColor = this.originalOptions.label.color
     this.labelFontSize = this.originalOptions.label.fontSize
@@ -1548,12 +1175,7 @@ class PincerArrowObject extends Base {
     this.labelLineColor = this.originalOptions.label.lineColor
     this.labelBackgroundColorStart = this.originalOptions.label.backgroundColor[0]
     this.labelBackgroundColorEnd = this.originalOptions.label.backgroundColor[1]
-    this.attributeLink = this.options.attribute.link.content
-    this.attributeVr = this.options.attribute.vr.content
-    this.attributeCamera = this.options.attribute.camera.content
-    this.attributeGoods = this.options.attribute.goods.content
-    this.cameraSelect && this.cameraSelect()
-    this.goodsSelect && this.goodsSelect()
+
 
     for (let i = 0; i < this.options.positions.length; i++) {
       if (this._elms.lng && this._elms.lng[i]) {
@@ -1607,51 +1229,6 @@ class PincerArrowObject extends Base {
     await syncData(this.sdk, this.options.id)
   }
 
-  _addLink() {
-    // document.getElementsByClassName
-    if (this._DialogObject._element.content.getElementsByClassName('link_add')[0].value) {
-      this.options.attribute.link.content.push({
-        name: '链接',
-        url: this._DialogObject._element.content.getElementsByClassName('link_add')[0].value
-      })
-      this._DialogObject._element.content.getElementsByClassName('link_add')[0].value = ''
-      this.attributeLink = this.options.attribute.link.content
-    }
-    else {
-      this.Dialog.clickAddLink && this.Dialog.clickAddLink()
-    }
-  }
-
-  addAttributeLink(link) {
-    this.options.attribute.link.content.push({
-      name: '链接',
-      url: link
-    })
-    this.attributeLink = this.options.attribute.link.content
-  }
-
-  _addRr() {
-    if (this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value) {
-      this.options.attribute.vr.content.push({
-        name: '全景图' ,
-        url: this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value
-      })
-      this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value = ''
-      this.attributeVr = this.options.attribute.vr.content
-    }
-    else {
-      this.Dialog.clickAddVr && this.Dialog.clickAddVr()
-    }
-  }
-
-  addAttributeRr(vr) {
-    this.options.attribute.vr.content.push({
-      name: '全景图' ,
-      url: vr
-    })
-    this.attributeVr = this.options.attribute.vr.content
-  }
-
   /**
    * 飞到
   */
@@ -1852,6 +1429,11 @@ class PincerArrowObject extends Base {
           positions: [...this.positions]
         }
         this.positionEditing = false
+
+        if(this._positionEditingCallback) {
+          this._positionEditingCallback()
+          this._positionEditingCallback = null
+        }
       })
       this.event.mouse_right((movement, cartesian) => {
         this.positionEditing = false
@@ -1954,208 +1536,122 @@ class PincerArrowObject extends Base {
   get positionEditing() {
     return this.operate.positionEditing
   }
-
-  static EventBinding(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') {
-                  if (e.data != '.' && (e.data != '-' || e.target.value)) {
-                    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)
-                    }
-                    that[m.value] = value
-                  }
-                }
-                else {
-                  that[m.value] = value
-                }
-              })
-              if (elements[i].nodeName == 'IMG') {
-                elements[i].src = that[m.value]
-              }
-              else {
-                elements[i].value = that[m.value]
-              }
-            }
-            if (that._elms[m.value]) {
-              that._elms[m.value].push(elements[i])
-            }
-            else {
-              that._elms[m.value] = [elements[i]]
-            }
-            removeName.push(m.name)
-            break;
-          }
-          case '@click': {
-            elements[i].addEventListener('click', (e) => {
-              if (typeof (that[m.value]) === 'function') {
-                that[m.value](e)
-              }
-            });
-            removeName.push(m.name)
-            // elements[i].attributes.removeNamedItem(m.name)
-            break;
-          }
-          case '@change': {
-            isEvent = true
-            Event.push((e) => {
-              let value = e.target.value
-              if (e.target.type == 'number' && value != '') {
-                value = Number(value)
-                e.target.value = value
-              }
-              if (typeof (that[m.value]) === 'function') {
-                that[m.value](e, value)
-              }
-            })
-            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'
-        }
-        if (elements[i].className.indexOf('blur') !== -1) {
-          ventType = 'blur'
-        }
-        elements[i].addEventListener(ventType, (e) => {
-          for (let t = 0; t < Event.length; t++) {
-            Event[t](e)
-          }
-        });
-      }
-    }
+  openPositionEditing(cd) {
+    this.positionEditing = true
+    this._positionEditingCallback = cd
+  }
+  get areaChangeCallBack() {
+    return this._areaChangeCallBack
   }
 
-  static nodeEdit(that, cb = () => { }) {
-    that.positionEditing = false
+  set areaChangeCallBack (cd) {
+    this._areaChangeCallBack = cd
+  }
+
+
+  nodeEdit(cb = () => { }) {
+    this.positionEditing = false
     setTimeout(() => {
       if (YJ.Measure.GetMeasureStatus()) {
         cb('上一次测量未结束')
       } else {
-        that.removeAnimate()
+        this.removeAnimate()
+        let _this = this
         YJ.Measure.SetMeasureStatus(true)
-        that.tip = new MouseTip('请选择一个顶点，右键取消', that.sdk)
-        that.event = new MouseEvent(that.sdk)
-        that.nodePoints = []
+        this.tip = new MouseTip('请选择一个顶点，右键取消', this.sdk)
+        this.event = new MouseEvent(this.sdk)
+        this.nodePoints = []
         let selectPoint
         let originalPosition
-        let optionsPositions = [...that.options.positions]
+        let optionsPositions = [...this.options.positions]
 
         let leftEvent = (movement, cartesian) => {
           if (selectPoint) {
-            that.options.positions[selectPoint.index] = that.cartesian3Towgs84(cartesian, that.sdk.viewer)
-            optionsPositions[selectPoint.index] = that.options.positions[selectPoint.index]
+            this.options.positions[selectPoint.index] = this.cartesian3Towgs84(cartesian, this.sdk.viewer)
+            optionsPositions[selectPoint.index] = this.options.positions[selectPoint.index]
             let index = selectPoint.index
-            let entity = that.sdk.viewer.entities.add({
+            let entity = this.sdk.viewer.entities.add({
               name: 'node-secondary-edit-point',
               index: index,
               position: Cesium.Cartesian3.fromDegrees(optionsPositions[selectPoint.index].lng, optionsPositions[selectPoint.index].lat, optionsPositions[selectPoint.index].alt),
               billboard: {
-                image: that.getSourceRootPath() + '/img/point.png',
+                image: this.getSourceRootPath() + '/img/point.png',
                 width: 15,
                 height: 15,
                 disableDepthTestDistance: Number.POSITIVE_INFINITY,
                 color: Cesium.Color.WHITE.withAlpha(0.99)
               },
             })
-            that.nodePoints.splice(selectPoint.index, 0, entity)
+            this.nodePoints.splice(selectPoint.index, 0, entity)
             selectPoint = null
-            that.tip.set_text('请选择一个顶点，右键取消')
+            this.tip.set_text('请选择一个顶点，右键取消')
           }
           else {
-            var pick = that.sdk.viewer.scene.pick(movement.position);
+            var pick = this.sdk.viewer.scene.pick(movement.position);
             if (pick && pick.id && pick.id.name && pick.id.name === 'node-secondary-edit-point') {
               selectPoint = pick.id
-              originalPosition = that.cartesian3Towgs84(pick.id.position.getValue(), that.sdk.viewer)
-              that.nodePoints.splice(pick.id.index, 1)
-              that.sdk.viewer.entities.remove(pick.id)
-              that.tip.set_text('左键确定，右键取消')
+              originalPosition = this.cartesian3Towgs84(pick.id.position.getValue(), this.sdk.viewer)
+              this.nodePoints.splice(pick.id.index, 1)
+              this.sdk.viewer.entities.remove(pick.id)
+              this.tip.set_text('左键确定，右键取消')
             }
           }
-          that.renewPositions()
-          that.tip.setPosition(
+          this.renewPositions()
+          this.tip.setPosition(
             cartesian,
             movement.position.x,
             movement.position.y
           )
         }
         let rightEvent = () => {
-          that.event.mouse_move(() => { })
-          that.event.mouse_left(() => { })
-          that.event.mouse_right(() => { })
-          that.event.gesture_pinck_start(() => { })
+          this.event.mouse_move(() => { })
+          this.event.mouse_left(() => { })
+          this.event.mouse_right(() => { })
+          this.event.gesture_pinck_start(() => { })
           if (selectPoint) {
             optionsPositions[selectPoint.index] = originalPosition
-            if (that._elms.lng && that._elms.lng[selectPoint.index]) {
-              that._elms.lng[selectPoint.index].innerHTML = that.options.positions[selectPoint.index].lng.toFixed(8)
+            if (this._elms.lng && this._elms.lng[selectPoint.index]) {
+              this._elms.lng[selectPoint.index].innerHTML = this.options.positions[selectPoint.index].lng.toFixed(8)
             }
-            if (that._elms.lat && that._elms.lat[selectPoint.index]) {
-              that._elms.lat[selectPoint.index].innerHTML = that.options.positions[selectPoint.index].lat.toFixed(8)
+            if (this._elms.lat && this._elms.lat[selectPoint.index]) {
+              this._elms.lat[selectPoint.index].innerHTML = this.options.positions[selectPoint.index].lat.toFixed(8)
             }
             cb(null, optionsPositions)
           }
-          that.options.positions = [...optionsPositions]
-          that.heightMode = that.heightMode
-          that.previous = null
+          this.options.positions = [...optionsPositions]
+          this.heightMode = this.heightMode
+          this.previous = null
         }
 
 
-        that.entity.polyline.clampToGround = true
-        that.entity.polyline.arcType = Cesium.ArcType.GEODESIC
-        that.entity.polygon.perPositionHeight = false
-        that.entity.polygon.hierarchy = new Cesium.CallbackProperty(function () {
-          return new Cesium.PolygonHierarchy(that.positionsH)
+        this.entity.polyline.clampToGround = true
+        this.entity.polyline.arcType = Cesium.ArcType.GEODESIC
+        this.entity.polygon.perPositionHeight = false
+        this.entity.polygon.hierarchy = new Cesium.CallbackProperty(function () {
+          return new Cesium.PolygonHierarchy(_this.positionsH)
         }, false)
-        that.entity.polyline.positions = new Cesium.CallbackProperty(function () {
-          return [...that.positionsH, that.positionsH[0], that.positionsH[1]]
+        this.entity.polyline.positions = new Cesium.CallbackProperty(function () {
+          return [..._this.positionsH, _this.positionsH[0], _this.positionsH[1]]
         }, false)
 
         setTimeout(() => {
-          that.event.mouse_left(leftEvent)
+          this.event.mouse_left(leftEvent)
 
-          that.event.mouse_right(rightEvent)
+          this.event.mouse_right(rightEvent)
 
-          that.event.mouse_move((movement, cartesian) => {
+          this.event.mouse_move((movement, cartesian) => {
             if (selectPoint) {
-              that.options.positions[selectPoint.index] = that.cartesian3Towgs84(cartesian, that.sdk.viewer)
-              that.renewPositions()
+              this.options.positions[selectPoint.index] = this.cartesian3Towgs84(cartesian, this.sdk.viewer)
+              this.renewPositions()
             }
-            that.tip.setPosition(
+            this.tip.setPosition(
               cartesian,
               movement.endPosition.x,
               movement.endPosition.y
             )
           })
 
-          that.event.gesture_pinck_start((movement, cartesian) => {
+          this.event.gesture_pinck_start((movement, cartesian) => {
             let startTime = new Date()
             let pos = {
               position: {
@@ -2163,7 +1659,7 @@ class PincerArrowObject extends Base {
                 y: (movement.position1.y + movement.position2.y) / 2
               }
             }
-            that.event.gesture_pinck_end(() => {
+            this.event.gesture_pinck_end(() => {
               let endTime = new Date()
               if (endTime - startTime >= 500) {
                 // 长按取消
@@ -2178,23 +1674,23 @@ class PincerArrowObject extends Base {
 
           let points = [[]]
           let pos84 = []
-          for (let i = 0; i < that.positionsH.length; i++) {
-            let position = that.cartesian3Towgs84(that.positionsH[i], that.sdk.viewer)
+          for (let i = 0; i < this.positionsH.length; i++) {
+            let position = this.cartesian3Towgs84(this.positionsH[i], this.sdk.viewer)
             pos84.push(position)
             points[0].push([position.lng, position.lat])
           }
-          let position = that.cartesian3Towgs84(that.positionsH[0], that.sdk.viewer)
+          let position = this.cartesian3Towgs84(this.positionsH[0], this.sdk.viewer)
           points[0].push([position.lng, position.lat])
           let polygon = turf.polygon(points)
           let centroid = turf.pointOnFeature(polygon)
-          let objectsToExclude = [...that.sdk.viewer.entities.values]
-          that
+          let objectsToExclude = [...this.sdk.viewer.entities.values]
+          this
             .getClampToHeight({
               lng: centroid.geometry.coordinates[0],
               lat: centroid.geometry.coordinates[1]
             }, objectsToExclude)
             .then(height => {
-              that.label.position = [
+              this.label.position = [
                 centroid.geometry.coordinates[0],
                 centroid.geometry.coordinates[1],
                 height
@@ -2203,39 +1699,39 @@ class PincerArrowObject extends Base {
           createNodePoints()
         }, 200);
         async function createNodePoints() {
-          let objectsToExclude = [...that.sdk.viewer.entities.values]
+          let objectsToExclude = [..._this.sdk.viewer.entities.values]
           for (let i = 0; i < optionsPositions.length; i++) {
-            let height = await that.getClampToHeight(that.options.positions[i], objectsToExclude)
-            let entity = that.sdk.viewer.entities.add({
+            let height = await _this.getClampToHeight(_this.options.positions[i], objectsToExclude)
+            let entity = _this.sdk.viewer.entities.add({
               name: 'node-secondary-edit-point',
               index: i,
               position: Cesium.Cartesian3.fromDegrees(optionsPositions[i].lng, optionsPositions[i].lat, height),
               billboard: {
-                image: that.getSourceRootPath() + '/img/point.png',
+                image: _this.getSourceRootPath() + '/img/point.png',
                 width: 15,
                 height: 15,
                 disableDepthTestDistance: Number.POSITIVE_INFINITY,
                 color: Cesium.Color.WHITE.withAlpha(0.99)
               },
             })
-            that.nodePoints.push(entity)
+            _this.nodePoints.push(entity)
           }
         }
       }
     }, 0);
   }
 
-  static closeNodeEdit(that) {
+  closeNodeEdit() {
     YJ.Measure.SetMeasureStatus(false)
-    that.event && that.event.destroy()
-    that.tip && that.tip.destroy()
-    that.tip = null
+    this.event && this.event.destroy()
+    this.tip && this.tip.destroy()
+    this.tip = null
 
-    for (let i = 0; i < that.nodePoints.length; i++) {
-      that.sdk.viewer.entities.remove(that.nodePoints[i])
+    for (let i = 0; i < this.nodePoints.length; i++) {
+      this.sdk.viewer.entities.remove(this.nodePoints[i])
     }
-    that.nodePoints = []
-    that.picking = true
+    this.nodePoints = []
+    this.picking = true
   }
 
   setPosition(v) {
@@ -2673,8 +2169,8 @@ class PincerArrowObject extends Base {
 
     // 计算投影面积
     if (!this.spreadState) {
-      this.options.areaByMeter = this.computeArea(pos84)
-      this.areaUnit = this.areaUnit
+      this.areaByMeter = this.computeArea(pos84)
+      this.areaChangeCallBack && this.areaChangeCallBack()
     }
     return fromDegreesArray
   }

src/Obj/Base/RoutePlanning/index.js

@@ -195,22 +195,23 @@ class RoutePlanning extends Base {
       this._element_style.type = 'text/css'
       this._element_style.setAttribute('data-name', 'YJ_style_dialog')
       this._element_style.innerHTML = css()
-      this._DialogObject = await new Dialog(this.sdk.viewer._container, {
-        title: '路径规划',
-        closeCallBack: () => {
-          this.tip && this.tip.destroy()
-          this.event && this.event.destroy()
-          this.Dialog.closeCallBack && this.Dialog.closeCallBack()
-        }
-      })
-      await this._DialogObject.init()
+      // this._DialogObject = await new Dialog(this.sdk.viewer._container, {
+      //   title: '路径规划',
+      //   closeCallBack: () => {
+      //     this.tip && this.tip.destroy()
+      //     this.event && this.event.destroy()
+      //     this.Dialog.closeCallBack && this.Dialog.closeCallBack()
+      //   }
+      // })
+      // await this._DialogObject.init()
 
       let div = document.createElement('div')
       div.style.position = 'absolute'
       div.style.left = '24px'
       div.style.flet = '0'
       div.style.display = 'flex'
-      this._DialogObject.footAppChild(div)
+      document.getElementsByClassName('RoutePlanning')[0].getElementsByClassName('foot')[0].appendChild(div)
+      // this._DialogObject.footAppChild(div)
 
       let queryBtn = document.createElement('button')
       queryBtn.className = 'default'
@@ -285,10 +286,10 @@ class RoutePlanning extends Base {
       div.appendChild(cleanBtn)
 
       document.getElementsByTagName('head')[0].appendChild(this._element_style)
-      let contentElm = document.createElement('div')
-      contentElm.innerHTML = html()
-      this._DialogObject.contentAppChild(contentElm)
-
+      // let contentElm = document.createElement('div')
+      // contentElm.innerHTML = html()
+      // this._DialogObject.contentAppChild(contentElm)
+      let contentElm = document.getElementsByClassName('RoutePlanning')[0]
       if (this.options.gps) {
         let locateCurrentBtn = document.createElement('button')
         locateCurrentBtn.innerHTML = '当前位置'
@@ -300,7 +301,7 @@ class RoutePlanning extends Base {
         let startColElm = contentElm.getElementsByClassName('start-col')[0]
         startColElm.appendChild(locateCurrentBtn)
 
-        let endPickBtnElm = this._DialogObject._element.body.getElementsByClassName(
+        let endPickBtnElm = contentElm._element.body.getElementsByClassName(
           'end-pick-btn'
         )[0]
         endPickBtnElm.style.marginRight = '91px'

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

@@ -17,6 +17,7 @@ class GroundText extends Base {
    * @param options.id {string} 唯一标识
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.text {string} 文字
+   * @param options.color=#FFC107 {string} 颜色
    * @param options.angle=0 {number} 旋转角度
    * @param options.scale=1 {number} 缩放比例
    * @param options.speed=1 {number} 文字滚动速度
@@ -49,20 +50,21 @@ class GroundText extends Base {
       textArray.splice(70 - textArray.length)
     }
     this.options.text = textArray.join('\n')
-    this.options.name = this.options.text
     this.options.show =
       options.show || options.show === false ? options.show : true
     this.options.angle = options.angle || 0
     this.options.scale =
       options.scale || options.scale === 0 ? options.scale : 1
-    this.options.fontSize = options.fontSize || 20
-    this.options.duration =
-      options.duration || options.duration === 0 ? options.duration : 50000
+    // this.options.fontSize = options.fontSize || 20
+    // this.options.duration =
+    //   options.duration || options.duration === 0 ? options.duration : 50000
     this.options.speed =
       options.speed || options.speed === 0 ? options.speed : 1
     this.options.color = options.color || '#FFC107'
     this.options.position = options.position
 
+    delete this.options.name
+
     if (!this.options.position && this.options.positions) {
       this.options.position = { lng: (this.options.positions[0].lng + this.options.positions[1].lng) / 2, lat: (this.options.positions[0].lat + this.options.positions[1].lat) / 2 }
       let point1 = turf.point([this.options.positions[0].lng, this.options.positions[0].lat]);
@@ -70,7 +72,7 @@ class GroundText extends Base {
 
       let options = { units: 'miles' };
       let distance1 = turf.rhumbDistance(point1, point2, options);
-      
+
 
       // 计算两点与x轴正方向的夹角（弧度）
       function calculateAngle(pointA, pointB) {
@@ -80,7 +82,7 @@ class GroundText extends Base {
       }
 
       let angleRadians = calculateAngle([this.options.positions[0].lng, this.options.positions[0].lat], [this.options.positions[1].lng, this.options.positions[1].lat]);
-      this.options.angle = (360+Cesium.Math.toDegrees(angleRadians))%360
+      this.options.angle = (360 + Cesium.Math.toDegrees(angleRadians)) % 360
 
       let gap =
         Math.abs(Math.cos((Math.PI / 180) * this.options.position.lat)) *
@@ -98,10 +100,11 @@ class GroundText extends Base {
       let to = turf.point([lng2, lat]);
       let distance2 = turf.rhumbDistance(from, to, options);
       let latRadians = Cesium.Math.toRadians(this.options.position.lat)
-      distance2 = distance2 * (1+(Math.abs(Math.sin(angleRadians)*Math.tan(latRadians)*Math.sin(latRadians)*Math.sin(latRadians))))
+      distance2 = distance2 * (1 + (Math.abs(Math.sin(angleRadians) * Math.tan(latRadians) * Math.sin(latRadians) * Math.sin(latRadians))))
       this.options.scale = distance1 / distance2
     }
 
+    this.duration = 50000
     this.entity
     this._positionEditing = false
     this.Dialog = _Dialog
@@ -137,6 +140,9 @@ class GroundText extends Base {
     })
   }
 
+  get name() {
+    return
+  }
   get text() {
     return this.options.text
   }
@@ -172,7 +178,7 @@ class GroundText extends Base {
         image: canvas.toDataURL('image/png'),
         color: this.options.color,
         repeat: new Cesium.Cartesian2(1.0, 1.0),
-        duration: this.options.duration / this.options.speed,
+        duration: this.duration / this.options.speed,
         fltr: false,
         is2D: this.sdk.viewer.scene.mode === Cesium.SceneMode.SCENE2D ? true : false
       })
@@ -200,7 +206,7 @@ class GroundText extends Base {
   }
 
   set angle(v) {
-    this.options.angle = v
+    this.options.angle = Number(v)
     this._elms.angle &&
       this._elms.angle.forEach(item => {
         item.value = v
@@ -212,45 +218,45 @@ class GroundText extends Base {
   }
 
   set scale(v) {
-    this.options.scale = v
+    this.options.scale = Number(v)
     this._elms.scale &&
       this._elms.scale.forEach(item => {
         item.value = v
       })
   }
 
-  get duration() {
-    return this.options.duration
-  }
+  // get duration() {
+  //   return this.options.duration
+  // }
 
-  set duration(v) {
-    this.options.duration = v
-    let canvas = this.getcanvas()
-    this.entity.rectangle.material = new Cesium.CustomMaterialSource({
-      image: canvas.toDataURL('image/png'),
-      color: this.options.color,
-      repeat: new Cesium.Cartesian2(1.0, 1.0),
-      duration: this.options.duration / this.options.speed,
-      fltr: false,
-      is2D: this.sdk.viewer.scene.mode === Cesium.SceneMode.SCENE2D ? true : false
-    })
-    this._elms.duration &&
-      this._elms.duration.forEach(item => {
-        item.value = v
-      })
-  }
+  // set duration(v) {
+  //   this.options.duration = v
+  //   let canvas = this.getcanvas()
+  //   this.entity.rectangle.material = new Cesium.CustomMaterialSource({
+  //     image: canvas.toDataURL('image/png'),
+  //     color: this.options.color,
+  //     repeat: new Cesium.Cartesian2(1.0, 1.0),
+  //     duration: this.options.duration / this.options.speed,
+  //     fltr: false,
+  //     is2D: this.sdk.viewer.scene.mode === Cesium.SceneMode.SCENE2D ? true : false
+  //   })
+  //   this._elms.duration &&
+  //     this._elms.duration.forEach(item => {
+  //       item.value = v
+  //     })
+  // }
   get speed() {
     return this.options.speed
   }
 
   set speed(v) {
-    this.options.speed = v
+    this.options.speed = Number(v)
     let canvas = this.getcanvas()
     this.entity.rectangle.material = new Cesium.CustomMaterialSource({
       image: canvas.toDataURL('image/png'),
       color: this.options.color,
       repeat: new Cesium.Cartesian2(1.0, 1.0),
-      duration: this.options.duration / this.options.speed,
+      duration: this.duration / this.options.speed,
       fltr: false,
       is2D: this.sdk.viewer.scene.mode === Cesium.SceneMode.SCENE2D ? true : false
     })
@@ -270,7 +276,7 @@ class GroundText extends Base {
       image: canvas.toDataURL('image/png'),
       color: this.options.color,
       repeat: new Cesium.Cartesian2(1.0, 1.0),
-      duration: this.options.duration / this.options.speed,
+      duration: this.duration / this.options.speed,
       fltr: false,
       is2D: this.sdk.viewer.scene.mode === Cesium.SceneMode.SCENE2D ? true : false
     })
@@ -328,7 +334,7 @@ class GroundText extends Base {
           image: canvas.toDataURL('image/png'),
           color: this.options.color,
           repeat: new Cesium.Cartesian2(1.0, 1.0),
-          duration: this.options.duration / this.options.speed,
+          duration: this.duration / this.options.speed,
           fltr: false,
           is2D: this.sdk.viewer.scene.mode === Cesium.SceneMode.SCENE2D ? true : false
         }),
@@ -505,6 +511,10 @@ class GroundText extends Base {
         })
       })
     } else {
+      if (this._positionEditingCallback) {
+        this._positionEditingCallback()
+        this._positionEditingCallback = null
+      }
       if (this.event) {
         this.event.mouse_move(() => { })
         this.event.mouse_left(() => { })
@@ -520,6 +530,11 @@ class GroundText extends Base {
     return this._positionEditing
   }
 
+  openPositionEditing(cd) {
+    this.positionEditing = true
+    this._positionEditingCallback = cd
+  }
+
   /**
    * 飞到
    */

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

@@ -56,13 +56,9 @@ class StandText extends Base {
     this.options.show = (options.show || options.show === false) ? options.show : true
     this.nodePoints = []
     this.entity
-    this.options.instruct = options.instruct || ""
-    this.options.operatingPoint = options.operatingPoint || ""
-    this.options.attribute = options.attribute || {}
-    this.options.attribute.link = this.options.attribute.link || {}
-    this.options.attribute.link.content = this.options.attribute.link.content || []
-    this.options.attribute.camera = this.options.attribute.camera || []
-    this.options.attributeType = options.attributeType || 'richText'
+
+    delete this.options.name
+
     this.extrudedHeight
     this._EventBinding = new EventBinding()
     this.Dialog = _Dialog
@@ -71,6 +67,9 @@ class StandText extends Base {
     StandText.create(this)
   }
 
+  get name() {
+    return
+  }
   get text() {
     return this.options.text
   }
@@ -164,7 +163,7 @@ class StandText extends Base {
   }
 
   set speed(v) {
-    this.options.speed = v
+    this.options.speed = Number(v)
     this.entity.wall.material = this.getMaterial()
     this._elms.speed && this._elms.speed.forEach((item) => {
       item.value = v
@@ -297,14 +296,6 @@ class StandText extends Base {
 
   // }
 
-  get attributeCamera() {
-    return this.options.attribute.camera
-  }
-
-  set attributeCamera(v) {
-    this.options.attribute.camera = v
-  }
-
   //创建
   static async create(that) {
 
@@ -397,15 +388,13 @@ class StandText extends Base {
           this.Dialog.showCallBack && this.Dialog.showCallBack()
         },
         secondaryEditCallBack: () => {
-          StandText.nodeEdit(this)
+          this.nodeEdit()
         }
       })
       this._DialogObject._element.body.className = this._DialogObject._element.body.className + ' stand-text'
       let contentElm = document.createElement('div');
       contentElm.innerHTML = html(this)
       this._DialogObject.contentAppChild(contentElm)
-      this.attributeType = this.options.attributeType
-      this.attributeCamera = this.options.attribute.camera
       // setTimeout(() => {
       //   this.attributeLink = this.options.attribute.link.content
       //   this.cameraSelect()
@@ -538,23 +527,24 @@ class StandText extends Base {
     }
   }
 
-  static nodeEdit(that, cb = () => { }) {
+  nodeEdit(cb = () => { }) {
     if (YJ.Measure.GetMeasureStatus()) {
       cb('上一次测量未结束')
     } else {
       YJ.Measure.SetMeasureStatus(true)
-      that.tip = new MouseTip('请选择一个顶点，右键取消', that.sdk)
-      that.event = new MouseEvent(that.sdk)
-      that.nodePoints = []
+      this._nodeEditCallback = cb
+      this.tip = new MouseTip('请选择一个顶点，右键取消', this.sdk)
+      this.event = new MouseEvent(this.sdk)
+      this.nodePoints = []
       let selectPoint
       let originalPosition
 
-      let positions = that.options.positions
+      let positions = this.options.positions
       let fromDegreesArray = []
       let minimumHeights = []
       let maximumHeights = []
-      let width = that.computeDistance2(positions)
-      let extrudedHeight = that.aspectRatio ? (width / that.aspectRatio) : 0
+      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)
         minimumHeights.push(positions[i].alt)
@@ -565,55 +555,55 @@ class StandText extends Base {
       let leftEvent = (movement, cartesian) => {
         if (selectPoint) {
           isAdd = true
-          let pos3 = that.sdk.viewer.scene.clampToHeight(cartesian, [that.entity])
-          that.options.positions[selectPoint.index] = that.cartesian3Towgs84(pos3, that.sdk.viewer)
-          originalPosition = that.options.positions[selectPoint.index]
-          let entity = that.sdk.viewer.entities.add({
+          let pos3 = this.sdk.viewer.scene.clampToHeight(cartesian, [this.entity])
+          this.options.positions[selectPoint.index] = this.cartesian3Towgs84(pos3, this.sdk.viewer)
+          originalPosition = this.options.positions[selectPoint.index]
+          let entity = this.sdk.viewer.entities.add({
             name: 'node-secondary-edit-point',
-            position: Cesium.Cartesian3.fromDegrees(that.options.positions[selectPoint.index].lng, that.options.positions[selectPoint.index].lat, that.options.positions[selectPoint.index].alt),
+            position: Cesium.Cartesian3.fromDegrees(this.options.positions[selectPoint.index].lng, this.options.positions[selectPoint.index].lat, this.options.positions[selectPoint.index].alt),
             billboard: {
-              image: that.getSourceRootPath() + '/img/point.png',
+              image: this.getSourceRootPath() + '/img/point.png',
               width: 15,
               height: 15,
               disableDepthTestDistance: Number.POSITIVE_INFINITY,
               color: Cesium.Color.WHITE.withAlpha(0.99)
             },
           })
-          that.nodePoints.splice(selectPoint.index, 0, entity)
-          that.options.positions.splice(selectPoint.index, 0, that.options.positions[selectPoint.index])
+          this.nodePoints.splice(selectPoint.index, 0, entity)
+          this.options.positions.splice(selectPoint.index, 0, this.options.positions[selectPoint.index])
 
-          let positions = that.options.positions
+          let positions = this.options.positions
           fromDegreesArray = []
           minimumHeights = []
           maximumHeights = []
-          width = that.computeDistance2(positions)
-          extrudedHeight = that.aspectRatio ? (width / that.aspectRatio) : 0
+          width = this.computeDistance2(positions)
+          extrudedHeight = this.aspectRatio ? (width / this.aspectRatio) : 0
           for (let i = 0; i < positions.length; i++) {
             fromDegreesArray.push(positions[i].lng, positions[i].lat)
             minimumHeights.push(positions[i].alt)
             maximumHeights.push(positions[i].alt + extrudedHeight)
           }
-          that.tip.setPosition(
+          this.tip.setPosition(
             cartesian,
             movement.position.x,
             movement.position.y
           )
         }
         else {
-          var pick = that.sdk.viewer.scene.pick(movement.position);
+          var pick = this.sdk.viewer.scene.pick(movement.position);
           if (pick && pick.id && pick.id.name && pick.id.name === 'node-secondary-edit-point') {
             selectPoint = pick.id
-            that.nodePoints.splice(pick.id.index, 1)
-            that.sdk.viewer.entities.remove(pick.id)
-            that.tip.set_text('左键开始，右键结束，CTRL+右键撤销')
-            originalPosition = that.cartesian3Towgs84(cartesian, that.sdk.viewer)
-            that.entity.wall.positions = new Cesium.CallbackProperty(function () {
+            this.nodePoints.splice(pick.id.index, 1)
+            this.sdk.viewer.entities.remove(pick.id)
+            this.tip.set_text('左键开始，右键结束，CTRL+右键撤销')
+            originalPosition = this.cartesian3Towgs84(cartesian, this.sdk.viewer)
+            this.entity.wall.positions = new Cesium.CallbackProperty(function () {
               return Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)
             }, false)
-            that.entity.wall.maximumHeights = new Cesium.CallbackProperty(function () {
+            this.entity.wall.maximumHeights = new Cesium.CallbackProperty(function () {
               return maximumHeights
             }, false)
-            that.entity.wall.minimumHeights = new Cesium.CallbackProperty(function () {
+            this.entity.wall.minimumHeights = new Cesium.CallbackProperty(function () {
               return minimumHeights
             }, false)
           }
@@ -621,69 +611,69 @@ class StandText extends Base {
       }
       let rightEvent = (movement, cartesian) => {
         if (selectPoint) {
-          that.options.positions[selectPoint.index] = originalPosition
+          this.options.positions[selectPoint.index] = originalPosition
           if(isAdd) {
-            that.options.positions.splice(selectPoint.index, 1)
+            this.options.positions.splice(selectPoint.index, 1)
           }
-          cb(null, that.options.positions)
+          cb(null, this.options.positions)
         }
-        let positions = that.options.positions
+        let positions = this.options.positions
         fromDegreesArray = []
         minimumHeights = []
         maximumHeights = []
-        width = that.computeDistance2(positions)
-        extrudedHeight = that.aspectRatio ? (width / that.aspectRatio) : 0
+        width = this.computeDistance2(positions)
+        extrudedHeight = this.aspectRatio ? (width / this.aspectRatio) : 0
         for (let i = 0; i < positions.length; i++) {
           fromDegreesArray.push(positions[i].lng, positions[i].lat)
           minimumHeights.push(positions[i].alt)
           maximumHeights.push(positions[i].alt + extrudedHeight)
         }
-        that.entity.wall.positions = Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)
+        this.entity.wall.positions = Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)
 
-        for (let i = 0; i < that.nodePoints.length; i++) {
-          that.sdk.viewer.entities.remove(that.nodePoints[i])
+        for (let i = 0; i < this.nodePoints.length; i++) {
+          this.sdk.viewer.entities.remove(this.nodePoints[i])
         }
-        that.nodePoints = []
+        this.nodePoints = []
         YJ.Measure.SetMeasureStatus(false)
-        that.event.destroy()
-        that.tip.destroy()
+        this.event.destroy()
+        this.tip.destroy()
       }
 
-      that.event.mouse_left(leftEvent)
+      this.event.mouse_left(leftEvent)
 
-      that.event.mouse_right(rightEvent)
+      this.event.mouse_right(rightEvent)
 
-      that.event.mouse_move((movement, cartesian) => {
+      this.event.mouse_move((movement, cartesian) => {
         if (selectPoint) {
-          let pos3 = that.sdk.viewer.scene.clampToHeight(cartesian, [that.entity])
-          that.options.positions[selectPoint.index] = that.cartesian3Towgs84(pos3, that.sdk.viewer)
-          let positions = that.options.positions
+          let pos3 = this.sdk.viewer.scene.clampToHeight(cartesian, [this.entity])
+          this.options.positions[selectPoint.index] = this.cartesian3Towgs84(pos3, this.sdk.viewer)
+          let positions = this.options.positions
           fromDegreesArray = []
           minimumHeights = []
           maximumHeights = []
-          width = that.computeDistance2(positions)
-          extrudedHeight = that.aspectRatio ? (width / that.aspectRatio) : 0
+          width = this.computeDistance2(positions)
+          extrudedHeight = this.aspectRatio ? (width / this.aspectRatio) : 0
           for (let i = 0; i < positions.length; i++) {
             fromDegreesArray.push(positions[i].lng, positions[i].lat)
             minimumHeights.push(positions[i].alt)
             maximumHeights.push(positions[i].alt + extrudedHeight)
           }
         }
-        that.tip.setPosition(
+        this.tip.setPosition(
           cartesian,
           movement.endPosition.x,
           movement.endPosition.y
         )
       })
 
-      that.event.mouse_right_keyboard_ctrl((movement, cartesian) => {
+      this.event.mouse_right_keyboard_ctrl((movement, cartesian) => {
         if (selectPoint) {
-          that.options.positions.pop()
-          that.sdk.viewer.entities.remove(that.nodePoints[that.nodePoints.length - 1])
-          that.nodePoints.pop()
-          if (selectPoint.index === that.options.positions.length) {
-            if (that.nodePoints[selectPoint.index - 1]) {
-              selectPoint = that.nodePoints[selectPoint.index - 1]
+          this.options.positions.pop()
+          this.sdk.viewer.entities.remove(this.nodePoints[this.nodePoints.length - 1])
+          this.nodePoints.pop()
+          if (selectPoint.index === this.options.positions.length) {
+            if (this.nodePoints[selectPoint.index - 1]) {
+              selectPoint = this.nodePoints[selectPoint.index - 1]
             }
             else {
               selectPoint.index = 0
@@ -692,7 +682,7 @@ class StandText extends Base {
         }
       })
 
-      that.event.gesture_pinck_start((movement, cartesian) => {
+      this.event.gesture_pinck_start((movement, cartesian) => {
         let startTime = new Date()
         let pos = {
           position: {
@@ -700,7 +690,7 @@ class StandText extends Base {
             y: (movement.position1.y + movement.position2.y) / 2
           }
         }
-        that.event.gesture_pinck_end(() => {
+        this.event.gesture_pinck_end(() => {
           let endTime = new Date()
           if (endTime - startTime >= 500) {
             // 长按取消
@@ -712,20 +702,20 @@ class StandText extends Base {
         })
       })
 
-      for (let i = 0; i < that.options.positions.length; i++) {
-        let entity = that.sdk.viewer.entities.add({
+      for (let i = 0; i < this.options.positions.length; i++) {
+        let entity = this.sdk.viewer.entities.add({
           name: 'node-secondary-edit-point',
           index: i,
-          position: Cesium.Cartesian3.fromDegrees(that.options.positions[i].lng, that.options.positions[i].lat, that.options.positions[i].alt),
+          position: Cesium.Cartesian3.fromDegrees(this.options.positions[i].lng, this.options.positions[i].lat, this.options.positions[i].alt),
           billboard: {
-            image: that.getSourceRootPath() + '/img/point.png',
+            image: this.getSourceRootPath() + '/img/point.png',
             width: 15,
             height: 15,
             disableDepthTestDistance: Number.POSITIVE_INFINITY,
             color: Cesium.Color.WHITE.withAlpha(0.99)
           },
         })
-        that.nodePoints.push(entity)
+        this.nodePoints.push(entity)
       }
     }
   }

src/Obj/Base/TrajectoryMotion/index.js

@@ -15,11 +15,6 @@ import { setSplitDirection, syncSplitData, setActiveId, getSdk } from '../../../
 
 class TrajectoryMotion extends Base {
   #timeoutEventObject = null
-  #lineEdit = false
-  #_requestAnimationFrameEventId
-  #_requestAnimationFrameEventId2
-  #mouseRightevent
-  #firstPersonViewEvent
   /**
  * @constructor
  * @description 轨迹运动
@@ -99,12 +94,13 @@ class TrajectoryMotion extends Base {
     this.options.line.smooth = options.line.smooth ? options.line.smooth : false
     this.options.line.noseToTail = options.line.noseToTail ? options.line.noseToTail : false
     this.positions_smooth = []
-    this.options.unitFuelConsumption = options.unitFuelConsumption || 0
     this.options.ground = options.ground || false
     this.options.state = (options.state || options.state === false) ? options.state : true
     this.options.routeDirection = (options.routeDirection || options.routeDirection === false) ? options.routeDirection : true
     this.keyPoints = []
     this.realTimePositions = []
+    this._lineEdit = false
+    this._keyPoint = false
     this._elms = {};
     this.Dialog = _Dialog
     this.realTimeRouteArray = []
@@ -114,7 +110,6 @@ class TrajectoryMotion extends Base {
 
     options.label = options.label || {}
     this.options.label = {
-      text: this.options.name,
       show: options.label.show || false,
       fontSize: (options.label.fontSize || options.label.fontSize === 0) ? options.label.fontSize : 20,
       fontFamily: options.label.fontFamily ? options.label.fontFamily : 0,
@@ -203,7 +198,6 @@ class TrajectoryMotion extends Base {
           this.realTimeLine && (this.realTimeLine.show = (!this.showView || this.showView == 3 || !sdkD) ? true : false)
         }
         this.label && (this.label.show = (!this.showView || this.showView == 3) ? this.options.label.show : false)
-        this.fuelLabel && (this.fuelLabel.show = (!this.showView || this.showView == 3) ? this.options.fuelShow : false)
       }
       else {
         this.model.show = (!this.showView || this.showView == 3 || !sdkD) ? this.options.show : false
@@ -226,7 +220,6 @@ class TrajectoryMotion extends Base {
           this.keyPoints[i].show = (!this.showView || this.showView == 3) ? show : false
         }
         this.label && (this.label.show = false)
-        this.fuelLabel && (this.fuelLabel.show = false)
         this.viewFollow = false
       }
 
@@ -281,17 +274,14 @@ class TrajectoryMotion extends Base {
       // Cesium.Matrix4.multiplyByTranslation(this.model.modelMatrix, new Cesium.Cartesian3(0, 0, -difference), this.model.modelMatrix)
       // Cesium.Matrix4.getTranslation(this.model.modelMatrix, this.model.position)
       this.label && (this.label.show = this.label.show)
-      this.fuelLabel && (this.fuelLabel.show = this.fuelLabel.show)
       if (this.options.label.position) {
         setTimeout(() => {
           if (this.options.label.position.alt) {
             this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
-            this.fuelLabel && (this.fuelLabel.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
           }
           else {
             this.getClampToHeight({ lng: this.options.label.position.lng, lat: this.options.label.position.lat }).then((height) => {
               this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, height])
-              this.fuelLabel && (this.fuelLabel.position = [this.options.label.position.lng, this.options.label.position.lat, height])
             })
           }
         }, 0)
@@ -640,7 +630,7 @@ class TrajectoryMotion extends Base {
   }
   set state(v) {
     this.options.state = v
-    cancelAnimationFrame(this.#_requestAnimationFrameEventId)
+    cancelAnimationFrame(this._requestAnimationFrameEventId)
     if (this.editObj) {
       this.editObj.destroy()
       this.editObj = null
@@ -667,7 +657,7 @@ class TrajectoryMotion extends Base {
         let positionCamera = { ...this.sdk.viewer.camera._position }
 
         let _this = this
-        this.#_requestAnimationFrameEventId = requestAnimationFrame(function fn() {
+        this._requestAnimationFrameEventId = requestAnimationFrame(function fn() {
           if (_this.firstPersonView) {
             _this.sdk.viewer.camera.setView({
               destination: { ...positionCamera },
@@ -678,7 +668,7 @@ class TrajectoryMotion extends Base {
               }
             })
           }
-          _this.#_requestAnimationFrameEventId = requestAnimationFrame(fn)
+          _this._requestAnimationFrameEventId = requestAnimationFrame(fn)
         })
         this.TweenAnimate.pause()
         setTimeout(() => {
@@ -817,10 +807,10 @@ class TrajectoryMotion extends Base {
   }
 
   get keyPointShow() {
-    return this.options.line.keyPoint
+    return this._keyPoint
   }
   set keyPointShow(v) {
-    this.options.line.keyPoint = v
+    this._keyPoint = v
     for (let i = 0; i < this.keyPoints.length; i++) {
       if (this.show) {
         this.keyPoints[i].show = v
@@ -831,7 +821,7 @@ class TrajectoryMotion extends Base {
     })
     if (!v && this.lineEdit) {
       // 关闭线编辑
-      this.#lineEdit = v
+      this._lineEdit = v
       YJ.Measure.SetMeasureStatus(false)
       this.event && this.event.destroy()
       this.ControllerObject && this.ControllerObject.destroy()
@@ -844,7 +834,7 @@ class TrajectoryMotion extends Base {
   }
 
   get lineEdit() {
-    return this.#lineEdit
+    return this._lineEdit
   }
 
   set lineEdit(v) {
@@ -963,7 +953,7 @@ class TrajectoryMotion extends Base {
       this.keyPointShow = v
       this.ControllerObject.destroy()
     }
-    this.#lineEdit = v
+    this._lineEdit = v
     this._elms.lineEdit && this._elms.lineEdit.forEach((item) => {
       item.checked = v
     })
@@ -1008,8 +998,8 @@ class TrajectoryMotion extends Base {
     if (get2DView() || splitSdk.sdkD || !this.show) {
       v = false
     }
-    cancelAnimationFrame(this.#_requestAnimationFrameEventId)
-    this.#firstPersonViewEvent && this.#firstPersonViewEvent.destroy()
+    cancelAnimationFrame(this._requestAnimationFrameEventId)
+    this._firstPersonViewEvent && this._firstPersonViewEvent.destroy()
     this.sdk.viewer._firstPersonView = v
     this.options.firstPersonView = v
     if (this.options.firstPersonView) {
@@ -1040,18 +1030,18 @@ class TrajectoryMotion extends Base {
       }
       let targetEntity = targetSdk ? targetSdk.entityMap.get(this.options.id) : undefined
       if (this.sdk)
-        this.#firstPersonViewEvent = new MouseEvent(this.sdk)
-      this.#firstPersonViewEvent.mouse_right_down((movement, cartesian) => {
+        this._firstPersonViewEvent = new MouseEvent(this.sdk)
+      this._firstPersonViewEvent.mouse_right_down((movement, cartesian) => {
         let startPosition = { ...movement.position }
-        this.#firstPersonViewEvent.mouse_move((movement2, cartesian2) => {
+        this._firstPersonViewEvent.mouse_move((movement2, cartesian2) => {
           this.firstPersonHeadingPitch.heading = this.firstPersonHeadingPitch.heading + ((movement2.endPosition.x - startPosition.x) / 20)
           this.firstPersonHeadingPitch.pitch = this.firstPersonHeadingPitch.pitch + ((startPosition.y - movement2.endPosition.y) / 10)
           targetEntity && (targetEntity.firstPersonHeadingPitch = { ...this.firstPersonHeadingPitch })
           startPosition = { ...movement2.endPosition }
         }, true)
       }, true)
-      this.#firstPersonViewEvent.mouse_right_up((movement, cartesian) => {
-        this.#firstPersonViewEvent.mouse_move(() => { })
+      this._firstPersonViewEvent.mouse_right_up((movement, cartesian) => {
+        this._firstPersonViewEvent.mouse_move(() => { })
       }, true)
     }
     else {
@@ -1197,7 +1187,7 @@ class TrajectoryMotion extends Base {
     if (this.show) {
       if (this.label) {
         this.label.show = show
-        this.label.pixelOffset = this.options.label.pixelOffset + (this.fuelShow ? this.labelFontSize + 20 : 0)
+        this.label.pixelOffset = this.options.label.pixelOffset
         if (this.options.label.position) {
           setTimeout(() => {
             if (this.options.label.position.alt) {
@@ -1227,7 +1217,6 @@ class TrajectoryMotion extends Base {
   set labelFontFamily(v) {
     this.options.label.fontFamily = v || 0
     this.label && (this.label.fontFamily = this.options.label.fontFamily)
-    this.fuelLabel && (this.fuelLabel.fontFamily = this.options.label.fontFamily)
 
     let name = getFontFamilyName(this.labelFontFamily) || ''
     this._elms.labelFontFamily &&
@@ -1242,7 +1231,6 @@ class TrajectoryMotion extends Base {
   set labelColor(v) {
     this.options.label.color = v
     this.label && (this.label.color = v)
-    this.fuelLabel && (this.fuelLabel.color = v)
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
         let labelColorPicker = new YJColorPicker({
@@ -1270,13 +1258,7 @@ class TrajectoryMotion extends Base {
   set labelFontSize(v) {
     this.options.label.fontSize = v
     this.label && (this.label.fontSize = v)
-    if (this.fuelLabel) {
-      this.fuelLabel.fontSize = v
-      this.label.pixelOffset = this.options.label.pixelOffset + v + 20
-    }
-    else {
-      this.label.pixelOffset = this.options.label.pixelOffset
-    }
+    this.label.pixelOffset = this.options.label.pixelOffset
     this._elms.labelFontSize && this._elms.labelFontSize.forEach((item) => {
       item.value = v
     })
@@ -1288,7 +1270,6 @@ class TrajectoryMotion extends Base {
   set labelScaleByDistance(v) {
     this.options.label.scaleByDistance = v
     this.label && (this.label.scaleByDistance = v)
-    this.fuelLabel && (this.fuelLabel.scaleByDistance = v)
     this._elms.labelScaleByDistance && this._elms.labelScaleByDistance.forEach((item) => {
       item.checked = v
     })
@@ -1304,7 +1285,6 @@ class TrajectoryMotion extends Base {
     }
     this.options.label.near = near
     this.label && (this.label.near = near)
-    this.fuelLabel && (this.fuelLabel.near = near)
     this._elms.labelNear && this._elms.labelNear.forEach((item) => {
       item.value = near
     })
@@ -1320,66 +1300,11 @@ class TrajectoryMotion extends Base {
     }
     this.options.label.far = far
     this.label && (this.label.far = far)
-    this.fuelLabel && (this.fuelLabel.far = far)
     this._elms.labelFar && this._elms.labelFar.forEach((item) => {
       item.value = far
     })
   }
 
-  get unitFuelConsumption() {
-    return this.options.unitFuelConsumption
-  }
-
-  set unitFuelConsumption(v) {
-    this.options.unitFuelConsumption = v
-    this._elms.unitFuelConsumption && this._elms.unitFuelConsumption.forEach((item) => {
-      item.value = v
-    })
-  }
-
-  get fuelShow() {
-    return this.options.fuelShow
-  }
-
-  set fuelShow(v) {
-    this.options.fuelShow = v
-    let show = v
-    if (this.show && (!this.showView || this.showView == 3)) {
-      show = v
-    }
-    else {
-      show = false
-    }
-    if (this.show) {
-      if (this.fuelLabel) {
-        this.fuelLabel.show = show
-        this.label.pixelOffset = this.options.label.pixelOffset + (show ? this.labelFontSize + 20 : 0)
-      }
-      else {
-        this.label.pixelOffset = this.options.label.pixelOffset
-      }
-      if (this.options.label.position) {
-        setTimeout(() => {
-          if (this.options.label.position.alt) {
-            this.fuelLabel && (this.fuelLabel.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
-          }
-          else {
-            this.getClampToHeight({ lng: this.options.label.position.lng, lat: this.options.label.position.lat }).then((height) => {
-              this.fuelLabel && (this.fuelLabel.position = [this.options.label.position.lng, this.options.label.position.lat, height])
-            })
-          }
-        }, 0);
-      }
-    }
-    else {
-      this.fuelLabel && (this.fuelLabel.show = false)
-      this.label.pixelOffset = this.options.label.pixelOffset
-    }
-    this._elms.fuelShow && this._elms.fuelShow.forEach((item) => {
-      item.checked = v
-    })
-  }
-
   // 创建路径
   static addLine(that) {
     let positions_smooth = that.renewLinePositions(that.options.line.positions)
@@ -1422,11 +1347,11 @@ class TrajectoryMotion extends Base {
       },
     })
     that.sdk._entityZIndex++
-    if (that.#mouseRightevent) {
-      that.#mouseRightevent.destroy()
+    if (that._mouseRightevent) {
+      that._mouseRightevent.destroy()
     }
-    that.#mouseRightevent = new MouseEvent(that.sdk)
-    that.#mouseRightevent.mouse_right((movement, cartesian) => {
+    that._mouseRightevent = new MouseEvent(that.sdk)
+    that._mouseRightevent.mouse_right((movement, cartesian) => {
       let splitSdk = getSdk()
       let targetSdk
       if (that.sdk === splitSdk.sdkP) {
@@ -1498,7 +1423,6 @@ class TrajectoryMotion extends Base {
     }
     let pos = that.smooth ? that.positions_smooth : Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArrayHeights)
     TrajectoryMotion.createLabel(that)
-    TrajectoryMotion.createFuelLabel(that)
     that.modelMove(pos)
 
 
@@ -1514,7 +1438,7 @@ class TrajectoryMotion extends Base {
       fontSize: that.options.label.fontSize,
       fontFamily: that.options.label.fontFamily,
       color: that.options.label.color,
-      pixelOffset: that.options.label.pixelOffset + (that.options.fuelShow ? that.options.label.fontSize + 20 : 0),
+      pixelOffset: that.options.label.pixelOffset,
       backgroundColor: that.options.label.backgroundColor,
       lineColor: that.options.label.lineColor,
       lineWidth: that.options.label.lineWidth,
@@ -1524,26 +1448,6 @@ class TrajectoryMotion extends Base {
     }, that.model)
   }
 
-  static async createFuelLabel(that) {
-    let labelPosition = that.cartesian3Towgs84(that.model.position, that.sdk.viewer)
-    that.fuelLabel = new LabelObject(that.sdk, {
-      show: that.options.show ? (that.options.fuelShow ? true : false) : false,
-      // show: true,
-      position: [labelPosition.lng, labelPosition.lat, labelPosition.alt],
-      text: '总油耗:',
-      fontSize: that.options.label.fontSize,
-      fontFamily: that.options.label.fontFamily,
-      color: that.options.label.color,
-      pixelOffset: 0,
-      backgroundColor: ['#6e6e6e', '#6e6e6e'],
-      lineColor: '#00ffff00',
-      lineWidth: 0,
-      scaleByDistance: that.options.label.scaleByDistance,
-      near: that.options.label.near,
-      far: that.options.label.far
-    }, that.model)
-  }
-
   // 创建关键点
   static async addKeyPoint(that) {
     for (let i = 0; i < that.options.line.positions.length; i++) {
@@ -1552,7 +1456,7 @@ class TrajectoryMotion extends Base {
       let entity = that.sdk.viewer.entities.add({
         name: 'node-secondary-edit-point',
         index: i,
-        show: that.options.line.keyPoint || false,
+        show: that._keyPoint || false,
         position: that.ground ? result : Cesium.Cartesian3.fromDegrees(that.options.line.positions[i].lng, that.options.line.positions[i].lat, that.options.line.positions[i].alt),
         billboard: {
           image: that.getSourceRootPath() + '/img/point.png',
@@ -1568,7 +1472,7 @@ class TrajectoryMotion extends Base {
 
   // 模型移动
   async modelMove(positions, option = { time: 0 }) {
-    cancelAnimationFrame(this.#_requestAnimationFrameEventId)
+    cancelAnimationFrame(this._requestAnimationFrameEventId)
     let _this = this
     let time = option.time || 0
     let startDistance = option.distance
@@ -1654,7 +1558,7 @@ class TrajectoryMotion extends Base {
 
       animateUpdate()
       function animateUpdate() {
-        _this.#_requestAnimationFrameEventId2 = requestAnimationFrame(
+        _this._requestAnimationFrameEventId2 = requestAnimationFrame(
           animateUpdate
         )
         if (_this.options.firstPersonView) {
@@ -1672,8 +1576,6 @@ class TrajectoryMotion extends Base {
     }
 
     async function setPosition(distance) {
-      _this.totalFuelConsumption = Number((distance / 100 * _this.unitFuelConsumption).toFixed(2))
-      _this.fuelLabel.text = '总油耗:' + _this.totalFuelConsumption + ' L'
       _this.model.isMove = true
       let sdk2D = get2DView()
       let splitSdk = getSdk()
@@ -1886,7 +1788,6 @@ class TrajectoryMotion extends Base {
       }
       let labelPosition = _this.cartesian3Towgs84(position, _this.sdk.viewer)
       _this.label.position = [labelPosition.lng, labelPosition.lat, labelPosition.alt]
-      _this.fuelLabel.position = [labelPosition.lng, labelPosition.lat, labelPosition.alt]
       lastDistance = distance
       // console.log(position)
       _this.realTimeRouteArray.push(position)
@@ -2010,6 +1911,7 @@ class TrajectoryMotion extends Base {
 
   // 编辑框
   async edit(state) {
+    return
     if (this._error) {
       return
     }
@@ -2259,7 +2161,7 @@ class TrajectoryMotion extends Base {
     setActiveViewer(0)
     closeRotateAround(this.sdk)
 
-    if (this.options.customView) {
+    if (this.options.customView && this.options.customView.position && this.options.customView.orientation) {
       this.sdk.viewer.camera.flyTo({
         destination: this.options.customView.position,
         orientation: this.options.customView.orientation
@@ -2283,7 +2185,6 @@ class TrajectoryMotion extends Base {
     this.sdk.viewer.entities.remove(this.line)
     this.sdk.viewer.entities.remove(this.realTimeLine)
     this.label && this.label.remove()
-    this.fuelLabel && this.fuelLabel.remove()
     for (let i = 0; i < this.keyPointShow.length; i++) {
       this.sdk.viewer.entities.remove(this.keyPointShow[i])
     }
@@ -2291,20 +2192,19 @@ class TrajectoryMotion extends Base {
     this.realTimeLine = null
     this.model = null
     this.label = null
-    this.fuelLabel = null
     if (this._DialogObject && !this._DialogObject.isDestroy) {
       this._DialogObject.close()
       this._DialogObject = null
     }
-    if (this.#mouseRightevent) {
-      this.#mouseRightevent.destroy()
+    if (this._mouseRightevent) {
+      this._mouseRightevent.destroy()
     }
     this.removeModelAnimate()
     let sdk2D = get2DView()
     if (!sdk2D || sdk2D !== this.sdk) {
       this.viewFollow = false
     }
-    cancelAnimationFrame(this.#_requestAnimationFrameEventId)
+    cancelAnimationFrame(this._requestAnimationFrameEventId)
     await this.sdk.removeIncetance(this.options.id)
     await syncData(this.sdk, this.options.id)
 
@@ -2326,7 +2226,7 @@ class TrajectoryMotion extends Base {
     (this.noseToTail !== this.originalOptions.line.noseToTail) && (this.noseToTail = this.originalOptions.line.noseToTail);
     (this.height !== this.originalOptions.height) && (this.height = this.originalOptions.height);
     (this.lineShow !== this.originalOptions.line.show) && (this.lineShow = this.originalOptions.line.show);
-    this.keyPointShow = this.originalOptions.line.keyPoint;
+    this.keyPointShow = false;
     this.routeDirection = this.originalOptions.routeDirection;
     this.scale = this.originalOptions.model.scale;
     (this.loop !== this.originalOptions.loop) && (this.loop = this.originalOptions.loop);
@@ -2345,7 +2245,6 @@ class TrajectoryMotion extends Base {
       this.model && (this.model.show = false)
     }
     this.labelShow = this.originalOptions.label.show
-    this.fuelLabelShow = this.originalOptions.fuelShow
     this.labelColor = this.originalOptions.label.color
     this.labelFontSize = this.originalOptions.label.fontSize
     this.labelFontFamily = this.originalOptions.label.fontFamily

src/Obj/Base/WallStereoscopic/index.js

@@ -72,14 +72,12 @@ class WallStereoscopic extends Base {
     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
+    this.options.noseToTail = options.noseToTail || false
     this.entity
     this.nodePoints = []
     options.label = options.label || {}
     this.options.label = {
-      text: this.options.name,
       show: options.label.show || false,
-      position: options.label.position,
       fontSize: (options.label.fontSize || options.label.fontSize === 0) ? options.label.fontSize : 20,
       fontFamily: options.label.fontFamily ? options.label.fontFamily : 0,
       color: options.label.color || '#ffffff',
@@ -94,17 +92,13 @@ class WallStereoscopic extends Base {
     this.options.instruct = options.instruct || ""
     this.options.operatingPoint = options.operatingPoint || ""
     this.options.attribute = options.attribute || {}
-    this.options.attribute.vr = this.options.attribute.vr || {}
-    this.options.attribute.vr.content = this.options.attribute.vr.content || []
     this.options.attribute.link = this.options.attribute.link || {}
     this.options.attribute.link.content = this.options.attribute.link.content || []
-    this.options.attribute.camera = this.options.attribute.camera || {}
-    this.options.attribute.camera = this.options.attribute.camera.content || []
-    this.options.attribute.ISC = this.options.attribute.ISC || {}
-    this.options.attribute.ISC.content = this.options.attribute.ISC.content || []
-    this.options.attribute.goods = this.options.attribute.goods || {}
-    this.options.attribute.goods.content = this.options.attribute.goods.content || []
-    this.options.attributeType = options.attributeType || 'richText'
+
+    delete this.options.attribute.camera
+    delete this.options.attribute.vr
+    delete this.options.attribute.goods
+
     this.Dialog = _Dialog
     this._elms = {};
     if (!this.options.positions || this.options.positions.length < 2) {
@@ -186,11 +180,11 @@ class WallStereoscopic extends Base {
   }
 
   get noseToTail() {
-    return this.options['nose-to-tail']
+    return this.options.noseToTail
   }
 
   set noseToTail(v) {
-    this.options['nose-to-tail'] = v
+    this.options.noseToTail = v
     let positions = this.options.positions
     let fromDegreesArray = []
     for (let i = 0; i < positions.length; i++) {
@@ -455,324 +449,6 @@ class WallStereoscopic extends Base {
     })
   }
 
-  get attributeType() {
-    return this.options.attributeType
-  }
-
-  set attributeType(v) {
-    this.options.attributeType = v
-    this._elms.attributeType && this._elms.attributeType.forEach((item) => {
-      item.value = v
-    })
-    let attributeContent = this._DialogObject._element.content.getElementsByClassName('attribute-content')
-    for (let i = 0; i < attributeContent.length; i++) {
-      if (attributeContent[i].className.indexOf('attribute-content-' + v) > -1) {
-        attributeContent[i].style.display = 'block';
-      }
-      else {
-        attributeContent[i].style.display = 'none';
-      }
-    }
-  }
-
-  get attributeLink() {
-    return this.options.attribute.link.content
-  }
-
-  set attributeLink(v) {
-    this.options.attribute.link.content = v
-    if (!this._DialogObject || !this._DialogObject._element || !this._DialogObject._element.content || this._DialogObject._element.content.getElementsByClassName('attribute-content-link').length == 0) {
-      return
-    }
-    let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-link')[1].getElementsByClassName('table')[0]
-    let tableContent = table.getElementsByClassName('table-body')[0]
-    tableContent.innerHTML = ''
-    if (this.options.attribute.link.content.length > 0) {
-      table.getElementsByClassName('table-empty')[0].style.display = 'none'
-    }
-    else {
-      table.getElementsByClassName('table-empty')[0].style.display = 'flex'
-    }
-    for (let i = 0; i < this.options.attribute.link.content.length; i++) {
-      let tr = `
-      <div class="tr">
-          <div class="td">` + this.options.attribute.link.content[i].name + `</div>
-          <div class="td">` + this.options.attribute.link.content[i].url + `</div>
-          <div class="td">
-              <button @click="linkEdit">编辑</button>
-              <button @click="linkDelete">删除</button>
-          </div>
-      </div>`
-      let trElm = document.createRange().createContextualFragment(tr)
-      tableContent.appendChild(trElm)
-    }
-    let item = tableContent.getElementsByClassName('tr')
-    let fun = {
-      linkEdit: async (index) => {
-        this.attributeLink = await this.options.attribute.link.content
-        let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-link')[1].getElementsByClassName('table')[0]
-        let tableContent = table.getElementsByClassName('table-body')[0]
-        let item = tableContent.getElementsByClassName('tr')
-        for (let i = 0; i < item.length; i++) {
-          if (index === i) {
-            let height = item[i].offsetHeight
-            let html = `
-              <div class="td">
-                <input class="input" type="text">
-              </div>
-              <div class="td">
-                <textarea class="input link-edit" type="text"></textarea>
-              </div>
-              <div class="td">
-                  <button @click="confirmEdit">确认</button>
-                  <button @click="cancelEdit">取消</button>
-              </div>`
-            item[i].innerHTML = html
-            let textareaElm = item[i].getElementsByClassName('link-edit')[0]
-            textareaElm.style.height = (height - 10) + 'px'
-            let td = item[i].getElementsByClassName('td')
-            td[0].getElementsByClassName('input')[0].value = this.options.attribute.link.content[index].name
-            td[1].getElementsByClassName('input')[0].value = this.options.attribute.link.content[index].url
-            let btn = item[i].getElementsByTagName('button')
-            for (let n = 0; n < btn.length; n++) {
-              if (!btn[n] || !btn[n].attributes) {
-                continue;
-              }
-              for (let m of btn[n].attributes) {
-                if (m.name === '@click') {
-                  btn[n].addEventListener('click', (e) => {
-                    if (typeof (fun[m.value]) === 'function') {
-                      fun[m.value]({ name: td[0].getElementsByClassName('input')[0].value, url: td[1].getElementsByClassName('input')[0].value }, i)
-                    }
-                  });
-                  btn[n].attributes.removeNamedItem(m.name)
-                  break
-                }
-              }
-            }
-            break
-          }
-        }
-      },
-      linkDelete: (i) => {
-        this.options.attribute.link.content.splice(i, 1)
-        this.attributeLink = this.options.attribute.link.content
-      },
-
-      confirmEdit: (value, i) => {
-        let name = value.name && value.name.replace(/\s/g, "")
-        let url = value.url && value.url.replace(/\s/g, "")
-        if (name && url) {
-          this.options.attribute.link.content[i] = value
-        }
-        else {
-          window.ELEMENT && window.ELEMENT.Message({
-            message: '名称或链接不能为空！',
-            type: 'warning',
-            duration: 1500
-          });
-        }
-        this.attributeLink = this.options.attribute.link.content
-      },
-      cancelEdit: () => {
-        this.attributeLink = this.options.attribute.link.content
-      },
-      fileSelect: (value, i) => {
-        let fileElm = item[i].getElementsByClassName('file-select')[0]
-        fileElm.click()
-        fileElm.removeEventListener('change', fileSelect)
-        fileElm.addEventListener('change', fileSelect)
-      }
-    }
-    let fileSelect = (event) => {
-      if (event.target.value) {
-        let td = item[event.target.getAttribute('index')].getElementsByClassName('td')
-        td[1].getElementsByClassName('input')[0].value = event.target.value
-        event.target.value = null
-      }
-    }
-    for (let i = 0; i < item.length; i++) {
-      let btn = item[i].getElementsByTagName('button')
-      for (let n = 0; n < btn.length; n++) {
-        if (!btn[n] || !btn[n].attributes) {
-          continue;
-        }
-        for (let m of btn[n].attributes) {
-          if (m.name === '@click') {
-            btn[n].addEventListener('click', (e) => {
-              if (typeof (fun[m.value]) === 'function') {
-                fun[m.value](i)
-              }
-            });
-            btn[n].attributes.removeNamedItem(m.name)
-            break
-          }
-        }
-      }
-    }
-  }
-
-  get attributeCamera() {
-    return this.options.attribute.camera.content
-  }
-
-  set attributeCamera(v) {
-    this.options.attribute.camera.content = v
-  }
-
-  get attributeISC() {
-    return this.options.attribute.ISC.content
-  }
-
-  set attributeISC(v) {
-    this.options.attribute.ISC.content = v
-  }
-
-  get attributeVr() {
-    return this.options.attribute.vr.content
-  }
-
-  set attributeVr(v) {
-    this.options.attribute.vr.content = v
-    if (!this._DialogObject || !this._DialogObject._element || !this._DialogObject._element.content || this._DialogObject._element.content.getElementsByClassName('attribute-content-vr').length == 0) {
-      return
-    }
-    let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-vr')[1].getElementsByClassName('table')[0]
-    let tableContent = table.getElementsByClassName('table-body')[0]
-    tableContent.innerHTML = ''
-    if (this.options.attribute.vr.content.length > 0) {
-      table.getElementsByClassName('table-empty')[0].style.display = 'none'
-    }
-    else {
-      table.getElementsByClassName('table-empty')[0].style.display = 'flex'
-    }
-    for (let i = 0; i < this.options.attribute.vr.content.length; i++) {
-      let tr = `
-      <div class="tr">
-          <div class="td">` + this.options.attribute.vr.content[i].name + `</div>
-          <div class="td">` + this.options.attribute.vr.content[i].url + `</div>
-          <div class="td">
-              <button @click="vrEdit">编辑</button>
-              <button @click="vrDelete">删除</button>
-          </div>
-      </div>`
-      let trElm = document.createRange().createContextualFragment(tr)
-      tableContent.appendChild(trElm)
-    }
-    let item = tableContent.getElementsByClassName('tr')
-    let fun = {
-      vrEdit: async (index) => {
-        this.attributeVr = await this.options.attribute.vr.content
-        let table = this._DialogObject._element.content.getElementsByClassName('attribute-content-vr')[1].getElementsByClassName('table')[0]
-        let tableContent = table.getElementsByClassName('table-body')[0]
-        let item = tableContent.getElementsByClassName('tr')
-        for (let i = 0; i < item.length; i++) {
-          if (index === i) {
-            let height = item[i].offsetHeight
-            let html = `
-              <div class="td">
-                <input class="input" type="text">
-              </div>
-              <div class="td">
-                <textarea class="input link-edit" type="text"></textarea>
-              </div>
-              <div class="td">
-                  <button @click="confirmEdit">确认</button>
-                  <button @click="cancelEdit">取消</button>
-              </div>`
-            item[i].innerHTML = html
-            let textareaElm = item[i].getElementsByClassName('link-edit')[0]
-            textareaElm.style.height = (height - 10) + 'px'
-            let td = item[i].getElementsByClassName('td')
-            td[0].getElementsByClassName('input')[0].value = this.options.attribute.vr.content[index].name
-            td[1].getElementsByClassName('input')[0].value = this.options.attribute.vr.content[index].url
-            let btn = item[i].getElementsByTagName('button')
-            for (let n = 0; n < btn.length; n++) {
-              if (!btn[n] || !btn[n].attributes) {
-                continue;
-              }
-              for (let m of btn[n].attributes) {
-                if (m.name === '@click') {
-                  btn[n].addEventListener('click', (e) => {
-                    if (typeof (fun[m.value]) === 'function') {
-                      fun[m.value]({ name: td[0].getElementsByClassName('input')[0].value, url: td[1].getElementsByClassName('input')[0].value }, i)
-                    }
-                  });
-                  btn[n].attributes.removeNamedItem(m.name)
-                  break
-                }
-              }
-            }
-            break
-          }
-        }
-      },
-      vrDelete: (i) => {
-        this.options.attribute.vr.content.splice(i, 1)
-        this.attributeVr = this.options.attribute.vr.content
-      },
-
-      confirmEdit: (value, i) => {
-        let name = value.name && value.name.replace(/\s/g, "")
-        let url = value.url && value.url.replace(/\s/g, "")
-        if (name && url) {
-          this.options.attribute.vr.content[i] = value
-        }
-        else {
-          window.ELEMENT && window.ELEMENT.Message({
-            message: '名称或链接不能为空！',
-            type: 'warning',
-            duration: 1500
-          });
-        }
-        this.attributeVr = this.options.attribute.vr.content
-      },
-      cancelEdit: () => {
-        this.attributeVr = this.options.attribute.vr.content
-      },
-      fileSelect: (value, i) => {
-        let fileElm = item[i].getElementsByClassName('file-select')[0]
-        fileElm.click()
-        fileElm.removeEventListener('change', fileSelect)
-        fileElm.addEventListener('change', fileSelect)
-      }
-    }
-    let fileSelect = (event) => {
-      if (event.target.value) {
-        let td = item[event.target.getAttribute('index')].getElementsByClassName('td')
-        td[1].getElementsByClassName('input')[0].value = event.target.value
-        event.target.value = null
-      }
-    }
-    for (let i = 0; i < item.length; i++) {
-      let btn = item[i].getElementsByTagName('button')
-      for (let n = 0; n < btn.length; n++) {
-        for (let m of btn[n].attributes) {
-          if (!btn[n] || !btn[n].attributes) {
-            continue;
-          }
-          if (m.name === '@click') {
-            btn[n].addEventListener('click', (e) => {
-              if (typeof (fun[m.value]) === 'function') {
-                fun[m.value](i)
-              }
-            });
-            btn[n].attributes.removeNamedItem(m.name)
-            break
-          }
-        }
-      }
-    }
-  }
-
-  get attributeGoods() {
-    return this.options.attribute.goods.content
-  }
-
-  set attributeGoods(v) {
-    this.options.attribute.goods.content = v
-  }
-
   //创建
   static async create(that) {
 
@@ -825,6 +501,7 @@ class WallStereoscopic extends Base {
 
   // 编辑框
   async edit(state) {
+    return
     let _this = this
     this.originalOptions = this.deepCopyObj(this.options)
 
@@ -1108,13 +785,6 @@ class WallStereoscopic extends Base {
     this.labelBackgroundColorEnd = this.originalOptions.label.backgroundColor[1]
     this.instruct = this.originalOptions.instruct
     this.operatingPoint = this.originalOptions.operatingPoint
-    this.attributeLink = this.options.attribute.link.content
-    this.attributeVr = this.options.attribute.vr.content
-    this.attributeCamera = this.options.attribute.camera.content
-    this.attributeGoods = this.options.attribute.goods.content
-    this.attributeISC = this.options.attribute.ISC.content
-    this.cameraSelect && this.cameraSelect()
-    this.goodsSelect && this.goodsSelect()
 
     let positions = this.options.positions
     let fromDegreesArray = []
@@ -1147,61 +817,6 @@ class WallStereoscopic extends Base {
     await syncData(this.sdk, this.options.id)
   }
 
-  instructSubmit() {
-    this.Dialog.instructSubmit && this.Dialog.instructSubmit(this.options.id, this.options.label.text, this.instruct)
-    this.originalOptions.instruct = this.instruct
-  }
-
-  operatingPointSubmit() {
-    this.Dialog.operatingPointSubmit && this.Dialog.operatingPointSubmit(this.options.id, this.options.label.text, this.operatingPoint)
-    this.originalOptions.operatingPoint = this.operatingPoint
-  }
-
-  _addLink() {
-    // document.getElementsByClassName
-    if (this._DialogObject._element.content.getElementsByClassName('link_add')[0].value) {
-      this.options.attribute.link.content.push({
-        name: '链接',
-        url: this._DialogObject._element.content.getElementsByClassName('link_add')[0].value
-      })
-      this._DialogObject._element.content.getElementsByClassName('link_add')[0].value = ''
-      this.attributeLink = this.options.attribute.link.content
-    }
-    else {
-      this.Dialog.clickAddLink && this.Dialog.clickAddLink()
-    }
-  }
-
-  addAttributeLink(link) {
-    this.options.attribute.link.content.push({
-      name: '链接',
-      url: link
-    })
-    this.attributeLink = this.options.attribute.link.content
-  }
-
-  _addRr() {
-    if (this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value) {
-      this.options.attribute.vr.content.push({
-        name: '全景图' ,
-        url: this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value
-      })
-      this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value = ''
-      this.attributeVr = this.options.attribute.vr.content
-    }
-    else {
-      this.Dialog.clickAddVr && this.Dialog.clickAddVr()
-    }
-  }
-
-  addAttributeRr(vr) {
-    this.options.attribute.vr.content.push({
-      name: '全景图' ,
-      url: vr
-    })
-    this.attributeVr = this.options.attribute.vr.content
-  }
-
   getMaterial() {
     let material
     switch (this.options.material) {
@@ -1305,7 +920,8 @@ class WallStereoscopic extends Base {
     }
   }
 
-  static nodeEdit(that, cb = () => { }) {
+  nodeEdit(cb = () => { }) {
+    let that = this
     if (YJ.Measure.GetMeasureStatus()) {
       cb('上一次测量未结束')
     } else {

src/Obj/Base/index.js

@@ -15,8 +15,6 @@ 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) {
@@ -32,8 +30,14 @@ class Base extends Tools {
     this.rightClickCallBack = null
     this.picking = true
     this.options.host = this.options.host || getHost()
-    // this.#_showView = this.options.showView || 0
+    // this.options.customView = options.customView ||{
+    //   relativePosition: undefined,
+    //   orientation: undefined
+    // }
+    this.options.customView = options.customView
+    // this._showView = this.options.showView || 0
     this.setDefaultValue()
+    this._showView
 
     // this.sdk.addIncetance(this.options.id, this)
   }
@@ -60,7 +64,7 @@ class Base extends Tools {
   // }
 
   get showView() {
-    return this.#_showView
+    return this._showView
   }
 
   set showView(v) {
@@ -68,28 +72,28 @@ class Base extends Tools {
 
     let sdk2D = get2DSdk().sdkD
     if (!sdk2D) {
-      this.#_showView = v
+      this._showView = v
       if (this.entity) {
         this.entity._showView = v
       }
       return
     }
     if (this.sdk === sdk2D) {
-      this.#_showView = 0
+      this._showView = 0
       return
     }
-    if (!this.#_showView && !this.show) {
+    if (!this._showView && !this.show) {
       return
     }
     if (this.sdk === sdk2D) {
-      this.#_showView = 0
+      this._showView = 0
       return
     }
     if (v != 2 && v != 3) {
-      this.#_showView = 0
+      this._showView = 0
     }
     else {
-      this.#_showView = v
+      this._showView = v
     }
 
     this.isShowView = true
@@ -98,7 +102,7 @@ class Base extends Tools {
     //   return
     // }
 
-    if (!this.#_showView) {
+    if (!this._showView) {
       this.show = true
     }
     else {
@@ -502,7 +506,10 @@ class Base extends Tools {
 
   // 重置视角
   resetCustomView() {
-    this.options.customView = undefined
+    this.options.customView = {
+      relativePosition: undefined,
+      orientation: undefined
+    }
   }
 
 

src/Obj/Element/Dialog/eventBinding.js

@@ -17,6 +17,7 @@ class EventBinding {
   }
 
   on(that, elements) {
+    return
     this.element = {}
     for (let i = 0; i < elements.length; i++) {
       if (!elements[i] || !elements[i].attributes) {

src/Tools/index.js

@@ -127,9 +127,9 @@ class Tools {
     var alt = cartographic.height < 0 ? 0 : cartographic.height
     // var alt = cartographic.height
     return {
-      lng: lng,
-      lat: lat,
-      alt: alt,
+      lng: Number(lng.toFixed(8)),
+      lat: Number(lat.toFixed(8)),
+      alt: Number(alt.toFixed(2)),
     }
   }
 
@@ -141,13 +141,14 @@ class Tools {
    * @param [fractionDigits=2] 保留小数点位数
    * @param [ground=true] 是否贴地
    * */
-  async computeDistance(positions = [], fractionDigits = 2, type = '空间长度') {
+  async computeDistance(positions = [], fractionDigits = 2, type = 0) {
     if (positions.length < 2) {
       return 0
     } else {
       let length = 0
       switch (type) {
-        case '空间长度':
+        case '0':
+        case 0:
           for (let i = 0; i < positions.length - 1; i++) {
             const position1 = Cesium.Cartesian3.fromDegrees(positions[i].lng, positions[i].lat, positions[i].alt);
             const position2 = Cesium.Cartesian3.fromDegrees(positions[i + 1].lng, positions[i + 1].lat, positions[i + 1].alt);
@@ -155,7 +156,8 @@ class Tools {
             length = length + distance
           }
           break
-        case '投影长度':
+        case '1':
+        case 1:
           for (let i = 0; i < positions.length - 1; i++) {
             const position1 = Cesium.Cartesian3.fromDegrees(positions[i].lng, positions[i].lat, 0);
             const position2 = Cesium.Cartesian3.fromDegrees(positions[i + 1].lng, positions[i + 1].lat, 0);
@@ -163,7 +165,8 @@ class Tools {
             length = length + distance
           }
           break
-        case '地表长度':
+        case '2':
+        case 2:
           let meters
           let lineString2 = []
           positions.forEach((item) => {
@@ -1243,14 +1246,28 @@ class Tools {
    * */
   deepCopyObj(obj) {
     let newobj = null;
-    //判断是否需要继续进行递归
-    if (typeof (obj) == 'object' && obj !== null) {
-      newobj = obj instanceof Array ? [] : {};                //进行下一层递归克隆
+    // 处理数组 - 使用原生Array构造函数创建新数组
+    if (Array.isArray(obj)) {
+      newobj = [];
+      // 只拷贝数组元素，不拷贝可能存在的扩展方法
+      for (let i = 0; i < obj.length; i++) {
+        newobj[i] = this.deepCopyObj(obj[i]);
+      }
+      return newobj;
+    }
+
+    // 处理对象
+    else if (obj && typeof obj === 'object') {
+      newobj = {};
       for (let i in obj) {
-        if (i != 'earth' && i != 'Dialog')
-          newobj[i] = this.deepCopyObj(obj[i])
-      }                //如果不是对象直接赋值
-    } else newobj = obj;
+        // 排除指定属性和方法属性
+        if (i !== 'earth' && i !== 'Dialog' && typeof obj[i] !== 'function') {
+          newobj[i] = this.deepCopyObj(obj[i]);
+        }
+      }
+      return newobj;
+    }
+    else newobj = obj;
     return newobj;
   }
 
@@ -1517,7 +1534,13 @@ class Tools {
     document.body.appendChild(message)
     message.classList.add(type)
   }
-
+  /**两点之间的距离 */
+  pointDistance(p1, p2) {
+    let centerDegress = Cesium.Cartesian3.fromDegrees(p1.lng, p1.lat)
+    let point = Cesium.Cartesian3.fromDegrees(p2, p2)
+    let distance = Cesium.Cartesian3.distance(point, centerDegress)
+    return distance
+  }
 }
 
 export default Tools

src/Tools/projConvert.js

@@ -1,138 +1,141 @@
 import Dialog from '../BaseDialog'
 import { Proj } from './proj'
 import { legp } from '../Obj/Element/datalist';
+import Tools from "../Tools";
 let _DialogObject
 const open = async (sdk, closeCallBack) => {
   let proj = new Proj()
-  if (_DialogObject && _DialogObject.close) {
-    _DialogObject.close()
-    _DialogObject = null
-  }
-  _DialogObject = await new Dialog(sdk.viewer._container, {
-    title: '度分秒',
-    left: '180px',
-    top: '100px',
-    closeCallBack: () => {
-      closeCallBack && closeCallBack()
-    }
-  })
-  await _DialogObject.init()
+  let tools = new Tools(sdk)
+  // if (_DialogObject && _DialogObject.close) {
+  //   _DialogObject.close()
+  //   _DialogObject = null
+  // }
+  // _DialogObject = await new Dialog(sdk.viewer._container, {
+  //   title: '度分秒',
+  //   left: '180px',
+  //   top: '100px',
+  //   closeCallBack: () => {
+  //     closeCallBack && closeCallBack()
+  //   }
+  // })
+  // await _DialogObject.init()
 
-  let html = `
-        <span class="custom-divider"></span>
-        <div class="div-item">
-          <div class="row">
-            <div class="col input-select-box">
-              <span class="label" style="flex: 0 0 60px;">输入格式</span>
-              <div class="input-select"></div>
-            </div>
-          </div>
-        </div>
-        <div class="div-item item" data-type="${0}">
-          <span class="custom-divider"></span>
-          <p style="font-size: 16px;padding-bottom: 6px;margin-top: 10px;margin-bottom: 5px;">
-            <span style="margin-right: 10px;">度</span>
-            <span style="font-size: 12px;margin-bottom: 5px;color: #F16C55">例如116.6°, 39.9°</span>
-          </p>
-          <div class="row">
-            <div class="col">
-              <span class="label" style="flex: auto;">经度</span>
-              <input class="input lng" type="number" min="-180" max="180" value="0" title="">
-            </div>
-            <div class="col" style="margin: 0;">
-              <span class="label">纬度</span>
-              <input class="input lat" type="number" min="-90" max="90" value="0" title="">
-            </div>
-            <div class="col" style="flex: 0 0 24px;">
-              <i class="icon-copy-box" title="复制" data-clipboard-action="copy" data-clipboard-target=".input" style="cursor: pointer;">
-                <svg class="icon-copy" style="margin: 4px;margin-bottom: 0px;"><use xlink:href="#yj-icon-copy"></use></svg>
-              </i>
-              <button class="convert" style="margin-left: 10px;">转 换</button>
-            </div>
-          </div>
-        </div>
-        <div class="div-item item" data-type="${1}">
-          <span class="custom-divider"></span>
-          <p style="font-size: 16px;padding-bottom: 6px;margin-top: 10px;margin-bottom: 5px;">
-            <span style="margin-right: 10px;">度分</span>
-            <span style="font-size: 12px;margin-bottom: 5px;color: #F16C55">例如95°10.1702', 49°12.4015'</span>
-          </p>
-          <div class="row">
-            <div class="col" style="flex-direction: column;">
-              <div class="row" style="margin-bottom: 15px;">
-                <span class="label">经度</span>
-                <input class="input lng-dm-d" style="flex: 1;" type="number" min="-180" max="180" value="0" title="">
-                <span class="label" style="flex: 0 0 14px;margin: 0 10px;">度</span>
-                <input class="input lng-dm-m" style="flex: 1;" type="number" min="0" max="60" value="0" title="">
-                <span class="label" style="flex: 0 0 14px;margin: 0 10px;">分</span>
-                <span class="top-line"></span>
-              </div>
-              <div class="row">
-                <span class="label">纬度</span>
-                <input class="input lat-dm-d" style="flex: 1;" type="number" min="-90" max="90" value="0" title="">
-                <span class="label" style="flex: 0 0 14px;margin: 0 10px;">度</span>
-                <input class="input lat-dm-m" style="flex: 1;" type="number" min="0" max="60" value="0" title="">
-                <span class="label" style="flex: 0 0 14px;margin: 0 10px;">分</span>
-                <span class="bottom-line"></span>
-              </div>
-            </div>
-            <div class="col" style="flex: 0 0 24px;margin: 0;">
-              <i class="icon-copy-box" title="复制" data-clipboard-action="copy" data-clipboard-target=".input" style="cursor: pointer;position: relative;left: -30px;">
-                <svg class="icon-copy" style="margin: 4px;margin-bottom: 0px;"><use xlink:href="#yj-icon-copy"></use></svg>
-              </i>
-              <button class="convert" style="margin-left: 10px;">转 换</button>
-            </div>
-          </div>
-        </div>
-        <div class="div-item item" data-type="${2}">
-          <span class="custom-divider"></span>
-          <p style="font-size: 16px;padding-bottom: 6px;margin-top: 10px;margin-bottom: 5px;">
-            <span style="margin-right: 10px;">度分秒</span>
-            <span style="font-size: 12px;margin-bottom: 5px;color: #F16C55">例如11°18'54.37", 39°13'46.57"</span>
-          </p>
-          <div class="row">
-            <div class="col" style="flex-direction: column;">
-              <div class="row" style="margin-bottom: 15px;">
-                <span class="label">经度</span>
-                <input class="input lng-dms-d" style="flex: 1;" type="number" min="-180" max="180" value="0" title="">
-                <span class="label" style="flex: 0 0 14px;margin: 0 10px;">度</span>
-                <input class="input lng-dms-m" style="flex: 1;" type="number" min="0" max="60" value="0" title="">
-                <span class="label" style="flex: 0 0 14px;margin: 0 10px;">分</span>
-                <input class="input lng-dms-s" style="flex: 1;" type="number" min="0" max="60" value="0" title="">
-                <span class="label" style="flex: 0 0 14px;margin: 0 10px;">秒</span>
-                <span class="top-line"></span>
-              </div>
-              <div class="row">
-                <span class="label">纬度</span>
-                <input class="input lat-dms-d" style="flex: 1;" type="number" min="-90" max="90" value="0" title="">
-                <span class="label" style="flex: 0 0 14px;margin: 0 10px;">度</span>
-                <input class="input lat-dms-m" style="flex: 1;" type="number" min="0" max="60" value="0" title="">
-                <span class="label" style="flex: 0 0 14px;margin: 0 10px;">分</span>
-                <input class="input lat-dms-s" style="flex: 1;" type="number" min="0" max="60" value="0" title="">
-                <span class="label" style="flex: 0 0 14px;margin: 0 10px;">秒</span>
-                <span class="bottom-line"></span>
-              </div>
-            </div>
-            <div class="col" style="flex: 0 0 24px; margin: 0;">
-              <i class="icon-copy-box" title="复制" data-clipboard-action="copy" data-clipboard-target=".input" style="cursor: pointer;position: relative;left: -30px;">
-                <svg class="icon-copy" style="margin: 4px;margin-bottom: 0px;"><use xlink:href="#yj-icon-copy"></use></svg>
-              </i>
-              <button class="convert" style="margin-left: 10px;">转 换</button>
-            </div>
-          </div>
-        </div>
-        <span class="custom-divider" style="order: 10;margin-top: 12px;"></span>
-      `
-  _DialogObject._element.body.className = _DialogObject._element.body.className + ' proj-convert'
-  let contentElm = document.createElement('div')
-  contentElm.style.width = '460px'
-  contentElm.style.display = 'flex'
-  contentElm.style.flexDirection = 'column'
-  contentElm.innerHTML = html
-  _DialogObject.contentAppChild(contentElm)
+  // let html = `
+  //       <span class="custom-divider"></span>
+  //       <div class="div-item">
+  //         <div class="row">
+  //           <div class="col input-select-box">
+  //             <span class="label" style="flex: 0 0 60px;">输入格式</span>
+  //             <div class="input-select"></div>
+  //           </div>
+  //         </div>
+  //       </div>
+  //       <div class="div-item item" data-type="${0}">
+  //         <span class="custom-divider"></span>
+  //         <p style="font-size: 16px;padding-bottom: 6px;margin-top: 10px;margin-bottom: 5px;">
+  //           <span style="margin-right: 10px;">度</span>
+  //           <span style="font-size: 12px;margin-bottom: 5px;color: #F16C55">例如116.6°, 39.9°</span>
+  //         </p>
+  //         <div class="row">
+  //           <div class="col">
+  //             <span class="label" style="flex: auto;">经度</span>
+  //             <input class="input lng" type="number" min="-180" max="180" value="0" title="">
+  //           </div>
+  //           <div class="col" style="margin: 0;">
+  //             <span class="label">纬度</span>
+  //             <input class="input lat" type="number" min="-90" max="90" value="0" title="">
+  //           </div>
+  //           <div class="col" style="flex: 0 0 24px;">
+  //             <i class="icon-copy-box" title="复制" data-clipboard-action="copy" data-clipboard-target=".input" style="cursor: pointer;">
+  //               <svg class="icon-copy" style="margin: 4px;margin-bottom: 0px;"><use xlink:href="#yj-icon-copy"></use></svg>
+  //             </i>
+  //             <button class="convert" style="margin-left: 10px;">转 换</button>
+  //           </div>
+  //         </div>
+  //       </div>
+  //       <div class="div-item item" data-type="${1}">
+  //         <span class="custom-divider"></span>
+  //         <p style="font-size: 16px;padding-bottom: 6px;margin-top: 10px;margin-bottom: 5px;">
+  //           <span style="margin-right: 10px;">度分</span>
+  //           <span style="font-size: 12px;margin-bottom: 5px;color: #F16C55">例如95°10.1702', 49°12.4015'</span>
+  //         </p>
+  //         <div class="row">
+  //           <div class="col" style="flex-direction: column;">
+  //             <div class="row" style="margin-bottom: 15px;">
+  //               <span class="label">经度</span>
+  //               <input class="input lng-dm-d" style="flex: 1;" type="number" min="-180" max="180" value="0" title="">
+  //               <span class="label" style="flex: 0 0 14px;margin: 0 10px;">度</span>
+  //               <input class="input lng-dm-m" style="flex: 1;" type="number" min="0" max="60" value="0" title="">
+  //               <span class="label" style="flex: 0 0 14px;margin: 0 10px;">分</span>
+  //               <span class="top-line"></span>
+  //             </div>
+  //             <div class="row">
+  //               <span class="label">纬度</span>
+  //               <input class="input lat-dm-d" style="flex: 1;" type="number" min="-90" max="90" value="0" title="">
+  //               <span class="label" style="flex: 0 0 14px;margin: 0 10px;">度</span>
+  //               <input class="input lat-dm-m" style="flex: 1;" type="number" min="0" max="60" value="0" title="">
+  //               <span class="label" style="flex: 0 0 14px;margin: 0 10px;">分</span>
+  //               <span class="bottom-line"></span>
+  //             </div>
+  //           </div>
+  //           <div class="col" style="flex: 0 0 24px;margin: 0;">
+  //             <i class="icon-copy-box" title="复制" data-clipboard-action="copy" data-clipboard-target=".input" style="cursor: pointer;position: relative;left: -30px;">
+  //               <svg class="icon-copy" style="margin: 4px;margin-bottom: 0px;"><use xlink:href="#yj-icon-copy"></use></svg>
+  //             </i>
+  //             <button class="convert" style="margin-left: 10px;">转 换</button>
+  //           </div>
+  //         </div>
+  //       </div>
+  //       <div class="div-item item" data-type="${2}">
+  //         <span class="custom-divider"></span>
+  //         <p style="font-size: 16px;padding-bottom: 6px;margin-top: 10px;margin-bottom: 5px;">
+  //           <span style="margin-right: 10px;">度分秒</span>
+  //           <span style="font-size: 12px;margin-bottom: 5px;color: #F16C55">例如11°18'54.37", 39°13'46.57"</span>
+  //         </p>
+  //         <div class="row">
+  //           <div class="col" style="flex-direction: column;">
+  //             <div class="row" style="margin-bottom: 15px;">
+  //               <span class="label">经度</span>
+  //               <input class="input lng-dms-d" style="flex: 1;" type="number" min="-180" max="180" value="0" title="">
+  //               <span class="label" style="flex: 0 0 14px;margin: 0 10px;">度</span>
+  //               <input class="input lng-dms-m" style="flex: 1;" type="number" min="0" max="60" value="0" title="">
+  //               <span class="label" style="flex: 0 0 14px;margin: 0 10px;">分</span>
+  //               <input class="input lng-dms-s" style="flex: 1;" type="number" min="0" max="60" value="0" title="">
+  //               <span class="label" style="flex: 0 0 14px;margin: 0 10px;">秒</span>
+  //               <span class="top-line"></span>
+  //             </div>
+  //             <div class="row">
+  //               <span class="label">纬度</span>
+  //               <input class="input lat-dms-d" style="flex: 1;" type="number" min="-90" max="90" value="0" title="">
+  //               <span class="label" style="flex: 0 0 14px;margin: 0 10px;">度</span>
+  //               <input class="input lat-dms-m" style="flex: 1;" type="number" min="0" max="60" value="0" title="">
+  //               <span class="label" style="flex: 0 0 14px;margin: 0 10px;">分</span>
+  //               <input class="input lat-dms-s" style="flex: 1;" type="number" min="0" max="60" value="0" title="">
+  //               <span class="label" style="flex: 0 0 14px;margin: 0 10px;">秒</span>
+  //               <span class="bottom-line"></span>
+  //             </div>
+  //           </div>
+  //           <div class="col" style="flex: 0 0 24px; margin: 0;">
+  //             <i class="icon-copy-box" title="复制" data-clipboard-action="copy" data-clipboard-target=".input" style="cursor: pointer;position: relative;left: -30px;">
+  //               <svg class="icon-copy" style="margin: 4px;margin-bottom: 0px;"><use xlink:href="#yj-icon-copy"></use></svg>
+  //             </i>
+  //             <button class="convert" style="margin-left: 10px;">转 换</button>
+  //           </div>
+  //         </div>
+  //       </div>
+  //       <span class="custom-divider" style="order: 10;margin-top: 12px;"></span>
+  //     `
+  // _DialogObject._element.body.className = _DialogObject._element.body.className + ' proj-convert'
+  // let contentElm = document.createElement('div')
+  // contentElm.style.width = '460px'
+  // contentElm.style.display = 'flex'
+  // contentElm.style.flexDirection = 'column'
+  // contentElm.innerHTML = html
+  // _DialogObject.contentAppChild(contentElm)
+
+  let contentElm = document.getElementsByClassName('proj-convert')[0].getElementsByClassName('content')[0]
 
   let items = contentElm.getElementsByClassName('item')
-
   for (let i = 0; i < items.length; i++) {
     let type = items[i].getAttribute('data-type')
     let convertElm = items[i].getElementsByClassName('convert')[0]
@@ -183,20 +186,10 @@ const open = async (sdk, closeCallBack) => {
     });
 
     clipboard.on('success', function (e) {
-      window.ELEMENT &&
-        window.ELEMENT.Message({
-          message: '已复制到剪切板',
-          type: 'success',
-          duration: 1500
-        })
+      tools.message({ text: '已复制到剪切板' })
     });
     clipboard.on('error', function (e) {
-      window.ELEMENT &&
-        window.ELEMENT.Message({
-          message: '复制失败',
-          type: 'warning',
-          duration: 1500
-        })
+      tools.message({ type: 'warning', text: '复制失败' })
     });
     convertElm.addEventListener('click', () => {
       // let a = proj.degreesToDMS(100.345546743)
@@ -317,12 +310,7 @@ const open = async (sdk, closeCallBack) => {
           contentElm.getElementsByClassName('lat-dm-m')[0].value = latdnArr2[0]
           break
       }
-      window.ELEMENT &&
-        window.ELEMENT.Message({
-          message: '转换成功',
-          type: 'success',
-          duration: 1500
-        })
+      tools.message({ text: '转换成功' })
       for (let m = 0; m < items.length; m++) {
         items[m].style.display = 'block'
       }
@@ -372,10 +360,10 @@ const open = async (sdk, closeCallBack) => {
   }
   ]
 
-  let selectDataLegpObject = legp(_DialogObject._element.content.getElementsByClassName('input-select-box')[0], ".input-select")
+  let selectDataLegpObject = legp(contentElm.getElementsByClassName('input-select-box')[0], ".input-select")
   if (selectDataLegpObject) {
     selectDataLegpObject.legp_search(selectData)
-    let selectDataLegpElm = _DialogObject._element.content.getElementsByClassName('input-select')[0].getElementsByTagName('input')[0]
+    let selectDataLegpElm = contentElm.getElementsByClassName('input-select')[0].getElementsByTagName('input')[0]
     selectDataLegpElm.value = selectData[0].value
     selectDataLegpElm.addEventListener('input', () => {
       for (let i = 0; i < selectData.length; i++) {

src/Tools/projectionConvert.js

@@ -5,77 +5,78 @@ import MouseEvent from '../Event/index'
 import MouseTip from '../MouseTip'
 import Tools from '../Tools'
 let _DialogObject
+let tip
+let event
 const open = async (sdk, closeCallBack) => {
   let topls = new Tools()
   let proj = new Proj()
-  let tip
-  let event
-  if (_DialogObject && _DialogObject.close) {
-    _DialogObject.close()
-    _DialogObject = null
-  }
-  _DialogObject = await new Dialog(sdk.viewer._container, {
-    title: '投影转换', left: '180px', top: '100px',
-    closeCallBack: () => {
-      closeCallBack && closeCallBack()
-    },
-  })
-  await _DialogObject.init()
+  // if (_DialogObject && _DialogObject.close) {
+  //   _DialogObject.close()
+  //   _DialogObject = null
+  // }
+  // _DialogObject = await new Dialog(sdk.viewer._container, {
+  //   title: '投影转换', left: '180px', top: '100px',
+  //   closeCallBack: () => {
+  //     closeCallBack && closeCallBack()
+  //   },
+  // })
+  // await _DialogObject.init()
 
-  let html = `
-    <span class="custom-divider"></span>
-    <div style="width: 540px;display: flex;">
-      <div class="row left" style="flex: 1;margin-bottom: 0;">
-        <div style="margin: 10px 0;flex: 1;display: flex;align-items: center;flex: 1;justify-content: space-between;">
-          <span class="lable-left-line">源坐标</span>
-          <button class="btn pick" style="margin-left: 20px;"><svg class="icon-edit"><use xlink:href="#yj-icon-edit"></use></svg>坐标拾取</button>
-        </div>
-        <div>
-          <div style="display: flex;margin-bottom: 12px;align-items: center;">
-            <span class="label" style="flex: 0 0 60px;">椭圆基准</span>
-            <div class="datalist_left"></div>
-          </div>
-          <div style="display: flex;margin-bottom: 12px;align-items: center;">
-            <span class="label" style="flex: 0 0 60px;">经度(x)</span>
-            <input class="input left-x" type="number" title="">
-          </div>
-          <div style="display: flex;margin-bottom: 10px;align-items: center;">
-            <span class="label" style="flex: 0 0 60px;">纬度(y)</span>
-            <input class="input left-y" type="number" title="">
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;flex-direction: column;justify-content: center;margin: 28px 15px 0 15px;">
-        <button class="btn convert">坐标转换<i style="margin-top: 2px;margin-left: 5px;" class="el-icon-right"></i></button>
-      </div>
-      <div class="row right" style="flex: 1;margin-bottom: 0;">
-        <div style="margin: 10px 0;height: 32px; display: flex;align-items: center;flex: 1;justify-content: space-between;">
-          <span class="lable-left-line">目标坐标</span>
-          <button class="btn copy" data-clipboard-action="copy" data-clipboard-target=".input" style="margin-left: 20px;"><svg class="icon-copy"><use xlink:href="#yj-icon-copy"></use></svg>复制</button>
-        </div>
-        <div>
-          <div style="display: flex;margin-bottom: 12px;align-items: center;">
-            <span class="label" style="flex: 0 0 60px;">椭圆基准</span>
-            <div class="datalist_right"></div>
-          </div>
-          <div style="display: flex;margin-bottom: 12px;align-items: center;">
-            <span class="label" style="flex: 0 0 60px;">经度(x)</span>
-            <input class="input right-x" readonly="readonly">
-          </div>
-          <div style="display: flex;margin-bottom: 10px;align-items: center;">
-            <span class="label" style="flex: 0 0 60px;">纬度(y)</span>
-            <input class="input right-y" readonly="readonly">
-          </div>
-        </div>
-      </div>
-    </div>
-    <span class="custom-divider"></span>
-  `
-  let contentElm = document.createElement('div');
-  contentElm.innerHTML = html
-  _DialogObject.contentAppChild(contentElm)
+  // let html = `
+  //   <span class="custom-divider"></span>
+  //   <div style="width: 540px;display: flex;">
+  //     <div class="row left" style="flex: 1;margin-bottom: 0;">
+  //       <div style="margin: 10px 0;flex: 1;display: flex;align-items: center;flex: 1;justify-content: space-between;">
+  //         <span class="lable-left-line">源坐标</span>
+  //         <button class="btn pick" style="margin-left: 20px;"><svg class="icon-edit"><use xlink:href="#yj-icon-edit"></use></svg>坐标拾取</button>
+  //       </div>
+  //       <div>
+  //         <div style="display: flex;margin-bottom: 12px;align-items: center;">
+  //           <span class="label" style="flex: 0 0 60px;">椭圆基准</span>
+  //           <div class="datalist_left"></div>
+  //         </div>
+  //         <div style="display: flex;margin-bottom: 12px;align-items: center;">
+  //           <span class="label" style="flex: 0 0 60px;">经度(x)</span>
+  //           <input class="input left-x" type="number" title="">
+  //         </div>
+  //         <div style="display: flex;margin-bottom: 10px;align-items: center;">
+  //           <span class="label" style="flex: 0 0 60px;">纬度(y)</span>
+  //           <input class="input left-y" type="number" title="">
+  //         </div>
+  //       </div>
+  //     </div>
+  //     <div style="display: flex;flex-direction: column;justify-content: center;margin: 28px 15px 0 15px;">
+  //       <button class="btn convert">坐标转换<i style="margin-top: 2px;margin-left: 5px;" class="el-icon-right"></i></button>
+  //     </div>
+  //     <div class="row right" style="flex: 1;margin-bottom: 0;">
+  //       <div style="margin: 10px 0;height: 32px; display: flex;align-items: center;flex: 1;justify-content: space-between;">
+  //         <span class="lable-left-line">目标坐标</span>
+  //         <button class="btn copy" data-clipboard-action="copy" data-clipboard-target=".input" style="margin-left: 20px;"><svg class="icon-copy"><use xlink:href="#yj-icon-copy"></use></svg>复制</button>
+  //       </div>
+  //       <div>
+  //         <div style="display: flex;margin-bottom: 12px;align-items: center;">
+  //           <span class="label" style="flex: 0 0 60px;">椭圆基准</span>
+  //           <div class="datalist_right"></div>
+  //         </div>
+  //         <div style="display: flex;margin-bottom: 12px;align-items: center;">
+  //           <span class="label" style="flex: 0 0 60px;">经度(x)</span>
+  //           <input class="input right-x" readonly="readonly">
+  //         </div>
+  //         <div style="display: flex;margin-bottom: 10px;align-items: center;">
+  //           <span class="label" style="flex: 0 0 60px;">纬度(y)</span>
+  //           <input class="input right-y" readonly="readonly">
+  //         </div>
+  //       </div>
+  //     </div>
+  //   </div>
+  //   <span class="custom-divider"></span>
+  // `
+  // let contentElm = document.createElement('div');
+  // contentElm.innerHTML = html
+  // _DialogObject.contentAppChild(contentElm)
 
   // legp(contentElm, ".datalist").legp_search(tagData)
+  let contentElm = document.getElementsByClassName('projection-convert')[0].getElementsByClassName('content')[0]
 
   let tagData = []
   let i = 0
@@ -95,6 +96,7 @@ const open = async (sdk, closeCallBack) => {
 
   let pickElm = contentElm.getElementsByClassName('pick')[0]
   let copyElm = contentElm.getElementsByClassName('copy')[0]
+  let sourceCopyElm = contentElm.getElementsByClassName('sourceCopy')[0]
   let datalistLeftInput = contentElm.getElementsByClassName('datalist_left')[0].getElementsByTagName('input')[0]
   datalistLeftInput.value = tagData[0].value
   legpObjectLeft.legp_searchActive(tagData[0].value)
@@ -137,11 +139,7 @@ const open = async (sdk, closeCallBack) => {
     if (!leftXElm.value || !leftYElm.value) {
       rightXElm.value = ''
       rightYElm.value = ''
-      window.ELEMENT && window.ELEMENT.Message({
-        message: '请输入源坐标',
-        type: 'warning',
-        duration: 1500
-      });
+      topls.message({ type: 'warning', text: '请输入源坐标' })
       return
     }
     let result = proj.convert([{ x: Number(leftXElm.value), y: Number(leftYElm.value) }], datalistLeftInput.value, datalistRightInput.value)
@@ -150,11 +148,7 @@ const open = async (sdk, closeCallBack) => {
       rightYElm.value = result.points[0].y
     }
     else {
-      window.ELEMENT && window.ELEMENT.Message({
-        message: result.message,
-        type: 'warning',
-        duration: 1500
-      });
+      topls.message({ type: 'warning', text: result.message })
     }
   })
 
@@ -164,11 +158,7 @@ const open = async (sdk, closeCallBack) => {
       if (!rightXElm.value || !rightYElm.value) {
         rightXElm.value = ''
         rightYElm.value = ''
-        window.ELEMENT && window.ELEMENT.Message({
-          message: '复制失败，目标坐标为空！',
-          type: 'warning',
-          duration: 1500
-        });
+        topls.message({ type: 'warning', text: '复制失败，目标坐标为空！' })
       }
       else {
         let text = `${rightXElm.value},${rightYElm.value}`
@@ -177,13 +167,26 @@ const open = async (sdk, closeCallBack) => {
     }
   });
 
+
   clipboard.on('success', function (e) {
-    window.ELEMENT &&
-      window.ELEMENT.Message({
-        message: '已复制到剪切板',
-        type: 'success',
-        duration: 1500
-      })
+    topls.message({ text: '已复制到剪切板' })
+  });
+
+  let sourcelipboard = new ClipboardJS(sourceCopyElm, {
+    text: (trigger) => {
+      if (!leftXElm.value || !leftYElm.value) {
+        leftXElm.value = ''
+        leftYElm.value = ''
+        topls.message({ type: 'warning', text: '复制失败，目标坐标为空！' })
+      }
+      else {
+        let text = `${leftXElm.value},${leftYElm.value}`
+        return text;
+      }
+    }
+  });
+  sourcelipboard.on('success', function (e) {
+    topls.message({ text: '已复制到剪切板' })
   });
 }
 
@@ -192,6 +195,8 @@ const close = () => {
     _DialogObject.close()
     _DialogObject = null
   }
+  tip && tip.destroy()
+  event && event.destroy()
 }
 
-export { open, close }
+export { open, close }

src/YJEarth/index.js

@@ -31,6 +31,8 @@ import YJColorPicker from "../Obj/Element/yj-color-picker";
 
 class YJEarth {
   #_requestAnimationFrameEventId = undefined
+  #_BillboardCollection
+  #_LabelCollection
   /**
    * @constructor
    * @param div_id {string} 地球所在的dom id
@@ -272,6 +274,34 @@ class YJEarth {
     this.viewer.scene.fxaa = true
     this.viewer.scene.postProcessStages.fxaa.enabled = true
     this.viewer.scene.screenSpaceCameraController.enableCollisionDetection = true //true 禁止 false 允许
+
+
+
+
+
+
+
+
+    const BillboardCollection = this.viewer.scene.primitives.add(new Cesium.BillboardCollection({
+      scene: this.viewer.scene,
+    }));
+    const labelCollection = this.viewer.scene.primitives.add(new Cesium.LabelCollection({
+      scene: this.viewer.scene,
+    }));
+
+    this.#_BillboardCollection = BillboardCollection
+    this.#_LabelCollection = labelCollection
+
+
+
+
+
+
+
+
+
+
+
     createCluster(this.viewer)
     keyboardMapRoamingInit(this.viewer)
     let a = Cesium.viewerCesiumNavigationMixin(this.viewer, {
@@ -522,6 +552,13 @@ class YJEarth {
 
   }
 
+  get collection() {
+    return {
+      billboard: this.#_BillboardCollection,
+      label: this.#_LabelCollection
+    }
+  }
+
   destroy() {
     cancelAnimationFrame(this.#_requestAnimationFrameEventId)
     for (let [id, obj] of this.entityMap) {

static/custom/css/index.css

@@ -65,7 +65,7 @@
   position: absolute;
   color: var(--color-sdk-auxiliary-public);
   font-size: 14px;
-  z-index: 999999;
+  z-index: 99;
   background: linear-gradient(0deg, var(--color-sdk-bg-gradual)), rgba(0, 0, 0, 0.6);
   border: 1.5px solid;
   border-image: linear-gradient(to bottom, var(--color-sdk-gradual)) 1;
@@ -76,8 +76,6 @@
 }
 
 .YJ-custom-base-dialog * {
-  margin: 0px;
-  padding: 0px;
   box-sizing: border-box;
 }
 
@@ -171,7 +169,7 @@
   position: relative;
 }
 
-.YJ-custom-base-dialog button:not(button[disabled="disabled"]):hover {
+.YJ-custom-base-dialog button:not(button[disabled]):hover {
   border-color: rgba(var(--color-sdk-base-rgb), 1) !important;
   cursor: pointer;
 }
@@ -3888,3 +3886,81 @@
       /* 移回顶部外 */
   }
 }
+
+.yj-custom-icon {
+  display: inline-block;
+  width: 22px;
+  height: 10px;
+  margin-right: 5px;
+}
+
+.yj-custom-icon.line {
+  border: 1px solid rgba(255, 255, 255, 1);
+  height: 0px;
+  margin-top: 4px;
+}
+
+.yj-custom-icon.dash-line {
+  border: 1px dashed rgba(255, 255, 255, 1);
+  height: 0px;
+  margin-top: 4px;
+}
+
+.yj-custom-icon.light-line {
+  border: 1px solid rgba(255, 255, 255, 1);
+  height: 0px;
+  margin-top: 4px;
+  box-shadow: 0 0 3px #fff
+}
+
+.yj-custom-icon.tail-line {
+  background: url(../../img/arrow/tail.png) 100% 100% no-repeat;
+  background-size: 100% 100%;
+}
+
+.yj-custom-icon.mult-tail-line {
+  background: url(../../img/arrow/tail.png) 100% 100% no-repeat;
+  background-size: 100% 100%;
+}
+
+.yj-custom-icon.flow-dash-line1 {
+  border: 1px dashed rgba(255, 255, 255, 1);
+  height: 0px;
+  margin-top: 4px;
+}
+
+.yj-custom-icon.flow-dash-line2 {
+  border: 1px dashed rgba(255, 255, 255, 1);
+  height: 0px;
+  margin-top: 4px;
+}
+
+.yj-custom-icon.pic-line1 {
+  background: url(../../img/arrow/1.png) 100% 100% no-repeat;
+  background-size: 100% 100%;
+}
+
+.yj-custom-icon.pic-line2 {
+  background: url(../../img/arrow/2.png) 100% 100% no-repeat;
+  background-size: 100% 100%;
+}
+
+.yj-custom-icon.pic-line3 {
+  background: url(../../img/arrow/3.png) 100% 100% no-repeat;
+  background-size: 100% 100%;
+}
+
+.yj-custom-icon.pic-line4 {
+  background: url(../../img/arrow/4.png) 100% 100% no-repeat;
+  background-size: 100% 100%;
+}
+
+.yj-custom-icon.pic-line5 {
+  background: url(../../img/arrow/5.png) 100% 100% no-repeat;
+  background-size: 100% 100%;
+}
+
+.yj-custom-icon.pic-line6 {
+  background: url(../../img/arrow/6.png) 100% 100% no-repeat;
+  background-size: 100% 100%;
+}

yarn.lock

@@ -24,7 +24,7 @@
   resolved "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.26.2.tgz"
   integrity sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==
 
-"@babel/core@^7.4.0":
+"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.0.0-0 || ^8.0.0-0 <8.0.0", "@babel/core@^7.12.0", "@babel/core@^7.13.0", "@babel/core@^7.4.0", "@babel/core@^7.4.0 || ^8.0.0-0 <8.0.0":
   version "7.26.0"
   resolved "https://registry.npmmirror.com/@babel/core/-/core-7.26.0.tgz"
   integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==
@@ -971,7 +971,7 @@
   resolved "https://registry.npmmirror.com/@types/linkify-it/-/linkify-it-5.0.0.tgz"
   integrity sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==
 
-"@types/markdown-it@^12.2.3":
+"@types/markdown-it@*", "@types/markdown-it@^12.2.3":
   version "12.2.3"
   resolved "https://registry.npmmirror.com/@types/markdown-it/-/markdown-it-12.2.3.tgz"
   integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
@@ -1144,7 +1144,7 @@ acorn-jsx@^5.0.0:
   resolved "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^6.0.7, acorn@^6.4.1:
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^6.0.7, acorn@^6.4.1:
   version "6.4.2"
   resolved "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
@@ -1159,7 +1159,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1, ajv@>=5.0.0:
   version "6.12.6"
   resolved "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -1422,11 +1422,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.0.2:
-  version "1.5.1"
-  resolved "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.npmmirror.com/base/-/base-0.11.2.tgz"
@@ -1440,6 +1435,11 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
+base64-js@^1.0.2:
+  version "1.5.1"
+  resolved "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz"
@@ -1455,19 +1455,22 @@ binary-extensions@^2.0.0:
   resolved "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz"
   integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
 bluebird@^3.5.5, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.npmmirror.com/bluebird/-/bluebird-3.7.2.tgz"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
+bn.js@^4.0.0:
+  version "4.12.1"
+  resolved "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz"
+  integrity sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==
+
+bn.js@^4.1.0:
+  version "4.12.1"
+  resolved "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz"
+  integrity sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==
+
+bn.js@^4.11.9:
   version "4.12.1"
   resolved "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz"
   integrity sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==
@@ -1576,7 +1579,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.24.0, browserslist@^4.24.2:
+browserslist@^4.24.0, browserslist@^4.24.2, "browserslist@>= 4.21.0":
   version "4.24.2"
   resolved "https://registry.npmmirror.com/browserslist/-/browserslist-4.24.2.tgz"
   integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
@@ -2006,7 +2009,14 @@ data-view-byte-offset@^1.0.0:
     es-errors "^1.3.0"
     is-data-view "^1.0.1"
 
-debug@^2.2.0, debug@^2.3.3:
+debug@^2.2.0:
+  version "2.6.9"
+  resolved "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -2444,7 +2454,7 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   resolved "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint@^5.15.3:
+"eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9", eslint@^5.15.3, "eslint@>= 4.12.1", eslint@>=3.14.1, eslint@>=4.19.1, eslint@>=5.0.0:
   version "5.16.0"
   resolved "https://registry.npmmirror.com/eslint/-/eslint-5.16.0.tgz"
   integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
@@ -2519,7 +2529,12 @@ estraverse@^4.1.1:
   resolved "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.1.0, estraverse@^5.2.0:
+estraverse@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+estraverse@^5.2.0:
   version "5.3.0"
   resolved "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
@@ -2639,11 +2654,6 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmmirror.com/fill-range/-/fill-range-4.0.0.tgz"
@@ -2768,19 +2778,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
-
-fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
 function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz"
@@ -3131,7 +3128,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@2:
   version "2.0.4"
   resolved "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -3297,6 +3294,11 @@ is-extendable@^0.1.0, is-extendable@^0.1.1:
   resolved "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
   integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
 
+is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
+  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
+
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz"
@@ -3449,7 +3451,7 @@ is-wsl@^1.1.0:
   resolved "https://registry.npmmirror.com/is-wsl/-/is-wsl-1.1.0.tgz"
   integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
@@ -3542,7 +3544,14 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json5@^1.0.1, json5@^1.0.2:
+json5@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
+  dependencies:
+    minimist "^1.2.0"
+
+json5@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz"
   integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
@@ -3554,7 +3563,21 @@ json5@^2.1.2, json5@^2.2.3:
   resolved "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+kind-of@^3.0.2:
+  version "3.2.2"
+  resolved "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
+  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^3.0.3:
+  version "3.2.2"
+  resolved "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
+  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
   integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
@@ -3600,7 +3623,16 @@ loader-runner@^2.4.0:
   resolved "https://registry.npmmirror.com/loader-runner/-/loader-runner-2.4.0.tgz"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@^1.2.3, loader-utils@^1.4.0:
+loader-utils@^1.2.3:
+  version "1.4.2"
+  resolved "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
+loader-utils@^1.4.0:
   version "1.4.2"
   resolved "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz"
   integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
@@ -3682,7 +3714,7 @@ markdown-it-anchor@^8.4.1:
   resolved "https://registry.npmmirror.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz"
   integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==
 
-markdown-it@^12.3.2:
+markdown-it@*, markdown-it@^12.3.2:
   version "12.3.2"
   resolved "https://registry.npmmirror.com/markdown-it/-/markdown-it-12.3.2.tgz"
   integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
@@ -3847,26 +3879,21 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz"
-  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
-
 ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz"
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
+
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.7.tgz"
   integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==
 
-nan@^2.12.1:
-  version "2.22.2"
-  resolved "https://registry.npmmirror.com/nan/-/nan-2.22.2.tgz#6b504fd029fb8f38c0990e52ad5c26772fdacfbb"
-  integrity sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==
-
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.npmmirror.com/nanomatch/-/nanomatch-1.2.13.tgz"
@@ -4258,7 +4285,7 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^1.16.4:
+prettier@^1.16.4, prettier@>=1.13.0:
   version "1.19.1"
   resolved "https://registry.npmmirror.com/prettier/-/prettier-1.19.1.tgz"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
@@ -4325,7 +4352,12 @@ pumpify@^1.3.3:
     inherits "^2.0.3"
     pump "^2.0.0"
 
-punycode@^1.2.4, punycode@^1.4.1:
+punycode@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.npmmirror.com/punycode/-/punycode-1.4.1.tgz"
+  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
+
+punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.npmmirror.com/punycode/-/punycode-1.4.1.tgz"
   integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
@@ -4362,7 +4394,7 @@ randomfill@^1.0.4:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@^2.3.8, readable-stream@~2.3.6:
+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@^2.3.8, readable-stream@~2.3.6, "readable-stream@1 || 2":
   version "2.3.8"
   resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -4564,13 +4596,6 @@ ret@~0.1.10:
   resolved "https://registry.npmmirror.com/ret/-/ret-0.1.15.tgz"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.npmmirror.com/rimraf/-/rimraf-2.6.3.tgz"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
@@ -4578,6 +4603,13 @@ rimraf@^2.5.4, rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
+rimraf@2.6.3:
+  version "2.6.3"
+  resolved "https://registry.npmmirror.com/rimraf/-/rimraf-2.6.3.tgz"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.npmmirror.com/ripemd160/-/ripemd160-2.0.2.tgz"
@@ -4683,7 +4715,12 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+semver@^5.5.0, semver@^5.5.1:
+  version "5.7.2"
+  resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
+
+semver@^5.6.0:
   version "5.7.2"
   resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
@@ -4931,6 +4968,13 @@ stream-shift@^1.0.0:
   resolved "https://registry.npmmirror.com/stream-shift/-/stream-shift-1.0.3.tgz"
   integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==
 
+string_decoder@^1.0.0, string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
 string-width@^2.1.0:
   version "2.1.1"
   resolved "https://registry.npmmirror.com/string-width/-/string-width-2.1.1.tgz"
@@ -4939,7 +4983,16 @@ string-width@^2.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0, string-width@^3.1.0:
+string-width@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.npmmirror.com/string-width/-/string-width-3.1.0.tgz"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmmirror.com/string-width/-/string-width-3.1.0.tgz"
   integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
@@ -4976,13 +5029,6 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-string_decoder@^1.0.0, string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-4.0.0.tgz"
@@ -5080,6 +5126,11 @@ text-table@^0.2.0:
   resolved "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.npmmirror.com/through/-/through-2.3.8.tgz"
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
+
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.npmmirror.com/through2/-/through2-2.0.5.tgz"
@@ -5088,11 +5139,6 @@ through2@^2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.npmmirror.com/through/-/through-2.3.8.tgz"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
 timers-browserify@^2.0.4:
   version "2.0.12"
   resolved "https://registry.npmmirror.com/timers-browserify/-/timers-browserify-2.0.12.tgz"
@@ -5428,7 +5474,7 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.29.6:
+webpack@^4.0.0, "webpack@^4.0.0 || ^5.0.0", webpack@^4.29.6, webpack@>=2, webpack@4.x.x:
   version "4.47.0"
   resolved "https://registry.npmmirror.com/webpack/-/webpack-4.47.0.tgz"
   integrity sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==
@@ -5513,7 +5559,21 @@ which-typed-array@^1.1.14, which-typed-array@^1.1.15:
     gopd "^1.0.1"
     has-tostringtag "^1.0.2"
 
-which@^1.2.14, which@^1.2.9, which@^1.3.1:
+which@^1.2.14:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/which/-/which-1.3.1.tgz"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/which/-/which-1.3.1.tgz"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.npmmirror.com/which/-/which-1.3.1.tgz"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==