vue-openlayers-plugin 1.1.14 → 1.1.16

package/lib/{index-e868c4e2.mjs → index-198a96d2.mjs}

@@ -67661,6 +67661,7 @@ class GeoJSONLayerHandler extends BaseLayer2 {
     __publicField(this, "vectorSource", null);
     __publicField(this, "refreshTimer", null);
     __publicField(this, "refreshDebounceTimer", null);
+    __publicField(this, "initialRefreshTimer", null);
     __publicField(this, "moveEndListener", null);
     __publicField(this, "lastKnownZoom");
     __publicField(this, "isRefreshing", false);
@@ -67682,16 +67683,13 @@ class GeoJSONLayerHandler extends BaseLayer2 {
     this.setupRefreshBehavior();
     return vectorLayer;
   }
-  /**
-   * 创建矢量数据源
-   */
   createVectorSource() {
     this.registerCustomProjection();
     return new VectorSource$1();
   }
   getGeoJSONConfig() {
-    var _a2;
-    const nestedConfig = this.config.geojsonConfig || ((_a2 = this.config.config) == null ? void 0 : _a2.geojson);
+    var _a2, _b2, _c2;
+    const nestedConfig = this.config.geojsonConfig || ((_b2 = (_a2 = this.config.config) == null ? void 0 : _a2.vector) == null ? void 0 : _b2.geojson) || ((_c2 = this.config.config) == null ? void 0 : _c2.geojson);
     const requestConfig = {
       url: this.config.url,
       method: this.config.method,
@@ -67701,12 +67699,33 @@ class GeoJSONLayerHandler extends BaseLayer2 {
       dataPath: this.config.dataPath,
       ...(nestedConfig == null ? void 0 : nestedConfig.request) || {}
     };
+    const normalizedRequestConfig = this.normalizeRequestConfig(requestConfig);
     return {
       data: (nestedConfig == null ? void 0 : nestedConfig.data) ?? this.config.data,
       dataPath: (nestedConfig == null ? void 0 : nestedConfig.dataPath) ?? this.config.dataPath,
       clearOnError: (nestedConfig == null ? void 0 : nestedConfig.clearOnError) ?? false,
       refresh: nestedConfig == null ? void 0 : nestedConfig.refresh,
-      request: requestConfig.url || (nestedConfig == null ? void 0 : nestedConfig.request) ? requestConfig : void 0
+      request: normalizedRequestConfig.url || (nestedConfig == null ? void 0 : nestedConfig.request) ? normalizedRequestConfig : void 0
+    };
+  }
+  normalizeRequestConfig(requestConfig) {
+    var _a2;
+    const normalizedParams = {
+      ...requestConfig.params || {}
+    };
+    const landTypeParamName = requestConfig.landTypeParamName || "landType";
+    const landTypeValue = requestConfig.landType ?? this.config.geojsonLandType ?? normalizedParams[landTypeParamName] ?? normalizedParams.landType;
+    if (landTypeValue !== void 0 && normalizedParams[landTypeParamName] === void 0) {
+      normalizedParams[landTypeParamName] = landTypeValue;
+    }
+    const managementUnitParamName = requestConfig.managementUnitParamName || "managementUnit";
+    const managementUnitValue = requestConfig.managementUnit ?? this.config.managementUnit ?? ((_a2 = this.config.metadata) == null ? void 0 : _a2.managementUnit) ?? normalizedParams[managementUnitParamName] ?? normalizedParams.managementUnit;
+    if (managementUnitValue !== void 0 && normalizedParams[managementUnitParamName] === void 0) {
+      normalizedParams[managementUnitParamName] = managementUnitValue;
+    }
+    return {
+      ...requestConfig,
+      params: normalizedParams
     };
   }
   getDataProjection() {
@@ -67719,20 +67738,30 @@ class GeoJSONLayerHandler extends BaseLayer2 {
   async initializeSource() {
     var _a2;
     const source = this.getVectorSource();
-    if (!source)
+    if (!source) {
       return;
+    }
     const geojsonConfig = this.getGeoJSONConfig();
     if (geojsonConfig.data) {
       this.applyGeoJSONData(geojsonConfig.data);
       return;
     }
     if (((_a2 = geojsonConfig.request) == null ? void 0 : _a2.url) || this.config.url) {
-      await this.refresh();
+      this.scheduleInitialRefresh();
       return;
     }
     source.clear();
     this.originalFeatures = [];
   }
+  scheduleInitialRefresh() {
+    if (this.initialRefreshTimer) {
+      clearTimeout(this.initialRefreshTimer);
+    }
+    this.initialRefreshTimer = setTimeout(() => {
+      this.initialRefreshTimer = null;
+      void this.refresh();
+    }, 0);
+  }
   getVectorSource() {
     if (this.vectorSource) {
       return this.vectorSource;
@@ -67746,8 +67775,9 @@ class GeoJSONLayerHandler extends BaseLayer2 {
   }
   applyGeoJSONData(data) {
     const source = this.getVectorSource();
-    if (!source)
+    if (!source) {
       return;
+    }
     const features2 = this.readFeaturesFromData(data);
     source.clear();
     source.addFeatures(features2);
@@ -67771,7 +67801,7 @@ class GeoJSONLayerHandler extends BaseLayer2 {
       }
       try {
         return this.normalizeGeoJSONData(JSON.parse(trimmed));
-      } catch (error2) {
+      } catch {
         throw new Error("GeoJSON 字符串解析失败");
       }
     }
@@ -67855,15 +67885,17 @@ class GeoJSONLayerHandler extends BaseLayer2 {
     };
   }
   createRequestUrl(url, params, method) {
-    const requestUrl = new URL(url, window.location.origin);
+    var _a2;
+    const baseOrigin = typeof window !== "undefined" && ((_a2 = window.location) == null ? void 0 : _a2.origin) ? window.location.origin : "http://localhost";
+    const requestUrl = new URL(url, baseOrigin);
     Object.entries(params).forEach(([key, value]) => {
       if (value === void 0 || value === null || method !== "GET") {
         return;
       }
       if (Array.isArray(value)) {
-        value.forEach(
-          (item) => requestUrl.searchParams.append(key, String(item))
-        );
+        value.forEach((item) => {
+          requestUrl.searchParams.append(key, String(item));
+        });
         return;
       }
       requestUrl.searchParams.set(key, String(value));
@@ -67873,6 +67905,8 @@ class GeoJSONLayerHandler extends BaseLayer2 {
   async refresh(overrides) {
     const geojsonConfig = this.getGeoJSONConfig();
     const requestConfig = geojsonConfig.request;
+    let requestUrl = "";
+    let requestMethod = (requestConfig == null ? void 0 : requestConfig.method) || "GET";
     if (!(requestConfig == null ? void 0 : requestConfig.url)) {
       if (geojsonConfig.data) {
         this.applyGeoJSONData(geojsonConfig.data);
@@ -67885,12 +67919,13 @@ class GeoJSONLayerHandler extends BaseLayer2 {
     this.isRefreshing = true;
     try {
       const refreshPayload = this.buildExtentPayload(geojsonConfig.refresh);
+      const currentRequestBody = (overrides == null ? void 0 : overrides.body) ?? requestConfig.body;
       const context = this.buildRequestContext({
         params: {
           ...refreshPayload.params || {},
           ...(overrides == null ? void 0 : overrides.params) || {}
         },
-        body: typeof refreshPayload.body === "object" && !Array.isArray(refreshPayload.body) && typeof ((overrides == null ? void 0 : overrides.body) || requestConfig.body) === "object" && !Array.isArray((overrides == null ? void 0 : overrides.body) || requestConfig.body) ? {
+        body: typeof refreshPayload.body === "object" && !Array.isArray(refreshPayload.body) && typeof currentRequestBody === "object" && !Array.isArray(currentRequestBody) ? {
           ...requestConfig.body,
           ...refreshPayload.body,
           ...overrides == null ? void 0 : overrides.body
@@ -67921,17 +67956,19 @@ class GeoJSONLayerHandler extends BaseLayer2 {
           }
         };
       }
-      const requestUrl = this.createRequestUrl(
+      requestMethod = request.method;
+      requestUrl = this.createRequestUrl(
         request.url,
         request.params,
         request.method
       );
+      const requestHeaders = request.method === "GET" ? { ...request.headers } : {
+        "Content-Type": "application/json;charset=UTF-8",
+        ...request.headers
+      };
       const response = await fetch(requestUrl, {
         method: request.method,
-        headers: {
-          "Content-Type": request.method === "GET" ? void 0 : "application/json;charset=UTF-8",
-          ...request.headers
-        },
+        headers: requestHeaders,
         body: request.method === "GET" || request.body === void 0 ? void 0 : typeof request.body === "string" ? request.body : JSON.stringify(request.body)
       });
       if (!response.ok) {
@@ -67968,7 +68005,10 @@ class GeoJSONLayerHandler extends BaseLayer2 {
         source == null ? void 0 : source.clear();
         this.originalFeatures = [];
       }
-      throw error2;
+      const errorMessage = error2 instanceof Error ? error2.message : String(error2);
+      throw new Error(
+        `GeoJSON 请求失败 [${this.config.id}] ${requestMethod} ${requestUrl || requestConfig.url}: ${errorMessage}`
+      );
     } finally {
       this.isRefreshing = false;
     }
@@ -68726,6 +68766,10 @@ class GeoJSONLayerHandler extends BaseLayer2 {
   }
   destroy() {
     this.clearRefreshBehavior();
+    if (this.initialRefreshTimer) {
+      clearTimeout(this.initialRefreshTimer);
+      this.initialRefreshTimer = null;
+    }
     this.vectorSource = null;
     super.destroy();
   }
@@ -333732,72 +333776,6 @@ class LayerManager {
   getLayerHandler(layerId) {
     return this.layerHandlers.get(layerId);
   }
-  async refreshLayer(layerId, options) {
-    try {
-      const config = this.getLayerConfig(layerId);
-      if (!config) {
-        return false;
-      }
-      if (!this.layerHandlers.has(layerId) && config.visible) {
-        const loaded = await this.loadLayerOnDemand(layerId);
-        if (!loaded) {
-          return false;
-        }
-      }
-      const handler = this.layerHandlers.get(layerId);
-      if (!(handler == null ? void 0 : handler.refresh)) {
-        return false;
-      }
-      await handler.refresh(options);
-      return true;
-    } catch (error2) {
-      console.error("刷新图层失败:", error2);
-      return false;
-    }
-  }
-  updateLayerRequestParams(layerId, params) {
-    var _a2, _b2, _c2, _d, _e2, _f, _g;
-    try {
-      const config = this.getLayerConfig(layerId);
-      if (!config) {
-        return false;
-      }
-      const nextConfig = {
-        ...config,
-        params: {
-          ...config.params || {},
-          ...params
-        },
-        geojsonConfig: {
-          ...config.geojsonConfig || ((_a2 = config.config) == null ? void 0 : _a2.geojson) || {},
-          request: {
-            ...((_c2 = config.geojsonConfig || ((_b2 = config.config) == null ? void 0 : _b2.geojson)) == null ? void 0 : _c2.request) || {},
-            params: {
-              ...((_f = (_e2 = config.geojsonConfig || ((_d = config.config) == null ? void 0 : _d.geojson)) == null ? void 0 : _e2.request) == null ? void 0 : _f.params) || {},
-              ...params
-            }
-          }
-        }
-      };
-      if (this.layerConfigs.has(layerId)) {
-        this.layerConfigs.set(layerId, nextConfig);
-      }
-      if (this.pendingLayerConfigs.has(layerId)) {
-        this.pendingLayerConfigs.set(layerId, nextConfig);
-      }
-      const handler = this.layerHandlers.get(layerId);
-      (_g = handler == null ? void 0 : handler.updateRequestParams) == null ? void 0 : _g.call(handler, params);
-      this.saveLayerConfigs();
-      this.eventBus.emit("layer-config-updated", {
-        layerId,
-        config: nextConfig
-      });
-      return true;
-    } catch (error2) {
-      console.error("更新图层请求参数失败:", error2);
-      return false;
-    }
-  }
   /**
    * 设置底图图层ID列表（用于底图互斥判断）
    */
@@ -334115,25 +334093,74 @@ class LayerManager {
     }
     return void 0;
   }
+  async refreshLayer(layerId, options) {
+    try {
+      const handler = this.layerHandlers.get(layerId);
+      if (!handler || typeof handler.refresh !== "function") {
+        return false;
+      }
+      await handler.refresh(options);
+      return true;
+    } catch (error2) {
+      console.error("刷新图层失败:", error2);
+      return false;
+    }
+  }
+  updateLayerRequestParams(layerId, params) {
+    var _a2, _b2, _c2, _d, _e2, _f, _g, _h, _i2, _j, _k, _l, _m, _n2, _o2, _p, _q, _r2, _s;
+    try {
+      const config = this.getLayerConfig(layerId);
+      if (!config) {
+        return false;
+      }
+      const nextConfig = {
+        ...config,
+        params: {
+          ...config.params || {},
+          ...params
+        },
+        geojsonConfig: {
+          ...config.geojsonConfig || ((_b2 = (_a2 = config.config) == null ? void 0 : _a2.vector) == null ? void 0 : _b2.geojson) || ((_c2 = config.config) == null ? void 0 : _c2.geojson) || {},
+          request: {
+            ...((_d = config.geojsonConfig) == null ? void 0 : _d.request) || ((_g = (_f = (_e2 = config.config) == null ? void 0 : _e2.vector) == null ? void 0 : _f.geojson) == null ? void 0 : _g.request) || ((_i2 = (_h = config.config) == null ? void 0 : _h.geojson) == null ? void 0 : _i2.request) || {},
+            params: {
+              ...((_k = (_j = config.geojsonConfig) == null ? void 0 : _j.request) == null ? void 0 : _k.params) || ((_o2 = (_n2 = (_m = (_l = config.config) == null ? void 0 : _l.vector) == null ? void 0 : _m.geojson) == null ? void 0 : _n2.request) == null ? void 0 : _o2.params) || ((_r2 = (_q = (_p = config.config) == null ? void 0 : _p.geojson) == null ? void 0 : _q.request) == null ? void 0 : _r2.params) || {},
+              ...params
+            }
+          }
+        }
+      };
+      if (this.layerConfigs.has(layerId)) {
+        this.layerConfigs.set(layerId, nextConfig);
+      }
+      if (this.pendingLayerConfigs.has(layerId)) {
+        this.pendingLayerConfigs.set(layerId, nextConfig);
+      }
+      const handler = this.layerHandlers.get(layerId);
+      (_s = handler == null ? void 0 : handler.updateRequestParams) == null ? void 0 : _s.call(handler, params);
+      this.saveLayerConfigs();
+      this.eventBus.emit("layer-config-updated", {
+        layerId,
+        config: nextConfig
+      });
+      return true;
+    } catch (error2) {
+      console.error("更新图层请求参数失败:", error2);
+      return false;
+    }
+  }
   /**
    * 更新图层配置
    */
   updateLayerConfig(layerId, newConfig) {
     try {
       const handler = this.layerHandlers.get(layerId);
-      const config = this.layerConfigs.get(layerId) || this.pendingLayerConfigs.get(layerId);
-      if (config) {
+      const config = this.layerConfigs.get(layerId);
+      if (handler && config) {
         const updatedConfig = { ...config, ...newConfig };
-        if (this.layerConfigs.has(layerId)) {
-          this.layerConfigs.set(layerId, updatedConfig);
-        }
-        if (this.pendingLayerConfigs.has(layerId)) {
-          this.pendingLayerConfigs.set(layerId, updatedConfig);
-        }
-        if (handler) {
-          handler.updateConfig(newConfig);
-        }
-        if (handler && (newConfig.style || newConfig.customCss !== void 0)) {
+        this.layerConfigs.set(layerId, updatedConfig);
+        handler.updateConfig(newConfig);
+        if (newConfig.style || newConfig.customCss !== void 0) {
           if ("updateLayerStyles" in handler) {
             handler.updateLayerStyles(
               updatedConfig.style,
@@ -337370,19 +337397,19 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
   }
 });
 const defaultComponents = {
-  measurement: () => import("./MeasurementDialog-44599074.mjs"),
-  basemap: () => import("./BasemapPanel-d022a31a.mjs"),
-  print: () => import("./MapPrintDialog-c65f685b.mjs"),
-  "layer-panel": () => import("./LayerPanel-1a0456a4.mjs"),
-  coordinate: () => import("./CoordinateLocationDialog-6cdf239b.mjs"),
-  "region-navigation": () => import("./RegionNavigationDialog-b1cdc5f9.mjs"),
-  "my-markers": () => import("./MyMarkersDialog-dd288574.mjs"),
-  "view-bookmarks": () => import("./ViewBookmarksDialog-2a6bc942.mjs"),
-  "map-drawing": () => import("./index-199c60c9.mjs"),
-  "filter-panel": () => import("./FilterPanel-de00b336.mjs"),
-  "swipe-compare": () => import("./SwipeCompareDialog-dfae0afd.mjs"),
-  "split-compare": () => import("./SplitCompareDialog-6dd0fb71.mjs"),
-  "quad-compare": () => import("./QuadCompareDialog-2cd17881.mjs")
+  measurement: () => import("./MeasurementDialog-9914f4e9.mjs"),
+  basemap: () => import("./BasemapPanel-d1332546.mjs"),
+  print: () => import("./MapPrintDialog-eea9e39e.mjs"),
+  "layer-panel": () => import("./LayerPanel-f411a32b.mjs"),
+  coordinate: () => import("./CoordinateLocationDialog-c2d89c1e.mjs"),
+  "region-navigation": () => import("./RegionNavigationDialog-2843eedd.mjs"),
+  "my-markers": () => import("./MyMarkersDialog-ef717e8c.mjs"),
+  "view-bookmarks": () => import("./ViewBookmarksDialog-d3e38c53.mjs"),
+  "map-drawing": () => import("./index-92020358.mjs"),
+  "filter-panel": () => import("./FilterPanel-d7cb1c79.mjs"),
+  "swipe-compare": () => import("./SwipeCompareDialog-547de7ee.mjs"),
+  "split-compare": () => import("./SplitCompareDialog-1e678e69.mjs"),
+  "quad-compare": () => import("./QuadCompareDialog-3d6eaf0c.mjs")
 };
 const _DialogRegistry = class _DialogRegistry {
   constructor() {
@@ -352410,7 +352437,7 @@ function(t3) {
  */
 function(t3) {
   function e8() {
-    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-560c236e.mjs")).catch(function(t4) {
+    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-dd926512.mjs")).catch(function(t4) {
       return Promise.reject(new Error("Could not load canvg: " + t4));
     }).then(function(t4) {
       return t4.default ? t4.default : t4;

package/lib/{index-199c60c9.mjs → index-92020358.mjs}

@@ -1,6 +1,6 @@
 import { inject, computed, ref, onMounted, resolveComponent, openBlock, createElementBlock, createVNode, withCtx, Fragment, renderList, createElementVNode, normalizeClass, toDisplayString, unref, createTextVNode, createCommentVNode, createBlock } from "vue";
 import { Close } from "@element-plus/icons-vue";
-import { b as _export_sfc, D as DrawingManager, X } from "./index-e868c4e2.mjs";
+import { b as _export_sfc, D as DrawingManager, X } from "./index-198a96d2.mjs";
 import "ol";
 import "proj4";
 import "@supermapgis/iclient-ol";

package/lib/{index.es-560c236e.mjs → index.es-dd926512.mjs}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, g as getDefaultExportFromCjs, _ as _asyncToGenerator, a as _defineProperty } from "./index-e868c4e2.mjs";
+import { c as commonjsGlobal, g as getDefaultExportFromCjs, _ as _asyncToGenerator, a as _defineProperty } from "./index-198a96d2.mjs";
 import "vue";
 import "@element-plus/icons-vue";
 import "ol";

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-import { ad, a0, K, O, a4, D, aA, a9, ac, aF, aE, ak, al, aw, ax, Y, am, an, aD, aB, $, Z, ay, az, B, E, F, A, J, y, C, z, G, au, av, as, at, aq, ar, x, s, q, w, O as O2, p, u, v, ae, af, ai, aj, ao, ap, aG, N, ag, ah, U, ab, a1, a5, a8, Q, f, W, aa, a6, a2, a3, aC, P, a7, l, S, r, R } from "./index-e868c4e2.mjs";
+import { ad, a0, K, O, a4, D, aA, a9, ac, aF, aE, ak, al, aw, ax, Y, am, an, aD, aB, $, Z, ay, az, B, E, F, A, J, y, C, z, G, au, av, as, at, aq, ar, x, s, q, w, O as O2, p, u, v, ae, af, ai, aj, ao, ap, aG, N, ag, ah, U, ab, a1, a5, a8, Q, f, W, aa, a6, a2, a3, aC, P, a7, l, S, r, R } from "./index-198a96d2.mjs";
 import "vue";
 import "@element-plus/icons-vue";
 import "ol";