@yangyongtao/gaea 1.1.27 → 1.1.29

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [1.1.29] - 2026-09-04
+
+### Fixed
+- 2D/3D 切换严格隐藏 3D 图标：新增 `_markersVisible` 全局状态，`showAllMarkers` / `hideAllMarkers` 同步更新；`addScreenIcon` 新增图标按当前状态显隐；`setCategoryVisible` 显示分类、复位按钮、`lockedModesSwitch` 解锁恢复图标时均叠加全局可见性判断，杜绝 2D 模式下图标残留
+
+## [1.1.28] - 2026-09-01
+
+### Changed
+- 海塘图标按 `haitangyizhangtu` 规则改为等级图标：`_initScreenIcons` 优先使用每条海塘自身的 `imgUrl`（`child.imgUrl || cfg.img`），默认 10 条海塘分别配置 `海塘-{level}级.png`（沿浦/霞关/下在=3级、大渔=2级、三茆/信智/雾城/渔岙/流岐岙=4级、木林=5级）
+
 ## [1.1.27] - 2026-09-01
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yangyongtao/gaea",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "description": "Gaea 3D visualization component library - Vue 3 components based on Godot WASM engine. Includes WMTS layer loading, camera view control, Vite plugin auto-injection, etc.",
   "type": "module",
   "main": "src/index.cjs",

package/src/GaeaMethods.js

