From f3040d5fdef9f8ed2dae92bc84b0358169658b08 Mon Sep 17 00:00:00 2001
From: supermap123 <huangyiqin@supermap>
Date: Fri, 19 Apr 2024 15:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=BA=E9=99=B7:=E5=A4=A9?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E3=80=81=E5=BF=85=E5=BA=94=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E6=89=93=E4=B8=8D=E5=BC=80=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=BE=E5=B1=82=E5=88=97=E8=A1=A8=E6=96=87=E5=AD=97=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E3=80=81GPU=E5=89=96=E9=9D=A2=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                         |  2 +-
 SuperMap iEarth/public/config/serviceList.js  | 30 +++++++++----------
 SuperMap iEarth/src/App.vue                   |  7 +++++
 .../analyse/analyse-profile/profile.vue       | 13 +++++++-
 .../src/package/layerTree/layerTree.vue       | 12 ++++++--
 SuperMap iEarth/src/views/viewer/openScene.ts | 10 +++----
 SuperMap iEarth/src/views/viewer/viewer.vue   |  6 +++-
 7 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index cbb7b3af..e8783bfe 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-  "liveServer.settings.port": 5502
+  "liveServer.settings.port": 5505
 }
\ No newline at end of file
diff --git a/SuperMap iEarth/public/config/serviceList.js b/SuperMap iEarth/public/config/serviceList.js
index cbce482a..3c1660d0 100644
--- a/SuperMap iEarth/public/config/serviceList.js	
+++ b/SuperMap iEarth/public/config/serviceList.js	
@@ -97,21 +97,21 @@ const layerServiceData = {
             thumbnail: './images/baseMap/grad.png',
             type: 'GRIDIMAGERY',
             chooseType: false,
-        },
-        {
-            url: 'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png',
-            name: "japanStand",
-            thumbnail: './images/baseMap/standard_jp.png',
-            type: 'UrlTemplateImageryProvider',
-            chooseType: false,
-        },
-        {
-            url: 'https://cyberjapandata.gsi.go.jp/xyz/pale/{z}/{x}/{y}.png',
-            name: "japanPale",
-            thumbnail: './images/baseMap/tinge_jp.png',
-            type: 'UrlTemplateImageryProvider',
-            chooseType: false,
-        },
+        }
+        // {
+        //     url: 'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png',
+        //     name: "japanStand",
+        //     thumbnail: './images/baseMap/standard_jp.png',
+        //     type: 'UrlTemplateImageryProvider',
+        //     chooseType: false,
+        // },
+        // {
+        //     url: 'https://cyberjapandata.gsi.go.jp/xyz/pale/{z}/{x}/{y}.png',
+        //     name: "japanPale",
+        //     thumbnail: './images/baseMap/tinge_jp.png',
+        //     type: 'UrlTemplateImageryProvider',
+        //     chooseType: false,
+        // },
         // {
         //     url: 'https://cyberjapandata.gsi.go.jp/xyz/blank/{z}/{x}/{y}.png',
         //     name: "japanBlank",
diff --git a/SuperMap iEarth/src/App.vue b/SuperMap iEarth/src/App.vue
index 46d52321..2b2ca93a 100644
--- a/SuperMap iEarth/src/App.vue	
+++ b/SuperMap iEarth/src/App.vue	
@@ -368,6 +368,13 @@ const overridesTheme = {
   line-height: 0.34rem;
 }
 
+/* 图层列表选项 内容 避免过长 */
+.n-tree .n-tree-node-content .n-tree-node-content__text div{
+  width: 140px;
+  overflow: hidden;
+  text-overflow: ellipsis; // 文字过长后使用省略号
+}
+
 // echarts图表样式
 #echartsProfile > div {
   left: 0.1rem;
