vue-openlayers-plugin 1.0.49 → 1.0.51

package/lib/{index-2dac53c6.mjs → index-0cfcd57c.mjs}

@@ -82790,6 +82790,7 @@ class StyleFactory {
     const textStyle = new Text$5({
       text: config.text,
       font: config.font || `${config.fontSize || 12}px ${config.fontFamily || "Arial"}`,
+      scale: config.scale,
       fill: this.createFill(config.fill),
       stroke: this.createStroke(config.stroke),
       offsetX: config.offsetX,
@@ -82797,6 +82798,10 @@ class StyleFactory {
       textAlign: config.textAlign,
       textBaseline: config.textBaseline,
       rotation: config.rotation,
+      rotateWithView: config.rotateWithView,
+      maxAngle: config.maxAngle,
+      placement: config.placement,
+      overflow: config.overflow,
       backgroundFill: this.createFill(config.backgroundFill),
       backgroundStroke: this.createStroke(config.backgroundStroke),
       padding: config.padding
@@ -82896,7 +82901,8 @@ class StyleFactory {
       });
     }
     if (config == null ? void 0 : config.text) {
-      styleOptions.text = this.createText(config.text);
+      const textCfg = { placement: "line", overflow: true, ...config.text };
+      styleOptions.text = this.createText(textCfg);
     }
     return new Style$3(styleOptions);
   }
@@ -83104,10 +83110,27 @@ const _StyleManager = class _StyleManager {
    */
   createStyleFunction(styleConfig) {
     return (feature2, resolution) => {
+      var _a3, _b3;
       const geometryType = StyleFactory.getFeatureGeometryType(feature2);
       const defaultConfig = this.getDefaultStyle(geometryType);
       const customConfig = styleConfig == null ? void 0 : styleConfig[geometryType];
       const finalConfig = this.mergeStyleConfig(defaultConfig, customConfig);
+      if (finalConfig && finalConfig.text) {
+        const textCfg = { ...finalConfig.text };
+        let content2 = textCfg.text;
+        if (!content2 && typeof textCfg.field === "string") {
+          const v5 = (_a3 = feature2 == null ? void 0 : feature2.get) == null ? void 0 : _a3.call(feature2, textCfg.field);
+          content2 = v5 !== void 0 && v5 !== null ? String(v5) : "";
+        }
+        if (typeof textCfg.template === "string" && textCfg.template.length > 0) {
+          const props = ((_b3 = feature2 == null ? void 0 : feature2.getProperties) == null ? void 0 : _b3.call(feature2)) || {};
+          content2 = textCfg.template.replace(/\{([^}]+)\}/g, (_m, key) => {
+            const v5 = props[key];
+            return v5 !== void 0 && v5 !== null ? String(v5) : "";
+          });
+        }
+        finalConfig.text = { ...textCfg, text: content2 };
+      }
       return StyleFactory.createStyleByGeometryType(geometryType, finalConfig);
     };
   }
@@ -83193,11 +83216,15 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
     __publicField(this, "styleConfig");
   }
   createLayer() {
+    var _a3, _b3, _c2;
     const vectorSource = this.createVectorSource();
+    const declutterOpt = (_c2 = (_b3 = (_a3 = this.config) == null ? void 0 : _a3.config) == null ? void 0 : _b3.vector) == null ? void 0 : _c2.declutter;
     const vectorLayer = new VectorLayer$3({
       className: this.config.className,
       source: vectorSource,
-      style: this.createStyleFunction()
+      style: this.createStyleFunction(),
+      // 默认关闭 declutter；如需避免标签重叠，可在 config.vector.declutter 设为 true
+      declutter: declutterOpt !== void 0 ? !!declutterOpt : false
     });
     return vectorLayer;
   }
@@ -83212,14 +83239,34 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
       const features2 = format2.readFeatures(this.config.data, {
         featureProjection: mapProjection
       });
