@yangyongtao/gaea 1.1.19 → 1.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yangyongtao/gaea",
-  "version": "1.1.19",
+  "version": "1.1.20",
   "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

@@ -275,7 +275,6 @@ export class GaeaApp {
     this._secIsClickArr = [];
     this._secScreenIconKeyValue = {};
     this._groundPolygonElements = [];
-    this._categoryIcons = {};
     this.tweenGroup = new TWEEN.Group();
     this._tourConfig = {
       '沿浦水闸': { direction: [-0.5, 0.3, 0.3], positionList: [
@@ -806,18 +805,13 @@ export class GaeaApp {
     };
     console.log('[GaeaApp] 开始创建屏幕图标... categories:', cats.length);
     let count = 0;
-    this._categoryIcons = {};
     for (const cat of cats) {
       if (!cat.children?.length) continue;
-      this._categoryIcons[cat.key] = [];
       const cfg = catConfig[cat.key] || { img: '', method: 'textImage', visibleRange: [10, 50000], offset: [-40, -35], drawLine: false };
       for (const child of cat.children) {
         if (!child.position) continue;
         count++;
         try {
-          const safeId = child.text.replace(/[^a-zA-Z0-9\u4e00-\u9fa5]/g, '_');
-          const divId = 'gaea-icon-' + safeId;
-          this._categoryIcons[cat.key].push(divId);
           this.addScreenIcon({
             name: child.text,
             text: child.text,
@@ -828,6 +822,7 @@ export class GaeaApp {
             visibleRange: cfg.visibleRange,
             anchorType: cfg.anchorType,
             drawLine: cfg.drawLine,
+            category: cat.key,
             onClick: (name, data) => {
               if (cfg.onClick) cfg.onClick(name, { ...child, ...data });
             },
@@ -848,24 +843,28 @@ export class GaeaApp {
    * @param {boolean} visible 是否可见
    */
   setCategoryVisible(categoryKey, visible) {
-    const divIds = this._categoryIcons?.[categoryKey];
-    if (!divIds?.length) return;
-    divIds.forEach(divId => {
-      const el = document.getElementById(divId);
-      if (el) el.style.display = visible ? '' : 'none';
+    const items = this._screenIconList.filter(item => item.category === categoryKey);
+    if (!items.length) return;
+    items.forEach(item => {
+      if (visible) {
+        item.element.UseAutoVisible();
+        item.element.EnablePick = true;
+      } else {
+        item.element.ForceSetVisible(false);
+        item.element.EnablePick = false;
+      }
     });
   }
 
   /**
-   * 获取某个分类的当前可见性（根据第一个图标的 display 状态判断）
+   * 获取某个分类的当前可见性（根据第一个图标判断）
    * @param {string} categoryKey
    * @returns {boolean}
    */
   getCategoryVisible(categoryKey) {
-    const divIds = this._categoryIcons?.[categoryKey];
-    if (!divIds?.length) return true;
-    const el = document.getElementById(divIds[0]);
-    return el ? el.style.display !== 'none' : true;
+    const item = this._screenIconList.find(item => item.category === categoryKey);
+    if (!item) return true;
+    return item.element.Visible !== false;
   }
 
   // ---- 公开方法 ----
@@ -1210,7 +1209,7 @@ export class GaeaApp {
    * 添加屏幕图标（参考 ht_3dview 三种创建方式）
    * @param {string} opts.method - 'textImage' | 'styled' | 'imageOnly'
    */
-  addScreenIcon({ name, text, imgUrl, position, method = 'textImage', offset = [0, 0], visibleRange = [10, 50000], anchorType = 6, drawLine = false, onClick, type = null, divId: externalDivId, elementName, elementChildrenIndex } = {}) {
+  addScreenIcon({ name, text, imgUrl, position, method = 'textImage', offset = [0, 0], visibleRange = [10, 50000], anchorType = 6, drawLine = false, onClick, type = null, category = null, divId: externalDivId, elementName, elementChildrenIndex } = {}) {
     const safeId = name.replace(/[^a-zA-Z0-9\u4e00-\u9fa5]/g, '_');
     const divId = externalDivId || 'gaea-icon-' + safeId;
 
@@ -1313,7 +1312,7 @@ export class GaeaApp {
         console.log('[GaeaApp] child:', !!child);
         if (child) {
           child.AddChild(screen, false);
-          const screenItem = { element: screen, type: type || null };
+          const screenItem = { element: screen, type: type || null, category };
           this._screenIconList.push(screenItem);
           return screen;
         }
@@ -1324,7 +1323,7 @@ export class GaeaApp {
 
     screen.GeographyPosition = new Gaea.Vector3(position.x, position.y, position.z || 0);
     Gaea.World.Instance.RenderableObjectList.AddLast(screen);
-    const screenItem = { element: screen, type: type || null };
+    const screenItem = { element: screen, type: type || null, category };
      this._screenIconList.push(screenItem);
     return screen;
   }