diff --git a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/profile.vue b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/profile.vue
index db03926c..28aa16b2 100644
--- a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/profile.vue	
+++ b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/profile.vue	
@@ -233,6 +233,12 @@ function setDataForGpuProFile(result: any) {
 
 //分析
 function analysis() {
+  // 解决缺陷【8035】GPU剖面分析下报错崩溃问题
+  profile.clear();
+  if (ctx) ctx.clearRect(0, 0, canvas.width, canvas.height);
+  profile_GPU.destroy();
+  profile_GPU = new SuperMap3D.Profile(scene);
+
   let interValID = setInterval(() => {
     if (!handlerPolyline.positions) return;
 
@@ -264,7 +270,12 @@ function analysis() {
           state.show = false;
         }
       });
-      if (state.infoShowMode === "canvas") getCanvasImage();
+      if (state.infoShowMode === "canvas") {
+        // getCanvasImage();
+        setTimeout(()=>{ // 通过定时器延迟执行获取，还是不对，接口问题？
+          getCanvasImage();
+        },1000)
+      }
       handlerPolyline.polylineTransparent.show = false;
     },
     (err) => {
diff --git a/SuperMap iEarth/src/package/layerTree/layerTree.vue b/SuperMap iEarth/src/package/layerTree/layerTree.vue
index 07376d97..53e532d4 100644
--- a/SuperMap iEarth/src/package/layerTree/layerTree.vue	
+++ b/SuperMap iEarth/src/package/layerTree/layerTree.vue	
@@ -16,7 +16,7 @@
 
 <script setup lang="ts">
 import { h, ref, nextTick, onMounted } from "vue";
-import { TreeOption, NButton, NDropdown, NInput, useMessage } from "naive-ui";
+import { TreeOption, NButton, NDropdown, NInput, useMessage, NEllipsis } from "naive-ui";
 import { usePanelStore } from "@/store";
 import { useLayerStore } from "@/store/index";
 
@@ -443,6 +443,7 @@ const nodelabel = ({ option }: { option: TreeOption }) => {
           autofocus: true,
           ref: inputRef,
           size: "small",
+          title: option.label,
           value: option.label,
           onUpdateValue: (v) => {
             option.label = v;
@@ -471,7 +472,14 @@ const nodelabel = ({ option }: { option: TreeOption }) => {
             option.isedit = false;
           },
         })
-      : option.label
+        : h(NEllipsis,{
+            bordered: false,
+            text: true,
+            title: option.label,
+            focusable: false, // 取消focus效果
+          },
+          { default: () => option.label }
+        )
   );
 };
 
diff --git a/SuperMap iEarth/src/views/viewer/openScene.ts b/SuperMap iEarth/src/views/viewer/openScene.ts
index 0c7f56b9..6f288445 100644
--- a/SuperMap iEarth/src/views/viewer/openScene.ts	
+++ b/SuperMap iEarth/src/views/viewer/openScene.ts	
@@ -21,8 +21,8 @@ let state = reactive({
   sceneID: '',
   updateTime: undefined,
   isNewVersion: true,
-  key: layerStore.configToken.BingMapKey, // 必应地图key
-  TiandituToken: layerStore.configToken.TiandituToken, // 天地图token
+  // key: layerStore.configToken.BingMapKey, // 必应地图key
+  // TiandituToken: layerStore.configToken.TiandituToken, // 天地图token
 })
 
 // 打开已保存的场景
@@ -270,14 +270,14 @@ function openImagery(content: any) {
           case "BingMapsImageryProvider":
             imageryProvider = new SuperMap3D.BingMapsImageryProvider({
               url: content.layers.imageryLayer[i].url,
-              key: state.key
+              key: layerStore.configToken.BingMapKey
               // key: "Aq0D7MCY5ErORA9vrwFtfE9aancUq5J6uNjw0GieF0ostaIrVuJZ8ScXxNHHvEwS",
             });
             break;
           case "TiandituImageryProvider":
             imageryProvider = new SuperMap3D.TiandituImageryProvider({
               url: content.layers.imageryLayer[i].url,
-              token: state.TiandituToken
+              token: layerStore.configToken.TiandituToken
               // token: content.layers.imageryLayer[i].token
             });
             break;
@@ -345,7 +345,7 @@ function openTerrain(content: any) {
         break;
       case "tianDiTuTerrain":
         viewer.terrainProvider = new SuperMap3D.TiandituTerrainProvider({
-          token: state.TiandituToken
+          token: layerStore.configToken.TiandituToken
         });
         break;
       case "supermapOnlineTerrain":
diff --git a/SuperMap iEarth/src/views/viewer/viewer.vue b/SuperMap iEarth/src/views/viewer/viewer.vue
index ad277ca7..6273d0ed 100644
--- a/SuperMap iEarth/src/views/viewer/viewer.vue	
+++ b/SuperMap iEarth/src/views/viewer/viewer.vue	
@@ -23,7 +23,7 @@ window.EarthGlobal = {};
 let viewer: any;
 
 onMounted(() => {
-  getCreateOrEditScene();
+  // getCreateOrEditScene();
   initViewer();
 });
 
@@ -34,6 +34,10 @@ onBeforeUnmount(() => {
 // 获取token和key相关配置
 getConfig().then((res) => {
   if (window.iEarthConsole) console.log("当前configToken配置:", res);
+  getCreateOrEditScene();
+},(err) => {
+  console.log(err);
+  getCreateOrEditScene(); // 确保无论如何都能打开场景
 });
 
 // 获取当前环境：创建 || 编辑  or 非iportal环境（普通环境）