+      if (features2 && features2.length > 0) {
+        try {
+          console.log("[GeoJSONLayerHandler] 示例要素属性:", features2[0].getProperties());
+        } catch (e8) {
+        }
+      }
       return new VectorSource$2({ features: features2 });
     } else if (this.config.url) {
-      return new VectorSource$2({
+      const source = new VectorSource$2({
         url: this.config.url,
         format: new GeoJSON$4({
           featureProjection: mapProjection
         })
       });
+      try {
+        const logOnce = (e8) => {
+          var _a4, _b3;
+          try {
+            const props = ((_b3 = (_a4 = e8.feature) == null ? void 0 : _a4.getProperties) == null ? void 0 : _b3.call(_a4)) || {};
+            console.log("[GeoJSONLayerHandler] addfeature 属性示例:", props);
+          } catch (_2) {
+          }
+          source.un("addfeature", logOnce);
+        };
+        source.on("addfeature", logOnce);
+      } catch (e8) {
+      }
+      return source;
     } else {
       return new VectorSource$2();
     }
@@ -83229,15 +83276,92 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
    */
   createStyleFunction() {
     this.parseStyleConfig();
-    return styleManager.createStyleFunction(this.styleConfig);
+    const baseStyleFn = styleManager.createStyleFunction(this.styleConfig);
+    return (feature2, resolution) => {
+      var _a3, _b3, _c2, _d, _e2, _f;
+      const style = baseStyleFn(feature2, resolution);
+      try {
+        const geometry2 = (_a3 = feature2 == null ? void 0 : feature2.getGeometry) == null ? void 0 : _a3.call(feature2);
+        const geometryType = ((_b3 = geometry2 == null ? void 0 : geometry2.getType) == null ? void 0 : _b3.call(geometry2)) || "Point";
+        const textCfg = (_d = (_c2 = this.styleConfig) == null ? void 0 : _c2[geometryType]) == null ? void 0 : _d.text;
+        if (textCfg && this.map && typeof this.map.getView === "function") {
+          const z2 = (_f = (_e2 = this.map.getView()).getZoom) == null ? void 0 : _f.call(_e2);
+          if (typeof z2 === "number") {
+            const minZ = textCfg.minZoom;
+            const maxZ = textCfg.maxZoom;
+            const outOfRange = minZ != null && z2 < minZ || maxZ != null && z2 > maxZ;
+            if (outOfRange && typeof style.setText === "function") {
+              style.setText(null);
+            }
+          }
+        }
+      } catch (_2) {
+      }
+      return style;
+    };
   }
   /**
    * 解析样式配置
    */
   parseStyleConfig() {
+    var _a3;
     if (!this.styleConfig) {
       this.styleConfig = {};
     }
+    const style = (_a3 = this.config) == null ? void 0 : _a3.style;
+    if (style && typeof style === "object") {
+      const polygonStyle2 = {};
+      if (style.fill)
+        polygonStyle2.fill = style.fill;
+      if (style.stroke)
+        polygonStyle2.stroke = style.stroke;
+      if (style.text)
+        polygonStyle2.text = style.text;
+      if (Object.keys(polygonStyle2).length > 0) {
+        this.styleConfig.Polygon = {
+          ...this.styleConfig.Polygon || {},
+          ...polygonStyle2
+        };
+        this.styleConfig.MultiPolygon = {
+          ...this.styleConfig.MultiPolygon || {},
+          ...polygonStyle2
+        };
+      }
+      const lineStyle2 = {};
+      if (style.stroke)
+        lineStyle2.stroke = style.stroke;
+      if (style.text)
+        lineStyle2.text = style.text;
+      if (Object.keys(lineStyle2).length > 0) {
+        this.styleConfig.LineString = {
+          ...this.styleConfig.LineString || {},
+          ...lineStyle2
+        };
+        this.styleConfig.MultiLineString = {
+          ...this.styleConfig.MultiLineString || {},
+          ...lineStyle2
+        };
+      }
+      const pointStyle2 = {};
+      if (style.circle)
+        pointStyle2.circle = style.circle;
+      if (style.icon)
+        pointStyle2.icon = style.icon;
+      if (style.regularShape)
+        pointStyle2.regularShape = style.regularShape;
+      if (style.text)
+        pointStyle2.text = style.text;
+      if (Object.keys(pointStyle2).length > 0) {
+        this.styleConfig.Point = {
+          ...this.styleConfig.Point || {},
+          ...pointStyle2
+        };
+        this.styleConfig.MultiPoint = {
+          ...this.styleConfig.MultiPoint || {},
+          ...pointStyle2
+        };
+      }
+    }
   }
   /**
    * 转换旧的样式配置为新格式
@@ -83611,16 +83735,20 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
   parseCQLExpression(cqlExpression) {
     const filters = [];
     let expression = cqlExpression.trim();
-    if (expression.startsWith("(") && expression.endsWith(")")) {
+    const stripOuter = (s2) => {
+      if (!(s2.startsWith("(") || s2.startsWith("（")))
+        return s2;
+      const openChar = s2[0];
+      const closeChar = openChar === "(" ? ")" : "）";
       let depth = 0;
       let wrapsWhole = true;
-      for (let i = 0; i < expression.length; i++) {
-        const ch = expression[i];
-        if (ch === "(")
+      for (let i = 0; i < s2.length; i++) {
+        const ch = s2[i];
+        if (ch === openChar)
           depth++;
-        else if (ch === ")") {
+        else if (ch === closeChar) {
           depth--;
-          if (depth === 0 && i < expression.length - 1) {
+          if (depth === 0 && i < s2.length - 1) {
             wrapsWhole = false;
             break;
           }
@@ -83631,9 +83759,15 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
         }
       }
       if (wrapsWhole && depth === 0) {
-        expression = expression.slice(1, -1).trim();
+        return s2.slice(1, -1).trim();
       }
-    }
+      return s2;
+    };
+    let prevExp;
+    do {
+      prevExp = expression;
+      expression = stripOuter(expression);
+    } while (expression !== prevExp);
     const conditions = expression.split(/\s+AND\s+/i);
     for (let i = 0; i < conditions.length; i++) {
       const condition = conditions[i].trim();
@@ -83666,7 +83800,7 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
       // property LIKE 'pattern'
       { 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 }
+      { regex: /^(\w+)\s+IN\s*[\(（]\s*([\s\S]+?)\s*[\)）]\s*$/i, operator: FilterOperator.IN }
     ];
     for (const pattern of patterns) {
       const match2 = condition.match(pattern.regex);
@@ -468798,7 +468932,7 @@ class MapManager {
       ...this.config.eventManager
     };
     this.eventManager = new EventManager(this.map, this.layerManager, eventManagerConfig);
-    const defaultSearchConfig = {
+    const defaultSearchConfig2 = {
       enabled: true,
       position: "top-left",
       placeholder: "搜索地点...",
@@ -468814,7 +468948,7 @@ class MapManager {
         zoomLevel: 16
       }
     };
-    this.searchMarkerManager = new SearchMarkerManager(this.map, defaultSearchConfig);
+    this.searchMarkerManager = new SearchMarkerManager(this.map, defaultSearchConfig2);
     this.featureHighlightManager = new FeatureHighlightManager(this.map);
     this.markerAdapter = new MarkerDrawingAdapter(this.map);
     this.drawingManager = new DrawingManager({ map: this.map });
@@ -469260,23 +469394,30 @@ class MapManager {
    * 搜索位置
    */
   async searchLocation(query) {
+    var _a3, _b3;
     if (!this.searchMarkerManager || !this.map)
       return [];
     try {
-      const { tiandituSearchApi: tiandituSearchApi2 } = await Promise.resolve().then(() => tiandituSearchApi$1);
-      const results = await tiandituSearchApi2.search(query);
-      if (results.length > 0) {
-        const result = results[0];
-        const coordinate = [parseFloat(result.lon), parseFloat(result.lat)];
-        this.searchMarkerManager.addSearchMarkers([{ coordinate, name: result.name }]);
-        const view = this.map.getView();
-        const projection2 = view.getProjection().getCode();
-        const targetCoordinate = projection2 === "EPSG:4326" || projection2 === "EPSG:4490" ? coordinate : fromLonLat$1(coordinate);
-        view.animate({
-          center: targetCoordinate,
-          zoom: 16,
-          duration: 1e3
-        });
+      const { MapSearchService: MapSearchService2, defaultSearchConfig: defaultSearchConfig2 } = await Promise.resolve().then(() => searchService);
+      const searchConfig = ((_b3 = (_a3 = this.config) == null ? void 0 : _a3.controls) == null ? void 0 : _b3.search) ? { ...defaultSearchConfig2, ...this.config.controls.search } : defaultSearchConfig2;
+      if (searchConfig.enabled === false) {
+        return [];
+      }
+      if (searchConfig.provider === "layer") {
+        const layerResults = await this.searchLayersByAttribute(query, searchConfig);
+        if (layerResults && layerResults.length > 0) {
+          this.searchMarkerManager.updateConfig(searchConfig);
+          this.searchMarkerManager.addSearchMarkers(layerResults);
+          this.searchMarkerManager.locateToResult(layerResults[0]);
+        }
+        return layerResults;
+      }
+      const searchService$1 = new MapSearchService2(searchConfig);
+      const results = await searchService$1.search(query);
+      if (results && results.length > 0) {
+        this.searchMarkerManager.updateConfig(searchConfig);
+        this.searchMarkerManager.addSearchMarkers(results);
+        this.searchMarkerManager.locateToResult(results[0]);
       }
       return results;
     } catch (error2) {
@@ -469284,6 +469425,101 @@ class MapManager {
       throw error2;
     }
   }
+  /**
+   * 在已加载的矢量图层中按属性搜索
+   */
+  async searchLayersByAttribute(query, searchConfig) {
+    var _a3, _b3, _c2, _d, _e2, _f;
+    try {
+      if (!this.layerManager || !this.map || !query || query.trim().length < (searchConfig.minSearchLength || 2)) {
+        return [];
+      }
+      const q2 = query.trim().toLowerCase();
+      const results = [];
+      const mapProj = this.map.getView().getProjection();
+      const layerSearch = searchConfig.layerSearch || {};
+      const onlyVisible = layerSearch.onlyVisible ?? true;
+      const targetLayerIds = Array.isArray(layerSearch.layers) ? new Set(layerSearch.layers) : null;
+      const attrKeys = Array.isArray(layerSearch.attributeKeys) ? layerSearch.attributeKeys : void 0;
+      const perLayerLimit = layerSearch.maxPerLayer ?? searchConfig.maxResults ?? 10;
+      const allConfigs = this.layerManager.getAllLayerConfigs();
+      const targetConfigs = allConfigs.filter((cfg) => {
+        if (targetLayerIds && !targetLayerIds.has(cfg.id))
+          return false;
+        if (onlyVisible && cfg.visible === false)
+          return false;
+        const t3 = (cfg.type || "").toLowerCase();
+        return t3 === "vector" || t3 === "geojson" || t3 === "wfs";
+      });
+      for (const cfg of targetConfigs) {
+        const handler = this.layerManager.getLayerHandler(cfg.id);
+        if (!handler)
+          continue;
+        const layer2 = (_a3 = handler.getLayer) == null ? void 0 : _a3.call(handler);
+        if (!layer2 || typeof layer2.getSource !== "function")
+          continue;
+        const source = layer2.getSource();
+        if (!source || typeof source.getFeatures !== "function")
+          continue;
+        const features2 = source.getFeatures() || [];
+        let count2 = 0;
+        for (const feature2 of features2) {
+          if (perLayerLimit && count2 >= perLayerLimit)
+            break;
+          const props = typeof feature2.getProperties === "function" ? feature2.getProperties() : {};
+          const { geometry: geometry2, ...dataProps } = props || {};
+          const keysToCheck = attrKeys && attrKeys.length > 0 ? attrKeys : Object.keys(dataProps).filter((k2) => {
+            const v5 = dataProps[k2];
+            return typeof v5 === "string" || typeof v5 === "number";
+          });
+          let matchedLabel;
+          for (const k2 of keysToCheck) {
+            const v5 = dataProps[k2];
+            if (v5 == null)
+              continue;
+            const s2 = String(v5).toLowerCase();
+            if (s2.includes(q2)) {
+              matchedLabel = String(v5);
+              break;
+            }
+          }
+          if (!matchedLabel)
+            continue;
+          const geom = typeof feature2.getGeometry === "function" ? feature2.getGeometry() : null;
+          if (!geom)
+            continue;
+          let center2;
+          const type = (_b3 = geom.getType) == null ? void 0 : _b3.call(geom);
+          if (type === "Point" && typeof geom.getCoordinates === "function") {
+            center2 = geom.getCoordinates();
+          } else {
+            const extent3 = (_c2 = geom.getExtent) == null ? void 0 : _c2.call(geom);
+            if (!extent3 || extent3.length < 4)
+              continue;
+            center2 = [(extent3[0] + extent3[2]) / 2, (extent3[1] + extent3[3]) / 2];
+          }
+          const [lng, lat2] = toLonLat$1(center2, mapProj);
+          const id = String(((_d = feature2.getId) == null ? void 0 : _d.call(feature2)) ?? ((_e2 = feature2.get) == null ? void 0 : _e2.call(feature2, "id")) ?? `${cfg.id}-${results.length + 1}`);
+          results.push({
+            id,
+            name: matchedLabel || cfg.name,
+            address: cfg.name || "",
+            location: [lng, lat2],
+            type: "layer-feature",
+            bounds: (_f = geom.getExtent) == null ? void 0 : _f.call(geom)
+          });
+          count2++;
+        }
+      }
+      if (searchConfig.maxResults && results.length > searchConfig.maxResults) {
+        return results.slice(0, searchConfig.maxResults);
+      }
+      return results;
+    } catch (err2) {
+      console.error("图层属性搜索失败:", err2);
+      return [];
+    }
+  }
   /**
    * 清除搜索标记
    */
@@ -469433,6 +469669,10 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
       });
     };
     const updateMapConfig = (config) => {
+      if (mapManager.value) {
+        mapManager.value.updateConfig(config);
+        return;
+      }
       if (!map2.value)
         return;
       const view = map2.value.getView();
@@ -469455,6 +469695,27 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
       width: typeof props.width === "number" ? `${props.width}px` : props.width,
       height: typeof props.height === "number" ? `${props.height}px` : props.height
     }));
