vue-openlayers-plugin 1.0.48 → 1.0.49

package/lib/{index-6010d8cc.mjs → index-2dac53c6.mjs}

@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { getCurrentInstance, inject, ref, computed, unref, getCurrentScope, onScopeDispose, shallowRef, watchEffect, readonly, onMounted, nextTick, watch, isRef, warn as warn$3, provide, defineComponent, openBlock, createElementBlock, mergeProps, renderSlot, createElementVNode, toRef, onUnmounted, useAttrs as useAttrs$1, useSlots, normalizeClass, normalizeStyle as normalizeStyle$1, createCommentVNode, Fragment, createBlock, withCtx, resolveDynamicComponent, withModifiers, toDisplayString, onBeforeUnmount, createVNode as createVNode$1, Transition, withDirectives, createTextVNode, vShow, Text as Text$7, reactive, h as h$4, shallowReactive, isVNode, render as render$3, markRaw, toRefs, resolveComponent, withKeys, renderList, createApp, resolveDirective, Teleport } from "vue";
+import { getCurrentInstance, inject, ref, computed, unref, getCurrentScope, onScopeDispose, shallowRef, watchEffect, readonly, onMounted, nextTick, watch, isRef, warn as warn$3, provide, defineComponent, openBlock, createElementBlock, mergeProps, renderSlot, createElementVNode, toRef, onUnmounted, useAttrs as useAttrs$1, useSlots, normalizeClass, normalizeStyle as normalizeStyle$1, createCommentVNode, Fragment, createBlock, withCtx, resolveDynamicComponent, withModifiers, toDisplayString, onBeforeUnmount, createVNode as createVNode$1, Transition, withDirectives, createTextVNode, vShow, Text as Text$6, reactive, h as h$4, shallowReactive, isVNode, render as render$3, markRaw, toRefs, resolveComponent, withKeys, renderList, createApp, resolveDirective, Teleport } from "vue";
 import { Feature as Feature$6, Map as Map$8 } from "ol";
 function _mergeNamespaces(n2, m2) {
   for (var i = 0; i < m2.length; i++) {
@@ -58,7 +58,7 @@ const Shape$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
     return Rect$1;
   },
   get Text() {
-    return Text$4;
+    return Text$3;
   }
 }, Symbol.toStringTag, { value: "Module" }));
 const Shape = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -97,7 +97,7 @@ const Shape = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
     return Rect;
   },
   get Text() {
-    return Text$3;
+    return Text$2;
   }
 }, Symbol.toStringTag, { value: "Module" }));
 const configProviderContextKey = Symbol();
