12-12

src/Global/MultiViewportMode/index.js

@@ -11,8 +11,8 @@ import { getLeftClickState, getRightClickState, getMoveState } from "../../Globa
 import { openLeftClick, openRightClick, openMove } from "./ClickCallback"
 
 
-let sdk2D
+let sdk2D = null
-let sdk3D
+let sdk3D = null
 let activeViewer
 let controlViewer
 let syncObject = {}
@@ -491,18 +491,18 @@ async function syncPrimitives(primitive) {
     for (let i = primitives2D.length - 1; i >= 1; i--) {
       let flag = false
       for (let m = primitives3D.length - 1; m >= 1; m--) {
-        if (primitives3D[m].id && primitives2D[m].id && (primitives3D[m].id === primitives2D[i].id)) {
+        if (primitives3D[m].id && primitives2D[i].id && (primitives3D[m].id === primitives2D[i].id)) {
           flag = true
         }
       }
-      if (!flag) {
+      // if (!flag) {
-        sdk2D.viewer.scene.primitives.remove(primitives2D[i])
+      //   sdk2D.viewer.scene.primitives.remove(primitives2D[i])
-      }
+      // }
     }
     for (let m = primitives3D.length - 1; m >= 1; m--) {
       let flag = false
       for (let i = primitives2D.length - 1; i >= 1; i--) {
-        if (primitives3D[m].id && primitives2D[m].id && (primitives3D[m].id === primitives2D[i].id)) {
+        if (primitives3D[m].id && primitives2D[i].id && (primitives3D[m].id === primitives2D[i].id)) {
           flag = true
           primitives2D[i].show = primitives3D[m].show
           primitives2D[i].startColor = primitives3D[m].startColor
@@ -518,9 +518,9 @@ async function syncPrimitives(primitive) {
           primitives2D[i].modelMatrix = primitives3D[m].modelMatrix
         }
       }
-      if (!flag) {
+      // if (!flag) {
-        sdk2D.viewer.scene.primitives.add(primitives3D[m])
+      //   sdk2D.viewer.scene.primitives.add(primitives3D[m])
-      }
+      // }
     }
   }
 }

src/Global/SplitScreen/index.js

@@ -1112,7 +1112,7 @@ async function syncPrimitives(primitive) {
     for (let i = primitives2D.length - 1; i >= 1; i--) {
       let flag = false
       for (let m = primitives3D.length - 1; m >= 1; m--) {
-        if (primitives3D[m].id && primitives2D[m].id && (primitives3D[m].id === primitives2D[i].id)) {
+        if (primitives3D[m].id && primitives2D[i].id && (primitives3D[m].id === primitives2D[i].id)) {
           flag = true
         }
       }
@@ -1123,7 +1123,7 @@ async function syncPrimitives(primitive) {
     for (let m = primitives3D.length - 1; m >= 1; m--) {
       let flag = false
       for (let i = primitives2D.length - 1; i >= 1; i--) {
-        if (primitives3D[m].id && primitives2D[m].id && (primitives3D[m].id === primitives2D[i].id)) {
+        if (primitives3D[m].id && primitives2D[i].id && (primitives3D[m].id === primitives2D[i].id)) {
           flag = true
           primitives2D[i].show = primitives3D[m].show
           primitives2D[i].startColor = primitives3D[m].startColor

src/In/index.js

@@ -67,12 +67,13 @@ import {
   on as multiViewportModeOn,
   off as multiViewportModeOff,
   get2DView,
-  getSdk as getSdk2
+  getSdk as getSdk2,
+  syncData
 } from '../Global/MultiViewportMode'
 import { MouseCoordinate } from '../Global/MouseCoordinate'
 import { MouseRightMenu } from '../Global/mouseRightMenu'
 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 { on as SplitScreenOn, off as SplitScreenOff, setActiveId as SplitScreenSetActiveId, getSdk, syncSplitData } from '../Global/SplitScreen'
 import LocateCurrent from '../Obj/Base/LocateCurrent'
 
 import { AnalysisClear, SectionClear } from '../Obj/Analysis/clear'
@@ -313,7 +314,8 @@ if (!window.YJ) {
         on: multiViewportModeOn,
         off: multiViewportModeOff,
         get2DView,
-        getSdk: getSdk2
+        getSdk: getSdk2,
+        syncData: syncData
       },
       MouseCoordinate,
       MouseRightMenu,
@@ -348,7 +350,8 @@ if (!window.YJ) {
         on: SplitScreenOn,
         off: SplitScreenOff,
         setActiveId: SplitScreenSetActiveId,
-        getSdk
+        getSdk,
+        syncData: syncSplitData
       },
       Contour: ContourDialog,
       ContourStartDraw,

src/Obj/Base/CurvelineObject/index.js

@@ -84,7 +84,7 @@ class CurvelineObject extends Base {
     this.options.noseToTail = options.noseToTail || false
     this.options.extend = options.extend || false
     this.options.rotate = (options.rotate || options.rotate === false) ? options.rotate : true
-    this.options.space = options.space || 1
+    this.options.space = (options.space || options.space === 0) ? options.space : 1
     this.options.speed = options.speed || 10
     // this.options.dashSize = options.dashSize || 0.03
     this.options.wordsName = options.wordsName || 0

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

@@ -585,7 +585,7 @@ class Flame extends Base {
     this.lng = this.originalOptions.lng
     this.lat = this.originalOptions.lat
     this.alt = this.originalOptions.alt
-    syncPrimitives(this.entity)
+    // syncPrimitives(this.entity)
   }
 
   async remove() {

src/Obj/Base/PolylineObject/index.js

@@ -83,7 +83,7 @@ class PolylineObject extends Base {
     this.options.smooth = options.smooth || false
     this.options.extend = options.extend || false
     this.options.rotate = (options.rotate || options.rotate === false) ? options.rotate : true
-    this.options.space = options.space || 1
+    this.options.space = (options.space || options.space === 0) ? options.space : 1
     this.options.speed = options.speed || 10
     // this.options.dashSize = options.dashSize || 0.03
     this.options.wordsName = options.wordsName || 0

static/custom/css/index.css

@@ -3494,7 +3494,7 @@
 
 .YJ-custom-checkbox-left:checked::after,
 .YJ-custom-checkbox-right:checked::after {
-  content: "✔";
+  content: "\2714";
   background-color: rgba(var(--color-base1), 1);
   color: rgba(var(--color-sdk-auxiliary), 1);
   width: 25px;
@@ -3529,7 +3529,7 @@
 }
 
 .YJ-custom-base-dialog>.content input.YJ-custom-checkbox[type=checkbox]:checked::after {
-  content: "✔";
+  content: "\2714";
   background-color: rgba(var(--color-base1), 1);
   color: rgba(var(--color-sdk-auxiliary), 1);
   width: 12px;