@touchvue/plugin 1.0.0-beta.5 → 1.0.0-beta.6

package/index.mjs

@@ -15236,75 +15236,88 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
       }
     }
     function syncThWidth() {
-      if (props.columns.length > 0) {
+      var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+      if (props.columns.length > 0 && bodyHead.value && bodyHead.value.row) {
         const trs = bodyHead.value.row.children;
-        if (Number(props.fixTop) > 0 && topHead.value) {
+        if (Number(props.fixTop) > 0 && topHead.value && topHead.value.row) {
           const topTrs = topHead.value.row.children;
           for (let i = 0; i < topTrs.length; i++) {
-            const ths = trs[i].children;
-            const topThs = topTrs[i].children;
-            for (let j = 0; j < ths.length; j++) {
-              const th = ths[j];
-              const topTh = topThs[j];
-              topTh.style.width = th.getBoundingClientRect().width + "px";
+            const ths = (_a2 = trs[i]) == null ? void 0 : _a2.children;
+            const topThs = (_b = topTrs[i]) == null ? void 0 : _b.children;
+            if (ths && topThs) {
+              for (let j = 0; j < ths.length; j++) {
+                const th = ths[j];
+                const topTh = topThs[j];
+                if (th && topTh) {
+                  topTh.style.width = th.getBoundingClientRect().width + "px";
+                }
+              }
             }
           }
         }
-        if (Number(props.fixLeft) > 0 && leftHead.value) {
+        if (Number(props.fixLeft) > 0 && leftHead.value && leftHead.value.row) {
           const leftTrs = leftHead.value.row.children;
           for (let i = 0; i < leftTrs.length; i++) {
-            const ths = trs[i].children;
-            const leftThs = leftTrs[i].children;
-            if (leftThs.length > 0) {
+            const ths = (_c = trs[i]) == null ? void 0 : _c.children;
+            const leftThs = (_d = leftTrs[i]) == null ? void 0 : _d.children;
+            if (ths && leftThs && leftThs.length > 0) {
               for (let j = 0; j < leftThs.length; j++) {
                 const th = ths[j];
                 const leftTh = leftThs[j];
-                leftTh.style.width = th.getBoundingClientRect().width + "px";
-                leftTh.style.height = th.getBoundingClientRect().height + "px";
+                if (th && leftTh) {
+                  leftTh.style.width = th.getBoundingClientRect().width + "px";
+                  leftTh.style.height = th.getBoundingClientRect().height + "px";
+                }
               }
             }
           }
-          if (Number(props.fixTop) > 0 && leftTopHead.value) {
-            const leftTopTrs = leftTopHead.value.$refs.row.children;
+          if (Number(props.fixTop) > 0 && leftTopHead.value && leftTopHead.value.row) {
+            const leftTopTrs = leftTopHead.value.row.children;
             for (let i = 0; i < leftTopTrs.length; i++) {
-              const ths = trs[i].children;
-              const leftTopThs = leftTopTrs[i].children;
-              if (leftTopThs.length > 0) {
-                for (let i2 = 0; i2 < leftTopThs.length; i2++) {
-                  const th = ths[i2];
-                  const leftTopTh = leftTopThs[i2];
-                  leftTopTh.style.width = th.getBoundingClientRect().width + "px";
-                  leftTopTh.style.height = th.getBoundingClientRect().height + "px";
+              const ths = (_e = trs[i]) == null ? void 0 : _e.children;
+              const leftTopThs = (_f = leftTopTrs[i]) == null ? void 0 : _f.children;
+              if (ths && leftTopThs && leftTopThs.length > 0) {
+                for (let j = 0; j < leftTopThs.length; j++) {
+                  const th = ths[j];
+                  const leftTopTh = leftTopThs[j];
+                  if (th && leftTopTh) {
+                    leftTopTh.style.width = th.getBoundingClientRect().width + "px";
+                    leftTopTh.style.height = th.getBoundingClientRect().height + "px";
+                  }
                 }
               }
             }
           }
         }
-        if (Number(props.fixRight) > 0 && rightHead.value) {
+        if (Number(props.fixRight) > 0 && rightHead.value && rightHead.value.row) {
           const rightTrs = rightHead.value.row.children;
           for (let i = 0; i < rightTrs.length; i++) {
-            const ths = trs[i].children;
-            const rightThs = rightTrs[i].children;
-            if (rightThs.length > 0) {
+            const ths = (_g = trs[i]) == null ? void 0 : _g.children;
+            const rightThs = (_h = rightTrs[i]) == null ? void 0 : _h.children;
+            if (ths && rightThs && rightThs.length > 0) {
               for (let j = ths.length - rightThs.length; j < ths.length; j++) {
                 const th = ths[j];
                 const rightTh = rightThs[j - ths.length + rightThs.length];
-                rightTh.style.width = th.getBoundingClientRect().width + "px";
-                rightTh.style.height = th.getBoundingClientRect().height + "px";
+                if (th && rightTh) {
+                  rightTh.style.width = th.getBoundingClientRect().width + "px";
+                  rightTh.style.height = th.getBoundingClientRect().height + "px";
+                }
               }
             }
           }
-          if (Number(props.fixTop) > 0 && rightTopHead.value) {
+          if (Number(props.fixTop) > 0 && rightTopHead.value && rightTopHead.value.row) {
             const rightTopTrs = rightTopHead.value.row.children;
             for (let i = 0; i < rightTopTrs.length; i++) {
-              const ths = trs[i].children;
-              const rightTopThs = rightTopTrs[i].children;
-              if (rightTopThs.length > 0) {
-                for (let i2 = ths.length - rightTopThs.length; i2 < ths.length; i2++) {
-                  const th = ths[i2];
-                  const rightTopTh = rightTopThs[i2 - ths.length + rightTopThs.length];
-                  rightTopTh.style.width = th.getBoundingClientRect().width + "px";
-                  rightTopTh.style.height = th.getBoundingClientRect().height + "px";
+              const ths = (_i = trs[i]) == null ? void 0 : _i.children;
+              const rightTopThs = (_j = rightTopTrs[i]) == null ? void 0 : _j.children;
+              if (ths && rightTopThs && rightTopThs.length > 0) {
+                for (let j = ths.length - rightTopThs.length; j < ths.length; j++) {
+                  const th = ths[j];
+                  const rightTopTh = rightTopThs[j - ths.length + rightTopThs.length];
+                  if (th && rightTopTh) {
+                    rightTopTh.style.width = th.getBoundingClientRect().width + "px";
+                    rightTopTh.style.height = th.getBoundingClientRect().height + "px";
+                  }
                 }
               }
             }
@@ -19496,7 +19509,7 @@ const _sfc_main$q = defineComponent({
     // 类型：normal 或 loading
     type: {
       type: String,
-      default: "",
+      default: "normal",
       validator: (val) => ["normal", "loading", "circle"].includes(val)
     },
     // 进度条百分比，0~100的数字
@@ -19678,12 +19691,8 @@ const _sfc_main$q = defineComponent({
         const el = document.querySelector(".to-progress");
         if (el) {
           if (props.type === "circle") {
-            const circleBgTick = parseFloat(
-              getComputedStyle(elRef.value).getPropertyValue("--thick")
-            );
-            const circleBarTick = parseFloat(
-              getComputedStyle(elRef.value).getPropertyValue("--bar-thick")
-            );
+            const circleBgTick = parseFloat(getComputedStyle(elRef.value).getPropertyValue("--thick"));
+            const circleBarTick = parseFloat(getComputedStyle(elRef.value).getPropertyValue("--bar-thick"));
             const width = parseFloat(getComputedStyle(elRef.value).getPropertyValue("--width"));
             thick.value = circleBgTick / width * 100;
             barThick.value = circleBarTick / width * 100;
@@ -25341,7 +25350,12 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     endAngle: { type: [String, Number], default: -270 },
     value: { type: [String, Number], default: "" },
     label: { type: [String, Number], default: "" },
-    gap: { type: [String, Number], default: 0 }
+    gap: { type: [String, Number], default: 0 },
+    emphasisScale: { type: Boolean, default: false },
+    emphasisScaleSize: { type: [String, Number], default: 5 },
+    backgroundSizePercentage: { type: [Number, String], default: 100 },
+    // 默认为 100%
+    backgroundPosition: { type: String, default: "center" }
   },
   emits: {
     "item-click": (_) => true
@@ -25417,15 +25431,37 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     });
     const isRing = computed(() => Number(props.barSize) < Number(props.size) / 2);
     const chartRadius = computed(() => {
-      const outerRatio = 1 - Number(props.borderWidth) / Number(props.size);
+      let outerRatio = 1 - Number(props.borderWidth) / Number(props.size);
+      if (props.emphasisScale) {
+        const scaleAdjustment = props.emphasisScaleSize / (Number(props.size) * 4);
+        outerRatio = Math.max(0, outerRatio - scaleAdjustment);
+      }
       const outer = String(Number(outerRatio.toFixed(2)) * 100 + "%");
       if (isRing.value) {
-        const innerRatio = 1 - (2 * Number(props.borderWidth) + 2 * Number(props.barSize)) / Number(props.size);
+        let innerRatio = 1 - (2 * Number(props.borderWidth) + 2 * Number(props.barSize)) / Number(props.size);
+        if (props.emphasisScale) {
+          const scaleAdjustment = props.emphasisScaleSize / (Number(props.size) * 4);
+          innerRatio = Math.max(0, innerRatio + scaleAdjustment);
+        }
         const inner = String(Number(innerRatio.toFixed(2)) * 100 + "%");
         return [inner, outer];
       }
       return ["0%", outer];
     });
+    const backgroundStyle = computed(() => {
+      const percentage = Number(props.backgroundSizePercentage);
+      return {
+        backgroundSize: `${percentage}% ${percentage}%`,
+        backgroundPosition: props.backgroundPosition,
+        backgroundRepeat: "no-repeat",
+        // 使用 transform 来居中背景，当背景不是 100% 时保持居中
+        transform: percentage !== 100 ? "translate(-50%, -50%)" : "none",
+        left: percentage !== 100 ? "50%" : "0",
+        top: percentage !== 100 ? "50%" : "0",
+        width: percentage !== 100 ? `${percentage}%` : "100%",
+        height: percentage !== 100 ? `${percentage}%` : "100%"
+      };
+    });
     const processedColors = computed(() => {
       const color = props.color;
       if (isArray(color)) {
@@ -25536,7 +25572,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
               length: 15,
               length2: 15
             },
-            emphasis: { scale: false }
+            emphasis: { scale: props.emphasisScale, scaleSize: props.emphasisScaleSize }
           }
         ]
       };
@@ -25623,13 +25659,20 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
             class: "to-echarts-pie-pic-content",
             style: normalizeStyle(setContentStyle.value)
           }, null, 4),
-          unref(slots).title ? (openBlock(), createElementBlock("div", {
+          unref(slots).background ? (openBlock(), createElementBlock("div", {
             key: 0,
+            class: "to-echarts-pie-background",
+            style: normalizeStyle(backgroundStyle.value)
+          }, [
+            renderSlot(_ctx.$slots, "background")
+          ], 4)) : createCommentVNode("", true),
+          unref(slots).title ? (openBlock(), createElementBlock("div", {
+            key: 1,
             class: "to-echarts-pie-pic-text"
           }, [
             renderSlot(_ctx.$slots, "title")
           ])) : __props.label || __props.value ? withDirectives((openBlock(), createElementBlock("div", {
-            key: 1,
+            key: 2,
             class: "to-echarts-pie-pic-text"
           }, [
             __props.value ? (openBlock(), createElementBlock("div", {
@@ -25773,6 +25816,30 @@ const echartsBarProps = {
   interval: {
     type: Number,
     default: 0
+  },
+  tooltipType: {
+    type: String,
+    default: "shadow"
+  },
+  tooltipTextColor: {
+    type: String,
+    default: "#666"
+  },
+  tooltipBgColor: {
+    type: String,
+    default: "#fff"
+  },
+  tooltipBorderColor: {
+    type: String,
+    default: "#333"
+  },
+  showDefaultToolTip: {
+    type: Boolean,
+    default: false
+  },
+  mode: {
+    type: String,
+    default: "default"
   }
 };
 const echartsBarEmits = {
@@ -25989,6 +26056,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                 smooth: item.smooth || props.smooth
               });
             }
+            let { lineStyle, areaStyle } = getCssConfig(item, i);
             series.push({
               name: item.name,
               type: item.type ? item.type : props.chartsType,
@@ -25996,9 +26064,13 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               barWidth: Number(props.barSize) * currentEm.value,
               itemStyle: {
                 borderRadius: Number(props.borderRadius) * currentEm.value,
-                color: getItemColor(item, i)
+                color: lineStyle[2]
+              },
+              lineStyle: {
+                type: lineStyle[1],
+                width: lineStyle[0]
               },
-              areaStyle: item.areaStyle ? item.areaStyle : null,
+              areaStyle: areaStyle ? areaStyle : null,
               label: getSeriesLabelConfig(),
               z: 2,
               smooth: item.smooth || props.smooth
@@ -26059,37 +26131,152 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         return get3dSeriesConfig();
       }
     });
-    const getItemColor = (item, i) => {
-      let color = null;
-      if (isArray(props.color)) {
-        color = props.color[i];
+    const getCssConfig = (item, i) => {
+      let box = document.createElement("div");
+      box.className = `to-echarts-bar-item mode-${item.mode}`;
+      box.style.display = "none";
+      chartContainer.value.appendChild(box);
+      let lineStr = getComputedStyle(box).getPropertyValue("--line").trim();
+      let lineStyle = null;
+      if (lineStr) {
+        let lineArr = lineStr.split(" ", 2);
+        let length = lineStr.split(" ").length;
+        if (length > 3) {
+          const thirdPart = lineStr.substring(lineArr.join(" ").length + 1);
+          const result = [...lineArr, thirdPart];
+          lineStyle = [unitToNumber(result[0]), result[1], parseColorStops(result[2])];
+        } else {
+          const result = lineStr.split(" ");
+          lineStyle = [unitToNumber(result[0]), result[1], result[2]];
+        }
       } else {
-        color = props.color;
+        lineStyle = [2, "solid", props.color[i]];
+      }
+      let areaStr = getComputedStyle(box).getPropertyValue("--area").trim();
+      let areaStyle = null;
+      if (areaStr) {
+        if (areaStr.includes("linear-gradient")) {
+          areaStyle = {
+            color: parseColorStops(areaStr)
+          };
+        } else {
+          areaStyle = {
+            color: areaStr
+          };
+        }
       }
-      if (item.linearGradient) {
-        color = item.linearGradient;
+      return {
+        lineStyle,
+        areaStyle
+      };
+    };
+    const parseColorStops = (str) => {
+      const reg = /\((.*?)\)/;
+      const match = str.match(reg);
+      let obj = {};
+      if (match) {
+        let arr = match[1].split(",");
+        let fx = arr[0];
+        let color = arr.splice(1);
+        let colorStops = color.map((item) => {
+          let k = item.trim().split(" ");
+          return {
+            offset: percentToDecimal(k[1]),
+            color: k[0]
+          };
+        });
+        if (fx.includes("right")) {
+          obj = {
+            type: "linear",
+            x: 0,
+            y: 0,
+            x2: 1,
+            y2: 0,
+            colorStops
+          };
+        } else {
+          obj = {
+            type: "linear",
+            x: 0,
+            y: 0,
+            x2: 0,
+            y2: 1,
+            colorStops
+          };
+        }
       }
-      return color;
+      return obj;
     };
+    function percentToDecimal(percent, clamp = true) {
+      if (percent === null || percent === void 0 || percent === "") {
+        return 0;
+      }
+      let str = String(percent).trim().replace(/%/g, "");
+      let num = parseFloat(str);
+      if (isNaN(num) || !isFinite(num)) {
+        return 0;
+      }
+      let decimal = num / 100;
+      if (clamp) {
+        decimal = Math.max(0, Math.min(1, decimal));
+      }
+      return decimal;
+    }
+    function unitToNumber(size, clampPositive = true) {
+      if (size === null || size === void 0 || size === "") {
+        return 0;
+      }
+      if (typeof size === "number" && isFinite(size)) {
+        const num2 = clampPositive ? Math.max(0, size) : size;
+        return num2;
+      }
+      const str = String(size).trim();
+      const numMatch = str.match(/^-?\d+(\.\d+)?/);
+      let num = numMatch ? parseFloat(numMatch[0]) : 0;
+      if (isNaN(num) || !isFinite(num)) {
+        return 0;
+      }
+      if (clampPositive) {
+        num = Math.max(0, num);
+      }
+      return num;
+    }
     const tooltipConfig = computed(() => {
       if (!props.showTooltip) {
         return { show: false };
       }
+      if (props.showDefaultToolTip) {
+        return {
+          show: true,
+          trigger: "axis",
+          axisPointer: {
+            type: props.tooltipType
+          },
+          appendTo: typeof document !== "undefined" ? document.body : void 0,
+          className: "to-echarts-tooltip",
+          borderColor: props.tooltipBorderColor,
+          backgroundColor: props.tooltipBgColor,
+          textStyle: {
+            fontSize: Number(props.fontSize) * currentEm.value,
+            color: props.tooltipTextColor
+          }
+        };
+      }
       return {
         show: true,
         trigger: "axis",
         axisPointer: {
-          type: "shadow"
+          type: props.tooltipType
         },
+        borderColor: props.tooltipBorderColor,
         appendTo: typeof document !== "undefined" ? document.body : void 0,
         className: "to-echarts-tooltip",
         confine: false,
-        extraCssText: slots.tip ? "padding: 0; background: transparent; border: none; box-shadow: none; font-size:" + Number(props.tipFontSize) * getEmPx() + "px" : "background: #fff; box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); padding: 10px; border-radius: 4px; font-size:" + Number(props.tipFontSize) * getEmPx() + "px",
+        extraCssText: slots.tip ? "padding: 0; background: transparent; border: none; box-shadow: none; font-size:" + Number(props.tipFontSize) * getEmPx() + "px" : `background: ${props.tooltipBgColor}; box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); padding: 10px; border-radius: 4px; font-size:` + Number(props.tipFontSize) * getEmPx() + "px",
         textStyle: {
           fontSize: Number(props.fontSize) * currentEm.value,
-          color: "#666"
+          color: props.tooltipTextColor
         },
-        backgroundColor: "#fff",
         formatter: (params) => {
           const param = isArray(params) ? params.find((p) => p.value !== void 0) : params;
           if (!param)
@@ -26648,18 +26835,25 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         resizeObserver = null;
       }
     });
+    const setClass = computed(() => {
+      let arr = [];
+      if (props.mode) {
+        arr.push(`mode-${props.mode}`);
+      }
+      return arr;
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         ref_key: "chartContainer",
         ref: chartContainer,
-        class: "to-echarts-bar",
+        class: normalizeClass(["to-echarts-bar", setClass.value]),
         style: normalizeStyle(setBarStyle.value)
-      }, null, 4);
+      }, null, 6);
     };
   }
 });
-const echartsBar_vue_vue_type_style_index_0_scoped_4f4fca0e_lang = "";
-const EchartsBar = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-4f4fca0e"]]);
+const echartsBar_vue_vue_type_style_index_0_scoped_c70ba125_lang = "";
+const EchartsBar = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-c70ba125"]]);
 const ToEchartsBar = withInstall(EchartsBar);
 const DEFAULT_VIEW_CONTROL = {
   zoomSensitivity: 0,
@@ -26672,6 +26866,22 @@ const echartsMapProps = {
     type: Object,
     default: () => ({})
   },
+  rotate: {
+    type: [String, Number],
+    default: 0
+  },
+  scaleX: {
+    type: [String, Number],
+    default: 1
+  },
+  scaleY: {
+    type: [String, Number],
+    default: 1
+  },
+  aspectRatio: {
+    type: [String, Number],
+    default: ""
+  },
   shadow: {
     type: String,
     default: ""
@@ -29018,6 +29228,7 @@ const cityData = [
     city: "90"
   }
 ];
+const OUTLINE_BASE_URL = "https://geo.datav.aliyun.com/areas_v3/bound/";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
     name: "ToEchartsMap"
@@ -29120,6 +29331,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.width) {
         style.width = formatSize(props.width);
       }
+      let finalScaleX = Number(props.scaleX) || 1;
+      let finalScaleY = Number(props.scaleY) || 1;
+      if (props.aspectRatio) {
+        const targetRatio = Number(props.aspectRatio);
+        if (targetRatio > 0) {
+          const currentRatio = finalScaleX / finalScaleY;
+          if (currentRatio < targetRatio) {
+            finalScaleX = finalScaleY * targetRatio;
+          } else {
+            finalScaleY = finalScaleX / targetRatio;
+          }
+        }
+      }
+      const rotate = Number(props.rotate) || 0;
+      style.transform = `rotate(${rotate}deg) scaleX(${finalScaleX}) scaleY(${finalScaleY})`;
+      style.transformOrigin = "center center";
       return style;
     });
     const loadEcharts = async () => {
@@ -29273,7 +29500,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           value: item.properties,
           name: item.properties.name
         }))) != null ? _b : [];
-        await setMapOptions(geoName, mapData);
+        await setMapOptions(geoName, code, mapData);
       } catch (error) {
         console.error("[ToEchartsMap] 获取地图数据失败", error);
       }
@@ -29302,12 +29529,54 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const max2 = values.length ? Math.max(...values) : 0;
       return { min, max: max2 };
     };
-    const setMapOptions = async (geoName, mapData) => {
+    const outlineCache = /* @__PURE__ */ new Map();
+    const loadOutlineGeoJson = async (code) => {
+      if (!props.showOutline)
+        return null;
+      if (typeof fetch === "undefined")
+        return null;
+      if (!code)
+        return null;
+      if (outlineCache.has(code))
+        return outlineCache.get(code);
+      try {
+        const res = await fetch(`${OUTLINE_BASE_URL}${code}.json`);
+        if (!res.ok)
+          throw new Error(`Request failed: ${res.status}`);
+        const json = await res.json();
+        outlineCache.set(code, json);
+        return json;
+      } catch (e) {
+        console.warn("[ToEchartsMap] 获取外轮廓数据失败", code, e);
+        outlineCache.set(code, null);
+        return null;
+      }
+    };
+    const setMapOptions = async (geoName, code, mapData) => {
       if (!chart.value)
         return;
       await ensureEchartsGl();
+      let outlineMapName = null;
+      if (props.showOutline && echartsLib) {
+        const outlineJson = await loadOutlineGeoJson(code);
+        if (outlineJson) {
+          outlineMapName = `${geoName}__outline`;
+          try {
+            echartsLib.registerMap(outlineMapName, outlineJson);
+          } catch (e) {
+            console.warn("[ToEchartsMap] 外轮廓 registerMap 失败", e);
+          }
+        }
+      }
       isMapData.value = mapData.length > 0;
-      const option = getOption(geoName, mapData);
+      const option = getOption(geoName, code, mapData);
+      if (props.showOutline && !outlineMapName && Array.isArray(option.geo)) {
+        for (const g of option.geo) {
+          if (g && typeof g.map === "string" && g.map === `${geoName}__outline`) {
+            g.map = geoName;
+          }
+        }
+      }
       chart.value.setOption(option, true);
       if (props.autoplay && props.data.length) {
         mapActive(props.data);
@@ -29421,40 +29690,76 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       };
     };
-    const getOption = (geoName, mapData) => {
+    const getOption = (geoName, code, mapData) => {
       var _a2;
       const baseSeries = getBaseSeries(geoName, mapData);
       const shadowParts = parseShadow(props.shadow);
       const { min, max: max2 } = getMinMax(mapData);
-      return {
-        tooltip: {
-          trigger: "item",
-          formatter: (params) => {
-            if (!params.value)
-              return "";
-            return renderTooltip(params);
-          }
-        },
-        geo: {
-          // 轮廓线与底部阴影共用 geo：
-          // - shadow：用 geo 的 areaColor 作为底部投影层
-          // - showOutline：用 geo 的 borderColor/borderWidth 画最外围轮廓线
-          show: Boolean(props.shadow) || props.showOutline,
+      const geoLayers = [];
+      if (props.shadow) {
+        const shadowOffset = shadowParts[0] ? Number(shadowParts[0]) * currentEm.value : currentEm.value;
+        const shadowColor = (_a2 = shadowParts[1]) != null ? _a2 : "rgba(0,0,0,0.3)";
+        const shadow2Color = shadowParts[2];
+        if (shadow2Color) {
+          geoLayers.push({
+            z: 1,
+            show: true,
+            map: geoName,
+            roam: false,
+            top: shadowOffset * 2,
+            bottom: -shadowOffset,
+            silent: true,
+            itemStyle: {
+              areaColor: shadow2Color,
+              borderColor: "transparent"
+            }
+          });
+        }
+        geoLayers.push({
+          z: 2,
+          show: true,
           map: geoName,
           roam: false,
-          top: props.shadow ? shadowParts[0] ? Number(shadowParts[0]) * currentEm.value : currentEm.value : 0,
+          top: shadowOffset,
           bottom: 0,
           silent: true,
-          label: { show: false },
           itemStyle: {
-            areaColor: props.shadow ? (_a2 = shadowParts[1]) != null ? _a2 : "rgba(0,0,0,0.3)" : "transparent",
-            borderColor: props.showOutline ? props.outlineColor : "transparent",
-            borderWidth: props.showOutline ? Number(props.outlineWidth) : 0,
-            // 避免粗描边在尖锐拐角处产生 miter 尖刺
+            areaColor: shadowColor,
+            borderColor: "transparent"
+          }
+        });
+      }
+      if (props.showOutline) {
+        const shadowOffset = shadowParts[0] ? Number(shadowParts[0]) * currentEm.value : currentEm.value;
+        const outlineMapName = `${geoName}__outline`;
+        geoLayers.push({
+          z: 4,
+          // 高于 map series (z:3)
+          map: outlineMapName,
+          roam: false,
+          top: 0,
+          bottom: props.shadow ? shadowOffset : 0,
+          silent: true,
+          itemStyle: {
+            areaColor: "transparent",
+            borderColor: props.outlineColor,
+            borderWidth: Number(props.outlineWidth),
             borderJoin: "round",
             borderMiterLimit: 2
           }
+        });
+      }
+      baseSeries.z = 3;
+      return {
+        tooltip: {
+          trigger: "item",
+          formatter: (params) => {
+            if (!params.value)
+              return "";
+            return renderTooltip(params);
+          }
         },
+        geo: geoLayers,
         visualMap: showVisualMap() ? {
           seriesIndex: [0],
           min,