vue-openlayers-plugin 1.0.54 → 1.0.56

package/lib/{index-a3727619.mjs → index-a4ec7e53.mjs}

@@ -83210,6 +83210,8 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
   constructor(config, map2) {
     super(config, map2);
     __publicField(this, "styleConfig");
+    __publicField(this, "currentFilters", []);
+    __publicField(this, "originalFeatures", []);
   }
   createLayer() {
     var _a3, _b3, _c2;
@@ -83235,12 +83237,7 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
       const features2 = format2.readFeatures(this.config.data, {
         featureProjection: mapProjection
       });
-      if (features2 && features2.length > 0) {
-        try {
-          console.log("[GeoJSONLayerHandler] 示例要素属性:", features2[0].getProperties());
-        } catch (e8) {
-        }
-      }
+      this.originalFeatures = features2;
       return new VectorSource$2({ features: features2 });
     } else if (this.config.url) {
       const source = new VectorSource$2({
@@ -83262,6 +83259,9 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
         source.on("addfeature", logOnce);
       } catch (e8) {
       }
+      source.on("featuresloadend", () => {
+        this.originalFeatures = source.getFeatures();
+      });
       return source;
     } else {
       return new VectorSource$2();
@@ -83419,16 +83419,20 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
     var _a3;
     const layer2 = this.getLayer();
     const source = layer2.getSource();
-    if (source) {
-      const format2 = new GeoJSON$4();
-      const mapProjection = ((_a3 = this.map) == null ? void 0 : _a3.getView().getProjection().getCode()) || "EPSG:4326";
-      const olFeatures = format2.readFeatures({
-        type: "FeatureCollection",
-        features: features2
-      }, {
-        featureProjection: mapProjection
-      });
-      source.addFeatures(olFeatures);
+    if (!source)
+      return;
+    const format2 = new GeoJSON$4();
+    const mapProjection = ((_a3 = this.map) == null ? void 0 : _a3.getView().getProjection().getCode()) || "EPSG:4326";
+    const olFeatures = format2.readFeatures({
+      type: "FeatureCollection",
+      features: features2
+    }, {
+      featureProjection: mapProjection
+    });
+    source.addFeatures(olFeatures);
+    this.originalFeatures.push(...olFeatures);
+    if (this.getEnabledFilters().length > 0) {
+      this.applyFilters();
     }
   }
   /**
@@ -83437,9 +83441,10 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
   clearFeatures() {
     const layer2 = this.getLayer();
     const source = layer2.getSource();
-    if (source) {
-      source.clear();
-    }
+    if (!source)
+      return;
+    source.clear();
+    this.originalFeatures = [];
   }
   /**
    * 获取要素数量
@@ -83670,25 +83675,28 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
    * 应用过滤器（实现基类的抽象方法）
    */
   applyFilters() {
+    debugger;
     const layer2 = this.getLayer();
     const source = layer2.getSource();
     if (!source)
       return;
     const enabledFilters = this.getEnabledFilters();
-    const features2 = source.getFeatures();
+    if (this.originalFeatures.length === 0) {
+      this.originalFeatures = source.getFeatures();
+    }
     if (enabledFilters.length === 0) {
-      features2.forEach((feature2) => {
-        feature2.setStyle(void 0);
-      });
+      source.clear();
+      source.addFeatures(this.originalFeatures);
       return;
     }
     const logic = this.getFilterLogic();
-    features2.forEach((feature2) => {
+    const filtered = this.originalFeatures.filter((feature2) => {
       const results = enabledFilters.map((filter2) => this.checkFeatureAgainstFilter(feature2, filter2));
-      const visible = this.combineByLogic(results);
-      feature2.setStyle(visible ? void 0 : new Style$3({}));
+      return this.combineByLogic(results);
     });
-    console.log(`GeoJSON图层应用 ${enabledFilters.length} 个过滤器，组合逻辑为 ${logic}`);
+    source.clear();
+    source.addFeatures(filtered);
+    console.log(`GeoJSON图层应用过滤器（${logic}），显示 ${filtered.length}/${this.originalFeatures.length} 个要素`);
   }
   /**
    * 检查要素是否符合过滤器条件
@@ -490520,7 +490528,7 @@ function(t3) {
  */
 function(t3) {
   function e8() {
-    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-49a6cfdb.mjs")).catch(function(t4) {
+    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-1ed309bd.mjs")).catch(function(t4) {
       return Promise.reject(new Error("Could not load canvg: " + t4));
     }).then(function(t4) {
       return t4.default ? t4.default : t4;

package/lib/{index.es-49a6cfdb.mjs → index.es-1ed309bd.mjs}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, R as RGBColor, r as requestAnimationFrame, _ as _asyncToGenerator, a as _, p as processCanvasRGBA, b as _defineProperty } from "./index-a3727619.mjs";
+import { c as commonjsGlobal, R as RGBColor, r as requestAnimationFrame, _ as _asyncToGenerator, a as _, p as processCanvasRGBA, b as _defineProperty } from "./index-a4ec7e53.mjs";
 import "vue";
 import "ol";
 var check = function(it) {

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-import { z, B, d, C, D, a2, a3, u, y, a7, a6, I, H, Z, $, L, J, K, a4, h, M, a0, a1, X, Y, U, W, Q, S, P, A, F, G, N, O, a8, e, T, E, V, x, j, o, t, f, k, g, w, q, m, n, a5, i, s, l, v } from "./index-a3727619.mjs";
+import { z, B, d, C, D, a2, a3, u, y, a7, a6, I, H, Z, $, L, J, K, a4, h, M, a0, a1, X, Y, U, W, Q, S, P, A, F, G, N, O, a8, e, T, E, V, x, j, o, t, f, k, g, w, q, m, n, a5, i, s, l, v } from "./index-a4ec7e53.mjs";
 import "vue";
 import "ol";
 export {

package/lib/index.umd.js

@@ -83719,6 +83719,8 @@ ${this.attributes_.map(
     constructor(config, map2) {
       super(config, map2);
       __publicField(this, "styleConfig");
+      __publicField(this, "currentFilters", []);
+      __publicField(this, "originalFeatures", []);
     }
     createLayer() {
       var _a3, _b3, _c2;
@@ -83744,12 +83746,7 @@ ${this.attributes_.map(
         const features2 = format2.readFeatures(this.config.data, {
           featureProjection: mapProjection
         });
-        if (features2 && features2.length > 0) {
-          try {
-            console.log("[GeoJSONLayerHandler] 示例要素属性:", features2[0].getProperties());
-          } catch (e3) {
-          }
-        }
+        this.originalFeatures = features2;
         return new VectorSource$2({ features: features2 });
       } else if (this.config.url) {
         const source = new VectorSource$2({
@@ -83771,6 +83768,9 @@ ${this.attributes_.map(
           source.on("addfeature", logOnce);
         } catch (e3) {
         }
+        source.on("featuresloadend", () => {
+          this.originalFeatures = source.getFeatures();
+        });
         return source;
       } else {
         return new VectorSource$2();
@@ -83928,16 +83928,20 @@ ${this.attributes_.map(
       var _a3;
       const layer2 = this.getLayer();
       const source = layer2.getSource();
-      if (source) {
-        const format2 = new GeoJSON$4();
-        const mapProjection = ((_a3 = this.map) == null ? void 0 : _a3.getView().getProjection().getCode()) || "EPSG:4326";
-        const olFeatures = format2.readFeatures({
-          type: "FeatureCollection",
-          features: features2
-        }, {
-          featureProjection: mapProjection
-        });
-        source.addFeatures(olFeatures);
+      if (!source)
+        return;
+      const format2 = new GeoJSON$4();
+      const mapProjection = ((_a3 = this.map) == null ? void 0 : _a3.getView().getProjection().getCode()) || "EPSG:4326";
+      const olFeatures = format2.readFeatures({
+        type: "FeatureCollection",
+        features: features2
+      }, {
+        featureProjection: mapProjection
+      });
+      source.addFeatures(olFeatures);
+      this.originalFeatures.push(...olFeatures);
+      if (this.getEnabledFilters().length > 0) {
+        this.applyFilters();
       }
     }
     /**
@@ -83946,9 +83950,10 @@ ${this.attributes_.map(
     clearFeatures() {
       const layer2 = this.getLayer();
       const source = layer2.getSource();
-      if (source) {
-        source.clear();
-      }
+      if (!source)
+        return;
+      source.clear();
+      this.originalFeatures = [];
     }
     /**
      * 获取要素数量
@@ -84179,25 +84184,28 @@ ${this.attributes_.map(
      * 应用过滤器（实现基类的抽象方法）
      */
     applyFilters() {
+      debugger;
       const layer2 = this.getLayer();
       const source = layer2.getSource();
       if (!source)
         return;
       const enabledFilters = this.getEnabledFilters();
-      const features2 = source.getFeatures();
+      if (this.originalFeatures.length === 0) {
+        this.originalFeatures = source.getFeatures();
+      }
       if (enabledFilters.length === 0) {
-        features2.forEach((feature2) => {
-          feature2.setStyle(void 0);
-        });
+        source.clear();
+        source.addFeatures(this.originalFeatures);
         return;
       }
       const logic = this.getFilterLogic();
-      features2.forEach((feature2) => {
+      const filtered = this.originalFeatures.filter((feature2) => {
         const results = enabledFilters.map((filter2) => this.checkFeatureAgainstFilter(feature2, filter2));
-        const visible = this.combineByLogic(results);
-        feature2.setStyle(visible ? void 0 : new Style$3({}));
+        return this.combineByLogic(results);
       });
-      console.log(`GeoJSON图层应用 ${enabledFilters.length} 个过滤器，组合逻辑为 ${logic}`);
+      source.clear();
+      source.addFeatures(filtered);
+      console.log(`GeoJSON图层应用过滤器（${logic}），显示 ${filtered.length}/${this.originalFeatures.length} 个要素`);
     }
     /**
      * 检查要素是否符合过滤器条件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-openlayers-plugin",
-  "version": "1.0.54",
+  "version": "1.0.56",
   "description": "A Vue 3 plugin for OpenLayers with custom components and utilities",
   "main": "lib/index.umd.js",
   "module": "lib/index.esm.js",

package/types/src/components/CustomOpenlayer/utils/layers/GeoJSONLayerHandler.d.ts

@@ -10,6 +10,8 @@ import { IStyleConfigMap } from '../styles';
  */
 export declare class GeoJSONLayerHandler extends BaseLayer {
     private styleConfig?;
+    private currentFilters;
+    private originalFeatures;
     constructor(config: LayerConfig, map?: OLMap);
     createLayer(): Layer<VectorSource>;
     /**

package/types/src/components/CustomOpenlayer/utils/layers/GeoJSONLayerHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeoJSONLayerHandler.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CustomOpenlayer/utils/layers/GeoJSONLayerHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAM5C,OAAO,EAAE,GAAG,IAAI,KAAK,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,KAAK,EAAE,WAAW,EAA0D,MAAM,aAAa,CAAC;AAEvG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEjD;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,SAAS;IAChD,OAAO,CAAC,WAAW,CAAC,CAAkB;gBAE1B,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,KAAK;IAI5C,WAAW,IAAI,KAAK,CAAC,YAAY,CAAC;IAclC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAyB1B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAQ3B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA4DxB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAmD1B;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI;IAiBlC;;OAEG;IACH,aAAa,IAAI,IAAI;IAQrB;;OAEG;IACH,eAAe,IAAI,MAAM;IAMzB;;OAEG;IACH,WAAW,CAAC,WAAW,EAAE,GAAG,GAAG,IAAI;IAanC;;OAEG;IACH,cAAc,CAAC,WAAW,EAAE,eAAe,GAAG,IAAI;IAOlD;;OAEG;IACH,cAAc,IAAI,eAAe,GAAG,SAAS;IAI7C;;OAEG;IACH,qBAAqB,CACnB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,EAC1D,kBAAkB,CAAC,EAAE,eAAe,GACnC,IAAI;IAUP;;;OAGG;IACH,aAAa,CAAC,OAAO,CAAC,EAAE;QACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;QAClB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB,GAAG,IAAI;IA6DR;;;;OAIG;IACH,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAa,GAAG,IAAI;IAuDzD;;;;;OAKG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAa,GAAG,IAAI;IAkDtF;;;OAGG;IACH,SAAS,IAAI,MAAM,EAAE,GAAG,IAAI;IA+B5B;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;IA4B9B;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAkBjC;;;OAGG;IACH,OAAO,CAAC,cAAc;IAqBtB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAmD1B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IA6E/B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAkD5B;;OAEG;IACH,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAI5D;;OAEG;IACH,sBAAsB,IAAI,IAAI;CAG/B"}
+{"version":3,"file":"GeoJSONLayerHandler.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CustomOpenlayer/utils/layers/GeoJSONLayerHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAM5C,OAAO,EAAE,GAAG,IAAI,KAAK,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,KAAK,EAAE,WAAW,EAA0D,MAAM,aAAa,CAAC;AAEvG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEjD;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,SAAS;IAChD,OAAO,CAAC,WAAW,CAAC,CAAkB;IAEtC,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,gBAAgB,CAA2B;gBAEvC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,KAAK;IAI5C,WAAW,IAAI,KAAK,CAAC,YAAY,CAAC;IAclC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAyB1B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAQ3B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA4DxB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAmD1B;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI;IAsBlC;;OAEG;IACH,aAAa,IAAI,IAAI;IAQrB;;OAEG;IACH,eAAe,IAAI,MAAM;IAMzB;;OAEG;IACH,WAAW,CAAC,WAAW,EAAE,GAAG,GAAG,IAAI;IAanC;;OAEG;IACH,cAAc,CAAC,WAAW,EAAE,eAAe,GAAG,IAAI;IAOlD;;OAEG;IACH,cAAc,IAAI,eAAe,GAAG,SAAS;IAI7C;;OAEG;IACH,qBAAqB,CACnB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,EAC1D,kBAAkB,CAAC,EAAE,eAAe,GACnC,IAAI;IAUP;;;OAGG;IACH,aAAa,CAAC,OAAO,CAAC,EAAE;QACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;QAClB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB,GAAG,IAAI;IA6DR;;;;OAIG;IACH,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAa,GAAG,IAAI;IAuDzD;;;;;OAKG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAa,GAAG,IAAI;IAkDtF;;;OAGG;IACH,SAAS,IAAI,MAAM,EAAE,GAAG,IAAI;IA+B5B;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;IA4B9B;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAkBjC;;;OAGG;IACH,OAAO,CAAC,cAAc;IAqBtB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAmD1B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IA6E/B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAkD5B;;OAEG;IACH,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAI5D;;OAEG;IACH,sBAAsB,IAAI,IAAI;CAG/B"}