卷帘功能忽略文本框

src/Global/FlyRoam/index.js

@@ -135,6 +135,7 @@ const open = async (sdk, options = {}, _Dialog = {}) => {
       pitch: viewer.camera.pitch,
       roll: viewer.camera.roll
     }
+    tools.message({text: '操作成功'})
   })
 
   let totalTimeElm = contentElm.querySelector("input[name='totalTime']")

src/Global/MultiViewportMode/index.js

@@ -157,7 +157,12 @@ async function syncData2(sdk, id, entityId) {
         if (that.showView == 3) {
           options.show = false
         }
-        let newObject = await new that.constructor(sdk2D, options)
+        let callback
+        if(that.type === 'TextBox') {
+          callback = that.callback
+        }
+
+        let newObject = await new that.constructor(sdk2D, options, callback)
         newObject.onClick = that.onClick
         newObject.onRightClick = that.onRightClick
         newObject.onMouseMove = that.onMouseMove

src/Global/SplitScreen/index.js

@@ -1298,8 +1298,8 @@ function setActiveId(ids = []) {
 
 
         let thatP = sdkP.entityMap.get(activeIds[i])
-        let thatD = sdkD.entityMap.get(activeIds[i])
-        if (!thatP || (thatP.type === 'terrain' || !thatP.show)) {
+        // let thatD = sdkD.entityMap.get(activeIds[i])
+        if (!thatP || (thatP.type === 'terrain' || !thatP.show) || thatP.type === 'TextBox') {
           leftElm.style.display = 'none'
           rightElm.style.display = 'none'
           continue

src/Obj/Base/BatchModel/index.js

@@ -5,6 +5,7 @@ import Dialog from '../../Element/Dialog';
 import { html } from "./_element";
 import EventBinding from '../../Element/Dialog/eventBinding';
 import Base from "../index";
+import Tools from "../../../Tools";
 import { syncData } from '../../../Global/MultiViewportMode'
 import Model from '../BaseSource/BaseModel/Model'
 import { legp } from '../../Element/datalist'
@@ -13,7 +14,7 @@ import DrawPolyline from '../../../Draw/drawPolyline'
 import DrawPolygon from '../../../Draw/drawPolygon'
 import DrawThreeRect from '../../../Draw/drawThreeRect'
 import DrawPoint from '../../../Draw/drawPoint'
-import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
+import { setActiveViewer, closeRotateAround, closeViewFollow, CesiumContainer } from '../../../Global/global'
 
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../Global/SplitScreen'
 
@@ -46,6 +47,7 @@ class BatchModel extends Base {
     this._elms = {};
     this.pointArr = []
     this.sdk.addIncetance(this.options.id, this)
+    let tools = new Tools(sdk)
     // BatchModel.computeDis(this)
     // if (this.options.positions.length > 0 || this.options.positions.lng) {
     if ((options.type && options.spacing != undefined) || options.type == '点') {
@@ -67,6 +69,32 @@ class BatchModel extends Base {
       }
       Draw && Draw.start((a, positions) => {
         this.options.positions = positions;
+        //判断范围是否过大
+        if (options.type == '面') {
+          let posi = positions.map(v => {
+            return Cesium.Cartesian3.fromDegrees(v.lng, v.lat)
+          })
+          let dis1 = Cesium.Cartesian3.distance(posi[0], posi[1])
+          let dis2 = Cesium.Cartesian3.distance(posi[1], posi[2])
+          let num1 = dis1 / options.spacing
+          let num2 = dis2 / options.spacing
+          if (num1 * num2 > 100) {
+            tools.message({ type: 'warning', text: '数量大于100，请重新绘制' })
+            return;
+          }
+        } else if (options.type == '线') {
+          let posi = positions.map(v => {
+            return Cesium.Cartesian3.fromDegrees(v.lng, v.lat)
+          })
+          let dis = 0
+          for (let i = 0; i < posi.length - 2; i++) {
+            dis += Cesium.Cartesian3.distance(posi[i], posi[i + 1])
+          }
+          if (dis / options.spacing > 100) {
+            tools.message({ type: 'warning', text: '数量大于100，请重新绘制' })
+            return;
+          }
+        }
         // this.callback(this.options);
         (this.options.positions.length || this.options.positions.lng) && BatchModel.computeDis(this)
       })

src/Obj/Base/BillboardObject/index.js

@@ -2949,7 +2949,7 @@ class BillboardObject extends Base {
       let goodsHtml = ''
       let richTextHtml = ''
       for (let i = 0; i < this.options.attribute.link.content.length; i++) {
-        linkHtml += `<DIV-cy-tab-pane label="${this.options.attribute.link.content[i].name}"><iframe width='100%' height='100%' src="${this.options.attribute.link.content[i].url}"></iframe></DIV-cy-tab-pane>`
+        linkHtml += `<DIV-cy-tab-pane label="${this.options.attribute.link.content[i].name}"><iframe width='100%' height='100%' src="${this.options.attribute.link.content[i].url}" ></iframe></DIV-cy-tab-pane>`
       }
       if (this.options.attribute.goods && this.options.attribute.goods.content && this.options.attribute.goods.content.length > 0) {
         goodsHtml += `<DIV-cy-tab-pane label="物资">

src/Obj/Base/CircleDiffuse/index.js

@@ -181,7 +181,7 @@ class CircleDiffuse extends Base {
       }
       that.sdk._entityZIndex++
       if (that.sdk.viewer._element.className === 'cesium-viewer 2d') {
-        that.entity.ellipse.height = 1000000
+        that.entity.ellipse.height = 1
       }
       CircleDiffuse.createLabel(that)
       syncData(that.sdk, that.options.id)

src/Obj/Base/CurvelineObject/index.js

@@ -1384,10 +1384,10 @@ class CurvelineObject extends Base {
       that.options.lengthByMeter = res
       that.lengthUnit = that.options['length-unit']
       syncData(that.sdk, that.options.id)
+    })
     if (that.options.show) {
       setSplitDirection(0, that.options.id)
     }
-    })
 
     // if (this.options['nose-to-tail']) {
     //   let array = []

src/Obj/Base/FlyRoam/index.js

@@ -162,6 +162,7 @@ class FlyRoam extends Base {
           pitch: viewer.camera.pitch,
           roll: viewer.camera.roll
         }
+        this.message({text: '操作成功'})
       })
 
       let totalTimeElm = contentElm.querySelector("input[name='totalTime']")

src/Obj/Base/GroundSvg/index.js

@@ -376,7 +376,10 @@ class GroundSvg extends Base {
   }
   set textFontSize(v) {
     this.options.text.fontSize = v
-    this.text && (this.text.fontSize = v)
+    if(this.text) {
+      this.text.fontSize = v
+      this.text.pixelOffset = v
+    }
     this._elms.textFontSize && this._elms.textFontSize.forEach((item) => {
       item.value = v
     })
@@ -909,11 +912,10 @@ class GroundSvg extends Base {
         text: that.options.text.value,
         fontSize: that.options.text.fontSize,
         color: that.options.text.color,
-        pixelOffset: that.options.text.pixelOffset,
+        pixelOffset: that.options.text.fontSize,
         backgroundColor: that.options.text.backgroundColor,
-        lineColor: that.options.text.lineColor,
-        lineWidth: that.options.text.lineWidth,
-        pixelOffset: 0,
+        lineColor: '#ffffff00',
+        lineWidth: 0,
         scaleByDistance: that.options.text.scaleByDistance,
         backgroundColor: ['#ffffff00', '#ffffff00'],
         near: that.options.text.near,

src/Obj/Base/PolylineObject/index.js

@@ -1410,10 +1410,10 @@ class PolylineObject extends Base {
       that.options.lengthByMeter = res
       that.lengthUnit = that.options['length-unit']
       syncData(that.sdk, that.options.id)
+    })
     if (that.options.show) {
       setSplitDirection(0, that.options.id)
     }
-    })
 
 
     // if (this.options['nose-to-tail']) {

src/Obj/Base/RadarScan/index.js

@@ -138,7 +138,7 @@ class RadarScan extends Base {
     })
     that.sdk._entityZIndex++
     if (that.sdk.viewer._element.className === 'cesium-viewer 2d') {
-      that.entity.ellipse.height = 1000000
+      that.entity.ellipse.height = 1
     }
     RadarScan.createLabel(that)
     syncData(that.sdk, that.options.id)

src/Obj/Base/TextBox/index.js

@@ -32,6 +32,10 @@ class TextBox extends Base {
     this.callback = callback
   }
 
+  get type() {
+    return 'TextBox'
+  }
+
   async create(that) {
     let viewer = that.sdk.viewer
     // 创建div元素

src/Obj/Base/TrajectoryMotion/index.js

@@ -1764,9 +1764,10 @@ class TrajectoryMotion extends Base {
         if (!cartesian3) {
           return
         }
-        coordinates = _this.cartesian3Towgs84(cartesian3, viewer);
+        let pos84 = _this.cartesian3Towgs84(cartesian3, viewer);
+        coordinates = [pos84.lng, pos84.lat, pos84.alt + 1.8]
         position = cartesian3
-        positionCamera = Cesium.Cartesian3.fromDegrees(coordinates.lng, coordinates.lat, coordinates.alt + 1.8)
+        positionCamera = Cesium.Cartesian3.fromDegrees(coordinates[0], coordinates[1], coordinates[2])
         let positions_smooth = []
         for (let i = 0; i <= 1000; i++) {
           if ((i / 1000) > (distance / _this.distance)) {
@@ -1890,7 +1891,7 @@ class TrajectoryMotion extends Base {
           else {
             if (_this.sdk.viewer.trackedEntity) {
               _this.sdk.viewer.camera.setView({
-                destination: Cesium.Cartesian3.fromDegrees(coordinates.lng, coordinates.lat, _this.sdk.viewer.camera.positionCartographic.height),
+                destination: Cesium.Cartesian3.fromDegrees(coordinates[0], coordinates[1], _this.sdk.viewer.camera.positionCartographic.height),
                 orientation: {
                   heading: Cesium.Math.toRadians(-90),
                   pitch: 0,

src/Obj/Materail/CircleRippleMaterialProperty.js

@@ -50,7 +50,8 @@ export default class CircleDiffuseMaterialProperty {
       let color = this.colors[ratio[i]]
       _sourceColor = _sourceColor + `
         if(dis < float(${Number(ratio[i]) / 2})) {
-          material.diffuse = 1.5 * vec4(${color.red},${color.green},${color.blue},${color.alpha}).rgb;
+          material.diffuse = vec4(0.0,0.0,0.0,0.0).rgb;
+          material.emission = 1.0 * vec4(${color.red},${color.green},${color.blue},${color.alpha}).rgb;
         }
         `
     }

src/Tools/index.js

@@ -1493,6 +1493,30 @@ class Tools {
     }
   }
 
+  message(option = {}) {
+    let type = option.type || 'success'
+    let text = option.text || ''
+    let duration = option.duration || 1500
+
+    let message = document.getElementById('YJ-custom-message');
+    if (message) {
+      document.body.removeChild(message)
+    }
+    message = document.createElement('div')
+    message.id = 'YJ-custom-message'
+    if (type == 'success') {
+      message.innerHTML = `
+      <i><?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755929961282" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5064" width="16" height="16" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M874.119618 149.859922A510.816461 510.816461 0 0 0 511.997 0.00208a509.910462 509.910462 0 0 0-362.119618 149.857842c-199.817789 199.679789-199.817789 524.581447 0 724.260236a509.969462 509.969462 0 0 0 362.119618 149.857842A508.872463 508.872463 0 0 0 874.119618 874.120158c199.836789-199.679789 199.836789-524.581447 0-724.260236zM814.94268 378.210681L470.999043 744.132295a15.359984 15.359984 0 0 1-5.887994 4.095996c-1.751998 1.180999-2.913997 2.362998-5.276994 2.913997a34.499964 34.499964 0 0 1-13.469986 2.914997 45.547952 45.547952 0 0 1-12.897986-2.303998l-4.095996-2.363997a45.291952 45.291952 0 0 1-7.009992-4.095996l-196.902793-193.789796a34.126964 34.126964 0 0 1-10.555989-25.186973c0-9.37399 3.583996-18.74698 9.98399-25.186974a36.429962 36.429962 0 0 1 50.372947 0l169.98382 167.423824L763.389735 330.220732a37.059961 37.059961 0 0 1 50.371947-1.732998 33.647965 33.647965 0 0 1 11.165988 25.186973 35.544963 35.544963 0 0 1-9.98399 24.575974v-0.04z m0 0" fill="#52C41A" p-id="5065"></path></svg></i>${text}
+    `
+    } else if (type == 'warning') {
+      message.innerHTML = `
+      <i><?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1756093599258" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1648" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><path d="M512.002558 64.24521c-247.292176 0-447.75786 200.464661-447.75786 447.756837 0 247.287059 200.464661 447.752744 447.75786 447.752744 247.286036 0 447.75172-200.464661 447.75172-447.752744C959.754279 264.710894 759.288594 64.24521 512.002558 64.24521zM512.010745 735.87586c-20.602224 0-37.319977-16.718777-37.319977-37.323047 0-20.597107 16.717753-37.319977 37.319977-37.319977 20.60427 0 37.297464 16.72287 37.297464 37.319977C549.308209 719.158107 532.613992 735.87586 512.010745 735.87586zM549.308209 567.969733c0 20.600177-16.693194 37.293371-37.297464 37.293371-20.602224 0-37.319977-16.693194-37.319977-37.293371L474.690768 325.420581c0-20.605294 16.717753-37.297464 37.319977-37.297464 20.60427 0 37.297464 16.693194 37.297464 37.297464L549.308209 567.969733z" fill="#e98f36" p-id="1649"></path></svg></i>${text}
+    `
+    }
+
+    document.body.appendChild(message)
+    message.classList.add(type)
+  }
 
 }
 

src/YJEarth/index.js

@@ -151,7 +151,7 @@ class YJEarth {
     }
     this.options.contextOptions = {
       webgl: {
-        alpha: true,
+        // alpha: true,
         depth: true,
         stencil: true,
         antialias: true,

static/custom/css/index.css

@@ -3493,6 +3493,7 @@
   cursor: e-resize;
   background-color: #d3d3d3;
   user-select: none;
+  z-index: 1;
 }
 
 .cesium-performanceDisplay-defaultContainer {
@@ -3763,3 +3764,60 @@
 .billboard-attribute-box .table .table-body .tr:first-child {
   border-top: none;
 }
+
+/* 自定义提示 */
+#YJ-custom-message {
+  /* 固定在顶部中央 */
+  position: fixed;
+  top: 0;
+  left: 50%;
+  transform: translate(-50%, 0%);
+  /* 初始位置在屏幕顶部外 */
+
+  /* 样式美化 */
+  display: flex;
+  border-radius: 4px;
+  font-size: 14px;
+  padding: 15px 20px;
+  width: 380px;
+  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+  z-index: 9999999;
+
+
+  /* 动画定义 */
+  animation: YJ-custom-message-slideDown 0.5s forwards,
+    YJ-custom-message-fadeOut 0.5s 1500ms forwards;
+}
+
+#YJ-custom-message i {
+  margin: 2px 10px 0 0;
+  display: flex;
+  align-items: center;
+  width: 16px;
+}
+
+#YJ-custom-message.success {
+  background-color: #f0f9eb;
+  color: rgb(82, 196, 26);
+}
+#YJ-custom-message.warning {
+  background-color: #fdf6ec;
+  color: #e6a23c;
+}
+
+/* 滑入动画 */
+@keyframes YJ-custom-message-slideDown {
+  to {
+    top: 20px;
+    /* 移动到屏幕顶部 */
+  }
+}
+
+/* 淡出动画 - 1500ms后执行 */
+@keyframes YJ-custom-message-fadeOut {
+  to {
+    opacity: 0;
+    top: -200px
+      /* 移回顶部外 */
+  }
+}