@@ -171,16 +171,16 @@ const defaultConfig = {
   /** 图层树分类数据（默认数据，接口数据会合并进来） */
   layerCategories: [
     { key: 'seawall',             text: '海塘',       visible: true,  children: [
-      { text: '沿浦海塘',   position: { x: 27.220705, y: 120.457998, z: 20 } },
-      { text: '霞关海塘',   position: { x: 27.171059, y: 120.467901, z: 20 } },
-      { text: '三茆海塘',   position: { x: 27.193284, y: 120.464411, z: 20 } },
-      { text: '大渔海塘',   position: { x: 27.39027,  y: 120.599554, z: 20 } },
-      { text: '信智海塘',   position: { x: 27.300806, y: 120.544077, z: 20 } },
-      { text: '下在海塘',   position: { x: 27.215789, y: 120.445849, z: 10 } },
-      { text: '木林海塘',   position: { x: 27.193183, y: 120.424486, z: 20 } },
-      { text: '雾城海塘',   position: { x: 27.27682,  y: 120.518917, z: 20 } },
-      { text: '渔岙海塘',   position: { x: 27.403744, y: 120.557879, z: 20 } },
-      { text: '流岐岙海塘', position: { x: 27.318176, y: 120.542761, z: 20 } },
+      { text: '沿浦海塘',   level: '3', imgUrl: '/image/screenIcon/海塘-3级.png', position: { x: 27.220705, y: 120.457998, z: 20 } },
+      { text: '霞关海塘',   level: '3', imgUrl: '/image/screenIcon/海塘-3级.png', position: { x: 27.171059, y: 120.467901, z: 20 } },
+      { text: '三茆海塘',   level: '4', imgUrl: '/image/screenIcon/海塘-4级.png', position: { x: 27.193284, y: 120.464411, z: 20 } },
+      { text: '大渔海塘',   level: '2', imgUrl: '/image/screenIcon/海塘-2级.png', position: { x: 27.39027,  y: 120.599554, z: 20 } },
+      { text: '信智海塘',   level: '4', imgUrl: '/image/screenIcon/海塘-4级.png', position: { x: 27.300806, y: 120.544077, z: 20 } },
+      { text: '下在海塘',   level: '3', imgUrl: '/image/screenIcon/海塘-3级.png', position: { x: 27.215789, y: 120.445849, z: 10 } },
+      { text: '木林海塘',   level: '5', imgUrl: '/image/screenIcon/海塘-5级.png', position: { x: 27.193183, y: 120.424486, z: 20 } },
+      { text: '雾城海塘',   level: '4', imgUrl: '/image/screenIcon/海塘-4级.png', position: { x: 27.27682,  y: 120.518917, z: 20 } },
+      { text: '渔岙海塘',   level: '4', imgUrl: '/image/screenIcon/海塘-4级.png', position: { x: 27.403744, y: 120.557879, z: 20 } },
+      { text: '流岐岙海塘', level: '4', imgUrl: '/image/screenIcon/海塘-4级.png', position: { x: 27.318176, y: 120.542761, z: 20 } },
     ]},
     { key: 'hydrometricStations', text: '水文站',     visible: true,  children: [
       { text: '灵溪',   stcd: '7010CK01', sttp: 'ZQ', position: { x: 27.5014, y: 120.3847, z: 100 } },
@@ -290,6 +290,7 @@ export class GaeaApp {
     this.tLayers = [];
     this.layerCategories = this.config.layerCategories || [];
     this._screenIconList = [];
+    this._markersVisible = true; // 全局图标可见性（2D 模式下强制隐藏，3D 下恢复）
     this._hiddenCategories = new Set();
     this._tilesetMap = {}; // 已加载的 3D Tiles 引用，key 为 tileset 名称
     this._secIsClickArr = [];
@@ -560,9 +561,11 @@ export class GaeaApp {
       // 解锁视角（内部会调 UseAutoVisible 恢复非断面图标）
       this.lockedModesSwitch(false);
       // 恢复被 hiddenScreenWithClass 隐藏的图标 DOM
-      document.querySelectorAll('.gaea-locationLineStyle, .gaea-iconscreen, .gaea-iconGif').forEach(el => {
-        el.style.display = '';
-      });
+      if (this._markersVisible) {
+        document.querySelectorAll('.gaea-locationLineStyle, .gaea-iconscreen, .gaea-iconGif').forEach(el => {
+          el.style.display = '';
+        });
+      }
       // 断面模型缩回
       if (this._raisedSection) {
         this._raisedSection.TranslateObjectLocal(new Gaea.Vector3(0, -44, 0));
@@ -870,7 +873,7 @@ export class GaeaApp {
           this.addScreenIcon({
             name: child.text,
             text: child.text,
-            imgUrl: cfg.img,
+            imgUrl: child.imgUrl || cfg.img,
             method: cfg.method,
             position: child.position,
             offset: cfg.offset,
@@ -912,11 +915,11 @@ export class GaeaApp {
     }
     const els = document.querySelectorAll('.gaea-cat-' + categoryKey);
     console.log('[GaeaApp] setCategoryVisible:', categoryKey, visible, '元素数:', els.length);
-    els.forEach(el => { el.style.display = visible ? '' : 'none'; });
+    els.forEach(el => { el.style.display = visible && this._markersVisible ? '' : 'none'; });
     // 同步引擎可见性
     const items = this._screenIconList.filter(item => item.category === categoryKey);
     items.forEach(item => {
-      if (visible) {
+      if (visible && this._markersVisible) {
         item.element.UseAutoVisible();
         item.element.EnablePick = true;
       } else {
@@ -1799,6 +1802,7 @@ export class GaeaApp {
           child.AddChild(screen, false);
           const screenItem = { element: screen, type: type || null, category };
           this._screenIconList.push(screenItem);
+          this._applyMarkerVisibility(screenItem);
           return screen;
         }
       }
@@ -1810,9 +1814,19 @@ export class GaeaApp {
     Gaea.World.Instance.RenderableObjectList.AddLast(screen);
     const screenItem = { element: screen, type: type || null, category };
      this._screenIconList.push(screenItem);
+    this._applyMarkerVisibility(screenItem);
     return screen;
   }
 
+  /** 根据全局图标可见性状态（_markersVisible）应用单个图标显隐 */
+  _applyMarkerVisibility(screenItem) {
+    if (this._markersVisible) return;
+    screenItem.element.ForceSetVisible(false);
+    screenItem.element.EnablePick = false;
+    const el = document.getElementById(screenItem.element.DivID);
+    if (el) el.style.display = 'none';
+  }
+
   /** 记录当前视角，返回 URI 字符串 */
   favorite() {
     return Gaea.GaeaCamera.ConvertBy(Gaea.World.Instance.DefaultCamera).Favorite();
@@ -2095,7 +2109,7 @@ export class GaeaApp {
       Gaea.World.Instance.CameraController.LockedEntity = null;
       // 解锁时恢复非断面图标的自动可见
       this._screenIconList.forEach(item => {
-        if (!item.type) {
+        if (!item.type && this._markersVisible) {
           item.element.UseAutoVisible();
           item.element.EnablePick = true;
         }
@@ -2377,6 +2391,7 @@ export class GaeaApp {
 
   /** 显示所有屏幕标记 */
   showAllMarkers = () => {
+    this._markersVisible = true;
     this._screenIconList.forEach(item => {
       // 跳过被隐藏分类的标记
       if (this._hiddenCategories.has(item.category)) return
@@ -2390,6 +2405,7 @@ export class GaeaApp {
 
   /** 隐藏所有屏幕标记 */
   hideAllMarkers = () => {
+    this._markersVisible = false;
     this._screenIconList.forEach(item => {
       item.element.ForceSetVisible(false)
       item.element.EnablePick = false