@@ -3872,7 +3872,7 @@ const useButton = (props, emit) => {
     const defaultSlot = (_a3 = slots.default) == null ? void 0 : _a3.call(slots);
     if (autoInsertSpace.value && (defaultSlot == null ? void 0 : defaultSlot.length) === 1) {
       const slot = defaultSlot[0];
-      if ((slot == null ? void 0 : slot.type) === Text$7) {
+      if ((slot == null ? void 0 : slot.type) === Text$6) {
         const text2 = slot.children;
         return /^\p{Unified_Ideograph}{2}$/u.test(text2.trim());
       }
@@ -21015,7 +21015,7 @@ function defaultGeometryFunction$1(feature2) {
 }
 const Style$3 = Style$2;
 const DEFAULT_FILL_COLOR$1 = "#333";
-let Text$5 = class Text2 {
+let Text$4 = class Text {
   /**
    * @param {Options} [options] Options.
    */
@@ -21051,7 +21051,7 @@ let Text$5 = class Text2 {
    */
   clone() {
     const scale3 = this.getScale();
-    return new Text2({
+    return new Text({
       font: this.getFont(),
       placement: this.getPlacement(),
       repeat: this.getRepeat(),
@@ -21431,7 +21431,7 @@ let Text$5 = class Text2 {
     this.padding_ = padding2;
   }
 };
-const Text$6 = Text$5;
+const Text$5 = Text$4;
 function always$2(context) {
   return true;
 }
@@ -21767,7 +21767,7 @@ function buildText$1(flatStyle, context) {
     flatStyle,
     prefix + "declutter-mode"
   );
-  const text2 = new Text$6({ declutterMode });
+  const text2 = new Text$5({ declutterMode });
   return function(context2) {
     text2.setText(evaluateValue(context2));
     if (evaluateFill) {
@@ -58629,7 +58629,7 @@ class SearchMarkerManager {
           width: 2
         })
       }),
-      text: new Text$6({
+      text: new Text$5({
         text: String(index2 + 1),
         font: "12px Arial",
         fill: new Fill$2({
@@ -59765,7 +59765,7 @@ class PointDrawing extends BaseDrawing {
    * 创建文字样式
    */
   createTextStyle() {
-    const textStyle = new Text$6({
+    const textStyle = new Text$5({
       text: this._style.textContent,
       font: `${this._style.fontSize || 14}px ${this._style.fontFamily || "Arial"}`,
       fill: new Fill$2({
@@ -60277,7 +60277,7 @@ class LineDrawing extends BaseDrawing {
     const coordinates2 = this._config.coordinates;
     const midIndex = Math.floor(coordinates2.length / 2);
     const midPoint2 = coordinates2[midIndex];
-    const textStyle = new Text$6({
+    const textStyle = new Text$5({
       text: formattedLength,
       font: `${this._style.fontSize || 12}px ${this._style.fontFamily || "Arial"}`,
       fill: new Fill$2({
@@ -60307,7 +60307,7 @@ class LineDrawing extends BaseDrawing {
     const coordinates2 = this._config.coordinates;
     const midIndex = Math.floor(coordinates2.length / 2);
     const midPoint2 = coordinates2[midIndex];
-    const textStyle = new Text$6({
+    const textStyle = new Text$5({
       text: this._style.textContent,
       font: `${this._style.fontSize || 14}px ${this._style.fontFamily || "Arial"}`,
       fill: new Fill$2({
@@ -60867,7 +60867,7 @@ class PolygonDrawing extends BaseDrawing {
     const formattedArea = this.formatArea(area2);
     const geometry2 = (_a3 = this.feature) == null ? void 0 : _a3.getGeometry();
     const center2 = geometry2 ? geometry2.getInteriorPoint().getCoordinates() : [0, 0];
-    const textStyle = new Text$6({
+    const textStyle = new Text$5({
       text: formattedArea,
       font: `${this._style.fontSize || 12}px ${this._style.fontFamily || "Arial"}`,
       fill: new Fill$2({
@@ -60900,7 +60900,7 @@ class PolygonDrawing extends BaseDrawing {
     const geometry2 = (_a3 = this.feature) == null ? void 0 : _a3.getGeometry();
     const center2 = geometry2 ? geometry2.getInteriorPoint().getCoordinates() : [0, 0];
     const offsetCenter = [center2[0], center2[1] + 20];
-    const textStyle = new Text$6({
+    const textStyle = new Text$5({
       text: `周长: ${formattedPerimeter}`,
       font: `${this._style.fontSize || 10}px ${this._style.fontFamily || "Arial"}`,
       fill: new Fill$2({
@@ -60930,7 +60930,7 @@ class PolygonDrawing extends BaseDrawing {
     var _a3;
     const geometry2 = (_a3 = this.feature) == null ? void 0 : _a3.getGeometry();
     const center2 = geometry2 ? geometry2.getInteriorPoint().getCoordinates() : [0, 0];
-    const textStyle = new Text$6({
+    const textStyle = new Text$5({
       text: this._style.textContent,
       font: `${this._style.fontSize || 14}px ${this._style.fontFamily || "Arial"}`,
       fill: new Fill$2({
@@ -61459,7 +61459,7 @@ class TextDrawing extends BaseDrawing {
    * 创建样式
    */
   createStyle() {
-    const textStyle = new Text$6({
+    const textStyle = new Text$5({
       text: this._style.textContent,
       font: this.getFontString(),
       fill: new Fill$2({
@@ -61945,7 +61945,7 @@ class MultiPolygonDrawing extends BaseDrawing {
         const areaText = this.formatArea(area2);
         styles.push(new Style$3({
           geometry: new ol.geom.Point(center2),
-          text: new Text$6({
+          text: new Text$5({
             text: areaText,
             font: `${this._style.fontSize || 12}px ${this._style.fontFamily || "Arial"}`,
             fill: new Fill$2({
@@ -61982,7 +61982,7 @@ class MultiPolygonDrawing extends BaseDrawing {
         const offsetCenter = [center2[0], center2[1] - 20];
         styles.push(new Style$3({
           geometry: new ol.geom.Point(offsetCenter),
-          text: new Text$6({
+          text: new Text$5({
             text: perimeterText,
             font: `${(this._style.fontSize || 12) - 2}px ${this._style.fontFamily || "Arial"}`,
             fill: new Fill$2({
@@ -62016,7 +62016,7 @@ class MultiPolygonDrawing extends BaseDrawing {
       if (center2) {
         styles.push(new Style$3({
           geometry: new ol.geom.Point(center2),
-          text: new Text$6({
+          text: new Text$5({
             text: `${index2 + 1}`,
             font: `bold ${this._style.indexFontSize || 12}px ${this._style.fontFamily || "Arial"}`,
             fill: new Fill$2({
@@ -62048,7 +62048,7 @@ class MultiPolygonDrawing extends BaseDrawing {
     const center2 = geometry2 ? this.getMultiPolygonCenter() : [0, 0];
     return new Style$3({
       geometry: new ol.geom.Point(center2),
-      text: new Text$6({
+      text: new Text$5({
         text: this._style.textContent || "",
         font: `${this._style.fontSize || 14}px ${this._style.fontFamily || "Arial"}`,
         fill: new Fill$2({
@@ -62823,7 +62823,7 @@ class MultiPointDrawing extends BaseDrawing {
       ];
       styles.push(new Style$3({
         geometry: new Point$b(offsetCoord),
-        text: new Text$6({
+        text: new Text$5({
           text: `${index2 + 1}`,
           font: `bold ${this._style.indexFontSize || 12}px ${this._style.fontFamily || "Arial"}`,
           fill: new Fill$2({
@@ -62860,7 +62860,7 @@ class MultiPointDrawing extends BaseDrawing {
       ];
       styles.push(new Style$3({
         geometry: new Point$b(offsetCoord),
-        text: new Text$6({
+        text: new Text$5({
           text: coordText,
           font: `${(this._style.fontSize || 12) - 2}px ${this._style.fontFamily || "Arial"}`,
           fill: new Fill$2({
@@ -62889,7 +62889,7 @@ class MultiPointDrawing extends BaseDrawing {
     const center2 = this.getMultiPointCenter();
     return new Style$3({
       geometry: new Point$b(center2),
-      text: new Text$6({
+      text: new Text$5({
         text: this._style.textContent || "",
         font: `${this._style.fontSize || 14}px ${this._style.fontFamily || "Arial"}`,
         fill: new Fill$2({
@@ -63639,7 +63639,7 @@ class MultiLineStringDrawing extends BaseDrawing {
       ];
       styles.push(new Style$3({
         geometry: new Point$b(offsetPoint),
-        text: new Text$6({
+        text: new Text$5({
           text: `${index2 + 1}`,
           font: `bold ${this._style.indexFontSize || 12}px ${this._style.fontFamily || "Arial"}`,
           fill: new Fill$2({
@@ -63690,7 +63690,7 @@ class MultiLineStringDrawing extends BaseDrawing {
       ];
       styles.push(new Style$3({
         geometry: new Point$b(offsetPosition),
-        text: new Text$6({
+        text: new Text$5({
           text: lengthText,
           font: `${(this._style.fontSize || 12) - 1}px ${this._style.fontFamily || "Arial"}`,
           fill: new Fill$2({
@@ -63719,7 +63719,7 @@ class MultiLineStringDrawing extends BaseDrawing {
     const center2 = this.getMultiLineStringCenter();
     return new Style$3({
       geometry: new Point$b(center2),
-      text: new Text$6({
+      text: new Text$5({
         text: this._style.textContent || "",
         font: `${this._style.fontSize || 14}px ${this._style.fontFamily || "Arial"}`,
         fill: new Fill$2({
@@ -66807,7 +66807,7 @@ class PointWithTextDrawing extends BaseDrawing {
    */
   createTextStyle() {
     const textOffset = this.calculateTextOffset();
-    const textStyle = new Text$6({
+    const textStyle = new Text$5({
       text: this._style.textContent,
       font: this.getFontString(),
       fill: new Fill$2({
@@ -67786,7 +67786,7 @@ class ImageDrawing extends BaseDrawing {
    * 创建文字样式
    */
   createTextStyle() {
-    const textStyle = new Text$6({
+    const textStyle = new Text$5({
       text: this._style.textContent,
       font: `${this._style.fontSize || 12}px ${this._style.fontFamily || "Arial"}`,
       fill: new Fill$2({
@@ -68546,7 +68546,7 @@ class MilitaryDrawing extends BaseDrawing {
         geometry2 = new Point$b([0, 0]);
       }
     }
-    const textStyle = new Text$6({
+    const textStyle = new Text$5({
       text: this._style.textContent,
       font: `${this._style.fontSize || 12}px ${this._style.fontFamily || "Arial"}`,
       fill: new Fill$2({
@@ -69141,27 +69141,17 @@ function getUnitOptions(type) {
 }
 const STORAGE_CONFIG = {
   ENABLED: false,
-  // 默认禁用本地存储
   MAX_MEASUREMENTS: 100,
-  // 减少到100条，避免过多累积
   MAX_LAYER_CONFIGS: 30,
-  // 减少到30个，够用即可
   MAX_SEARCH_HISTORY: 20,
-  // 新增：搜索历史限制
   QUOTA_WARNING_THRESHOLD: 0.6,
-  // 配额警告阈值（60%）
   AUTO_CLEANUP_THRESHOLD: 0.7,
-  // 自动清理阈值（70%）
   COMPRESSION_ENABLED: true,
-  // 是否启用压缩
   BATCH_CLEANUP_SIZE: 10,
-  // 减少批量清理数量
   // 新增：数据过期时间配置（毫秒）
   DATA_EXPIRY: {
     MEASUREMENTS: 30 * 24 * 60 * 60 * 1e3,
-    // 30天
     MAP_STATE: 7 * 24 * 60 * 60 * 1e3,
-    // 7天
     SEARCH_HISTORY: 7 * 24 * 60 * 60 * 1e3
     // 7天
   }
@@ -69216,9 +69206,7 @@ class MapStorage {
   cleanupExpiredData() {
     try {
       const measurements = this.getMeasurements();
-      const validMeasurements = measurements.filter(
-        (m2) => !m2.timestamp || !this.isDataExpired(m2.timestamp, "MEASUREMENTS")
-      );
+      const validMeasurements = measurements.filter((m2) => !m2.timestamp || !this.isDataExpired(m2.timestamp, "MEASUREMENTS"));
       if (validMeasurements.length !== measurements.length) {
         this.saveMeasurements(validMeasurements);
         console.log(`清理过期测量结果：${measurements.length} -> ${validMeasurements.length}`);
@@ -69600,12 +69588,7 @@ class MapStorage {
    * 手动清理存储
    */
   manualCleanup(options = {}) {
-    const {
-      clearMeasurements = false,
-      clearLayerConfigs = false,
-      clearMapState = false,
-      keepRecentCount = 50
-    } = options;
+    const { clearMeasurements = false, clearLayerConfigs = false, clearMapState = false, keepRecentCount = 50 } = options;
     if (clearMeasurements) {
       if (keepRecentCount > 0) {
         const measurements = this.getMeasurements();
@@ -74685,7 +74668,7 @@ function createStyleDefaults() {
     color: [51, 51, 51, 1],
     width: 2
   });
-  DEFAULT_TEXT_STYLE = new Text$6({
+  DEFAULT_TEXT_STYLE = new Text$5({
     font: "bold 16px Helvetica",
     fill: DEFAULT_FILL_STYLE,
     stroke: DEFAULT_TEXT_STROKE_STYLE,
@@ -75584,7 +75567,7 @@ function labelStyleParser(node, objectStack) {
     return;
   }
   const styleObject = objectStack[objectStack.length - 1];
-  const textStyle = new Text$6({
+  const textStyle = new Text$5({
     fill: new Fill$2({
       color: (
         /** @type {import("../color.js").Color} */
@@ -81427,6 +81410,38 @@ class GeoJSONLocationTool {
     this.map = map2;
   }
 }
+var FilterType;
+(function(FilterType2) {
+  FilterType2["ATTRIBUTE"] = "attribute";
+  FilterType2["SPATIAL"] = "spatial";
+  FilterType2["CQL"] = "cql";
+  FilterType2["CUSTOM"] = "custom";
+})(FilterType || (FilterType = {}));
+var FilterOperator;
+(function(FilterOperator2) {
+  FilterOperator2["EQUAL"] = "equal";
+  FilterOperator2["NOT_EQUAL"] = "not_equal";
+  FilterOperator2["GREATER_THAN"] = "greater_than";
+  FilterOperator2["LESS_THAN"] = "less_than";
+  FilterOperator2["GREATER_EQUAL"] = "greater_equal";
+  FilterOperator2["LESS_EQUAL"] = "less_equal";
+  FilterOperator2["LIKE"] = "like";
+  FilterOperator2["IN"] = "in";
+  FilterOperator2["NOT_IN"] = "not_in";
+  FilterOperator2["BETWEEN"] = "between";
+  FilterOperator2["IS_NULL"] = "is_null";
+  FilterOperator2["IS_NOT_NULL"] = "is_not_null";
+})(FilterOperator || (FilterOperator = {}));
+var SpatialFilterType;
+(function(SpatialFilterType2) {
+  SpatialFilterType2["INTERSECTS"] = "intersects";
+  SpatialFilterType2["CONTAINS"] = "contains";
+  SpatialFilterType2["WITHIN"] = "within";
+  SpatialFilterType2["TOUCHES"] = "touches";
+  SpatialFilterType2["CROSSES"] = "crosses";
+  SpatialFilterType2["OVERLAPS"] = "overlaps";
+  SpatialFilterType2["DISJOINT"] = "disjoint";
+})(SpatialFilterType || (SpatialFilterType = {}));
 let BaseLayer$2 = class BaseLayer2 {
   constructor(config) {
     __publicField(this, "config");
@@ -81437,6 +81452,23 @@ let BaseLayer$2 = class BaseLayer2 {
     this.config = { ...config };
     this.processConfig();
   }
+  /**
+   * 获取过滤组合逻辑，默认 'AND'
+   */
+  getFilterLogic() {
+    return this.config.filterLogic ?? "AND";
+  }
+  /**
+   * 根据过滤组合逻辑计算布尔结果
+   * @param results 单个过滤条件的判定结果数组
+   */
+  combineByLogic(results) {
+    const logic = this.getFilterLogic();
+    if (logic === "OR") {
+      return results.some(Boolean);
+    }
+    return results.every(Boolean);
+  }
   /**
    * 处理图层配置，包括透明度转换等通用逻辑
    */
@@ -81520,6 +81552,21 @@ let BaseLayer$2 = class BaseLayer2 {
       this.layer.setOpacity(normalizedOpacity);
     }
   }
+  /**
+   * 设置图层层级
+   */
+  setZIndex(zIndex2) {
+    if (this.layer) {
+      this.layer.setZIndex(zIndex2);
+    }
+  }
+  /**
+   * 获取当前图层层级
+   */
+  getZIndex() {
+    var _a3;
+    return (_a3 = this.layer) == null ? void 0 : _a3.getZIndex();
+  }
   /**
    * 设置图层可见性
    */
@@ -81804,7 +81851,8 @@ let BaseLayer$2 = class BaseLayer2 {
     this.addFilter(filter2);
   }
 };
-var LayerType$1 = /* @__PURE__ */ ((LayerType2) => {
+var LayerType$1;
+(function(LayerType2) {
   LayerType2["TILE"] = "tile";
   LayerType2["WMS"] = "wms";
   LayerType2["WMTS"] = "wmts";
@@ -81819,8 +81867,7 @@ var LayerType$1 = /* @__PURE__ */ ((LayerType2) => {
   LayerType2["CANVAS"] = "canvas";
   LayerType2["IMAGE_VECTOR"] = "image_vector";
   LayerType2["VECTOR_TILE"] = "vector_tile";
-  return LayerType2;
-})(LayerType$1 || {});
+})(LayerType$1 || (LayerType$1 = {}));
 class TileLayerHandler extends BaseLayer$2 {
   constructor() {
     super(...arguments);
@@ -81983,9 +82030,8 @@ class TileLayerHandler extends BaseLayer$2 {
   }
   /**
    * 应用过滤器（瓦片图层不支持过滤）
-   * @param filters 过滤器数组
    */
-  applyFilters(filters) {
+  applyFilters() {
     console.warn("TileLayerHandler: 瓦片图层不支持客户端过滤功能。瓦片图层使用预渲染的图像瓦片，无法进行动态过滤。");
     console.info("TileLayerHandler: 如需过滤功能，请考虑：");
     console.info("1. 使用矢量图层（GeoJSON、WFS等）替代瓦片图层");
@@ -81993,38 +82039,6 @@ class TileLayerHandler extends BaseLayer$2 {
     console.info("3. 使用WMS图层并配置服务端过滤参数");
   }
 }
-var FilterType$1 = /* @__PURE__ */ ((FilterType2) => {
-  FilterType2["ATTRIBUTE"] = "attribute";
-  FilterType2["SPATIAL"] = "spatial";
-  FilterType2["CQL"] = "cql";
-  FilterType2["CUSTOM"] = "custom";
-  return FilterType2;
-})(FilterType$1 || {});
-var FilterOperator$1 = /* @__PURE__ */ ((FilterOperator2) => {
-  FilterOperator2["EQUAL"] = "equal";
-  FilterOperator2["NOT_EQUAL"] = "not_equal";
-  FilterOperator2["GREATER_THAN"] = "greater_than";
-  FilterOperator2["LESS_THAN"] = "less_than";
-  FilterOperator2["GREATER_EQUAL"] = "greater_equal";
-  FilterOperator2["LESS_EQUAL"] = "less_equal";
-  FilterOperator2["LIKE"] = "like";
-  FilterOperator2["IN"] = "in";
-  FilterOperator2["NOT_IN"] = "not_in";
-  FilterOperator2["BETWEEN"] = "between";
-  FilterOperator2["IS_NULL"] = "is_null";
-  FilterOperator2["IS_NOT_NULL"] = "is_not_null";
-  return FilterOperator2;
-})(FilterOperator$1 || {});
-var SpatialFilterType = /* @__PURE__ */ ((SpatialFilterType2) => {
-  SpatialFilterType2["INTERSECTS"] = "intersects";
-  SpatialFilterType2["CONTAINS"] = "contains";
-  SpatialFilterType2["WITHIN"] = "within";
-  SpatialFilterType2["TOUCHES"] = "touches";
-  SpatialFilterType2["CROSSES"] = "crosses";
-  SpatialFilterType2["OVERLAPS"] = "overlaps";
-  SpatialFilterType2["DISJOINT"] = "disjoint";
-  return SpatialFilterType2;
-})(SpatialFilterType || {});
 class WMSLayerHandler extends BaseLayer$2 {
   createLayer() {
     const source = this.createWMSSource();
@@ -82096,27 +82110,17 @@ class WMSLayerHandler extends BaseLayer$2 {
     const source = layer2.getSource();
     if (!source)
       return void 0;
-    return source.getFeatureInfoUrl(
-      coordinate,
-      resolution,
-      projection2,
-      {
-        "INFO_FORMAT": "application/json",
-        "FEATURE_COUNT": 10,
-        ...params2
-      }
-    );
+    return source.getFeatureInfoUrl(coordinate, resolution, projection2, {
+      "INFO_FORMAT": "application/json",
+      "FEATURE_COUNT": 10,
+      ...params2
+    });
   }
   /**
    * 通过坐标获取要素信息
    */
   async getFeatureInfoAtCoordinate(coordinate, options = {}) {
-    const {
-      infoFormat = "application/json",
-      featureCount = 10,
-      resolution,
-      projection: projection2 = "EPSG:3857"
-    } = options;
+    const { infoFormat = "application/json", featureCount = 10, resolution, projection: projection2 = "EPSG:3857" } = options;
     try {
       const map2 = this.map;
       if (!map2) {
@@ -82130,15 +82134,10 @@ class WMSLayerHandler extends BaseLayer$2 {
         console.warn("无法获取地图分辨率");
         return [];
       }
-      const url = this.getFeatureInfoUrl(
-        coordinate,
-        currentResolution,
-        currentProjection,
-        {
-          "INFO_FORMAT": infoFormat,
-          "FEATURE_COUNT": featureCount
-        }
-      );
+      const url = this.getFeatureInfoUrl(coordinate, currentResolution, currentProjection, {
+        "INFO_FORMAT": infoFormat,
+        "FEATURE_COUNT": featureCount
+      });
       if (!url) {
         console.warn("无法构建GetFeatureInfo请求URL");
         return [];
@@ -82215,8 +82214,8 @@ class WMSLayerHandler extends BaseLayer$2 {
    */
   applyFilters() {
     const enabledFilters = this.getEnabledFilters();
-    const attributeFilters = enabledFilters.filter((filter2) => filter2.type === FilterType$1.ATTRIBUTE);
-    const cqlFilters = enabledFilters.filter((filter2) => filter2.type === FilterType$1.CQL);
+    const attributeFilters = enabledFilters.filter((filter2) => filter2.type === FilterType.ATTRIBUTE);
+    const cqlFilters = enabledFilters.filter((filter2) => filter2.type === FilterType.CQL);
     const allCQLExpressions = [];
     attributeFilters.forEach((filter2) => {
       const config = filter2;
@@ -82230,9 +82229,11 @@ class WMSLayerHandler extends BaseLayer$2 {
       allCQLExpressions.push(`(${config.cqlExpression})`);
     });
     if (allCQLExpressions.length > 0) {
-      const combinedCQL = allCQLExpressions.join(" AND ");
+      const logic = this.getFilterLogic();
+      const separator = logic === "OR" ? " OR " : " AND ";
+      const combinedCQL = allCQLExpressions.join(separator);
       this.updateParams({ "CQL_FILTER": combinedCQL });
-      console.log("WMS图层应用CQL过滤器:", combinedCQL);
+      console.log(`WMS图层应用CQL过滤器 (${logic}):`, combinedCQL);
     } else {
       this.updateParams({ "CQL_FILTER": void 0 });
       console.log("WMS图层清除CQL过滤器");
@@ -82247,34 +82248,34 @@ class WMSLayerHandler extends BaseLayer$2 {
       return null;
     }
     switch (operator) {
-      case FilterOperator$1.EQUAL:
+      case FilterOperator.EQUAL:
         return typeof value === "string" ? `${property} = '${value}'` : `${property} = ${value}`;
-      case FilterOperator$1.NOT_EQUAL:
+      case FilterOperator.NOT_EQUAL:
         return typeof value === "string" ? `${property} <> '${value}'` : `${property} <> ${value}`;
-      case FilterOperator$1.GREATER_THAN:
+      case FilterOperator.GREATER_THAN:
         return `${property} > ${value}`;
-      case FilterOperator$1.GREATER_EQUAL:
+      case FilterOperator.GREATER_EQUAL:
         return `${property} >= ${value}`;
-      case FilterOperator$1.LESS_THAN:
+      case FilterOperator.LESS_THAN:
         return `${property} < ${value}`;
-      case FilterOperator$1.LESS_EQUAL:
+      case FilterOperator.LESS_EQUAL:
         return `${property} <= ${value}`;
-      case FilterOperator$1.LIKE:
+      case FilterOperator.LIKE:
         return `${property} LIKE '%${value}%'`;
-      case FilterOperator$1.IN:
+      case FilterOperator.IN:
         if (Array.isArray(value)) {
           const valueList = value.map((v5) => typeof v5 === "string" ? `'${v5}'` : v5).join(",");
           return `${property} IN (${valueList})`;
         }
         return null;
-      case FilterOperator$1.BETWEEN:
+      case FilterOperator.BETWEEN:
         if (Array.isArray(value) && value.length === 2) {
           return `${property} BETWEEN ${value[0]} AND ${value[1]}`;
         }
         return null;
-      case FilterOperator$1.IS_NULL:
+      case FilterOperator.IS_NULL:
         return `${property} IS NULL`;
-      case FilterOperator$1.IS_NOT_NULL:
+      case FilterOperator.IS_NOT_NULL:
         return `${property} IS NOT NULL`;
       default:
         console.warn(`WMS图层不支持的过滤器操作符: ${operator}`);
@@ -82297,7 +82298,7 @@ class WMSLayerHandler extends BaseLayer$2 {
     if (filterId) {
       this.removeFilter(filterId);
     } else {
-      const cqlFilters = this.getAllFilters().filter((filter2) => filter2.type === FilterType$1.CQL);
+      const cqlFilters = this.getAllFilters().filter((filter2) => filter2.type === FilterType.CQL);
       cqlFilters.forEach((filter2) => this.removeFilter(filter2.id));
     }
   }
@@ -82435,9 +82436,8 @@ class WMTSLayerHandler extends BaseLayer$2 {
   }
   /**
    * 应用过滤器（WMTS图层不支持过滤）
-   * @param filters 过滤器数组
    */
-  applyFilters(filters) {
+  applyFilters() {
     console.warn("WMTSLayerHandler: WMTS图层不支持客户端过滤功能。WMTS是预渲染的瓦片服务，无法进行动态过滤。");
     console.info("WMTSLayerHandler: 如需过滤功能，请考虑：");
     console.info("1. 使用WFS图层替代WMTS图层");
@@ -82601,11 +82601,22 @@ class WFSLayerHandler extends BaseLayer$2 {
     if (!this.config.wfsConfig.filters) {
       this.config.wfsConfig.filters = [];
     }
-    if (filter2.type === FilterType$1.ATTRIBUTE) {
+    if (filter2.type === FilterType.ATTRIBUTE) {
       const config = filter2;
+      let wfsOperator = "equalTo";
+      switch (config.operator) {
+        case FilterOperator.EQUAL:
+          wfsOperator = "equalTo";
+          break;
+        case FilterOperator.LIKE:
+          wfsOperator = "like";
+          break;
+        default:
+          console.warn(`WFS暂不支持操作符 ${String(config.operator)}，已回退为 equalTo`);
+          wfsOperator = "equalTo";
+      }
       const wfsFilter = {
-        type: "equalTo",
-        // 默认使用equalTo，可以根据需要扩展
+        type: wfsOperator,
         property: config.property,
         value: config.value
       };
@@ -82633,11 +82644,22 @@ class WFSLayerHandler extends BaseLayer$2 {
     }
     this.config.wfsConfig.filters = [];
     enabledFilters.forEach((filter2) => {
-      if (filter2.type === FilterType$1.ATTRIBUTE) {
+      if (filter2.type === FilterType.ATTRIBUTE) {
         const config = filter2;
+        let wfsOperator = "equalTo";
+        switch (config.operator) {
+          case FilterOperator.EQUAL:
+            wfsOperator = "equalTo";
+            break;
+          case FilterOperator.LIKE:
+            wfsOperator = "like";
+            break;
+          default:
+            console.warn(`WFS暂不支持操作符 ${String(config.operator)}，已回退为 equalTo`);
+            wfsOperator = "equalTo";
+        }
         const wfsFilter = {
-          type: "equalTo",
-          // 默认使用equalTo，可以根据需要扩展
+          type: wfsOperator,
           property: config.property,
           value: config.value
         };
@@ -82650,7 +82672,7 @@ class WFSLayerHandler extends BaseLayer$2 {
    * 便捷方法：添加WFS属性过滤器
    */
   addWFSAttributeFilter(id, property, value, operator = "equalTo", description) {
-    this.addAttributeFilter(id, property, value, operator === "equalTo" ? "eq" : "like", description);
+    this.addAttributeFilter(id, property, value, operator === "equalTo" ? FilterOperator.EQUAL : FilterOperator.LIKE, description);
   }
   /**
    * 便捷方法：移除WFS过滤器
@@ -82718,7 +82740,8 @@ class WFSLayerHandler extends BaseLayer$2 {
     }
   }
 }
-var GeometryType$2 = /* @__PURE__ */ ((GeometryType2) => {
+var GeometryType$2;
+(function(GeometryType2) {
   GeometryType2["POINT"] = "Point";
   GeometryType2["LINE_STRING"] = "LineString";
   GeometryType2["POLYGON"] = "Polygon";
@@ -82727,8 +82750,7 @@ var GeometryType$2 = /* @__PURE__ */ ((GeometryType2) => {
   GeometryType2["MULTI_POLYGON"] = "MultiPolygon";
   GeometryType2["GEOMETRY_COLLECTION"] = "GeometryCollection";
   GeometryType2["CIRCLE"] = "Circle";
-  return GeometryType2;
-})(GeometryType$2 || {});
+})(GeometryType$2 || (GeometryType$2 = {}));
 class StyleFactory {
   /**
    * 创建填充样式
@@ -82765,7 +82787,7 @@ class StyleFactory {
   static createText(config) {
     if (!config)
       return void 0;
-    const textStyle = new Text$6({
+    const textStyle = new Text$5({
       text: config.text,
       font: config.font || `${config.fontSize || 12}px ${config.fontFamily || "Arial"}`,
       fill: this.createFill(config.fill),
@@ -83538,27 +83560,24 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
       });
       return;
     }
+    const logic = this.getFilterLogic();
     features2.forEach((feature2) => {
-      let visible = true;
-      for (const filter2 of enabledFilters) {
-        if (!this.checkFeatureAgainstFilter(feature2, filter2)) {
-          visible = false;
-          break;
-        }
-      }
+      const results = enabledFilters.map((filter2) => this.checkFeatureAgainstFilter(feature2, filter2));
+      const visible = this.combineByLogic(results);
       feature2.setStyle(visible ? void 0 : new Style$3({}));
     });
+    console.log(`GeoJSON图层应用 ${enabledFilters.length} 个过滤器，组合逻辑为 ${logic}`);
   }
   /**
    * 检查要素是否符合过滤器条件
    */
   checkFeatureAgainstFilter(feature2, filter2) {
     switch (filter2.type) {
-      case FilterType$1.ATTRIBUTE:
+      case FilterType.ATTRIBUTE:
         return this.checkAttributeFilter(feature2, filter2);
-      case FilterType$1.CQL:
+      case FilterType.CQL:
         return this.checkCQLFilter(feature2, filter2);
-      case FilterType$1.CUSTOM:
+      case FilterType.CUSTOM:
         const customConfig = filter2;
         return customConfig.filterFunction(feature2);
       default:
@@ -83591,7 +83610,30 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
    */
   parseCQLExpression(cqlExpression) {
     const filters = [];
-    let expression = cqlExpression.replace(/^\s*\(\s*|\s*\)\s*$/g, "").trim();
+    let expression = cqlExpression.trim();
+    if (expression.startsWith("(") && expression.endsWith(")")) {
+      let depth = 0;
+      let wrapsWhole = true;
+      for (let i = 0; i < expression.length; i++) {
+        const ch = expression[i];
+        if (ch === "(")
+          depth++;
+        else if (ch === ")") {
+          depth--;
+          if (depth === 0 && i < expression.length - 1) {
+            wrapsWhole = false;
+            break;
+          }
+          if (depth < 0) {
+            wrapsWhole = false;
+            break;
+          }
+        }
+      }
+      if (wrapsWhole && depth === 0) {
+        expression = expression.slice(1, -1).trim();
+      }
+    }
     const conditions = expression.split(/\s+AND\s+/i);
     for (let i = 0; i < conditions.length; i++) {
       const condition = conditions[i].trim();
@@ -83608,36 +83650,48 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
   parseSingleCQLCondition(condition, index2) {
     const patterns = [
       // property = 'value' 或 property = value
-      { regex: /^(\w+)\s*=\s*'([^']*)'$/, operator: FilterOperator$1.EQUAL },
-      { regex: /^(\w+)\s*=\s*([^'\s]+)$/, operator: FilterOperator$1.EQUAL },
+      { regex: /^(\w+)\s*=\s*'([^']*)'$/, operator: FilterOperator.EQUAL },
+      { regex: /^(\w+)\s*=\s*([^'\s]+)$/, operator: FilterOperator.EQUAL },
       // property != 'value' 或 property <> 'value'
-      { regex: /^(\w+)\s*(?:!=|<>)\s*'([^']*)'$/, operator: FilterOperator$1.NOT_EQUAL },
-      { regex: /^(\w+)\s*(?:!=|<>)\s*([^'\s]+)$/, operator: FilterOperator$1.NOT_EQUAL },
+      { regex: /^(\w+)\s*(?:!=|<>)\s*'([^']*)'$/, operator: FilterOperator.NOT_EQUAL },
+      { regex: /^(\w+)\s*(?:!=|<>)\s*([^'\s]+)$/, operator: FilterOperator.NOT_EQUAL },
       // property > value
-      { regex: /^(\w+)\s*>\s*([^'\s]+)$/, operator: FilterOperator$1.GREATER_THAN },
+      { regex: /^(\w+)\s*>\s*([^'\s]+)$/, operator: FilterOperator.GREATER_THAN },
       // property >= value
-      { regex: /^(\w+)\s*>=\s*([^'\s]+)$/, operator: FilterOperator$1.GREATER_EQUAL },
+      { regex: /^(\w+)\s*>=\s*([^'\s]+)$/, operator: FilterOperator.GREATER_EQUAL },
       // property < value
-      { regex: /^(\w+)\s*<\s*([^'\s]+)$/, operator: FilterOperator$1.LESS_THAN },
+      { regex: /^(\w+)\s*<\s*([^'\s]+)$/, operator: FilterOperator.LESS_THAN },
       // property <= value
-      { regex: /^(\w+)\s*<=\s*([^'\s]+)$/, operator: FilterOperator$1.LESS_EQUAL },
+      { regex: /^(\w+)\s*<=\s*([^'\s]+)$/, operator: FilterOperator.LESS_EQUAL },
       // property LIKE 'pattern'
-      { regex: /^(\w+)\s+LIKE\s+'([^']*)'$/i, operator: FilterOperator$1.LIKE }
+      { regex: /^(\w+)\s+LIKE\s+'([^']*)'$/i, operator: FilterOperator.LIKE },
+      // property IN ('a','b',...) 或 property IN (1,2,...)
+      { regex: /^(\w+)\s+IN\s*\(\s*([^)]+)\s*\)$/i, operator: FilterOperator.IN }
     ];
     for (const pattern of patterns) {
       const match2 = condition.match(pattern.regex);
       if (match2) {
         const property = match2[1];
         let value = match2[2];
-        if (pattern.operator !== FilterOperator$1.LIKE && pattern.operator !== FilterOperator$1.EQUAL) {
-          const numValue = Number(value);
-          if (!isNaN(numValue)) {
-            value = numValue;
+        if (pattern.operator === FilterOperator.IN) {
+          const items = String(value).split(",").map((s2) => s2.trim()).map((s2) => {
+            const m2 = s2.match(/^'(.*)'$/);
+            const v5 = m2 ? m2[1] : s2;
+            const numValue = Number(v5);
+            return isNaN(numValue) ? v5 : numValue;
+          });
+          value = items;
+        } else {
+          if (pattern.operator !== FilterOperator.LIKE && pattern.operator !== FilterOperator.EQUAL) {
+            const numValue = Number(value);
+            if (!isNaN(numValue)) {
+              value = numValue;
+            }
           }
         }
         return {
           id: `cql_parsed_${index2}`,
-          type: FilterType$1.ATTRIBUTE,
+          type: FilterType.ATTRIBUTE,
           enabled: true,
           name: `CQL: ${condition}`,
           property,
@@ -83661,25 +83715,25 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
       return false;
     }
     switch (operator) {
-      case FilterOperator$1.EQUAL:
+      case FilterOperator.EQUAL:
         return featureValue === filterValue;
-      case FilterOperator$1.NOT_EQUAL:
+      case FilterOperator.NOT_EQUAL:
         return featureValue !== filterValue;
-      case FilterOperator$1.GREATER_THAN:
+      case FilterOperator.GREATER_THAN:
         return Number(featureValue) > Number(filterValue);
-      case FilterOperator$1.GREATER_EQUAL:
+      case FilterOperator.GREATER_EQUAL:
         return Number(featureValue) >= Number(filterValue);
-      case FilterOperator$1.LESS_THAN:
+      case FilterOperator.LESS_THAN:
         return Number(featureValue) < Number(filterValue);
-      case FilterOperator$1.LESS_EQUAL:
+      case FilterOperator.LESS_EQUAL:
         return Number(featureValue) <= Number(filterValue);
-      case FilterOperator$1.LIKE:
+      case FilterOperator.LIKE:
         const searchValue = config.caseSensitive ? filterValue : filterValue.toLowerCase();
         const targetValue = config.caseSensitive ? String(featureValue) : String(featureValue).toLowerCase();
         return targetValue.includes(searchValue);
-      case FilterOperator$1.IN:
+      case FilterOperator.IN:
         return Array.isArray(filterValue) && filterValue.includes(featureValue);
-      case FilterOperator$1.BETWEEN:
+      case FilterOperator.BETWEEN:
         if (Array.isArray(filterValue) && filterValue.length === 2) {
           const numValue = Number(featureValue);
           return numValue >= Number(filterValue[0]) && numValue <= Number(filterValue[1]);
@@ -83694,7 +83748,7 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
    * 便捷方法：按属性值过滤
    */
   filterFeaturesByProperty(property, value) {
-    this.addAttributeFilter("legacy", property, value, "eq", `${property} = ${value}`);
+    this.addAttributeFilter("legacy", property, value, FilterOperator.EQUAL, `${property} = ${value}`);
   }
   /**
    * 便捷方法：清除所有过滤器
@@ -83717,7 +83771,6 @@ class KMLLayerHandler extends BaseLayer$2 {
     this.kmlFormat = new KML$1({
       className: this.config.className,
       extractStyles: true,
-      // 提取KML中的样式
       showPointNames: false
       // 不显示点名称
     });
@@ -83762,7 +83815,7 @@ class KMLLayerHandler extends BaseLayer$2 {
           width: ((_j = (_i2 = styleConfig.circle) == null ? void 0 : _i2.stroke) == null ? void 0 : _j.width) || 1
         })
       }),
-      text: styleConfig.text ? new Text$6({
+      text: styleConfig.text ? new Text$5({
         font: styleConfig.text.font || "12px Calibri,sans-serif",
         fill: new Fill$2({
           color: ((_k = styleConfig.text.fill) == null ? void 0 : _k.color) || "#000"
@@ -83890,25 +83943,22 @@ class KMLLayerHandler extends BaseLayer$2 {
       });
       return;
     }
+    const logic = this.getFilterLogic();
     features2.forEach((feature2) => {
-      let visible = true;
-      for (const filter2 of enabledFilters) {
-        if (!this.checkFeatureAgainstFilter(feature2, filter2)) {
-          visible = false;
-          break;
-        }
-      }
+      const results = enabledFilters.map((filter2) => this.checkFeatureAgainstFilter(feature2, filter2));
+      const visible = this.combineByLogic(results);
       feature2.setStyle(visible ? void 0 : new Style$3({}));
     });
+    console.log(`KML图层应用 ${enabledFilters.length} 个过滤器，组合逻辑为 ${logic}`);
   }
   /**
    * 检查要素是否符合过滤器条件
    */
   checkFeatureAgainstFilter(feature2, filter2) {
     switch (filter2.type) {
-      case FilterType$1.ATTRIBUTE:
+      case FilterType.ATTRIBUTE:
         return this.checkAttributeFilter(feature2, filter2);
-      case FilterType$1.CUSTOM:
+      case FilterType.CUSTOM:
         const customConfig = filter2;
         return customConfig.filterFunction(feature2);
       default:
@@ -83922,30 +83972,30 @@ class KMLLayerHandler extends BaseLayer$2 {
   checkAttributeFilter(feature2, config) {
     const featureValue = feature2.get(config.property);
     const filterValue = config.value;
-    const operator = config.operator || "eq";
+    const operator = config.operator || FilterOperator.EQUAL;
     if (featureValue === void 0 || featureValue === null) {
       return false;
     }
     switch (operator) {
-      case "eq":
+      case FilterOperator.EQUAL:
         return featureValue === filterValue;
-      case "ne":
+      case FilterOperator.NOT_EQUAL:
         return featureValue !== filterValue;
-      case "gt":
+      case FilterOperator.GREATER_THAN:
         return Number(featureValue) > Number(filterValue);
-      case "gte":
+      case FilterOperator.GREATER_EQUAL:
         return Number(featureValue) >= Number(filterValue);
-      case "lt":
+      case FilterOperator.LESS_THAN:
         return Number(featureValue) < Number(filterValue);
-      case "lte":
+      case FilterOperator.LESS_EQUAL:
         return Number(featureValue) <= Number(filterValue);
-      case "like":
+      case FilterOperator.LIKE:
         const searchValue = config.caseSensitive ? filterValue : filterValue.toLowerCase();
         const targetValue = config.caseSensitive ? String(featureValue) : String(featureValue).toLowerCase();
         return targetValue.includes(searchValue);
-      case "in":
+      case FilterOperator.IN:
         return Array.isArray(filterValue) && filterValue.includes(featureValue);
-      case "between":
+      case FilterOperator.BETWEEN:
         if (Array.isArray(filterValue) && filterValue.length === 2) {
           const numValue = Number(featureValue);
           return numValue >= Number(filterValue[0]) && numValue <= Number(filterValue[1]);
@@ -83961,7 +84011,7 @@ class KMLLayerHandler extends BaseLayer$2 {
    * @deprecated 建议使用 addAttributeFilter 方法
    */
   filterFeaturesByProperty(property, value) {
-    this.addAttributeFilter("legacy", property, value, "eq", `${property} = ${value}`);
+    this.addAttributeFilter("legacy", property, value, FilterOperator.EQUAL, `${property} = ${value}`);
   }
   /**
    * 便捷方法：清除所有过滤器（保持向后兼容）
@@ -84049,7 +84099,7 @@ class GMLLayerHandler extends BaseLayer$2 {
           width: ((_j = (_i2 = styleConfig.circle) == null ? void 0 : _i2.stroke) == null ? void 0 : _j.width) || 1
         })
       }),
-      text: styleConfig.text ? new Text({
+      text: styleConfig.text ? new Text$5({
         font: styleConfig.text.font || "12px Calibri,sans-serif",
         fill: new Fill$2({
           color: ((_k = styleConfig.text.fill) == null ? void 0 : _k.color) || "#000"
@@ -84217,25 +84267,22 @@ class GMLLayerHandler extends BaseLayer$2 {
       });
       return;
     }
+    const logic = this.getFilterLogic();
     features2.forEach((feature2) => {
-      let visible = true;
-      for (const filter2 of enabledFilters) {
-        if (!this.checkFeatureAgainstFilter(feature2, filter2)) {
-          visible = false;
-          break;
-        }
-      }
+      const results = enabledFilters.map((filter2) => this.checkFeatureAgainstFilter(feature2, filter2));
+      const visible = this.combineByLogic(results);
       feature2.setStyle(visible ? void 0 : new Style$3({}));
     });
+    console.log(`GML图层应用 ${enabledFilters.length} 个过滤器，组合逻辑为 ${logic}`);
   }
   /**
    * 检查要素是否符合过滤器条件
    */
   checkFeatureAgainstFilter(feature2, filter2) {
     switch (filter2.type) {
-      case FilterType$1.ATTRIBUTE:
+      case FilterType.ATTRIBUTE:
         return this.checkAttributeFilter(feature2, filter2);
-      case FilterType$1.CUSTOM:
+      case FilterType.CUSTOM:
         const customConfig = filter2;
         return customConfig.filterFunction(feature2);
       default:
@@ -84249,30 +84296,30 @@ class GMLLayerHandler extends BaseLayer$2 {
   checkAttributeFilter(feature2, config) {
     const featureValue = feature2.get(config.property);
     const filterValue = config.value;
-    const operator = config.operator || "eq";
+    const operator = config.operator || FilterOperator.EQUAL;
     if (featureValue === void 0 || featureValue === null) {
       return false;
     }
     switch (operator) {
-      case "eq":
+      case FilterOperator.EQUAL:
         return featureValue === filterValue;
-      case "ne":
+      case FilterOperator.NOT_EQUAL:
         return featureValue !== filterValue;
-      case "gt":
+      case FilterOperator.GREATER_THAN:
         return Number(featureValue) > Number(filterValue);
-      case "gte":
+      case FilterOperator.GREATER_EQUAL:
         return Number(featureValue) >= Number(filterValue);
-      case "lt":
+      case FilterOperator.LESS_THAN:
         return Number(featureValue) < Number(filterValue);
-      case "lte":
+      case FilterOperator.LESS_EQUAL:
         return Number(featureValue) <= Number(filterValue);
-      case "like":
+      case FilterOperator.LIKE:
         const searchValue = config.caseSensitive ? filterValue : filterValue.toLowerCase();
         const targetValue = config.caseSensitive ? String(featureValue) : String(featureValue).toLowerCase();
         return targetValue.includes(searchValue);
-      case "in":
+      case FilterOperator.IN:
         return Array.isArray(filterValue) && filterValue.includes(featureValue);
-      case "between":
+      case FilterOperator.BETWEEN:
         if (Array.isArray(filterValue) && filterValue.length === 2) {
           const numValue = Number(featureValue);
           return numValue >= Number(filterValue[0]) && numValue <= Number(filterValue[1]);
@@ -84288,7 +84335,7 @@ class GMLLayerHandler extends BaseLayer$2 {
    * @deprecated 建议使用 addAttributeFilter 方法
    */
   filterFeaturesByProperty(property, value) {
-    this.addAttributeFilter("legacy", property, value, "eq", `${property} = ${value}`);
+    this.addAttributeFilter("legacy", property, value, FilterOperator.EQUAL, `${property} = ${value}`);
   }
   /**
    * 便捷方法：清除所有过滤器（保持向后兼容）
@@ -84431,7 +84478,7 @@ class WKTLayerHandler extends BaseLayer$2 {
           width: ((_j = (_i2 = styleConfig.circle) == null ? void 0 : _i2.stroke) == null ? void 0 : _j.width) || 2
         })
       }),
-      text: styleConfig.text ? new Text$6({
+      text: styleConfig.text ? new Text$5({
         font: styleConfig.text.font || "12px Calibri,sans-serif",
         fill: new Fill$2({
           color: ((_k = styleConfig.text.fill) == null ? void 0 : _k.color) || "#000"
@@ -84613,25 +84660,22 @@ class WKTLayerHandler extends BaseLayer$2 {
       });
       return;
     }
+    const logic = this.getFilterLogic();
     features2.forEach((feature2) => {
-      let visible = true;
-      for (const filter2 of enabledFilters) {
-        if (!this.checkFeatureAgainstFilter(feature2, filter2)) {
-          visible = false;
-          break;
-        }
-      }
+      const results = enabledFilters.map((filter2) => this.checkFeatureAgainstFilter(feature2, filter2));
+      const visible = this.combineByLogic(results);
       feature2.setStyle(visible ? void 0 : new Style$3({}));
     });
+    console.log(`WKT图层应用 ${enabledFilters.length} 个过滤器，组合逻辑为 ${logic}`);
   }
   /**
    * 检查要素是否符合过滤器条件
    */
   checkFeatureAgainstFilter(feature2, filter2) {
     switch (filter2.type) {
-      case FilterType$1.ATTRIBUTE:
+      case FilterType.ATTRIBUTE:
         return this.checkAttributeFilter(feature2, filter2);
-      case FilterType$1.CUSTOM:
+      case FilterType.CUSTOM:
         const customConfig = filter2;
         return customConfig.filterFunction(feature2);
       default:
@@ -84645,30 +84689,30 @@ class WKTLayerHandler extends BaseLayer$2 {
   checkAttributeFilter(feature2, config) {
     const featureValue = feature2.get(config.property);
     const filterValue = config.value;
-    const operator = config.operator || "eq";
+    const operator = config.operator || FilterOperator.EQUAL;
     if (featureValue === void 0 || featureValue === null) {
       return false;
     }
     switch (operator) {
-      case "eq":
+      case FilterOperator.EQUAL:
         return featureValue === filterValue;
-      case "ne":
+      case FilterOperator.NOT_EQUAL:
         return featureValue !== filterValue;
-      case "gt":
+      case FilterOperator.GREATER_THAN:
         return Number(featureValue) > Number(filterValue);
-      case "gte":
+      case FilterOperator.GREATER_EQUAL:
         return Number(featureValue) >= Number(filterValue);
-      case "lt":
+      case FilterOperator.LESS_THAN:
         return Number(featureValue) < Number(filterValue);
-      case "lte":
+      case FilterOperator.LESS_EQUAL:
         return Number(featureValue) <= Number(filterValue);
-      case "like":
+      case FilterOperator.LIKE:
         const searchValue = config.caseSensitive ? filterValue : filterValue.toLowerCase();
         const targetValue = config.caseSensitive ? String(featureValue) : String(featureValue).toLowerCase();
         return targetValue.includes(searchValue);
-      case "in":
+      case FilterOperator.IN:
         return Array.isArray(filterValue) && filterValue.includes(featureValue);
-      case "between":
+      case FilterOperator.BETWEEN:
         if (Array.isArray(filterValue) && filterValue.length === 2) {
           const numValue = Number(featureValue);
           return numValue >= Number(filterValue[0]) && numValue <= Number(filterValue[1]);
@@ -84684,7 +84728,7 @@ class WKTLayerHandler extends BaseLayer$2 {
    * @deprecated 建议使用 addAttributeFilter 方法
    */
   filterFeaturesByProperty(property, value) {
-    this.addAttributeFilter("legacy", property, value, "eq", `${property} = ${value}`);
+    this.addAttributeFilter("legacy", property, value, FilterOperator.EQUAL, `${property} = ${value}`);
   }
   /**
    * 便捷方法：清除所有过滤器（保持向后兼容）
@@ -84776,29 +84820,32 @@ class HeatmapLayerHandler extends BaseLayer$2 {
     }
   }
   /**
-   * 应用过滤器
+   * 应用过滤器（实现基类的抽象方法）
    */
-  applyFilters(filters) {
-    console.log("HeatmapLayerHandler: 应用过滤器", filters);
-    this.currentFilters = filters;
+  applyFilters() {
+    const enabledFilters = this.getEnabledFilters();
+    console.log("HeatmapLayerHandler: 应用过滤器", enabledFilters);
+    this.currentFilters = [...enabledFilters];
     const layer2 = this.getLayer();
     const source = layer2.getSource();
     if (!source || this.originalFeatures.length === 0) {
       console.warn("HeatmapLayerHandler: 无法应用过滤器 - 数据源或原始要素为空");
       return;
     }
-    if (filters.length === 0) {
+    if (enabledFilters.length === 0) {
       source.clear();
       source.addFeatures(this.originalFeatures);
       console.log("HeatmapLayerHandler: 清除所有过滤器，显示所有要素");
       return;
     }
+    const logic = this.getFilterLogic();
     const filteredFeatures = this.originalFeatures.filter((feature2) => {
-      return filters.every((filter2) => this.checkFeatureAgainstFilter(feature2, filter2));
+      const results = enabledFilters.map((f2) => this.checkFeatureAgainstFilter(feature2, f2));
+      return this.combineByLogic(results);
     });
     source.clear();
     source.addFeatures(filteredFeatures);
-    console.log(`HeatmapLayerHandler: 过滤完成，显示 ${filteredFeatures.length}/${this.originalFeatures.length} 个要素`);
+    console.log(`HeatmapLayerHandler: 过滤完成（${logic}），显示 ${filteredFeatures.length}/${this.originalFeatures.length} 个要素`);
   }
   /**
    * 检查要素是否符合过滤条件
@@ -84833,9 +84880,9 @@ class HeatmapLayerHandler extends BaseLayer$2 {
         return Number(value) > Number(config.value);
       case FilterOperator.LESS_THAN:
         return Number(value) < Number(config.value);
-      case FilterOperator.GREATER_THAN_OR_EQUAL:
+      case FilterOperator.GREATER_EQUAL:
         return Number(value) >= Number(config.value);
-      case FilterOperator.LESS_THAN_OR_EQUAL:
+      case FilterOperator.LESS_EQUAL:
         return Number(value) <= Number(config.value);
       case FilterOperator.LIKE:
         const pattern = String(config.value).replace(/%/g, ".*");
@@ -84865,27 +84912,20 @@ class HeatmapLayerHandler extends BaseLayer$2 {
    * 根据属性过滤要素（便捷方法）
    */
   filterFeaturesByProperty(property, value, operator = FilterOperator.EQUAL) {
-    const filter2 = {
-      type: FilterType.ATTRIBUTE,
-      config: {
-        property,
-        operator,
-        value
-      }
-    };
-    this.applyFilters([filter2]);
+    const id = `heatmap-attr-${property}-${Date.now()}`;
+    this.addAttributeFilter(id, property, value, operator);
   }
   /**
    * 清除所有过滤器
    */
   clearAllFeatureFilters() {
-    this.applyFilters([]);
+    this.clearAllFilters();
   }
   /**
    * 获取当前应用的过滤器
    */
   getCurrentFilters() {
-    return [...this.currentFilters];
+    return this.getEnabledFilters();
   }
   /**
    * 获取原始要素数量（未过滤的）
@@ -84955,7 +84995,7 @@ class HeatmapLayerHandler extends BaseLayer$2 {
       this.originalFeatures.push(...features2);
       source.addFeatures(features2);
       if (this.currentFilters.length > 0) {
-        this.applyFilters(this.currentFilters);
+        this.applyFilters();
       }
     }
   }
@@ -85026,28 +85066,31 @@ class ClusterLayerHandler extends BaseLayer$2 {
     }
   }
   /**
-   * 应用过滤器
+   * 应用过滤器（实现基类的抽象方法）
    */
-  applyFilters(filters) {
-    console.log("ClusterLayerHandler: 应用过滤器", filters);
-    this.currentFilters = filters;
+  applyFilters() {
+    const enabledFilters = this.getEnabledFilters();
+    console.log("ClusterLayerHandler: 应用过滤器", enabledFilters);
+    this.currentFilters = [...enabledFilters];
     const vectorSource = this.getVectorSource();
     if (!vectorSource || this.originalFeatures.length === 0) {
       console.warn("ClusterLayerHandler: 无法应用过滤器 - 数据源或原始要素为空");
       return;
     }
-    if (filters.length === 0) {
+    if (enabledFilters.length === 0) {
       vectorSource.clear();
       vectorSource.addFeatures(this.originalFeatures);
       console.log("ClusterLayerHandler: 清除所有过滤器，显示所有要素");
       return;
     }
+    const logic = this.getFilterLogic();
     const filteredFeatures = this.originalFeatures.filter((feature2) => {
-      return filters.every((filter2) => this.checkFeatureAgainstFilter(feature2, filter2));
+      const results = enabledFilters.map((f2) => this.checkFeatureAgainstFilter(feature2, f2));
+      return this.combineByLogic(results);
     });
     vectorSource.clear();
     vectorSource.addFeatures(filteredFeatures);
-    console.log(`ClusterLayerHandler: 过滤完成，显示 ${filteredFeatures.length}/${this.originalFeatures.length} 个要素`);
+    console.log(`ClusterLayerHandler: 过滤完成（${logic}），显示 ${filteredFeatures.length}/${this.originalFeatures.length} 个要素`);
   }
   /**
    * 检查要素是否符合过滤条件
@@ -85082,9 +85125,9 @@ class ClusterLayerHandler extends BaseLayer$2 {
         return Number(value) > Number(config.value);
       case FilterOperator.LESS_THAN:
         return Number(value) < Number(config.value);
-      case FilterOperator.GREATER_THAN_OR_EQUAL:
+      case FilterOperator.GREATER_EQUAL:
         return Number(value) >= Number(config.value);
-      case FilterOperator.LESS_THAN_OR_EQUAL:
+      case FilterOperator.LESS_EQUAL:
         return Number(value) <= Number(config.value);
       case FilterOperator.LIKE:
         const pattern = String(config.value).replace(/%/g, ".*");
@@ -85114,27 +85157,20 @@ class ClusterLayerHandler extends BaseLayer$2 {
    * 根据属性过滤要素（便捷方法）
    */
   filterFeaturesByProperty(property, value, operator = FilterOperator.EQUAL) {
-    const filter2 = {
-      type: FilterType.ATTRIBUTE,
-      config: {
-        property,
-        operator,
-        value
-      }
-    };
-    this.applyFilters([filter2]);
+    const id = `cluster-attr-${property}-${Date.now()}`;
+    this.addAttributeFilter(id, property, value, operator);
   }
   /**
    * 清除所有过滤器
    */
   clearAllFeatureFilters() {
-    this.applyFilters([]);
+    this.clearAllFilters();
   }
   /**
    * 获取当前应用的过滤器
    */
   getCurrentFilters() {
-    return [...this.currentFilters];
+    return this.getEnabledFilters();
   }
   /**
    * 获取原始要素数量（未过滤的）
@@ -85154,10 +85190,7 @@ class ClusterLayerHandler extends BaseLayer$2 {
    */
   createClusterStyleFunction() {
     this.parseStyleConfig();
-    return styleManager.createClusterStyleFunction(
-      this.clusterStyleConfig,
-      this.singleFeatureStyleConfig
-    );
+    return styleManager.createClusterStyleFunction(this.clusterStyleConfig, this.singleFeatureStyleConfig);
   }
   /**
    * 解析样式配置
@@ -85177,7 +85210,6 @@ class ClusterLayerHandler extends BaseLayer$2 {
     return {
       circle: {
         radius: 15,
-        // 动态半径将在样式管理器中处理
         fill: { color: legacyStyle.clusterFillColor || "rgba(255, 153, 0, 0.8)" },
         stroke: {
           color: legacyStyle.clusterStrokeColor || "#fff",
@@ -85251,7 +85283,7 @@ class ClusterLayerHandler extends BaseLayer$2 {
       this.originalFeatures.push(...olFeatures);
       vectorSource.addFeatures(olFeatures);
       if (this.currentFilters.length > 0) {
-        this.applyFilters(this.currentFilters);
+        this.applyFilters();
       }
     }
   }
@@ -85352,13 +85384,9 @@ class ImageVectorLayerHandler extends BaseLayer$2 {
       style: this.createStyleFunction(),
       // ImageVector图层特有的配置
       imageRatio: this.config.imageRatio || 1,
-      // 图像比率，用于高分辨率显示
       renderBuffer: this.config.renderBuffer || 100,
-      // 渲染缓冲区
       renderOrder: this.config.renderOrder,
-      // 渲染顺序
       background: this.config.background,
-      // 背景色
       declutter: this.config.declutter || false
       // 是否启用标注避让
     });
@@ -85467,11 +85495,7 @@ class ImageVectorLayerHandler extends BaseLayer$2 {
    * 设置基于属性的样式
    */
   setPropertyBasedStyle(propertyName, styleMapping, defaultStyleConfig) {
-    const styleFunction = styleManager.createPropertyBasedStyleFunction(
-      propertyName,
-      styleMapping,
-      defaultStyleConfig
-    );
+    const styleFunction = styleManager.createPropertyBasedStyleFunction(propertyName, styleMapping, defaultStyleConfig);
     const layer2 = this.getLayer();
     layer2.setStyle(styleFunction);
   }
@@ -85596,7 +85620,6 @@ class SuperMapTiledMapServiceHandler extends BaseLayer$2 {
         xyzOptions.tileGrid = new TileGrid$3({
           extent: extent3,
           origin: [-180, 90],
-          // 左上角原点
           resolutions: this.generateResolutions(),
           tileSize: [256, 256]
         });
@@ -280883,38 +280906,38 @@ var Rect$1 = (
     return Rect2;
   }(ShapeBase$1)
 );
-var Text$4 = (
+var Text$3 = (
   /** @class */
   function(_super) {
-    __extends$B(Text4, _super);
-    function Text4() {
+    __extends$B(Text3, _super);
+    function Text3() {
       return _super !== null && _super.apply(this, arguments) || this;
     }
-    Text4.prototype.getDefaultAttrs = function() {
+    Text3.prototype.getDefaultAttrs = function() {
       var attrs = _super.prototype.getDefaultAttrs.call(this);
       return __assign$m(__assign$m({}, attrs), { x: 0, y: 0, text: null, fontSize: 12, fontFamily: "sans-serif", fontStyle: "normal", fontWeight: "normal", fontVariant: "normal", textAlign: "start", textBaseline: "bottom" });
     };
-    Text4.prototype.isOnlyHitBox = function() {
+    Text3.prototype.isOnlyHitBox = function() {
       return true;
     };
-    Text4.prototype.initAttrs = function(attrs) {
+    Text3.prototype.initAttrs = function(attrs) {
       this._assembleFont();
       if (attrs.text) {
         this._setText(attrs.text);
       }
     };
-    Text4.prototype._assembleFont = function() {
+    Text3.prototype._assembleFont = function() {
       var attrs = this.attrs;
       attrs.font = assembleFont(attrs);
     };
-    Text4.prototype._setText = function(text2) {
+    Text3.prototype._setText = function(text2) {
       var textArr = null;
       if (isString$2(text2) && text2.indexOf("\n") !== -1) {
         textArr = text2.split("\n");
       }
       this.set("textArr", textArr);
     };
-    Text4.prototype.onAttrChange = function(name, value, originValue) {
+    Text3.prototype.onAttrChange = function(name, value, originValue) {
       _super.prototype.onAttrChange.call(this, name, value, originValue);
       if (name.startsWith("font")) {
         this._assembleFont();
@@ -280923,13 +280946,13 @@ var Text$4 = (
         this._setText(value);
       }
     };
-    Text4.prototype._getSpaceingY = function() {
+    Text3.prototype._getSpaceingY = function() {
       var attrs = this.attrs;
       var lineHeight2 = attrs.lineHeight;
       var fontSize2 = attrs.fontSize * 1;
       return lineHeight2 ? lineHeight2 - fontSize2 : fontSize2 * 0.14;
     };
-    Text4.prototype._drawTextArr = function(context, textArr, isFill) {
+    Text3.prototype._drawTextArr = function(context, textArr, isFill) {
       var attrs = this.attrs;
       var textBaseline = attrs.textBaseline;
       var x2 = attrs.x;
@@ -280953,7 +280976,7 @@ var Text$4 = (
         }
       });
     };
-    Text4.prototype._drawText = function(context, isFill) {
+    Text3.prototype._drawText = function(context, isFill) {
       var attrs = this.attr();
       var x2 = attrs.x;
       var y2 = attrs.y;
@@ -280971,7 +280994,7 @@ var Text$4 = (
         }
       }
     };
-    Text4.prototype.strokeAndFill = function(context) {
+    Text3.prototype.strokeAndFill = function(context) {
       var _a3 = this.attrs, lineWidth = _a3.lineWidth, opacity2 = _a3.opacity, strokeOpacity = _a3.strokeOpacity, fillOpacity = _a3.fillOpacity;
       if (this.isStroke()) {
         if (lineWidth > 0) {
@@ -280992,13 +281015,13 @@ var Text$4 = (
       }
       this.afterDrawPath(context);
     };
-    Text4.prototype.fill = function(context) {
+    Text3.prototype.fill = function(context) {
       this._drawText(context, true);
     };
-    Text4.prototype.stroke = function(context) {
+    Text3.prototype.stroke = function(context) {
       this._drawText(context, false);
     };
-    return Text4;
+    return Text3;
   }(ShapeBase$1)
 );
 function invertFromMatrix(v5, matrix2) {
@@ -282367,22 +282390,22 @@ var ANCHOR_MAP = {
   right: "end",
   end: "end"
 };
-var Text$3 = (
+var Text$2 = (
   /** @class */
   function(_super) {
-    __extends$A(Text4, _super);
-    function Text4() {
+    __extends$A(Text3, _super);
+    function Text3() {
       var _this = _super !== null && _super.apply(this, arguments) || this;
       _this.type = "text";
       _this.canFill = true;
       _this.canStroke = true;
       return _this;
     }
-    Text4.prototype.getDefaultAttrs = function() {
+    Text3.prototype.getDefaultAttrs = function() {
       var attrs = _super.prototype.getDefaultAttrs.call(this);
       return __assign$l(__assign$l({}, attrs), { x: 0, y: 0, text: null, fontSize: 12, fontFamily: "sans-serif", fontStyle: "normal", fontWeight: "normal", fontVariant: "normal", textAlign: "start", textBaseline: "bottom" });
     };
-    Text4.prototype.createPath = function(context, targetAttrs) {
+    Text3.prototype.createPath = function(context, targetAttrs) {
       var _this = this;
       var attrs = this.attr();
       var el = this.get("el");
@@ -282399,7 +282422,7 @@ var Text$3 = (
       el.setAttribute("paint-order", "stroke");
       el.setAttribute("style", "stroke-linecap:butt; stroke-linejoin:miter;");
     };
-    Text4.prototype._setFont = function() {
+    Text3.prototype._setFont = function() {
       var el = this.get("el");
       var _a3 = this.attr(), textBaseline = _a3.textBaseline, textAlign2 = _a3.textAlign;
       var browser2 = detect();
@@ -282410,7 +282433,7 @@ var Text$3 = (
       }
       el.setAttribute("text-anchor", ANCHOR_MAP[textAlign2] || "left");
     };
-    Text4.prototype._setText = function(text2) {
+    Text3.prototype._setText = function(text2) {
       var el = this.get("el");
       var _a3 = this.attr(), x2 = _a3.x, _b3 = _a3.textBaseline, baseline = _b3 === void 0 ? "bottom" : _b3;
       if (!text2) {
@@ -282441,7 +282464,7 @@ var Text$3 = (
         el.innerHTML = text2;
       }
     };
-    return Text4;
+    return Text3;
   }(ShapeBase)
 );
 var regexLG$1 = /^l\s*\(\s*([\d.]+)\s*\)\s*(.*)/i;
@@ -365748,7 +365771,7 @@ function defaultGeometryFunction(feature2) {
 }
 const Style$1 = Style2;
 const DEFAULT_FILL_COLOR = "#333";
-let Text$1 = class Text3 {
+class Text2 {
   /**
    * @param {Options} [options] Options.
    */
@@ -365784,7 +365807,7 @@ let Text$1 = class Text3 {
    */
   clone() {
     const scale3 = this.getScale();
-    return new Text3({
+    return new Text2({
       font: this.getFont(),
       placement: this.getPlacement(),
       repeat: this.getRepeat(),
@@ -366163,8 +366186,8 @@ let Text$1 = class Text3 {
   setPadding(padding2) {
     this.padding_ = padding2;
   }
-};
-const Text$2 = Text$1;
+}
+const Text$1 = Text2;
 const HIT_DETECT_RESOLUTION = 0.5;
 function createHitDetectionImageData(size2, transforms2, features2, styleFunction, extent3, resolution, rotation, squaredTolerance, projection2) {
   const userExtent = projection2 ? toUserExtent(extent3) : extent3;
@@ -368828,7 +368851,7 @@ function buildText(flatStyle, context) {
     flatStyle,
     prefix + "declutter-mode"
   );
-  const text2 = new Text$2({ declutterMode });
+  const text2 = new Text$1({ declutterMode });
   return function(context2) {
     text2.setText(evaluateValue(context2));
     if (evaluateFill) {
@@ -378681,7 +378704,7 @@ class StyleUtils {
    */
   static toOLTextStyle(style, text2) {
     return new Style$1({
-      text: new Text$2({
+      text: new Text$1({
         font: (style.fontStyle || "") + " " + (style.fontWeight || "") + " " + (style.fontSize || "") + " " + style.fontFamily,
         text: text2,
         textAlign: style.textAlign,
@@ -379326,7 +379349,7 @@ class StyleUtils {
     const { offsetX, offsetY, rotation = 0 } = parameters;
     const offset = StyleUtils.getTextOffset(fontSize2, offsetX, offsetY);
     return new Style$1({
-      text: new Text$2({
+      text: new Text$1({
         text: text2,
         font: fontSize2 + " supermapol-icons",
         placement: "point",
@@ -438926,7 +438949,7 @@ class VectorTileStyles extends Observable$1 {
     }
     function getDefaultSelectedTextStyle() {
       return new Style$1({
-        text: new Text$2({
+        text: new Text$1({
           font: "15px Microsoft YaHei",
           fill: new FillStyle({
             color: "blue"
@@ -445042,7 +445065,7 @@ class MapboxStyles extends Observable$1 {
           color: "rgba(255, 0, 0, 1)",
           width: 10
         }),
-        text: new Text$2({
+        text: new Text$1({
           font: 'normal 400 11.19px "Microsoft YaHei"',
           placement: "point",
           fill: new FillStyle({
@@ -449326,7 +449349,7 @@ class Graticule extends VectorLayer$1 {
       this.lonLabelPosition_ = options.lonLabelPosition == void 0 ? 0 : options.lonLabelPosition;
       this.latLabelPosition_ = options.latLabelPosition == void 0 ? 1 : options.latLabelPosition;
       this.lonLabelStyleBase_ = new Style$1({
-        text: options.lonLabelStyle !== void 0 ? options.lonLabelStyle.clone() : new Text$2({
+        text: options.lonLabelStyle !== void 0 ? options.lonLabelStyle.clone() : new Text$1({
           font: "12px Calibri,sans-serif",
           textBaseline: "bottom",
           fill: new FillStyle({
@@ -449344,7 +449367,7 @@ class Graticule extends VectorLayer$1 {
         return this.lonLabelStyleBase_;
       };
       this.latLabelStyleBase_ = new Style$1({
-        text: options.latLabelStyle !== void 0 ? options.latLabelStyle.clone() : new Text$2({
+        text: options.latLabelStyle !== void 0 ? options.latLabelStyle.clone() : new Text$1({
           font: "12px Calibri,sans-serif",
           textAlign: "right",
           fill: new FillStyle({
@@ -462004,7 +462027,7 @@ class WebMap extends Observable$1 {
       });
     }
     return new Style$1({
-      text: new Text$2(option)
+      text: new Text$1(option)
     });
   }
   /**
@@ -463822,7 +463845,7 @@ class WebMap extends Observable$1 {
       wrapX: false,
       targetSize: 0
     };
-    lonLabelStyle && (graticuleOptions.lonLabelStyle = new Text$2({
+    lonLabelStyle && (graticuleOptions.lonLabelStyle = new Text$1({
       font: `${lonLabelStyle.fontSize} ${lonLabelStyle.fontFamily}`,
       textBaseline: lonLabelStyle.textBaseline,
       fill: new FillStyle({
@@ -463833,7 +463856,7 @@ class WebMap extends Observable$1 {
         width: lonLabelStyle.outlineWidth
       })
     }));
-    latLabelStyle && (graticuleOptions.latLabelStyle = new Text$2({
+    latLabelStyle && (graticuleOptions.latLabelStyle = new Text$1({
       font: `${latLabelStyle.fontSize} ${latLabelStyle.fontFamily}`,
       textBaseline: latLabelStyle.textBaseline,
       fill: new FillStyle({
@@ -464438,13 +464461,9 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
       if (config.center && config.center.length >= 2) {
         const layerCenter = config.center;
         const isInView = layerCenter[0] >= mapExtent[0] && layerCenter[0] <= mapExtent[2] && layerCenter[1] >= mapExtent[1] && layerCenter[1] <= mapExtent[3];
-        console.log(
-          `图层中心点 [${layerCenter[0]}, ${layerCenter[1]}] 是否在当前视图内: ${isInView}`
-        );
+        console.log(`图层中心点 [${layerCenter[0]}, ${layerCenter[1]}] 是否在当前视图内: ${isInView}`);
         if (!isInView) {
-          console.warn(
-            `⚠️ 图层 ${config.name} 的中心点不在当前地图视图范围内，可能需要缩放到图层位置`
-          );
+          console.warn(`⚠️ 图层 ${config.name} 的中心点不在当前地图视图范围内，可能需要缩放到图层位置`);
         }
       }
     }
@@ -464456,9 +464475,7 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
     if (this.styleApplied || this.styleApplyAttempts >= this.maxStyleApplyAttempts)
       return;
     this.styleApplyAttempts++;
-    console.log(
-      `尝试应用样式到SuperMap图层 ${this.config.name}，第 ${this.styleApplyAttempts} 次`
-    );
+    console.log(`尝试应用样式到SuperMap图层 ${this.config.name}，第 ${this.styleApplyAttempts} 次`);
     setTimeout(() => {
       if (this.layer && this.config.style) {
         try {
@@ -464466,10 +464483,7 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
           this.styleApplied = true;
           console.log(`成功应用样式到SuperMap图层 ${this.config.name}`);
         } catch (error2) {
-          console.warn(
-            `应用样式到SuperMap图层 ${this.config.name} 失败:`,
-            error2
-          );
+          console.warn(`应用样式到SuperMap图层 ${this.config.name} 失败:`, error2);
           if (this.styleApplyAttempts < this.maxStyleApplyAttempts) {
             setTimeout(() => this.tryApplyStyles(), 500);
           }
@@ -464522,7 +464536,6 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
     const sourceOptions = {
       url: config.url,
       wrapX: true,
-      // SuperMap服务通常不需要wrapX
       format: config.format || "webp"
     };
     try {
@@ -464563,19 +464576,13 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
           console.log("📏 瓦片大小:", tileSize);
         } else {
           console.warn("map.json中没有bounds信息，使用默认配置");
-          const tileGrid = await this.createTileGrid(
-            projection2.getCode(),
-            config
-          );
+          const tileGrid = await this.createTileGrid(projection2.getCode(), config);
           if (tileGrid)
             sourceOptions.tileGrid = tileGrid;
         }
       } else {
         console.warn(`无法获取map.json (${response.status}), 使用默认配置`);
-        const tileGrid = await this.createTileGrid(
-          projection2.getCode(),
-          config
-        );
+        const tileGrid = await this.createTileGrid(projection2.getCode(), config);
         if (tileGrid)
           sourceOptions.tileGrid = tileGrid;
       }
@@ -464612,7 +464619,6 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
         origin,
         extent: extent3,
         resolutions,
-        // 只显示前5个分辨率
         tileSize,
         configOrigin: config.origin,
         calculatedOrigin: [extent3[0], extent3[3]]
@@ -464759,12 +464765,7 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
    * @returns Promise<any[]> 查询到的要素数组
    */
   async queryFeatureByPointOL(lon2, lat2, options = {}) {
-    const {
-      datasetNames = ["hms:Football_field"],
-      serviceUrl = "http://172.16.201.151/iserver/services/data-hms-public/rest/data",
-      tolerance: tolerance2 = 0.027,
-      vectorLayer = null
-    } = options;
+    const { datasetNames = ["hms:Football_field"], serviceUrl = "http://172.16.201.151/iserver/services/data-hms-public/rest/data", tolerance: tolerance2 = 0.027, vectorLayer = null } = options;
     const point2 = new Point$b([lon2, lat2]);
     let smGeom = Util2.toSuperMapGeometry(point2);
     if (!smGeom) {
@@ -464784,39 +464785,36 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
       // tolerance 参数在此版本中不支持，已移除
     });
     return new Promise((resolve, reject2) => {
-      new FeatureService2(serviceUrl).getFeaturesByGeometry(
-        queryParams,
-        (result) => {
-          var _a3, _b3, _c2;
-          if (result.error) {
-            console.error("iServer 错误:", result.error);
-            reject2(result.error);
-            return;
-          }
-          const rawFeatures = ((_b3 = (_a3 = result.result) == null ? void 0 : _a3.features) == null ? void 0 : _b3.features) || [];
-          console.log("SuperMap查询结果:", result);
-          console.log("原始要素数组:", rawFeatures);
-          const features2 = rawFeatures.map((feature2) => {
-            console.log("转换前的SuperMap要素:", feature2);
-            console.log("要素的fieldNames:", feature2.fieldNames);
-            console.log("要素的fieldValues:", feature2.fieldValues);
-            const transformedFeature = this.transformSupermapFeature(feature2);
-            console.log("转换后的标准要素:", transformedFeature);
-            console.log("转换后的properties:", transformedFeature.properties);
-            return transformedFeature;
+      new FeatureService2(serviceUrl).getFeaturesByGeometry(queryParams, (result) => {
+        var _a3, _b3, _c2;
+        if (result.error) {
+          console.error("iServer 错误:", result.error);
+          reject2(result.error);
+          return;
+        }
+        const rawFeatures = ((_b3 = (_a3 = result.result) == null ? void 0 : _a3.features) == null ? void 0 : _b3.features) || [];
+        console.log("SuperMap查询结果:", result);
+        console.log("原始要素数组:", rawFeatures);
+        const features2 = rawFeatures.map((feature2) => {
+          console.log("转换前的SuperMap要素:", feature2);
+          console.log("要素的fieldNames:", feature2.fieldNames);
+          console.log("要素的fieldValues:", feature2.fieldValues);
+          const transformedFeature = this.transformSupermapFeature(feature2);
+          console.log("转换后的标准要素:", transformedFeature);
+          console.log("转换后的properties:", transformedFeature.properties);
+          return transformedFeature;
+        });
+        if (vectorLayer) {
+          (_c2 = vectorLayer.getSource()) == null ? void 0 : _c2.clear();
+          features2.forEach((f2) => {
+            var _a4;
+            const olFeat = new Feature$6(Util2.toSuperMapGeometry(f2.geometry));
+            olFeat.setProperties(f2.properties || {});
+            (_a4 = vectorLayer.getSource()) == null ? void 0 : _a4.addFeature(olFeat);
           });
-          if (vectorLayer) {
-            (_c2 = vectorLayer.getSource()) == null ? void 0 : _c2.clear();
-            features2.forEach((f2) => {
-              var _a4;
-              const olFeat = new Feature$6(Util2.toSuperMapGeometry(f2.geometry));
-              olFeat.setProperties(f2.properties || {});
-              (_a4 = vectorLayer.getSource()) == null ? void 0 : _a4.addFeature(olFeat);
-            });
-          }
-          resolve(features2);
         }
-      );
+        resolve(features2);
+      });
     });
   }
   /**
@@ -464828,12 +464826,7 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
    */
   async getFeaturesByBuffer(lon2 = 93.53179023100006, lat2 = 42.81598224900006, options = {}) {
     try {
-      const {
-        bufferDistance = 0.027,
-        datasetNames = ["hms:Football_field"],
-        serviceUrl = "http://172.16.201.151/iserver/services/data-hms-public/rest/data",
-        vectorLayer = null
-      } = options;
+      const { bufferDistance = 0.027, datasetNames = ["hms:Football_field"], serviceUrl = "http://172.16.201.151/iserver/services/data-hms-public/rest/data", vectorLayer = null } = options;
       const olPoint = new Point$b([lon2, lat2]);
       let smGeom = Util2.toSuperMapGeometry(olPoint);
       console.log("Util.toSuperMapGeometry ->", smGeom);
@@ -464843,54 +464836,46 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
           smGeom = new SuperMap2.Geometry.Point(lon2, lat2);
           console.log("使用全局 SuperMap.Geometry.Point 构建 smGeom:", smGeom);
         } else {
-          console.warn(
-            "无法取得全局 SuperMap，无法构造 SuperMap.Geometry.Point。建议使用方案A的 REST 调用绕开。"
-          );
+          console.warn("无法取得全局 SuperMap，无法构造 SuperMap.Geometry.Point。建议使用方案A的 REST 调用绕开。");
         }
       }
       if (!smGeom) {
-        console.error(
-          "无法构建 SuperMap Geometry（smGeom 为 null）。请使用方案A 或检查 iClient 的引入方式。"
-        );
+        console.error("无法构建 SuperMap Geometry（smGeom 为 null）。请使用方案A 或检查 iClient 的引入方式。");
         return [];
       }
       const bufferParams = new GetFeaturesByBufferParameters({
         datasetNames,
         bufferDistance,
-        // 举例（300m ≈ 0.0027°），注意单位和坐标系一致
         geometry: smGeom,
         spatialQueryMode: "INTERSECT"
       });
       return new Promise((resolve, reject2) => {
-        new FeatureService2(serviceUrl).getFeaturesByBuffer(
-          bufferParams,
-          (serviceResult) => {
-            var _a3, _b3, _c2, _d;
-            console.log("serviceResult:", serviceResult);
-            if (serviceResult.error) {
-              console.error("iServer error:", serviceResult.error);
-              reject2(new Error("iServer 返回错误，详见控制台"));
-              return;
-            }
-            const rawFeatures = ((_b3 = (_a3 = serviceResult.result) == null ? void 0 : _a3.features) == null ? void 0 : _b3.features) || [];
-            const feats = rawFeatures.map((f2) => {
-              const transformedFeature = this.transformSupermapFeature(f2);
-              console.log("Buffer查询 - 转换前的SuperMap数据:", f2);
-              console.log("Buffer查询 - 转换后的标准数据:", transformedFeature);
-              const olFeat = new Feature$6(Util2.toSuperMapGeometry(f2.geometry));
-              olFeat.setProperties(transformedFeature.properties || {});
-              return olFeat;
-            });
-            if (vectorLayer) {
-              (_c2 = vectorLayer.getSource()) == null ? void 0 : _c2.clear();
-              if (feats.length) {
-                (_d = vectorLayer.getSource()) == null ? void 0 : _d.addFeatures(feats);
-              }
+        new FeatureService2(serviceUrl).getFeaturesByBuffer(bufferParams, (serviceResult) => {
+          var _a3, _b3, _c2, _d;
+          console.log("serviceResult:", serviceResult);
+          if (serviceResult.error) {
+            console.error("iServer error:", serviceResult.error);
+            reject2(new Error("iServer 返回错误，详见控制台"));
+            return;
+          }
+          const rawFeatures = ((_b3 = (_a3 = serviceResult.result) == null ? void 0 : _a3.features) == null ? void 0 : _b3.features) || [];
+          const feats = rawFeatures.map((f2) => {
+            const transformedFeature = this.transformSupermapFeature(f2);
+            console.log("Buffer查询 - 转换前的SuperMap数据:", f2);
+            console.log("Buffer查询 - 转换后的标准数据:", transformedFeature);
+            const olFeat = new Feature$6(Util2.toSuperMapGeometry(f2.geometry));
+            olFeat.setProperties(transformedFeature.properties || {});
+            return olFeat;
+          });
+          if (vectorLayer) {
+            (_c2 = vectorLayer.getSource()) == null ? void 0 : _c2.clear();
+            if (feats.length) {
+              (_d = vectorLayer.getSource()) == null ? void 0 : _d.addFeatures(feats);
             }
-            console.log("查询并绘制完成，count:", feats.length);
-            resolve(feats);
           }
-        );
+          console.log("查询并绘制完成，count:", feats.length);
+          resolve(feats);
+        });
       });
     } catch (err2) {
       console.error("queryBuffer 捕获异常：", err2);
@@ -464923,27 +464908,14 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
       console.warn("SuperMap图层缺少服务URL，无法进行要素查询");
       return [];
     }
-    const {
-      maxFeatures = 100,
-      datasetNames,
-      returnContent = true,
-      targetProjection
-    } = options;
+    const { maxFeatures = 100, datasetNames, returnContent = true, targetProjection } = options;
     try {
       const mapProjection = (_a3 = this.map) == null ? void 0 : _a3.getView().getProjection();
       const projectionCode = targetProjection || (mapProjection == null ? void 0 : mapProjection.getCode()) || "EPSG:4326";
       let transformedBounds = bounds2;
       if (mapProjection && targetProjection && mapProjection.getCode() !== targetProjection) {
-        const bottomLeft = transform$l(
-          [bounds2[0], bounds2[1]],
-          mapProjection.getCode(),
-          targetProjection
-        );
-        const topRight = transform$l(
-          [bounds2[2], bounds2[3]],
-          mapProjection.getCode(),
-          targetProjection
-        );
+        const bottomLeft = transform$l([bounds2[0], bounds2[1]], mapProjection.getCode(), targetProjection);
+        const topRight = transform$l([bounds2[2], bounds2[3]], mapProjection.getCode(), targetProjection);
         transformedBounds = [
           bottomLeft[0],
           bottomLeft[1],
@@ -464965,29 +464937,22 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
       });
       const boundsService = new GetFeaturesByBoundsService(serviceUrl);
       return new Promise((resolve, reject2) => {
-        boundsService.getFeaturesByBounds(
-          boundsParams,
-          (serviceResult) => {
-            var _a4;
-            if (serviceResult.type === "processCompleted") {
-              const result = serviceResult.result;
-              if (result && result.features) {
-                console.log(
-                  `SuperMap边界查询成功，找到 ${result.features.length} 个要素`
-                );
-                resolve(result.features);
-              } else {
-                console.log("SuperMap边界查询完成，但未找到要素");
-                resolve([]);
-              }
+        boundsService.getFeaturesByBounds(boundsParams, (serviceResult) => {
+          var _a4;
+          if (serviceResult.type === "processCompleted") {
+            const result = serviceResult.result;
+            if (result && result.features) {
+              console.log(`SuperMap边界查询成功，找到 ${result.features.length} 个要素`);
+              resolve(result.features);
             } else {
-              console.error("SuperMap边界查询失败:", serviceResult.error);
-              reject2(
-                new Error(((_a4 = serviceResult.error) == null ? void 0 : _a4.errorMsg) || "边界查询失败")
-              );
+              console.log("SuperMap边界查询完成，但未找到要素");
+              resolve([]);
             }
+          } else {
+            console.error("SuperMap边界查询失败:", serviceResult.error);
+            reject2(new Error(((_a4 = serviceResult.error) == null ? void 0 : _a4.errorMsg) || "边界查询失败"));
           }
-        );
+        });
       });
     } catch (error2) {
       console.error("SuperMap边界查询异常:", error2);
@@ -465006,13 +464971,7 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
       console.warn("SuperMap图层缺少服务URL，无法进行要素查询");
       return [];
     }
-    const {
-      maxFeatures = 100,
-      datasetNames,
-      returnContent = true,
-      spatialQueryMode = "INTERSECT",
-      targetProjection
-    } = options;
+    const { maxFeatures = 100, datasetNames, returnContent = true, spatialQueryMode = "INTERSECT", targetProjection } = options;
     try {
       const serviceUrl = this.buildDataServiceUrl(config.url);
       console.log(`开始SuperMap几何查询:`, {
@@ -465029,29 +464988,22 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
       });
       const geometryService = new GetFeaturesByGeometryService(serviceUrl);
       return new Promise((resolve, reject2) => {
-        geometryService.getFeaturesByGeometry(
-          geometryParams,
-          (serviceResult) => {
-            var _a3;
-            if (serviceResult.type === "processCompleted") {
-              const result = serviceResult.result;
-              if (result && result.features) {
-                console.log(
-                  `SuperMap几何查询成功，找到 ${result.features.length} 个要素`
-                );
-                resolve(result.features);
-              } else {
-                console.log("SuperMap几何查询完成，但未找到要素");
-                resolve([]);
-              }
+        geometryService.getFeaturesByGeometry(geometryParams, (serviceResult) => {
+          var _a3;
+          if (serviceResult.type === "processCompleted") {
+            const result = serviceResult.result;
+            if (result && result.features) {
+              console.log(`SuperMap几何查询成功，找到 ${result.features.length} 个要素`);
+              resolve(result.features);
             } else {
-              console.error("SuperMap几何查询失败:", serviceResult.error);
-              reject2(
-                new Error(((_a3 = serviceResult.error) == null ? void 0 : _a3.errorMsg) || "几何查询失败")
-              );
+              console.log("SuperMap几何查询完成，但未找到要素");
+              resolve([]);
             }
+          } else {
+            console.error("SuperMap几何查询失败:", serviceResult.error);
+            reject2(new Error(((_a3 = serviceResult.error) == null ? void 0 : _a3.errorMsg) || "几何查询失败"));
           }
-        );
+        });
       });
     } catch (error2) {
       console.error("SuperMap几何查询异常:", error2);
@@ -465070,12 +465022,7 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
       console.warn("SuperMap图层缺少服务URL，无法进行要素查询");
       return [];
     }
-    const {
-      maxFeatures = 100,
-      datasetNames,
-      returnContent = true,
-      targetProjection
-    } = options;
+    const { maxFeatures = 100, datasetNames, returnContent = true, targetProjection } = options;
     try {
       const serviceUrl = this.buildDataServiceUrl(config.url);
       console.log(`开始SuperMap SQL查询:`, {
@@ -465098,9 +465045,7 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
           if (serviceResult.type === "processCompleted") {
             const result = serviceResult.result;
             if (result && result.features) {
-              console.log(
-                `SuperMap SQL查询成功，找到 ${result.features.length} 个要素`
-              );
+              console.log(`SuperMap SQL查询成功，找到 ${result.features.length} 个要素`);
               resolve(result.features);
             } else {
               console.log("SuperMap SQL查询完成，但未找到要素");
@@ -465148,9 +465093,7 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
           if (serviceResult.type === "processCompleted") {
             const result = serviceResult.result;
             if (result && result.features) {
-              console.log(
-                `SuperMap ID查询成功，找到 ${result.features.length} 个要素`
-              );
+              console.log(`SuperMap ID查询成功，找到 ${result.features.length} 个要素`);
               resolve(result.features);
             } else {
               console.log("SuperMap ID查询完成，但未找到要素");
@@ -465180,10 +465123,7 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
         return mapUrl;
       }
       if (url.pathname.includes("/rest/maps/")) {
-        const dataServiceUrl = mapUrl.replace(
-          /\/rest\/maps\/.*$/,
-          "/rest/data"
-        );
+        const dataServiceUrl = mapUrl.replace(/\/rest\/maps\/.*$/, "/rest/data");
         console.log(`构建数据服务URL: ${mapUrl} -> ${dataServiceUrl}`);
         return dataServiceUrl;
       }
@@ -465193,9 +465133,7 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
         const serviceName = pathParts[servicesIndex + 1];
         const basePath = pathParts.slice(0, servicesIndex + 2).join("/");
         const dataServiceUrl = `${url.protocol}//${url.host}/${basePath}/rest/data`;
-        console.log(
-          `从服务名称构建数据服务URL: ${mapUrl} -> ${dataServiceUrl}`
-        );
+        console.log(`从服务名称构建数据服务URL: ${mapUrl} -> ${dataServiceUrl}`);
         return dataServiceUrl;
       }
       throw new Error(`无法解析SuperMap服务URL格式: ${mapUrl}`);
@@ -465239,37 +465177,24 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
    */
   async getFeatureInfoAtCoordinate(coordinate, options = {}) {
     var _a3, _b3, _c2, _d, _e2, _f;
-    const {
-      bufferDistance = 100,
-      maxFeatures = options.featureCount || 10,
-      queryMethod
-    } = options;
+    const { bufferDistance = 100, maxFeatures = options.featureCount || 10, queryMethod } = options;
     try {
       let features2 = [];
       const finalQueryMethod = queryMethod || ((_a3 = this.config.supermapConfig) == null ? void 0 : _a3.queryMethod) || "point";
       console.log(`使用查询方式: ${finalQueryMethod}`);
       if (finalQueryMethod === "buffer") {
         const configuredBufferDistance = ((_b3 = this.config.supermapConfig) == null ? void 0 : _b3.bufferDistance) || bufferDistance;
-        features2 = await this.getFeaturesByBuffer(
-          coordinate[0],
-          coordinate[1],
-          {
-            bufferDistance: configuredBufferDistance / 1e3,
-            // 转换为度数单位
-            datasetNames: (_c2 = this.config.supermapConfig) == null ? void 0 : _c2.datasetNames,
-            serviceUrl: (_d = this.config.supermapConfig) == null ? void 0 : _d.featureServiceUrl
-          }
-        );
+        features2 = await this.getFeaturesByBuffer(coordinate[0], coordinate[1], {
+          bufferDistance: configuredBufferDistance / 1e3,
+          datasetNames: (_c2 = this.config.supermapConfig) == null ? void 0 : _c2.datasetNames,
+          serviceUrl: (_d = this.config.supermapConfig) == null ? void 0 : _d.featureServiceUrl
+        });
       } else {
-        features2 = await this.queryFeatureByPointOL(
-          coordinate[0],
-          coordinate[1],
-          {
-            datasetNames: (_e2 = this.config.supermapConfig) == null ? void 0 : _e2.datasetNames,
-            serviceUrl: (_f = this.config.supermapConfig) == null ? void 0 : _f.featureServiceUrl
-            // tolerance 参数已移除，使用默认值
-          }
-        );
+        features2 = await this.queryFeatureByPointOL(coordinate[0], coordinate[1], {
+          datasetNames: (_e2 = this.config.supermapConfig) == null ? void 0 : _e2.datasetNames,
+          serviceUrl: (_f = this.config.supermapConfig) == null ? void 0 : _f.featureServiceUrl
+          // tolerance 参数已移除，使用默认值
+        });
       }
       return features2.slice(0, maxFeatures).map((feature2) => {
         if (feature2 && typeof feature2.getProperties === "function") {
@@ -465347,9 +465272,7 @@ const _TiandituLayerHandler = class _TiandituLayerHandler extends BaseLayer$2 {
    * 检查是否是天地图URL
    */
   isTiandituUrl(url) {
-    return _TiandituLayerHandler.TIANDITU_DOMAINS.some(
-      (domain) => url.includes(domain)
-    );
+    return _TiandituLayerHandler.TIANDITU_DOMAINS.some((domain) => url.includes(domain));
   }
   /**
    * 检查是否是开发模式
@@ -465363,9 +465286,7 @@ const _TiandituLayerHandler = class _TiandituLayerHandler extends BaseLayer$2 {
   convertToProxyUrl(originalUrl) {
     const urlObj = new URL(originalUrl);
     const pathParts = urlObj.pathname.split("/");
-    const serviceType = pathParts.find(
-      (part) => Object.values(_TiandituLayerHandler.TIANDITU_SERVICES).includes(part)
-    );
+    const serviceType = pathParts.find((part) => Object.values(_TiandituLayerHandler.TIANDITU_SERVICES).includes(part));
     if (!serviceType) {
       console.warn("无法识别天地图服务类型，使用默认代理路径");
       return `/api/tianditu${urlObj.pathname}${urlObj.search}`;
@@ -465382,9 +465303,7 @@ const _TiandituLayerHandler = class _TiandituLayerHandler extends BaseLayer$2 {
       return null;
     const urlObj = new URL(this.config.url);
     const pathParts = urlObj.pathname.split("/");
-    return pathParts.find(
-      (part) => Object.values(_TiandituLayerHandler.TIANDITU_SERVICES).includes(part)
-    ) || null;
+    return pathParts.find((part) => Object.values(_TiandituLayerHandler.TIANDITU_SERVICES).includes(part)) || null;
   }
   /**
    * 设置天地图密钥
@@ -465444,12 +465363,7 @@ const _TiandituLayerHandler = class _TiandituLayerHandler extends BaseLayer$2 {
    * 创建标准天地图URL
    */
   static createTiandituUrl(serviceType, options = {}) {
-    const {
-      tk = "YOUR_TIANDITU_KEY",
-      domain = "t{0-7}.tianditu.gov.cn",
-      format: format2 = "tiles",
-      style = "default"
-    } = options;
+    const { tk = "YOUR_TIANDITU_KEY", domain = "t{0-7}.tianditu.gov.cn", format: format2 = "tiles", style = "default" } = options;
     const service = _TiandituLayerHandler.TIANDITU_SERVICES[serviceType];
     if (!service) {
       throw new Error(`不支持的天地图服务类型: ${serviceType}`);
@@ -465458,9 +465372,8 @@ const _TiandituLayerHandler = class _TiandituLayerHandler extends BaseLayer$2 {
   }
   /**
    * 应用过滤器（天地图图层不支持过滤）
-   * @param filters 过滤器数组
    */
-  applyFilters(filters) {
+  applyFilters() {
     console.warn("TiandituLayerHandler: 天地图图层不支持客户端过滤功能。天地图是预渲染的瓦片服务，无法进行动态过滤。");
     console.info("TiandituLayerHandler: 如需过滤功能，请考虑：");
     console.info("1. 使用矢量图层（GeoJSON、WFS等）叠加在天地图上");
@@ -465480,15 +465393,10 @@ __publicField(_TiandituLayerHandler, "TIANDITU_DOMAINS", [
 ]);
 __publicField(_TiandituLayerHandler, "TIANDITU_SERVICES", {
   "img": "img_w",
-  // 卫星影像
   "vec": "vec_w",
-  // 矢量地图
   "cva": "cva_w",
-  // 矢量注记
   "cia": "cia_w",
-  // 影像注记
   "ter": "ter_w",
-  // 地形图
   "cta": "cta_w"
   // 地形注记
 });
@@ -465504,7 +465412,6 @@ class CanvasLayerHandler extends BaseLayer$2 {
       className: this.config.className,
       canvasFunction: this.getCanvasFunction(),
       projection: "EPSG:4326",
-      // 默认投影
       ratio: 1
     });
     const imageLayer = new ImageLayer$3({
@@ -465528,13 +465435,7 @@ class CanvasLayerHandler extends BaseLayer$2 {
       canvas.width = size2[0];
       canvas.height = size2[1];
       const canvasConfig = this.config.canvasConfig || {};
-      const {
-        backgroundColor: backgroundColor2 = "transparent",
-        gridSize = 50,
-        gridColor = "#cccccc",
-        showGrid = false,
-        customDrawFunction
-      } = canvasConfig;
+      const { backgroundColor: backgroundColor2 = "transparent", gridSize = 50, gridColor = "#cccccc", showGrid = false, customDrawFunction } = canvasConfig;
       if (backgroundColor2 !== "transparent") {
         context.fillStyle = backgroundColor2;
         context.fillRect(0, 0, canvas.width, canvas.height);
@@ -465667,9 +465568,8 @@ class CanvasLayerHandler extends BaseLayer$2 {
   }
   /**
    * 应用过滤器（Canvas图层不支持过滤）
-   * @param filters 过滤器数组
    */
-  applyFilters(filters) {
+  applyFilters() {
     console.warn("CanvasLayerHandler: Canvas图层不支持客户端过滤功能。Canvas图层是基于自定义绘制函数的图像图层，无法进行要素级别的过滤。");
     console.info("CanvasLayerHandler: 如需过滤功能，请考虑：");
     console.info("1. 在Canvas绘制函数中实现自定义的过滤逻辑");
@@ -465690,17 +465590,11 @@ class VectorTileLayerHandler extends BaseLayer$2 {
       style: this.createStyleFunction(),
       // VectorTile图层特有的配置
       renderBuffer: this.config.renderBuffer || 100,
-      // 渲染缓冲区
       renderOrder: this.config.renderOrder,
-      // 渲染顺序
       renderMode: this.config.renderMode || "hybrid",
-      // 渲染模式：'hybrid' | 'vector'
       declutter: this.config.declutter || false,
-      // 是否启用标注避让
       background: this.config.background,
-      // 背景色
       preload: this.config.preload || 0,
-      // 预加载级别
       useInterimTilesOnError: this.config.useInterimTilesOnError !== false
       // 错误时使用临时瓦片
     });
@@ -465720,7 +465614,6 @@ class VectorTileLayerHandler extends BaseLayer$2 {
       minZoom: config.minZoom || 0,
       tileSize: config.tileSize || 512,
       overlaps: config.overlaps !== false,
-      // 默认允许重叠
       projection: config.projection || "EPSG:4326"
     };
     if (config.tileGrid) {
@@ -465919,14 +465812,10 @@ class VectorTileLayerHandler extends BaseLayer$2 {
       return;
     }
     const originalStyleFunction = this.createStyleFunction();
+    const logic = this.getFilterLogic();
     const filteredStyleFunction = (feature2, resolution) => {
-      let visible = true;
-      for (const filter2 of enabledFilters) {
-        if (!this.checkFeatureAgainstFilter(feature2, filter2)) {
-          visible = false;
-          break;
-        }
-      }
+      const results = enabledFilters.map((filter2) => this.checkFeatureAgainstFilter(feature2, filter2));
+      const visible = this.combineByLogic(results);
       if (!visible) {
         return new Style$3({});
       }
@@ -465937,7 +465826,7 @@ class VectorTileLayerHandler extends BaseLayer$2 {
       }
     };
     layer2.setStyle(filteredStyleFunction);
-    console.log(`VectorTile图层应用 ${enabledFilters.length} 个过滤器`);
+    console.log(`VectorTile图层应用 ${enabledFilters.length} 个过滤器，组合逻辑为 ${logic}`);
   }
   /**
    * 检查要素是否符合过滤器条件
@@ -465967,11 +465856,11 @@ class VectorTileLayerHandler extends BaseLayer$2 {
         return featureValue !== filterValue;
       case FilterOperator.GREATER_THAN:
         return Number(featureValue) > Number(filterValue);
-      case FilterOperator.GREATER_THAN_OR_EQUAL:
+      case FilterOperator.GREATER_EQUAL:
         return Number(featureValue) >= Number(filterValue);
       case FilterOperator.LESS_THAN:
         return Number(featureValue) < Number(filterValue);
-      case FilterOperator.LESS_THAN_OR_EQUAL:
+      case FilterOperator.LESS_EQUAL:
         return Number(featureValue) <= Number(filterValue);
       case FilterOperator.LIKE:
         const pattern = filterValue.toString().replace(/%/g, ".*");
@@ -466027,15 +465916,11 @@ class VectorTileLayerHandler extends BaseLayer$2 {
     const extent3 = view.calculateExtent();
     const resolution = view.getResolution();
     try {
-      source.forEachFeatureAtCoordinateAndResolution(
-        extent3,
-        resolution || 1,
-        (feature2) => {
-          const props = feature2.getProperties();
-          const { geometry: geometry2, ...dataProps } = props;
-          properties.push(dataProps);
-        }
-      );
+      source.forEachFeatureAtCoordinateAndResolution(extent3, resolution || 1, (feature2) => {
+        const props = feature2.getProperties();
+        const { geometry: geometry2, ...dataProps } = props;
+        properties.push(dataProps);
+      });
     } catch (error2) {
       console.warn("获取VectorTile要素属性时出错:", error2);
     }
@@ -466201,28 +466086,6 @@ const _LayerFactory = class _LayerFactory {
 __publicField(_LayerFactory, "instance");
 let LayerFactory = _LayerFactory;
 const layerFactory = LayerFactory.getInstance();
-class LayerEventBus {
-  constructor() {
-    __publicField(this, "emitter");
-    this.emitter = mitt();
-  }
-  emit(type, event) {
-    this.emitter.emit(type, event);
-  }
-  on(type, handler) {
-    this.emitter.on(type, handler);
-  }
-  off(type, handler) {
-    this.emitter.off(type, handler);
-  }
-  clear() {
-    this.emitter.all.clear();
-  }
-}
-function createLayerEventBus() {
-  return new LayerEventBus();
-}
-const layerEventBus = mitt();
 class LayerManager {
   constructor(map2, eventBus, storage2) {
     __publicField(this, "map");
@@ -466253,7 +466116,6 @@ class LayerManager {
         ...config,
         id: layerId,
         visible: config.visible ?? false,
-        // 默认设置为false，避免意外激活图层
         opacity: config.opacity ?? 1,
         zIndex: config.zIndex ?? 0
       };
@@ -466430,7 +466292,6 @@ class LayerManager {
             ...childConfig,
             id: childLayerId,
             visible: groupConfig.visible ?? false,
-            // 子图层的可见性完全跟随组图层
             opacity: childConfig.opacity ?? groupConfig.opacity
           };
           if (this.addLayer(childFullConfig)) {
@@ -466634,9 +466495,7 @@ class LayerManager {
   async hideOtherBasemaps(currentBasemapId) {
     try {
       const allConfigs = [...this.layerConfigs.values(), ...this.pendingLayerConfigs.values()];
-      const basemapConfigs = allConfigs.filter(
-        (config) => this.isBasemapLayer(config.id) && config.id !== currentBasemapId
-      );
+      const basemapConfigs = allConfigs.filter((config) => this.isBasemapLayer(config.id) && config.id !== currentBasemapId);
       for (const config of basemapConfigs) {
         if (config.visible) {
           const handler = this.layerHandlers.get(config.id);
@@ -466661,9 +466520,7 @@ class LayerManager {
   async hideOtherBasemapsOnInit(currentBasemapId) {
     try {
       const allConfigs = [...this.layerConfigs.values(), ...this.pendingLayerConfigs.values()];
-      const basemapConfigs = allConfigs.filter(
-        (config) => this.isBasemapLayer(config.id) && config.id !== currentBasemapId && config.visible
-      );
+      const basemapConfigs = allConfigs.filter((config) => this.isBasemapLayer(config.id) && config.id !== currentBasemapId && config.visible);
       for (const config of basemapConfigs) {
         const handler = this.layerHandlers.get(config.id);
         if (handler) {
@@ -466949,15 +466806,11 @@ class LayerManager {
         try {
           if (config.type === "TileSuperMapRest" || config.type === "tilesupermaprest" || config.type === "TILESUPERMAPREST") {
             if ("getFeatureInfoAtCoordinate" in handler) {
-              const features2 = await handler.getFeatureInfoAtCoordinate(
-                coordinate,
-                {
-                  bufferDistance: 80,
-                  // 默认5米缓冲区
-                  maxFeatures: (options == null ? void 0 : options.featureCount) || 10,
-                  returnContent: true
-                }
-              );
+              const features2 = await handler.getFeatureInfoAtCoordinate(coordinate, {
+                bufferDistance: 80,
+                maxFeatures: (options == null ? void 0 : options.featureCount) || 10,
+                returnContent: true
+              });
               if (features2 && features2.length > 0) {
                 results.push({
                   layerId,
@@ -466969,13 +466822,10 @@ class LayerManager {
             }
           } else if (config.type === "wms" || config.type === "WMS") {
             if ("getFeatureInfoAtCoordinate" in handler) {
-              const features2 = await handler.getFeatureInfoAtCoordinate(
-                coordinate,
-                {
-                  infoFormat: (options == null ? void 0 : options.infoFormat) || "application/json",
-                  featureCount: (options == null ? void 0 : options.featureCount) || 10
-                }
-              );
+              const features2 = await handler.getFeatureInfoAtCoordinate(coordinate, {
+                infoFormat: (options == null ? void 0 : options.infoFormat) || "application/json",
+                featureCount: (options == null ? void 0 : options.featureCount) || 10
+              });
               if (features2 && features2.length > 0) {
                 results.push({
                   layerId,
@@ -467040,6 +466890,28 @@ class LayerManager {
     this.layerConfigs.clear();
   }
 }
+class LayerEventBus {
+  constructor() {
+    __publicField(this, "emitter");
+    this.emitter = mitt();
+  }
+  emit(type, event) {
+    this.emitter.emit(type, event);
+  }
+  on(type, handler) {
+    this.emitter.on(type, handler);
+  }
+  off(type, handler) {
+    this.emitter.off(type, handler);
+  }
+  clear() {
+    this.emitter.all.clear();
+  }
+}
+function createLayerEventBus() {
+  return new LayerEventBus();
+}
+const layerEventBus = mitt();
 const DEFAULT_HIGHLIGHT_STYLE = {
   fill: {
     color: "rgba(255, 255, 0, 0.3)",
@@ -467142,7 +467014,7 @@ class FeatureHighlightManager {
     if (this.styleConfig.text) {
       const properties = feature2.getProperties();
       const labelText = properties.name || properties.label || "高亮要素";
-      styleOptions.text = new Text$6({
+      styleOptions.text = new Text$5({
         text: labelText,
         font: this.styleConfig.text.font || "12px Arial",
         fill: new Fill$2({
@@ -467196,7 +467068,7 @@ class FeatureHighlightManager {
     if (customStyleConfig == null ? void 0 : customStyleConfig.text) {
       const properties = feature2.getProperties();
       const labelText = properties.name || properties.label || "高亮要素";
-      styleOptions.text = new Text$6({
+      styleOptions.text = new Text$5({
         text: labelText,
         font: customStyleConfig.text.font || "12px Arial",
         fill: new Fill$2({
@@ -472969,7 +472841,7 @@ const _sfc_main$g = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const RegionNavigationDialog = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-2cbe0bd1"]]);
+const RegionNavigationDialog = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-e968a62a"]]);
 const _hoisted_1$e = { class: "markers-content" };
 const _hoisted_2$d = { class: "toolbar" };
 const _hoisted_3$d = { class: "search-filter" };
@@ -477366,9 +477238,11 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     });
     watch(
       () => props.config,
-      () => {
+      (newConfig) => {
+        searchService.updateConfig(newConfig);
         searchResults.value = [];
         selectedIndex.value = -1;
+        console.log("MapSearch配置已更新:", newConfig);
       },
       { deep: true }
     );
@@ -490259,7 +490133,7 @@ function(t3) {
  */
 function(t3) {
   function e8() {
-    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-a22271e1.mjs")).catch(function(t4) {
+    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-a3c51163.mjs")).catch(function(t4) {
       return Promise.reject(new Error("Could not load canvg: " + t4));
     }).then(function(t4) {
       return t4.default ? t4.default : t4;
@@ -499180,8 +499054,8 @@ export {
   DrawingManagerFactory as a3,
   MapOperationTool as a4,
   htmlToPDF as a5,
-  FilterType$1 as a6,
-  FilterOperator$1 as a7,
+  FilterType as a6,
+  FilterOperator as a7,
   SpatialFilterType as a8,
   _defineProperty as b,
   commonjsGlobal as c,