vue-openlayers-plugin 1.0.33 → 1.0.34

package/lib/{index-ce768f90.mjs → index-d683decb.mjs}

@@ -463086,6 +463086,53 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
     __publicField(this, "styleApplyAttempts", 0);
     __publicField(this, "maxStyleApplyAttempts", 5);
   }
+  /**
+   * 转换SuperMap返回的数据格式为标准格式
+   * 将fieldNames和fieldValues转换为标准的key-value properties格式
+   * @param feature SuperMap返回的要素数据
+   * @returns 转换后的标准格式数据
+   */
+  transformSupermapFeature(feature2) {
+    console.log("transformSupermapFeature 输入:", feature2);
+    console.log("输入类型:", typeof feature2);
+    console.log("是否有fieldNames:", !!feature2.fieldNames);
+    console.log("是否有fieldValues:", !!feature2.fieldValues);
+    console.log("fieldNames类型:", Array.isArray(feature2.fieldNames) ? "array" : typeof feature2.fieldNames);
+    console.log("fieldValues类型:", Array.isArray(feature2.fieldValues) ? "array" : typeof feature2.fieldValues);
+    const hasFieldNames = feature2.fieldNames && (Array.isArray(feature2.fieldNames) || feature2.fieldNames.length !== void 0);
+    const hasFieldValues = feature2.fieldValues && (Array.isArray(feature2.fieldValues) || feature2.fieldValues.length !== void 0);
+    console.log("hasFieldNames:", hasFieldNames);
+    console.log("hasFieldValues:", hasFieldValues);
+    if (hasFieldNames && hasFieldValues) {
+      const properties = {};
+      console.log("开始转换 fieldNames:", feature2.fieldNames);
+      console.log("开始转换 fieldValues:", feature2.fieldValues);
+      const fieldNames2 = Array.isArray(feature2.fieldNames) ? feature2.fieldNames : Object.values(feature2.fieldNames || {});
+      const fieldValues = Array.isArray(feature2.fieldValues) ? feature2.fieldValues : Object.values(feature2.fieldValues || {});
+      console.log("转换后的fieldNames数组:", fieldNames2);
+      console.log("转换后的fieldValues数组:", fieldValues);
+      fieldNames2.forEach((fieldName, index2) => {
+        if (index2 < fieldValues.length) {
+          properties[fieldName] = fieldValues[index2];
+          console.log(`转换字段: ${fieldName} = ${fieldValues[index2]}`);
+        }
+      });
+      console.log("转换后的 properties:", properties);
+      const result = {
+        ...feature2,
+        properties,
+        // 保留原始的fieldNames和fieldValues以备需要
+        _original: {
+          fieldNames: feature2.fieldNames,
+          fieldValues: feature2.fieldValues
+        }
+      };
+      console.log("transformSupermapFeature 输出:", result);
+      return result;
+    }
+    console.log("不是SuperMap格式，直接返回:", feature2);
+    return feature2;
+  }
   setupEPSG4490() {
     (void 0)("EPSG:4490", "+proj=longlat +ellps=GRS80 +no_defs +type=crs");
     register$3(proj4$2);
@@ -463495,7 +463542,18 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
             reject2(result.error);
             return;
           }