+    const handleSearch = async (query) => {
+      if (!mapManager.value)
+        return;
+      try {
+        await mapManager.value.searchLocation(query);
+      } catch (error2) {
+        console.error("处理搜索失败:", error2);
+      }
+    };
+    const handleSearchSelect = (result) => {
+      var _a3;
+      const manager = (_a3 = mapManager.value) == null ? void 0 : _a3.getSearchMarkerManager();
+      if (manager) {
+        manager.locateToResult(result);
+      }
+    };
+    const handleSearchClear = () => {
+      if (mapManager.value) {
+        mapManager.value.clearSearchMarkers();
+      }
+    };
     __expose({
       getMap: () => map2.value,
       getMapManager: () => mapManager.value,
@@ -469474,7 +469735,11 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
         var _a3;
         return (_a3 = mapManager.value) == null ? void 0 : _a3.getEventManager();
       },
-      updateMapConfig
+      updateMapConfig,
+      // 搜索相关方法
+      handleSearch,
+      handleSearchSelect,
+      handleSearchClear
     });
     return (_ctx, _cache) => {
       const _directive_loading = resolveDirective("loading");
@@ -469495,7 +469760,7 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MapContainer = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__scopeId", "data-v-66697410"]]);
+const MapContainer = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__scopeId", "data-v-9ef2c9f4"]]);
 const _hoisted_1$k = ["href"];
 const _sfc_main$l = /* @__PURE__ */ defineComponent({
   __name: "index",
@@ -476654,19 +476919,16 @@ class TiandituSearchApi {
   }
 }
 const tiandituSearchApi = new TiandituSearchApi();
-const tiandituSearchApi$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  TiandituSearchApi,
-  tiandituSearchApi
-}, Symbol.toStringTag, { value: "Module" }));
 class MapSearchService {
-  // 5分钟缓存
-  constructor(config) {
+  constructor(config, deps) {
     __publicField(this, "config");
     __publicField(this, "cache", /* @__PURE__ */ new Map());
     __publicField(this, "cacheExpiry", /* @__PURE__ */ new Map());
     __publicField(this, "CACHE_DURATION", 5 * 60 * 1e3);
+    // 5分钟缓存
+    __publicField(this, "layerManager", null);
     this.config = config;
+    this.layerManager = (deps == null ? void 0 : deps.layerManager) ?? null;
   }
   /**
    * 搜索地址
@@ -476697,6 +476959,9 @@ class MapSearchService {
         case "custom":
           results = await this.searchCustom(query);
           break;
+        case "layer":
+          results = await this.searchLayer(query);
+          break;
         default:
           results = await this.searchTianditu(query);
       }
@@ -476871,6 +477136,106 @@ class MapSearchService {
       throw error2;
     }
   }
+  /**
+   * 图层属性搜索（本地矢量要素，纯列表，不进行地图操作）
+   */
+  async searchLayer(query) {
+    var _a3, _b3, _c2, _d;
+    try {
+      if (!this.layerManager) {
+        return [];
+      }
+      const minLen = this.config.minSearchLength || 2;
+      if (!query || query.trim().length < minLen) {
+        return [];
+      }
+      const q2 = query.trim().toLowerCase();
+      const results = [];
+      const layerSearch = this.config.layerSearch || {};
+      const onlyVisible = layerSearch.onlyVisible ?? true;
+      const targetLayerIds = Array.isArray(layerSearch.layers) ? new Set(layerSearch.layers) : null;
+      const attrKeys = Array.isArray(layerSearch.attributeKeys) ? layerSearch.attributeKeys : void 0;
+      const perLayerLimit = layerSearch.maxPerLayer ?? this.config.maxResults ?? 10;
+      const allConfigs = this.layerManager.getAllLayerConfigs();
+      const targetConfigs = allConfigs.filter((cfg) => {
+        if (targetLayerIds && !targetLayerIds.has(cfg.id))
+          return false;
+        if (onlyVisible && cfg.visible === false)
+          return false;
+        const t3 = (cfg.type || "").toLowerCase();
+        return t3 === "vector" || t3 === "geojson" || t3 === "wfs";
+      });
+      for (const cfg of targetConfigs) {
+        const handler = this.layerManager.getLayerHandler(cfg.id);
+        if (!handler)
+          continue;
+        const layer2 = (_a3 = handler.getLayer) == null ? void 0 : _a3.call(handler);
+        if (!layer2 || typeof layer2.getSource !== "function")
+          continue;
+        const source = layer2.getSource();
+        if (!source || typeof source.getFeatures !== "function")
+          continue;
+        const features2 = source.getFeatures() || [];
+        let count2 = 0;
+        for (const feature2 of features2) {
+          if (perLayerLimit && count2 >= perLayerLimit)
+            break;
+          const props = typeof feature2.getProperties === "function" ? feature2.getProperties() : {};
+          const { geometry: geometry2, ...dataProps } = props || {};
+          if (!geometry2 && typeof feature2.getGeometry === "function") {
+            dataProps.geometry = feature2.getGeometry();
+          }
+          const keysToCheck = attrKeys && attrKeys.length > 0 ? attrKeys : Object.keys(dataProps).filter((k2) => {
+            const v5 = dataProps[k2];
+            return typeof v5 === "string" || typeof v5 === "number";
+          });
+          let matchedLabel;
+          for (const k2 of keysToCheck) {
+            const v5 = dataProps[k2];
+            if (v5 == null)
+              continue;
+            const s2 = String(v5).toLowerCase();
+            if (s2.includes(q2)) {
+              matchedLabel = String(v5);
+              break;
+            }
+          }
+          if (!matchedLabel)
+            continue;
+          const geom = typeof feature2.getGeometry === "function" ? feature2.getGeometry() : geometry2;
+          if (!geom)
+            continue;
+          let center2;
+          const type = (_b3 = geom.getType) == null ? void 0 : _b3.call(geom);
+          if (type === "Point" && typeof geom.getCoordinates === "function") {
+            center2 = geom.getCoordinates();
+          } else if (typeof geom.getExtent === "function") {
+            const extent3 = geom.getExtent();
+            if (extent3 && extent3.length >= 4) {
+              center2 = [(extent3[0] + extent3[2]) / 2, (extent3[1] + extent3[3]) / 2];
+            }
+          }
+          const id = String(((_c2 = feature2.getId) == null ? void 0 : _c2.call(feature2)) ?? ((_d = feature2.get) == null ? void 0 : _d.call(feature2, "id")) ?? `${cfg.id}-${results.length + 1}`);
+          results.push({
+            id,
+            name: matchedLabel || cfg.name,
+            address: cfg.name || "",
+            location: center2 || [0, 0],
+            type: "layer-feature",
+            bounds: typeof geom.getExtent === "function" ? geom.getExtent() : void 0
+          });
+          count2++;
+        }
+      }
+      if (this.config.maxResults && results.length > this.config.maxResults) {
+        return results.slice(0, this.config.maxResults);
+      }
+      return results;
+    } catch (error2) {
+      console.error("图层属性搜索失败:", error2);
+      return [];
+    }
+  }
   /**
    * 解析百度地图结果
    */
@@ -476983,7 +477348,34 @@ class MapSearchService {
     this.config = config;
     this.clearCache();
   }
+  /**
+   * 设置图层管理器（用于图层搜索）
+   */
+  setLayerManager(manager) {
+    this.layerManager = manager ?? null;
+  }
 }
+const defaultSearchConfig = {
+  enabled: true,
+  position: "top-left",
+  placeholder: "搜索地点...",
+  provider: "tianditu",
+  maxResults: 10,
+  showHistory: true,
+  searchDelay: 300,
+  minSearchLength: 2,
+  resultStyle: {
+    markerColor: "#409eff",
+    markerSize: 20,
+    highlightColor: "#67c23a",
+    zoomLevel: 16
+  }
+};
+const searchService = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  MapSearchService,
+  defaultSearchConfig
+}, Symbol.toStringTag, { value: "Module" }));
 const _hoisted_1$7 = { class: "search-input-wrapper" };
 const _hoisted_2$7 = { class: "search-results" };
 const _hoisted_3$7 = {
@@ -477040,7 +477432,8 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const searchService = new MapSearchService(props.config);
+    const injectedLayerManager = inject("layerManager");
+    const searchService2 = new MapSearchService(props.config, { layerManager: (injectedLayerManager == null ? void 0 : injectedLayerManager.value) || null });
     const searchQuery = ref("");
     const searchResults = ref([]);
     const searchHistory = ref([]);
@@ -477142,7 +477535,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
       isLoading.value = true;
       showResults.value = true;
       try {
-        const results = await searchService.search(query);
+        const results = await searchService2.search(query);
         searchResults.value = results;
         emit("search", query);
       } catch (error2) {
@@ -477239,13 +477632,20 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     watch(
       () => props.config,
       (newConfig) => {
-        searchService.updateConfig(newConfig);
+        searchService2.updateConfig(newConfig);
         searchResults.value = [];
         selectedIndex.value = -1;
         console.log("MapSearch配置已更新:", newConfig);
       },
       { deep: true }
     );
+    watch(
+      () => injectedLayerManager == null ? void 0 : injectedLayerManager.value,
+      (lm) => {
+        searchService2.setLayerManager(lm || null);
+      },
+      { immediate: true }
+    );
     __expose({
       updateResults,
       clearResults,
@@ -481216,23 +481616,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     };
     const onSearch = (query) => {
-      debugger;
-      if (mapContainerRef.value && mapContainerRef.value.handleSearch) {
-        mapContainerRef.value.handleSearch(query);
-      }
       emit("search", query);
     };
     const onSearchSelect = (result) => {
-      if (mapContainerRef.value && mapContainerRef.value.handleSearchSelect) {
-        mapContainerRef.value.handleSearchSelect(result);
-      }
-      debugger;
       emit("search-select", result);
     };
     const onSearchClear = () => {
-      if (mapContainerRef.value && mapContainerRef.value.handleSearchClear) {
-        mapContainerRef.value.handleSearchClear();
-      }
       emit("search-clear");
     };
     const onLayerChange = (layer2) => {
@@ -481861,7 +482250,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const CustomOpenlayer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-913ddcb9"]]);
+const CustomOpenlayer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c8137b4e"]]);
 var u8 = Uint8Array;
 var u16 = Uint16Array;
 var i32 = Int32Array;
@@ -490133,7 +490522,7 @@ function(t3) {
  */
 function(t3) {
   function e8() {
-    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-a3c51163.mjs")).catch(function(t4) {
+    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-7867bf7f.mjs")).catch(function(t4) {
       return Promise.reject(new Error("Could not load canvg: " + t4));
     }).then(function(t4) {
       return t4.default ? t4.default : t4;