From 16942a2e631d7a1ee8b17d83921336249b2b7e0d Mon Sep 17 00:00:00 2001
From: zh <972939975@qq.com>
Date: Tue, 8 Jul 2025 16:48:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B7=E5=B8=98=E5=AF=B9=E6=AF=94=E4=B8=8B?=
 =?UTF-8?q?=E5=9B=BE=E5=B1=82=E5=B1=82=E7=BA=A7=E4=BF=AE=E6=94=B9=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Global/SplitScreen/index.js               | 22 +++++++++++++++----
 .../BaseLayer/ArcgisImagery/index.js          |  1 +
 .../BaseSource/BaseLayer/GdImagery/index.js   |  1 +
 .../Base/BaseSource/BaseLayer/Layer/index.js  |  1 +
 .../BaseLayer/Layer3rdparty/index.js          |  1 +
 src/Obj/Base/BaseSource/BaseLayer/index.js    |  4 ++--
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/Global/SplitScreen/index.js b/src/Global/SplitScreen/index.js
index d80440a..8df76aa 100644
--- a/src/Global/SplitScreen/index.js
+++ b/src/Global/SplitScreen/index.js
@@ -278,7 +278,7 @@ async function init(sdk) {
   sdk.viewer.scene.preRender.addEventListener(syncViewer, syncObject)
 
   // sdk.viewer.imageryLayers.layerAdded.addEventListener(syncImageryLayerAdded);
-  // sdk.viewer.imageryLayers.layerMoved.addEventListener(syncImageryLayerMoved);
+  sdk.viewer.imageryLayers.layerMoved.addEventListener(syncImageryLayerMoved);
   // sdk.viewer.imageryLayers.layerRemoved.addEventListener(syncImageryLayerRemoved);
   // sdk.viewer.imageryLayers.layerShownOrHidden.addEventListener(syncImageryLayerShownOrHidden);
 
@@ -711,6 +711,9 @@ async function setSplitDirection(v, id, isoff = false, entityId) {
           status.P = true
           status.D = true
           options.show = true
+          if(thatP.type==='layer') {
+            options.layer_index = thatP.layer_index
+          }
           target = await new thatP.constructor(sdkD, options)
           if (thatP.onClick) {
             target.onClick = thatP.onClick
@@ -794,6 +797,9 @@ async function setSplitDirection(v, id, isoff = false, entityId) {
           status.P = false
           status.D = true
           options.show = true
+          if(thatP.type==='layer') {
+            options.layer_index = thatP.layer_index
+          }
           target = await new thatP.constructor(sdkD, options)
           if (thatP.onClick) {
             target.onClick = thatP.onClick
@@ -1033,7 +1039,13 @@ function syncImageryLayerAdded(layer, index) {
   sdkD.viewer.imageryLayers.addImageryProvider(layer.imageryProvider, index)
 }
 function syncImageryLayerMoved(layer, newindxe, oldindex) {
-  let layerD = sdkD.viewer.imageryLayers._layers[oldindex]
+  let layerD
+  for (let i = 0; i < sdkD.viewer.imageryLayers._layers.length; i++) {
+    if (sdkD.viewer.imageryLayers._layers[i]._id === layer._id) {
+      layerD = sdkD.viewer.imageryLayers._layers[i]
+      break
+    }
+  }
   if (!layerD) {
     return
   }
@@ -1042,12 +1054,14 @@ function syncImageryLayerMoved(layer, newindxe, oldindex) {
     sdkD.viewer.imageryLayers.lowerToBottom(layerD)
   }
   // 移到最高层
-  else if (newindxe === sdk.viewer.imageryLayers._layers.length - 1) {
+  else if (newindxe === sdkD.viewer.imageryLayers._layers.length - 1) {
     sdkD.viewer.imageryLayers.raiseToTop(layerD)
   }
   else {
     if (newindxe < oldindex) {
-      sdkD.viewer.imageryLayers.lower(layerD)
+      if(newindxe<sdkD.viewer.imageryLayers._layers.length-1) {
+        sdkD.viewer.imageryLayers.lower(layerD)
+      }
     }
     else {
       sdkD.viewer.imageryLayers.raise(layerD)
diff --git a/src/Obj/Base/BaseSource/BaseLayer/ArcgisImagery/index.js b/src/Obj/Base/BaseSource/BaseLayer/ArcgisImagery/index.js
index d42b685..69ac8c9 100644
--- a/src/Obj/Base/BaseSource/BaseLayer/ArcgisImagery/index.js
+++ b/src/Obj/Base/BaseSource/BaseLayer/ArcgisImagery/index.js
@@ -33,6 +33,7 @@ class ArcgisLayer extends BaseLayer {
     } else {
       this.entity = this.sdk.viewer.imageryLayers.addImageryProvider(imageryProvider,)
     }
+    this.entity._id = this.options.id
     for (let i = 0; i < this.sdk.viewer.imageryLayers._layers.length; i++) {
       if (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider && this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type && (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'flw' || this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'jww')) {
         let layer = this.sdk.viewer.imageryLayers._layers[i]
diff --git a/src/Obj/Base/BaseSource/BaseLayer/GdImagery/index.js b/src/Obj/Base/BaseSource/BaseLayer/GdImagery/index.js
index d78d8cc..788338b 100644
--- a/src/Obj/Base/BaseSource/BaseLayer/GdImagery/index.js
+++ b/src/Obj/Base/BaseSource/BaseLayer/GdImagery/index.js
@@ -30,6 +30,7 @@ class GdImagery extends BaseLayer {
     } else {
       this.entity = this.sdk.viewer.imageryLayers.addImageryProvider(gdLayer,)
     }
+    this.entity._id = this.options.id
     for (let i = 0; i < this.sdk.viewer.imageryLayers._layers.length; i++) {
       if (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider && this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type && (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'flw' || this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'jww')) {
         let layer = this.sdk.viewer.imageryLayers._layers[i]
diff --git a/src/Obj/Base/BaseSource/BaseLayer/Layer/index.js b/src/Obj/Base/BaseSource/BaseLayer/Layer/index.js
index 3ede9ad..5e32de9 100644
--- a/src/Obj/Base/BaseSource/BaseLayer/Layer/index.js
+++ b/src/Obj/Base/BaseSource/BaseLayer/Layer/index.js
@@ -126,6 +126,7 @@ class Layer extends BaseLayer {
       this.entity =
         this.sdk.viewer.scene.imageryLayers.addImageryProvider(layer,)
     }
+    this.entity._id = this.options.id
     for (let i = 0; i < this.sdk.viewer.imageryLayers._layers.length; i++) {
       if (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider && this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type && (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'flw' || this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'jww')) {
         let layer = this.sdk.viewer.imageryLayers._layers[i]
diff --git a/src/Obj/Base/BaseSource/BaseLayer/Layer3rdparty/index.js b/src/Obj/Base/BaseSource/BaseLayer/Layer3rdparty/index.js
index d9f56c1..ed0d95b 100644
--- a/src/Obj/Base/BaseSource/BaseLayer/Layer3rdparty/index.js
+++ b/src/Obj/Base/BaseSource/BaseLayer/Layer3rdparty/index.js
@@ -37,6 +37,7 @@ class Layer3rdparty extends BaseLayer {
       this.entity =
         this.sdk.viewer.scene.imageryLayers.addImageryProvider(layer,)
     }
+    this.entity._id = this.options.id
     for (let i = 0; i < this.sdk.viewer.imageryLayers._layers.length; i++) {
       if (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider && this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type && (this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'flw' || this.sdk.viewer.imageryLayers._layers[i]._imageryProvider._type === 'jww')) {
         let layer = this.sdk.viewer.imageryLayers._layers[i]
diff --git a/src/Obj/Base/BaseSource/BaseLayer/index.js b/src/Obj/Base/BaseSource/BaseLayer/index.js
index 085e1a3..f4a0a79 100644
--- a/src/Obj/Base/BaseSource/BaseLayer/index.js
+++ b/src/Obj/Base/BaseSource/BaseLayer/index.js
@@ -28,11 +28,11 @@ class BaseLayer extends BaseSource {
   }
 
   get layerIndex() {
-    return this.entity._layerIndex
+    return this.entity ? this.entity._layerIndex : undefined
   }
 
   get layer_index() {
-    return this.entity._layerIndex
+    return this.entity ? this.entity._layerIndex : undefined
   }
 
   get brightness() {