-          const features2 = ((_b3 = (_a3 = result.result) == null ? void 0 : _a3.features) == null ? void 0 : _b3.features) || [];
+          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) => {
@@ -463556,20 +463614,26 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
         new FeatureService2(serviceUrl).getFeaturesByBuffer(
           bufferParams,
           (serviceResult) => {
-            var _a3, _b3, _c2, _d, _e2;
+            var _a3, _b3, _c2, _d;
             console.log("serviceResult:", serviceResult);
             if (serviceResult.error) {
               console.error("iServer error:", serviceResult.error);
               reject2(new Error("iServer 返回错误，详见控制台"));
               return;
             }
-            const feats = ((_c2 = (_b3 = (_a3 = serviceResult.result) == null ? void 0 : _a3.features) == null ? void 0 : _b3.features) == null ? void 0 : _c2.map(
-              (f2) => new Feature$6(Util2.toSuperMapGeometry(f2.geometry))
-            )) ?? [];
+            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) {
-              (_d = vectorLayer.getSource()) == null ? void 0 : _d.clear();
+              (_c2 = vectorLayer.getSource()) == null ? void 0 : _c2.clear();
               if (feats.length) {
-                (_e2 = vectorLayer.getSource()) == null ? void 0 : _e2.addFeatures(feats);
+                (_d = vectorLayer.getSource()) == null ? void 0 : _d.addFeatures(feats);
               }
             }
             console.log("查询并绘制完成，count:", feats.length);
@@ -463957,14 +464021,26 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
         );
       }
       return features2.slice(0, maxFeatures).map((feature2) => {
-        const properties = feature2.getProperties() || {};
-        feature2.setProperties({
-          ...properties,
-          layerId: this.config.id,
-          layerName: this.config.name,
-          layerType: "supermap-rest"
-        });
-        return feature2;
+        if (feature2 && typeof feature2.getProperties === "function") {
+          const properties = feature2.getProperties() || {};
+          feature2.setProperties({
+            ...properties,
+            layerId: this.config.id,
+            layerName: this.config.name,
+            layerType: "supermap-rest"
+          });
+          return feature2;
+        } else {
+          return {
+            ...feature2,
+            properties: {
+              ...feature2.properties || {},
+              layerId: this.config.id,
+              layerName: this.config.name,
+              layerType: "supermap-rest"
+            }
+          };
+        }
       });
     } catch (error2) {
       console.error("获取要素信息失败:", error2);
@@ -477582,7 +477658,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const currentView = ref(props.config.defaultView || "table");
+    const currentView = ref(props.config.defaultView || "list");
     const searchQuery = ref("");
     const sortField = ref("");
     const sortOrder = ref("asc");
@@ -477928,7 +478004,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ArrayPopup = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-4a372183"]]);
+const ArrayPopup = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-140dd964"]]);
 class PopupManager {
   constructor(map2, config = {}) {
     __publicField(this, "map");
@@ -478630,20 +478706,52 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             if (targetLayer && targetLayer.popup) {
               const popupConfig = targetLayer.popup;
               console.log("显示SuperMap图层popup:", { layerId, layerName, feature: feature2, coordinate });
-              let properties = feature2.properties || feature2;
+              let properties;
+              if (feature2 && typeof feature2.getProperties === "function") {
+                properties = feature2.getProperties();
+                console.log("OpenLayers Feature属性:", properties);
+              } else if (feature2 && feature2.properties) {
+                properties = feature2.properties;
+                console.log("GeoJSON Feature属性:", properties);
+              } else {
+                properties = feature2;
+                console.log("其他格式属性:", properties);
+              }
+              console.log("SuperMap要素属性数据:", properties);
+              console.log("popup配置字段:", popupConfig.fields);
               let content2 = {};
+              let hasValidFields = false;
               if (popupConfig.fields && Array.isArray(popupConfig.fields)) {
                 popupConfig.fields.forEach((field) => {
                   if (typeof field === "string") {
-                    content2[field] = properties[field] || "--";
+                    const value = properties[field];
+                    console.log(`字段 ${field} 的值:`, value);
+                    if (value !== void 0 && value !== null) {
+                      content2[field] = value;
+                      hasValidFields = true;
+                    } else {
+                      content2[field] = "--";
+                    }
                   } else if (field.name) {
                     const displayName = field.label || field.name;
-                    content2[displayName] = properties[field.name] || "--";
+                    const value = properties[field.name];
+                    console.log(`字段 ${field.name} (${displayName}) 的值:`, value);
+                    if (value !== void 0 && value !== null) {
+                      content2[displayName] = value;
+                      hasValidFields = true;
+                    } else {
+                      content2[displayName] = "--";
+                    }
                   }
                 });
+                if (!hasValidFields && properties && Object.keys(properties).length > 0) {
+                  console.log("配置的字段无效，显示所有属性:", properties);
+                  content2 = { ...properties };
+                }
               } else {
                 content2 = properties;
               }
+              console.log("最终popup内容:", content2);
               const getPopupType = (config) => {
                 if (config.type) {
                   return config.type;
@@ -479518,7 +479626,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const CustomOpenlayer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-78070f98"]]);
+const CustomOpenlayer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-02822978"]]);
 var u8 = Uint8Array;
 var u16 = Uint16Array;
 var i32 = Int32Array;
@@ -487790,7 +487898,7 @@ function(t3) {
  */
 function(t3) {
   function e8() {
-    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-3480a166.mjs")).catch(function(t4) {
+    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-9e1aa406.mjs")).catch(function(t4) {
       return Promise.reject(new Error("Could not load canvg: " + t4));
     }).then(function(t4) {
       return t4.default ? t4.default : t4;

package/lib/{index.es-3480a166.mjs → index.es-9e1aa406.mjs}

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

package/lib/index.esm.js

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

package/lib/index.umd.js

@@ -463862,6 +463862,53 @@ ${this.attributes_.map(
       __publicField(this, "styleApplyAttempts", 0);
       __publicField(this, "maxStyleApplyAttempts", 5);
     }
+    /**
+     * 转换SuperMap返回的数据格式为标准格式
+     * 将fieldNames和fieldValues转换为标准的key-value properties格式
+     * @param feature SuperMap返回的要素数据
+     * @returns 转换后的标准格式数据
+     */
+    transformSupermapFeature(feature2) {
+      console.log("transformSupermapFeature 输入:", feature2);
+      console.log("输入类型:", typeof feature2);
+      console.log("是否有fieldNames:", !!feature2.fieldNames);
+      console.log("是否有fieldValues:", !!feature2.fieldValues);
+      console.log("fieldNames类型:", Array.isArray(feature2.fieldNames) ? "array" : typeof feature2.fieldNames);
+      console.log("fieldValues类型:", Array.isArray(feature2.fieldValues) ? "array" : typeof feature2.fieldValues);
+      const hasFieldNames = feature2.fieldNames && (Array.isArray(feature2.fieldNames) || feature2.fieldNames.length !== void 0);
+      const hasFieldValues = feature2.fieldValues && (Array.isArray(feature2.fieldValues) || feature2.fieldValues.length !== void 0);
+      console.log("hasFieldNames:", hasFieldNames);
+      console.log("hasFieldValues:", hasFieldValues);
+      if (hasFieldNames && hasFieldValues) {
+        const properties = {};
+        console.log("开始转换 fieldNames:", feature2.fieldNames);
+        console.log("开始转换 fieldValues:", feature2.fieldValues);
+        const fieldNames2 = Array.isArray(feature2.fieldNames) ? feature2.fieldNames : Object.values(feature2.fieldNames || {});
+        const fieldValues = Array.isArray(feature2.fieldValues) ? feature2.fieldValues : Object.values(feature2.fieldValues || {});
+        console.log("转换后的fieldNames数组:", fieldNames2);
+        console.log("转换后的fieldValues数组:", fieldValues);
+        fieldNames2.forEach((fieldName, index2) => {
+          if (index2 < fieldValues.length) {
+            properties[fieldName] = fieldValues[index2];
+            console.log(`转换字段: ${fieldName} = ${fieldValues[index2]}`);
+          }
+        });
+        console.log("转换后的 properties:", properties);
+        const result = {
+          ...feature2,
+          properties,
+          // 保留原始的fieldNames和fieldValues以备需要
+          _original: {
+            fieldNames: feature2.fieldNames,
+            fieldValues: feature2.fieldValues
+          }
+        };
+        console.log("transformSupermapFeature 输出:", result);
+        return result;
+      }
+      console.log("不是SuperMap格式，直接返回:", feature2);
+      return feature2;
+    }
     setupEPSG4490() {
       (void 0)("EPSG:4490", "+proj=longlat +ellps=GRS80 +no_defs +type=crs");
       register$3(proj4$2);
@@ -464271,7 +464318,18 @@ ${this.attributes_.map(
               reject2(result.error);
               return;
             }
-            const features2 = ((_b3 = (_a3 = result.result) == null ? void 0 : _a3.features) == null ? void 0 : _b3.features) || [];
+            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) => {
@@ -464332,20 +464390,26 @@ ${this.attributes_.map(
           new FeatureService(serviceUrl).getFeaturesByBuffer(
             bufferParams,
             (serviceResult) => {
-              var _a3, _b3, _c2, _d, _e2;
+              var _a3, _b3, _c2, _d;
               console.log("serviceResult:", serviceResult);
               if (serviceResult.error) {
                 console.error("iServer error:", serviceResult.error);
                 reject2(new Error("iServer 返回错误，详见控制台"));
                 return;
               }
-              const feats = ((_c2 = (_b3 = (_a3 = serviceResult.result) == null ? void 0 : _a3.features) == null ? void 0 : _b3.features) == null ? void 0 : _c2.map(
-                (f2) => new ol$1.Feature(Util.toSuperMapGeometry(f2.geometry))
-              )) ?? [];
+              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 ol$1.Feature(Util.toSuperMapGeometry(f2.geometry));
+                olFeat.setProperties(transformedFeature.properties || {});
+                return olFeat;
+              });
               if (vectorLayer) {
-                (_d = vectorLayer.getSource()) == null ? void 0 : _d.clear();
+                (_c2 = vectorLayer.getSource()) == null ? void 0 : _c2.clear();
                 if (feats.length) {
-                  (_e2 = vectorLayer.getSource()) == null ? void 0 : _e2.addFeatures(feats);
+                  (_d = vectorLayer.getSource()) == null ? void 0 : _d.addFeatures(feats);
                 }
               }
               console.log("查询并绘制完成，count:", feats.length);
@@ -464733,14 +464797,26 @@ ${this.attributes_.map(
           );
         }
         return features2.slice(0, maxFeatures).map((feature2) => {
-          const properties = feature2.getProperties() || {};
-          feature2.setProperties({
-            ...properties,
-            layerId: this.config.id,
-            layerName: this.config.name,
-            layerType: "supermap-rest"
-          });
-          return feature2;
+          if (feature2 && typeof feature2.getProperties === "function") {
+            const properties = feature2.getProperties() || {};
+            feature2.setProperties({
+              ...properties,
+              layerId: this.config.id,
+              layerName: this.config.name,
+              layerType: "supermap-rest"
+            });
+            return feature2;
+          } else {
+            return {
+              ...feature2,
+              properties: {
+                ...feature2.properties || {},
+                layerId: this.config.id,
+                layerName: this.config.name,
+                layerType: "supermap-rest"
+              }
+            };
+          }
         });
       } catch (error2) {
         console.error("获取要素信息失败:", error2);
@@ -478382,7 +478458,7 @@ ${this.attributes_.map(
     setup(__props, { emit: __emit }) {
       const props = __props;
       const emit = __emit;
-      const currentView = vue.ref(props.config.defaultView || "table");
+      const currentView = vue.ref(props.config.defaultView || "list");
       const searchQuery = vue.ref("");
       const sortField = vue.ref("");
       const sortOrder = vue.ref("asc");
@@ -478728,8 +478804,8 @@ ${this.attributes_.map(
       };
     }
   });
-  const ArrayPopup_vue_vue_type_style_index_0_scoped_4a372183_lang = "";
-  const ArrayPopup = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-4a372183"]]);
+  const ArrayPopup_vue_vue_type_style_index_0_scoped_140dd964_lang = "";
+  const ArrayPopup = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-140dd964"]]);
   class PopupManager {
     constructor(map2, config = {}) {
       __publicField(this, "map");
@@ -479431,20 +479507,52 @@ ${this.attributes_.map(
               if (targetLayer && targetLayer.popup) {
                 const popupConfig = targetLayer.popup;
                 console.log("显示SuperMap图层popup:", { layerId, layerName, feature: feature2, coordinate });
-                let properties = feature2.properties || feature2;
+                let properties;
+                if (feature2 && typeof feature2.getProperties === "function") {
+                  properties = feature2.getProperties();
+                  console.log("OpenLayers Feature属性:", properties);
+                } else if (feature2 && feature2.properties) {
+                  properties = feature2.properties;
+                  console.log("GeoJSON Feature属性:", properties);
+                } else {
+                  properties = feature2;
+                  console.log("其他格式属性:", properties);
+                }
+                console.log("SuperMap要素属性数据:", properties);
+                console.log("popup配置字段:", popupConfig.fields);
                 let content2 = {};
+                let hasValidFields = false;
                 if (popupConfig.fields && Array.isArray(popupConfig.fields)) {
                   popupConfig.fields.forEach((field) => {
                     if (typeof field === "string") {
-                      content2[field] = properties[field] || "--";
+                      const value = properties[field];
+                      console.log(`字段 ${field} 的值:`, value);
+                      if (value !== void 0 && value !== null) {
+                        content2[field] = value;
+                        hasValidFields = true;
+                      } else {
+                        content2[field] = "--";
+                      }
                     } else if (field.name) {
                       const displayName = field.label || field.name;
-                      content2[displayName] = properties[field.name] || "--";
+                      const value = properties[field.name];
+                      console.log(`字段 ${field.name} (${displayName}) 的值:`, value);
+                      if (value !== void 0 && value !== null) {
+                        content2[displayName] = value;
+                        hasValidFields = true;
+                      } else {
+                        content2[displayName] = "--";
+                      }
                     }
                   });
+                  if (!hasValidFields && properties && Object.keys(properties).length > 0) {
+                    console.log("配置的字段无效，显示所有属性:", properties);
+                    content2 = { ...properties };
+                  }
                 } else {
                   content2 = properties;
                 }
+                console.log("最终popup内容:", content2);
                 const getPopupType = (config) => {
                   if (config.type) {
                     return config.type;
@@ -480319,8 +480427,8 @@ ${this.attributes_.map(
       };
     }
   });
-  const index_vue_vue_type_style_index_0_scoped_78070f98_lang = "";
-  const CustomOpenlayer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-78070f98"]]);
+  const index_vue_vue_type_style_index_0_scoped_02822978_lang = "";
+  const CustomOpenlayer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-02822978"]]);
   const base = "";
   var u8 = Uint8Array, u16 = Uint16Array, i32 = Int32Array;
   var fleb = new u8([