qy-vue-plugins 1.0.2-beta → 1.0.2

package/dist/mapboxV2/utils.mjs

@@ -1,40 +1,40 @@
-import { useId as k } from "vue";
-import { d as m, a as b } from "../chunks/constant-BqK1UnfT.js";
-function T(r, e) {
-  let i = {
+import { useId as L } from "vue";
+import { d, a as w } from "../chunks/constant-E83OJqPQ.js";
+function z(i, e) {
+  let t = {
     marginTop: "-2px"
   };
-  switch (r) {
+  switch (i) {
     case "solid":
     case "solid-line":
-      i.borderBottom = `4px solid ${e}`;
+      t.borderBottom = `4px solid ${e}`;
       break;
     case "dash":
     case "dotted":
     case "simple-dash":
-      i.borderBottom = `4px dashed ${e}`;
+      t.borderBottom = `4px dashed ${e}`;
       break;
     case "dot-dash":
-      i.backgroundImage = `linear-gradient(to right, ${e} 25%, rgba(255, 255, 255, 0) 25%, rgba(255, 255, 255, 0) 50%, ${e} 50%, ${e} 75%, rgba(255, 255, 255, 0) 75%)`;
+      t.backgroundImage = `linear-gradient(to right, ${e} 25%, rgba(255, 255, 255, 0) 25%, rgba(255, 255, 255, 0) 50%, ${e} 50%, ${e} 75%, rgba(255, 255, 255, 0) 75%)`;
       break;
     case "long-dash":
-      i.backgroundImage = `linear-gradient(to right, ${e} 50%, rgba(255, 255, 255, 0) 50%)`;
+      t.backgroundImage = `linear-gradient(to right, ${e} 50%, rgba(255, 255, 255, 0) 50%)`;
       break;
     case "dot-line":
-      i.backgroundImage = `linear-gradient(to right, ${e} 25%, rgba(255, 255, 255, 0) 10%)`;
+      t.backgroundImage = `linear-gradient(to right, ${e} 25%, rgba(255, 255, 255, 0) 10%)`;
       break;
     case "complex-pattern":
-      i.backgroundImage = `linear-gradient(to right, ${e} 20%, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0) 40%, ${e} 40%, ${e} 60%, rgba(255, 255, 255, 0) 60%)`;
+      t.backgroundImage = `linear-gradient(to right, ${e} 20%, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0) 40%, ${e} 40%, ${e} 60%, rgba(255, 255, 255, 0) 60%)`;
       break;
     default:
-      i.borderBottom = `4px solid ${e}`;
+      t.borderBottom = `4px solid ${e}`;
       break;
   }
-  return i;
+  return t;
 }
-function z(r, e) {
-  if (r && typeof r != "string")
-    return r;
+function F(i, e) {
+  if (i && typeof i != "string")
+    return i;
   switch (e) {
     case "symbol":
     // 符号图层
@@ -46,47 +46,81 @@ function z(r, e) {
     case "track":
     // 调查轨迹
     case "interest-point":
-      return r ? JSON.parse(r || "{}") : b;
+      return i ? JSON.parse(i || "{}") : w;
     case "point":
-      return JSON.parse(r || "{}");
+      return JSON.parse(i || "{}");
     case "line":
-      return JSON.parse(r || "{}");
+      return JSON.parse(i || "{}");
     case "shape":
     // 形状图层
     case "shp":
-      return r ? JSON.parse(r || "{}") : m;
+    // SHP 文件图层
+    case "kml":
+    // KML 文件图层
+    case "kmz":
+    // KMZ 文件图层
+    case "tif":
+      return i ? JSON.parse(i || "{}") : d;
     default:
       throw new Error(`Unsupported layer type: ${e}`);
   }
 }
-function M(r) {
+function T(i) {
   try {
-    return `layer-id-${r.id}`;
+    return `layer-id-${i.id}`;
   } catch (e) {
-    return console.error("Error getting layer ID:", e), `layer-id-${k()}`;
+    return console.error("Error getting layer ID:", e), `layer-id-${L()}`;
   }
 }
-function A(r) {
+function M(i) {
   try {
-    return `source-id-${r.id}`;
+    return `source-id-${i.id}`;
   } catch (e) {
-    return console.error("Error getting source ID:", e), `source-id-${k()}`;
+    return console.error("Error getting source ID:", e), `source-id-${L()}`;
   }
 }
-function L(r) {
+function N(i) {
   try {
-    return r.layerPaintConfig ? JSON.parse(r.layerPaintConfig) : m;
+    const e = i.layerPaintConfig ? JSON.parse(i.layerPaintConfig) : d;
+    if (e && typeof e == "object") {
+      const t = e, l = {
+        ...d,
+        ...t
+      }, u = Array.isArray(t.symbolConfigList) ? t.symbolConfigList : [], s = Array.isArray(t.circleConfigList) ? t.circleConfigList : [];
+      return !u.length && s.length && (l.symbolConfigList = JSON.parse(
+        JSON.stringify(s)
+      )), !s.length && u.length && (l.circleConfigList = JSON.parse(
+        JSON.stringify(u)
+      )), (!Array.isArray(l.fillColorList) || l.fillColorList.length === 0) && (l.fillColorList = JSON.parse(
+        JSON.stringify(d.fillColorList || [])
+      )), (!Array.isArray(l.outlineConfigList) || l.outlineConfigList.length === 0) && (l.outlineConfigList = JSON.parse(
+        JSON.stringify(d.outlineConfigList || [])
+      )), (!Array.isArray(l.symbolConfigList) || l.symbolConfigList.length === 0) && (l.symbolConfigList = JSON.parse(
+        JSON.stringify(d.symbolConfigList || [])
+      )), (!Array.isArray(l.circleConfigList) || l.circleConfigList.length === 0) && (l.circleConfigList = JSON.parse(
+        JSON.stringify(d.circleConfigList || [])
+      )), (!l.fillOpacityConfig || typeof l.fillOpacityConfig.value != "number") && (l.fillOpacityConfig = JSON.parse(
+        JSON.stringify(d.fillOpacityConfig || { value: 1 })
+      )), l;
+    }
+    return d;
   } catch {
-    return m;
+    return d;
   }
 }
-function w(r) {
+const C = (i) => {
+  const e = i.symbolConfigList, t = i.circleConfigList;
+  return Array.isArray(e) && e.length > 0 ? JSON.parse(JSON.stringify(e)) : Array.isArray(t) && t.length > 0 ? JSON.parse(JSON.stringify(t)) : JSON.parse(JSON.stringify(d.circleConfigList || []));
+};
+function E(i) {
   let e = "fill";
-  switch (r.layerType) {
+  switch (i.layerType) {
     case "shp":
-      if (r.layerShapes) {
-        const i = r.layerShapes.split(",");
-        i.length === 1 ? i[0] === "point" ? e = "circle" : i[0] === "line" ? e = "line" : e = "fill" : e = "fill";
+    case "kml":
+    case "kmz":
+      if (i.layerShapes) {
+        const t = i.layerShapes.split(",").map((l) => l.trim().toLowerCase());
+        t.length === 1 ? t[0] === "point" ? e = "circle" : t[0] === "line" ? e = "line" : e = "fill" : e = "fill";
       } else
         e = "fill";
       break;
@@ -94,9 +128,9 @@ function w(r) {
       e = "line";
       break;
     case "symbol":
-      if (e = "circle", r.layerPaintConfig) {
-        const i = JSON.parse(r.layerPaintConfig);
-        i.circleConfigList && i.circleConfigList?.length > 0 && i.circleConfigList[0].circleType == "symbol" && (e = "symbol");
+      if (e = "circle", i.layerPaintConfig) {
+        const t = JSON.parse(i.layerPaintConfig), l = t.symbolConfigList || t.circleConfigList;
+        l && l?.length > 0 && l[0].circleType == "symbol" && (e = "symbol");
       }
       break;
     default:
@@ -104,50 +138,61 @@ function w(r) {
   }
   return e;
 }
-function E(r) {
-  return r ? r.filter((e) => typeof e.key == "string" && e.value) : [];
-}
-function v(r) {
+function A(i) {
   try {
-    let e = [
-      ...E(
-        JSON.parse(JSON.stringify(r.fillColorList))
-      )
-    ], i = {};
-    const s = JSON.parse(
-      JSON.stringify(r.fillColorList)
-    ), t = s[s.length - 1];
-    i["fill-color"] = [t.color], i["fill-opacity"] = t.opacity, i["fill-outline-color"] = t.color;
-    let c = [];
-    return r.fillOpacityConfig && r.fillOpacityConfig.value != null && (i["fill-opacity"] = r.fillOpacityConfig.value), e.forEach((n) => {
+    let e = {}, t = JSON.parse(
+      JSON.stringify(i.fillColorList)
+    );
+    const l = t.find(
+      (n) => n.type === "default"
+    ), u = t.filter(
+      (n) => n.type === "custom"
+    );
+    l && (t = [...u, l]), console.log("[getFillStyle] 排序后的 fillColorList:", t);
+    let s = t.filter((n) => n.type === "custom" ? n.key && n.value : !0);
+    const f = s[s.length - 1];
+    if (!f || f.type !== "default")
+      return console.warn("[getFillStyle] 未找到默认配置，使用系统默认颜色"), e["fill-color"] = "rgba(103, 194, 58, 0.6)", e["fill-outline-color"] = "rgba(103, 194, 58, 1)", e;
+    console.log("[getFillStyle] 默认颜色配置:", f);
+    let r = [];
+    if (s.forEach((n) => {
       if (n.type == "custom") {
-        let l = -1;
-        c.forEach((o, a) => {
-          o.key == n.key && (l = a);
-        }), l > -1 ? c[l].list.push(n) : c.push({
+        let a = -1;
+        r.forEach((o, c) => {
+          o.key == n.key && (a = c);
+        }), a > -1 ? r[a].list.push(n) : r.push({
           key: n.key,
           list: [n]
         });
       }
-    }), c.length && c.forEach((n) => {
-      n.list.forEach((l) => {
-        i["fill-color"].unshift(l.color), i["fill-color"].unshift(l.value);
-      }), i["fill-color"].unshift(["get", n.key]), i["fill-color"].unshift("match");
-    }), i["fill-color"].length == 1 && (i["fill-color"] = i["fill-color"][0]), console.log("生成fillStyle成功---->", i), i;
+    }), console.log("[getFillStyle] fillColorGroupList:", r), r.length > 0) {
+      let n = f.color;
+      [...r].reverse().forEach((a) => {
+        const o = [
+          "match",
+          ["to-string", ["get", a.key]]
+        ];
+        a.list.forEach((c) => {
+          o.push(String(c.value)), o.push(c.color);
+        }), o.push(n), n = o;
+      }), e["fill-color"] = n, console.log("[getFillStyle] 使用条件渲染，colorExpression:", n);
+    } else
+      e["fill-color"] = f.color, console.log("[getFillStyle] 使用单一颜色:", f.color);
+    return e["fill-outline-color"] = f.color, e["fill-opacity"] = i?.fillOpacityConfig?.value ?? 1, console.log("[getFillStyle] 生成 fillStyle 成功:", e), e;
   } catch (e) {
-    console.log("生成fillStyle失败", e);
+    console.log("[getFillStyle] 生成 fillStyle 失败:", e);
   }
 }
-function F(r) {
-  if (!r || !r.showLabel)
+function B(i) {
+  if (!i || !i.showLabel)
     return null;
   const e = {
     // 设置标注文本字段
-    "text-field": ["get", r.labelField || "FID"],
+    "text-field": ["get", i.labelField || "FID"],
     // 设置字体大小
-    "text-size": r.fontSize || 14,
+    "text-size": i.fontSize || 14,
     // 设置字体颜色
-    "text-color": r.fontColor || "#000000",
+    "text-color": i.fontColor || "#000000",
     // 设置字体 - 使用 Mapbox 默认字体
     "text-font": ["Open Sans Regular"],
     // 文本锚点设置为多边形中心
@@ -161,226 +206,260 @@ function F(r) {
   };
   return console.log("生成labelStyle成功---->", e), e;
 }
-function I(r) {
+function J(i) {
   try {
-    let { outlineConfigList: e } = r;
+    let { outlineConfigList: e } = i;
     if (!e || e.length === 0)
-      return console.warn("outlineConfigList 为空"), {};
-    const i = JSON.parse(
-      JSON.stringify(e)
-    ), s = i.find(
+      return console.warn("[getOutLineStyle] outlineConfigList 为空，使用默认样式"), {
+        "line-color": "rgba(103, 194, 58, 1)",
+        "line-width": 2,
+        "line-dasharray": ["literal", []]
+      };
+    let t = JSON.parse(JSON.stringify(e));
+    const l = t.find(
       (n) => n.type === "default"
-    ) || i[i.length - 1];
-    let t = {
+    ), u = t.filter(
+      (n) => n.type === "custom"
+    );
+    l && (t = [...u, l]);
+    const s = t[t.length - 1];
+    if (!s || s.type !== "default")
+      return console.warn("[getOutLineStyle] 未找到默认配置，使用系统默认值"), {
+        "line-color": "rgba(103, 194, 58, 1)",
+        "line-width": 1
+      };
+    let f = {
       "line-color": s.outlineColor || "rgba(103, 194, 58, 1)",
-      "line-opacity": s.outlineOpacity ?? 1,
       "line-width": s.outlineWidth ?? 1
     };
-    s.lineStyle === "dash" ? t["line-dasharray"] = [2, 2] : t["line-dasharray"] = ["literal", []];
-    let c = [];
-    if (e.forEach((n) => {
-      if (n.type === "custom" && n.key) {
-        let l = -1;
-        c.forEach((o, a) => {
-          o.key === n.key && (l = a);
-        }), l > -1 ? c[l].list.push(n) : c.push({
+    s.lineStyle === "dash" ? f["line-dasharray"] = [2, 2] : f["line-dasharray"] = ["literal", []];
+    let r = [];
+    if (t.forEach((n) => {
+      if (n.type === "custom" && n.key && n.value) {
+        let a = -1;
+        r.forEach((o, c) => {
+          o.key === n.key && (a = c);
+        }), a > -1 ? r[a].list.push(n) : r.push({
           key: n.key,
           list: [n]
         });
       }
-    }), c.length > 0 && (["line-color", "line-opacity", "line-width"].forEach((l) => {
-      const o = l === "line-color" ? "outlineColor" : l === "line-opacity" ? "outlineOpacity" : "outlineWidth";
-      if (c.some(
-        (f) => f.list.some((p) => p[o] !== void 0)
+    }), r.length > 0 && (["line-color", "line-width"].forEach((a) => {
+      const o = a === "line-color" ? "outlineColor" : "outlineWidth";
+      if (r.some(
+        (g) => g.list.some((h) => h[o] !== void 0)
       )) {
-        const f = ["match", ["get", c[0].key]];
-        c.forEach((p) => {
-          p.list.forEach((h) => {
-            h.value !== void 0 && h[o] !== void 0 && (f.push(h.value), f.push(h[o]));
+        const g = [
+          "match",
+          ["to-string", ["get", r[0].key]]
+        ];
+        r.forEach((h) => {
+          h.list.forEach((p) => {
+            p.value !== void 0 && p[o] !== void 0 && (g.push(String(p.value)), g.push(p[o]));
           });
-        }), f.push(s[o] ?? t[l]), t[l] = f;
+        }), g.push(l[o] ?? f[a]), f[a] = g;
       }
-    }), c.some(
-      (l) => l.list.some((o) => o.lineStyle !== void 0)
+    }), r.some(
+      (a) => a.list.some((o) => o.lineStyle !== void 0)
     ))) {
-      const l = ["match", ["get", c[0].key]];
-      c.forEach((o) => {
-        o.list.forEach((a) => {
-          a.value !== void 0 && a.lineStyle && (l.push(a.value), l.push(
-            a.lineStyle === "dash" ? [2, 2] : ["literal", []]
+      const a = [
+        "match",
+        ["to-string", ["get", r[0].key]]
+      ];
+      r.forEach((o) => {
+        o.list.forEach((c) => {
+          c.value !== void 0 && c.lineStyle && (a.push(String(c.value)), a.push(
+            c.lineStyle === "dash" ? [2, 2] : ["literal", []]
           ));
         });
-      }), l.push(
-        s.lineStyle === "dash" ? [2, 2] : ["literal", []]
-      ), t["line-dasharray"] = l;
+      }), a.push(
+        l.lineStyle === "dash" ? [2, 2] : ["literal", []]
+      ), f["line-dasharray"] = a;
     }
-    return console.log("outlineStyle--->", t), t;
+    return f;
   } catch (e) {
-    return console.log("生成outlineStyle失败", e), {};
+    return console.log("生成outlineStyle失败", e), {
+      "line-color": "rgba(103, 194, 58, 1)",
+      "line-width": 2,
+      "line-dasharray": []
+    };
   }
 }
-function O(r) {
-  let { circleConfigList: e } = r;
-  const i = e[e.length - 1];
-  if (i && (i.renderMode === "color" || i.renderMode === "icon")) {
-    const l = {
+function v(i) {
+  let e = C(i), t = JSON.parse(JSON.stringify(e));
+  const l = t.find(
+    (o) => o.type === "default"
+  ), u = t.filter(
+    (o) => o.type === "custom"
+  );
+  l && (t = [...u, l]), console.log(
+    "[getCircleStyle] 排序后的 circleConfigList:",
+    t
+  );
+  const s = t[t.length - 1], f = s && (s.renderMode === "color" || s.renderMode === "icon");
+  if (!s || s.type !== "default")
+    return console.warn("[getCircleStyle] 未找到默认配置，使用系统默认值"), {
+      _useNewFormat: !0,
+      _circleConfigList: [
+        {
+          type: "default",
+          renderMode: "color",
+          pointStyle: "118",
+          pointTintColor: "rgba(103, 194, 58, 0.6)",
+          pointSize: 2
+        }
+      ],
+      "icon-image": "custom-icon-default-118-1031945806",
+      "icon-size": 1
+    };
+  if (console.log("[getCircleStyle] 默认配置:", s), f) {
+    const o = {
       _useNewFormat: !0,
       // 标记使用了新格式
-      _circleConfigList: e
+      _circleConfigList: t
       // 保存完整配置列表供后续使用
     };
-    l["icon-image"] = [], l["icon-size"] = [];
-    const o = e.filter(
-      (a) => a.type === "custom" && a.value !== "" && a.value != null
+    o["icon-image"] = [], o["icon-size"] = [];
+    const c = t.filter(
+      (g) => g.type === "custom" && g.value !== "" && g.value != null
     );
-    if (o.length > 0) {
-      const a = o[0].key;
-      let f = "string";
-      for (const u of o)
-        if (typeof u.value == "number") {
-          f = "number";
+    if (c.length > 0) {
+      const g = c[0].key;
+      let h = "string";
+      for (const y of c)
+        if (typeof y.value == "number") {
+          h = "number";
           break;
         }
-      const p = (u) => f === "number" ? typeof u == "number" ? u : Number(u) : String(u), h = ["match", ["get", a]];
-      o.forEach((u) => {
-        let g;
-        if (u.renderMode === "color") {
-          const S = (u.pointTintColor || "#67c23a").replace(
+      const p = (y) => h === "number" ? typeof y == "number" ? y : Number(y) : String(y), m = ["match", ["get", g]];
+      c.forEach((y) => {
+        let k;
+        if (y.renderMode === "color") {
+          const O = (y.pointTintColor || "rgba(103, 194, 58, 1)").replace(
             /[^a-zA-Z0-9]/g,
             ""
           );
-          g = `custom-icon-${u.key}-${(u.pointStyle || "地图点.svg").replace(".svg", "")}-${S}`;
+          k = `custom-icon-${y.key}-${y.pointStyle || ""}-${O}`;
         } else
-          g = u.iconImageName || "hiper-map-icon-1.png";
-        h.push(p(u.value)), h.push(g);
+          k = y.pointStyle || "";
+        m.push(p(y.value)), m.push(k);
       });
-      let y;
-      if (i.renderMode === "color") {
-        const u = (i.pointTintColor || "#67c23a").replace(/[^a-zA-Z0-9]/g, "");
-        y = `custom-icon-default-${(i.pointStyle || "地图点.svg").replace(".svg", "")}-${u}`;
+      let b;
+      if (s.renderMode === "color") {
+        const y = (s.pointTintColor || "#67c23a").replace(/[^a-zA-Z0-9]/g, "");
+        b = `custom-icon-default-${s.pointStyle || ""}-${y}`;
       } else
-        y = i.iconImageName || "hiper-map-icon-1.png";
-      h.push(y), l["icon-image"] = h;
-      const d = ["match", ["get", a]];
-      o.forEach((u) => {
-        d.push(p(u.value)), d.push((u.pointSize || 10) / 20);
-      }), d.push((i.pointSize || 10) / 20), l["icon-size"] = d;
+        b = s.pointStyle || "";
+      m.push(b), o["icon-image"] = m;
+      const S = ["match", ["get", g]];
+      c.forEach((y) => {
+        S.push(p(y.value)), S.push((y.pointSize || 10) / 20);
+      }), S.push((s.pointSize || 10) / 20), o["icon-size"] = S;
     } else {
-      let a;
-      if (i.renderMode === "color") {
-        const f = (i.pointTintColor || "#67c23a").replace(/[^a-zA-Z0-9]/g, "");
-        a = `custom-icon-default-${(i.pointStyle || "地图点.svg").replace(".svg", "")}-${f}`;
+      let g;
+      if (s.renderMode === "color") {
+        const h = (s.pointTintColor || "#67c23a").replace(/[^a-zA-Z0-9]/g, "");
+        g = `custom-icon-default-${s.pointStyle || ""}-${h}`;
       } else
-        a = i.iconImageName || "hiper-map-icon-1.png";
-      l["icon-image"] = a, l["icon-size"] = (i.pointSize || 10) / 20;
+        g = s.pointStyle || "";
+      o["icon-image"] = g, o["icon-size"] = (s.pointSize || 10) / 20;
     }
-    return l;
+    return o;
   }
-  const t = {
+  const r = {
     "circle-radius": [],
     "circle-stroke-width": [],
     "circle-color": [],
     "circle-stroke-color": [],
-    "circle-opacity": [],
-    "circle-stroke-opacity": [],
     "icon-image": []
   };
   e = [...e];
-  const c = e[e.length - 1];
-  e.splice(e.length - 1, 1), t["circle-radius"] = [c.circleRadius], t["circle-stroke-width"] = [c.circleStrokeWidth], t["circle-color"] = [c.circleColor], t["circle-stroke-color"] = [c.circleStrokeColor], t["circle-opacity"] = [c.circleOpacity], t["circle-stroke-opacity"] = [c.circleStrokeOpacity], t["icon-image"] = [
-    c.iconImageUrl || "hiper-map-icon-1.png"
+  const n = e[e.length - 1];
+  e.splice(e.length - 1, 1), r["circle-radius"] = [n.circleRadius], r["circle-stroke-width"] = [n.circleStrokeWidth], r["circle-color"] = [n.circleColor], r["circle-stroke-color"] = [n.circleStrokeColor], r["icon-image"] = [
+    n.iconImageUrl || ""
   ];
-  let n = [];
-  return e.forEach((l) => {
-    if (l.type == "custom") {
-      let o = -1;
-      n.forEach((a, f) => {
-        a.key == l.key && (o = f);
-      }), o > -1 ? n[o].list.push(
-        l
-      ) : n.push({
-        key: l.key,
-        list: [l]
+  let a = [];
+  return e.forEach((o) => {
+    if (o.type == "custom") {
+      let c = -1;
+      a.forEach((g, h) => {
+        g.key == o.key && (c = h);
+      }), c > -1 ? a[c].list.push(
+        o
+      ) : a.push({
+        key: o.key,
+        list: [o]
       });
     }
-  }), n.forEach((l) => {
-    c.circleType != "symbol" && (l.list.forEach((o) => {
-      t["circle-radius"].unshift(o.circleRadius), t["circle-radius"].unshift(o.value);
-    }), t["circle-radius"].unshift(["get", l.key]), t["circle-radius"].unshift("match"), l.list.forEach((o) => {
-      t["circle-stroke-width"].unshift(
-        o.circleStrokeWidth
-      ), t["circle-stroke-width"].unshift(o.value);
-    }), t["circle-stroke-width"].unshift([
-      "get",
-      l.key
-    ]), t["circle-stroke-width"].unshift("match"), l.list.forEach((o) => {
-      t["circle-color"].unshift(o.circleColor), t["circle-color"].unshift(o.value);
-    }), t["circle-color"].unshift(["get", l.key]), t["circle-color"].unshift("match"), l.list.forEach((o) => {
-      t["circle-stroke-color"].unshift(
-        o.circleStrokeColor
-      ), t["circle-stroke-color"].unshift(o.value);
-    }), t["circle-stroke-color"].unshift([
+  }), a.forEach((o) => {
+    n.circleType != "symbol" && (o.list.forEach((c) => {
+      r["circle-radius"].unshift(c.circleRadius), r["circle-radius"].unshift(c.value);
+    }), r["circle-radius"].unshift(["get", o.key]), r["circle-radius"].unshift("match"), o.list.forEach((c) => {
+      r["circle-stroke-width"].unshift(
+        c.circleStrokeWidth
+      ), r["circle-stroke-width"].unshift(c.value);
+    }), r["circle-stroke-width"].unshift([
       "get",
-      l.key
-    ]), t["circle-stroke-color"].unshift("match"), l.list.forEach((o) => {
-      t["circle-opacity"].unshift(o.circleOpacity), t["circle-opacity"].unshift(o.value);
-    }), t["circle-opacity"].unshift(["get", l.key]), t["circle-opacity"].unshift("match"), l.list.forEach((o) => {
-      t["circle-stroke-opacity"].unshift(
-        o.circleStrokeOpacity
-      ), t["circle-stroke-opacity"].unshift(o.value);
-    }), t["circle-stroke-opacity"].unshift([
+      o.key
+    ]), r["circle-stroke-width"].unshift("match"), o.list.forEach((c) => {
+      r["circle-color"].unshift(c.circleColor), r["circle-color"].unshift(c.value);
+    }), r["circle-color"].unshift(["get", o.key]), r["circle-color"].unshift("match"), o.list.forEach((c) => {
+      r["circle-stroke-color"].unshift(
+        c.circleStrokeColor
+      ), r["circle-stroke-color"].unshift(c.value);
+    }), r["circle-stroke-color"].unshift([
       "get",
-      l.key
-    ]), t["circle-stroke-opacity"].unshift("match")), c.circleType == "symbol" && (l.list.forEach((o) => {
-      t["icon-image"].unshift(
-        o.iconImageUrl || "hiper-map-icon-1.png"
-      ), t["icon-image"].unshift(o.value);
-    }), t["icon-image"].unshift(["get", l.key]), t["icon-image"].unshift("match"));
-  }), e.length == 0 && (t["circle-radius"] = t["circle-radius"][0], t["circle-stroke-width"] = t["circle-stroke-width"][0], t["circle-color"] = t["circle-color"][0], t["circle-stroke-color"] = t["circle-stroke-color"][0], t["circle-opacity"] = t["circle-opacity"][0], t["circle-stroke-opacity"] = t["circle-stroke-opacity"][0], t["icon-image"] = t["icon-image"][0]), t;
+      o.key
+    ]), r["circle-stroke-color"].unshift("match")), n.circleType == "symbol" && (o.list.forEach((c) => {
+      r["icon-image"].unshift(
+        c.iconImageUrl || ""
+      ), r["icon-image"].unshift(c.value);
+    }), r["icon-image"].unshift(["get", o.key]), r["icon-image"].unshift("match"));
+  }), e.length == 0 && (r["circle-radius"] = r["circle-radius"][0], r["circle-stroke-width"] = r["circle-stroke-width"][0], r["circle-color"] = r["circle-color"][0], r["circle-stroke-color"] = r["circle-stroke-color"][0], r["icon-image"] = r["icon-image"][0]), r;
 }
-function x(r) {
-  let { circleConfigList: e } = r;
-  const i = {
+function I(i) {
+  let e = C(i);
+  const t = {
     "icon-image": []
-  }, s = e[e.length - 1];
-  e.splice(e.length - 1, 1), i["icon-image"] = [
-    s.iconImageUrl || "hiper-map-icon-1.png"
+  }, l = e[e.length - 1];
+  e = e.slice(0, -1), t["icon-image"] = [
+    l.iconImageUrl || ""
   ];
-  let t = [];
-  return e.forEach((c) => {
-    if (c.type == "custom") {
-      let n = -1;
-      t.forEach((l, o) => {
-        l.key == c.key && (n = o);
-      }), n > -1 ? t[n].list.push(
-        c
-      ) : t.push({
-        key: c.key,
-        list: [c]
+  let u = [];
+  return e.forEach((s) => {
+    if (s.type == "custom") {
+      let f = -1;
+      u.forEach((r, n) => {
+        r.key == s.key && (f = n);
+      }), f > -1 ? u[f].list.push(
+        s
+      ) : u.push({
+        key: s.key,
+        list: [s]
       });
     }
-  }), t.forEach((c) => {
-    s.circleType == "symbol" && (c.list.forEach((n) => {
-      i["icon-image"].unshift(
-        n.iconImageUrl || "hiper-map-icon-1.png"
-      ), i["icon-image"].unshift(n.value);
-    }), i["icon-image"].unshift(["get", c.key]), i["icon-image"].unshift("match"));
-  }), e.length == 0 && (i["icon-image"] = i["icon-image"][0]), i;
+  }), u.forEach((s) => {
+    l.circleType == "symbol" && (s.list.forEach((f) => {
+      t["icon-image"].unshift(
+        f.iconImageUrl || ""
+      ), t["icon-image"].unshift(f.value);
+    }), t["icon-image"].unshift(["get", s.key]), t["icon-image"].unshift("match"));
+  }), e.length == 0 && (t["icon-image"] = t["icon-image"][0]), t;
 }
-function J(r) {
-  const e = L(r), i = w(r), s = {
+function U(i) {
+  const e = N(i), t = E(i), l = {
     "fill-color": "rgba(103, 194, 58, 0.6)",
     // 默认填充颜色为浅绿色，半透明
     "fill-opacity": 1,
     // 默认填充透明度为1
     "fill-outline-color": "rgba(103, 194, 58, 1)"
     // 默认轮廓颜色为绿色，不透明
-  }, t = {
-    "line-width": 1,
-    // 默认线宽为1像素
-    "line-color": "rgba(103, 194, 58, 0.6)"
-    // 默认线颜色为浅绿色，半透明
-  }, c = {
+  }, u = {
+    "line-width": 2,
+    // 默认线宽为2像素（与 LayerStyleEditDialog 保持一致）
+    "line-color": "rgba(103, 194, 58, 1)"
+    // 默认线颜色为绿色，不透明
+  }, s = {
     "circle-radius": ["interpolate", ["linear"], ["zoom"], 1, 6, 10, 8, 22, 12],
     // 根据缩放级别调整圆点半径
     "circle-stroke-width": [
@@ -411,84 +490,88 @@ function J(r) {
     // 默认圆点颜色为浅绿色，半透明
   };
   if (!e)
-    switch (console.warn("当前图层样式配置不存在，使用默认样式,还有执行到这里的情况？"), i) {
+    switch (console.warn("当前图层样式配置不存在，使用默认样式,还有执行到这里的情况？"), t) {
       case "fill":
-        return s;
+        return l;
       case "line":
-        return t;
+        return u;
       case "circle":
-        return c;
+        return s;
     }
-  switch (i) {
+  switch (t) {
     case "fill":
-      const n = v(e);
-      return n || s;
+      const f = A(e);
+      return f || l;
     case "line":
-      const l = I(e);
-      return l || t;
+      const r = J(e);
+      return r || u;
     case "circle":
-      const o = O(e);
-      return o || c;
+      const n = v(e);
+      return n || s;
     case "symbol":
-      const a = x(e);
+      const a = I(e);
       return a || {
-        "icon-image": "hiper-map-icon-1.png"
-        // 默认图标图片
+        "icon-image": ""
       };
   }
 }
-function C(r) {
-  return new Promise((e, i) => {
-    const s = new FileReader();
-    s.onload = () => {
-      s.result instanceof ArrayBuffer ? e(s.result) : i(new Error("Failed to read file as ArrayBuffer"));
-    }, s.onerror = i, s.readAsArrayBuffer(r);
+function W(i) {
+  return new Promise((e, t) => {
+    const l = new FileReader();
+    l.onload = () => {
+      l.result instanceof ArrayBuffer ? e(l.result) : t(new Error("Failed to read file as ArrayBuffer"));
+    }, l.onerror = t, l.readAsArrayBuffer(i);
   });
 }
-function B(r) {
-  const e = r.fileDirectory || {}, i = e.ModelTiepoint || [], s = e.ModelPixelScale || [];
-  if (i.length >= 6 && s.length >= 3) {
+function D(i) {
+  const e = i.fileDirectory || {}, t = e.ModelTiepoint || [], l = e.ModelPixelScale || [];
+  if (t.length >= 6 && l.length >= 3) {
     console.log(
       "情况1：使用ModelTiepoint和ModelPixelScale计算边界",
-      i,
-      s
+      t,
+      l
     );
-    const t = i[3], c = i[4], n = s[0], l = s[1], o = r.getWidth(), a = r.getHeight(), f = t, p = c, h = t + o * n, y = c - a * Math.abs(l);
-    return [f, y, h, p];
+    const u = t[3], s = t[4], f = l[0], r = l[1], n = i.getWidth(), a = i.getHeight(), o = u, c = s, g = u + n * f, h = s - a * Math.abs(r);
+    return [o, h, g, c];
   } else if (e.ModelTransformation) {
     console.log("情况2：使用ModelTransformation矩阵计算边界");
-    const t = e.ModelTransformation;
-    if (t && t.length >= 16) {
-      const c = r.getWidth(), n = r.getHeight(), l = t[3], o = t[7], a = l + c * t[0], f = o + n * t[5];
-      return [l, o, a, f];
+    const u = e.ModelTransformation;
+    if (u && u.length >= 16) {
+      const s = i.getWidth(), f = i.getHeight(), r = u[3], n = u[7], a = r + s * u[0], o = n + f * u[5];
+      return [r, n, a, o];
     }
   } else if (e.GeographicTypeGeoKey)
     return console.warn("Limited geographic information. Using approximated bounds."), [-180, -90, 180, 90];
   return console.warn("No geographic reference found. Using default bounds."), [-180, -90, 180, 90];
 }
-function U(r) {
-  r = r.replace(/^#/, "");
-  let e = 0, i = 0, s = 0;
-  return r.length === 3 ? (e = parseInt(r.charAt(0) + r.charAt(0), 16), i = parseInt(r.charAt(1) + r.charAt(1), 16), s = parseInt(r.charAt(2) + r.charAt(2), 16)) : r.length === 6 && (e = parseInt(r.substring(0, 2), 16), i = parseInt(r.substring(2, 4), 16), s = parseInt(r.substring(4, 6), 16)), [e, i, s];
+function R(i) {
+  i = i.replace(/^#/, "");
+  let e = 0, t = 0, l = 0;
+  return i.length === 3 ? (e = parseInt(i.charAt(0) + i.charAt(0), 16), t = parseInt(i.charAt(1) + i.charAt(1), 16), l = parseInt(i.charAt(2) + i.charAt(2), 16)) : i.length === 6 && (e = parseInt(i.substring(0, 2), 16), t = parseInt(i.substring(2, 4), 16), l = parseInt(i.substring(4, 6), 16)), [e, t, l];
+}
+function P(i, e, t) {
+  return Math.max(e, Math.min(t, i));
 }
-function W(r, e, i) {
-  return Math.max(e, Math.min(i, r));
+function X(i, e) {
+  if (i)
+    return e.find((t) => t.id === i);
 }
 export {
-  B as calculateBounds,
-  W as clamp,
-  O as getCircleStyle,
-  v as getFillStyle,
-  F as getLabelStyle,
-  M as getLayerId,
-  J as getLayerStyle,
-  w as getLayerType,
-  T as getLineLegendStyle,
-  I as getOutLineStyle,
-  A as getSourceId,
-  x as getSymbolStyle,
-  U as hexToRgb,
-  z as parseLayerPaintConfig,
-  L as parseStyleConfig,
-  C as readFileAsArrayBuffer
+  D as calculateBounds,
+  P as clamp,
+  v as getCircleStyle,
+  A as getFillStyle,
+  B as getLabelStyle,
+  T as getLayerId,
+  U as getLayerStyle,
+  E as getLayerType,
+  z as getLineLegendStyle,
+  J as getOutLineStyle,
+  M as getSourceId,
+  I as getSymbolStyle,
+  R as hexToRgb,
+  F as parseLayerPaintConfig,
+  N as parseStyleConfig,
+  W as readFileAsArrayBuffer,
+  X as resolveAssetById
 };