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

package/index.mjs

@@ -25833,7 +25833,7 @@ const echartsBarProps = {
     type: String,
     default: "#333"
   },
-  showDefaultToolTip: {
+  showDefaultTooltip: {
     type: Boolean,
     default: false
   },
@@ -26245,7 +26245,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       if (!props.showTooltip) {
         return { show: false };
       }
-      if (props.showDefaultToolTip) {
+      if (props.showDefaultTooltip) {
         return {
           show: true,
           trigger: "axis",
@@ -26852,8 +26852,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const echartsBar_vue_vue_type_style_index_0_scoped_c70ba125_lang = "";
-const EchartsBar = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-c70ba125"]]);
+const echartsBar_vue_vue_type_style_index_0_scoped_9ca896ae_lang = "";
+const EchartsBar = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-9ca896ae"]]);
 const ToEchartsBar = withInstall(EchartsBar);
 const DEFAULT_VIEW_CONTROL = {
   zoomSensitivity: 0,
@@ -27021,6 +27021,26 @@ const echartsMapProps = {
   outlineWidth: {
     type: [String, Number],
     default: 2
+  },
+  showLabelIcon: {
+    type: Boolean,
+    default: false
+  },
+  labelIcon: {
+    type: String,
+    default: "◉"
+  },
+  labelIconType: {
+    type: String,
+    default: "text"
+  },
+  labelIconSize: {
+    type: [Number, Array],
+    default: void 0
+  },
+  position: {
+    type: String,
+    default: ""
   }
 };
 const echartsMapEmits = {
@@ -29598,6 +29618,52 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const getBaseSeries = (geoName, mapData) => {
       var _a2;
+      const getLabelConfig = (isHover = false) => {
+        var _a3;
+        const name = (e) => {
+          var _a4, _b;
+          return (_b = (_a4 = props.nameMap) == null ? void 0 : _a4[e.name]) != null ? _b : e.name;
+        };
+        const fontColor = isHover ? props.fontColorHover || props.fontColor : props.fontColor;
+        const fontSizeValue = isHover ? props.fontSizeHover || props.fontSize : props.fontSize;
+        const fontSize = Number(fontSizeValue) * currentEm.value;
+        const baseLabel = {
+          show: true,
+          color: fontColor,
+          fontSize,
+          lineHeight: fontSize * 1.4,
+          align: "center"
+        };
+        if (!props.showLabelIcon) {
+          return {
+            ...baseLabel,
+            formatter: (e) => `${name(e)}`
+          };
+        }
+        if (props.labelIconType === "image") {
+          const size = (_a3 = props.labelIconSize) != null ? _a3 : 12;
+          const [width, height] = Array.isArray(size) ? size : [size, size];
+          return {
+            ...baseLabel,
+            formatter: (e) => `{a|${name(e)}}
+{b|}`,
+            rich: {
+              a: { ...baseLabel },
+              b: {
+                backgroundColor: { image: props.labelIcon },
+                width,
+                height,
+                align: "center"
+              }
+            }
+          };
+        }
+        return {
+          ...baseLabel,
+          formatter: (e) => `${name(e)}
+${props.labelIcon}`
+        };
+      };
       if (props.is3d) {
         return {
           viewControl: props.viewControl,
@@ -29606,15 +29672,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           data: mapData,
           roam: { zoom: false, rotate: true },
           regionHeight: (Number(props.regionHeight) || 0) * currentEm.value * 0.25,
-          label: {
-            show: true,
-            color: props.fontColor,
-            fontSize: Number(props.fontSize) * currentEm.value,
-            formatter: (e) => {
-              var _a3, _b;
-              return ` ${(_b = (_a3 = props.nameMap) == null ? void 0 : _a3[e.name]) != null ? _b : e.name} `;
-            }
-          },
+          label: getLabelConfig(false),
+          labelLayout: { hideOverlap: true },
           itemStyle: {
             color: props.color || "#65bbff",
             areaColor: props.color,
@@ -29632,11 +29691,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               areaColor: props.colorHover || props.color,
               borderColor: props.borderColorHover || props.borderColor
             },
-            label: {
-              show: true,
-              color: props.fontColorHover || props.fontColor,
-              fontSize: (props.fontSizeHover ? Number(props.fontSizeHover) : Number(props.fontSize)) * currentEm.value
-            }
+            label: getLabelConfig(true)
           }
         };
       }
@@ -29648,15 +29703,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         data: mapData,
         top: 0,
         bottom: props.shadow ? shadowParts[0] ? Number(shadowParts[0]) * currentEm.value : currentEm.value : 0,
-        label: {
-          show: true,
-          color: props.fontColor,
-          fontSize: Number(props.fontSize) * currentEm.value,
-          formatter: (e) => {
-            var _a3, _b;
-            return ` ${(_b = (_a3 = props.nameMap) == null ? void 0 : _a3[e.name]) != null ? _b : e.name} `;
-          }
-        },
+        label: getLabelConfig(false),
         itemStyle: {
           shadowBlur: itemShadowParts[0] ? Number(itemShadowParts[0]) * currentEm.value : 0,
           shadowColor: (_a2 = itemShadowParts[1]) != null ? _a2 : "rgba(0,0,0,0.3)",
@@ -29672,21 +29719,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             areaColor: props.colorHover || props.color,
             borderColor: props.borderColorHover || props.borderColor
           },
-          label: {
-            show: true,
-            color: props.fontColorHover || props.fontColor,
-            fontSize: (props.fontSizeHover ? Number(props.fontSizeHover) : Number(props.fontSize)) * currentEm.value
-          }
+          label: getLabelConfig(true)
         },
         select: {
           itemStyle: {
             areaColor: props.colorHover || props.color,
             borderColor: props.borderColorHover || props.borderColor
           },
-          label: {
-            color: props.fontColorHover || props.fontColor,
-            fontSize: (props.fontSizeHover ? Number(props.fontSizeHover) : Number(props.fontSize)) * currentEm.value
-          }
+          label: getLabelConfig(true)
         }
       };
     };
@@ -29733,8 +29773,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const shadowOffset = shadowParts[0] ? Number(shadowParts[0]) * currentEm.value : currentEm.value;
         const outlineMapName = `${geoName}__outline`;
         geoLayers.push({
-          z: 4,
-          // 高于 map series (z:3)
+          z: 2,
+          // 低于 map series (z:3)，避免盖住 label
           map: outlineMapName,
           roam: false,
           top: 0,
@@ -29750,15 +29790,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       }
       baseSeries.z = 3;
+      const tooltipConfig = {
+        trigger: "item",
+        formatter: (params) => {
+          if (!params.value)
+            return "";
+          return renderTooltip(params);
+        }
+      };
+      if (props.position) {
+        tooltipConfig.position = props.position;
+      }
+      tooltipConfig.confine = true;
       return {
-        tooltip: {
-          trigger: "item",
-          formatter: (params) => {
-            if (!params.value)
-              return "";
-            return renderTooltip(params);
-          }
-        },
+        tooltip: tooltipConfig,
         geo: geoLayers,
         visualMap: showVisualMap() ? {
           seriesIndex: [0],

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@touchvue/plugin",
-	"version": "1.0.0-beta.6",
+	"version": "1.0.0-beta.7",
 	"description": "Vue3 Plugin Library",
 	"private": false,
 	"type": "module",

package/style/style.css

@@ -1 +1 @@
-.mce-container,.mce-container *,.mce-widget,.mce-widget *,.mce-reset{white-space:pre-wrap!important}.to-watermark[data-v-52e4c07e]{position:absolute;inset:0;pointer-events:none}.to-watermark-grid[data-v-52e4c07e]{display:grid;grid-template-columns:repeat(var(--v66af80a3),1fr);grid-template-rows:repeat(var(--v66afb8fd),1fr);width:100%;height:100%;gap:var(--v86b305f8)}.to-watermark-item[data-v-52e4c07e]{display:flex;align-items:center;justify-content:center}.to-watermark-content[data-v-52e4c07e]{pointer-events:none!important;transform-origin:center}.to-step-tree{white-space:nowrap}.to-step-tree-item{display:inline-block;position:relative}.to-step-tree-item:last-child>.to-step-tree-item-arrow{display:none}.to-step-item-line{position:absolute;width:0;top:100%;left:4em;height:4em;border-left:1px dashed #ccc}.to-step-tree-item-children{position:absolute;left:0}.to-step-tree-item-node{padding:.5em;box-sizing:border-box;text-align:center;white-space:normal;display:inline-block;vertical-align:top;width:8em}.to-step-tree-item-arrow{display:inline-block;margin-left:-.5em;margin-right:-.5em;position:relative;vertical-align:top;margin-top:1.5em}.to-step-tree-item-arrow:before{content:"";width:5em;height:1px;display:block;background:#ccc}.to-step-tree-item-arrow:after{position:absolute;right:-.3em;width:0;transform:translateY(-55%);height:0;border:.3em solid #ccc;content:"";border-top-color:#0000;border-bottom-color:#0000;border-right-color:#0000}.to-step-tree-item-arrow .to-step-tree-item-arrow-content{position:absolute;width:100%;left:0;text-align:center;top:0;transform:translateY(-50%)}.to-step-tree-item-arrow .to-step-tree-item-arrow-content-top{position:absolute;width:100%;left:0;text-align:center;bottom:.5em}.to-step-tree-item-arrow .to-step-tree-item-arrow-content-bottom{position:absolute;width:100%;left:0;text-align:center;top:.5em}.to-step-tree-item-icon{text-align:center;font-size:116.67%;padding:.5em;margin:0 auto;width:2em;height:2em;background:#d9d9d9;color:#fff;line-height:1em;font-weight:700;border-radius:50%}.to-step-tree-item-label{margin-top:.5em}.to-step-tree-item-state-current>.to-step-tree-item-node .to-step-tree-item-icon{background:#0085d0}.to-step-tree-item-state-finished>.to-step-tree-item-node .to-step-tree-item-icon{background:#cce099}.to-echarts-pie{position:relative;margin:0 auto;display:inline-flex;align-items:center;overflow:hidden}.to-echarts-pie-legend{flex:1}.to-echarts-pie-pic{position:relative;align-self:center;display:inline-block;overflow:visible}.to-echarts-pie-background{position:absolute;pointer-events:none}.to-echarts-pie-background img{width:100%;height:100%;object-fit:contain}.to-echarts-pie-pic-content{position:relative}.to-echarts-pie-pic-text{pointer-events:none;position:absolute;z-index:2;left:50%;top:50%;transform:translate(-50%,-50%);text-align:center;width:100%}.to-echarts-pie-pic-value{font-size:2.4em}.to-echarts-pie-pic-label{font-size:1.5em}.to-echarts-pie.has-legend{display:flex;gap:1em;margin:0 auto}.to-echarts-pie.layout-v{flex-direction:column;align-items:inherit;text-align:center}.to-echarts-pie.side-top .to-echarts-pie-pic-text{bottom:0;transform:translate(-50%)}.to-echarts-pie.side-bottom .to-echarts-pie-pic-content{margin-top:-50%}.to-echarts-pie.side-bottom .to-echarts-pie-pic-text{top:0;transform:translate(-50%)}.to-echarts-bar[data-v-c70ba125]{position:relative}.to-echarts-tooltip,.echarts-tooltip{z-index:3000000!important;pointer-events:none}.to-echarts-map.tip-custom>div:nth-child(2){padding:0!important;border:0 none!important;box-shadow:none!important;background:none!important;font-size:100%!important}.to-echarts-map.tip-custom>div:nth-child(2)>div:nth-child(2){display:none}
+.mce-container,.mce-container *,.mce-widget,.mce-widget *,.mce-reset{white-space:pre-wrap!important}.to-watermark[data-v-52e4c07e]{position:absolute;inset:0;pointer-events:none}.to-watermark-grid[data-v-52e4c07e]{display:grid;grid-template-columns:repeat(var(--v66af80a3),1fr);grid-template-rows:repeat(var(--v66afb8fd),1fr);width:100%;height:100%;gap:var(--v86b305f8)}.to-watermark-item[data-v-52e4c07e]{display:flex;align-items:center;justify-content:center}.to-watermark-content[data-v-52e4c07e]{pointer-events:none!important;transform-origin:center}.to-step-tree{white-space:nowrap}.to-step-tree-item{display:inline-block;position:relative}.to-step-tree-item:last-child>.to-step-tree-item-arrow{display:none}.to-step-item-line{position:absolute;width:0;top:100%;left:4em;height:4em;border-left:1px dashed #ccc}.to-step-tree-item-children{position:absolute;left:0}.to-step-tree-item-node{padding:.5em;box-sizing:border-box;text-align:center;white-space:normal;display:inline-block;vertical-align:top;width:8em}.to-step-tree-item-arrow{display:inline-block;margin-left:-.5em;margin-right:-.5em;position:relative;vertical-align:top;margin-top:1.5em}.to-step-tree-item-arrow:before{content:"";width:5em;height:1px;display:block;background:#ccc}.to-step-tree-item-arrow:after{position:absolute;right:-.3em;width:0;transform:translateY(-55%);height:0;border:.3em solid #ccc;content:"";border-top-color:#0000;border-bottom-color:#0000;border-right-color:#0000}.to-step-tree-item-arrow .to-step-tree-item-arrow-content{position:absolute;width:100%;left:0;text-align:center;top:0;transform:translateY(-50%)}.to-step-tree-item-arrow .to-step-tree-item-arrow-content-top{position:absolute;width:100%;left:0;text-align:center;bottom:.5em}.to-step-tree-item-arrow .to-step-tree-item-arrow-content-bottom{position:absolute;width:100%;left:0;text-align:center;top:.5em}.to-step-tree-item-icon{text-align:center;font-size:116.67%;padding:.5em;margin:0 auto;width:2em;height:2em;background:#d9d9d9;color:#fff;line-height:1em;font-weight:700;border-radius:50%}.to-step-tree-item-label{margin-top:.5em}.to-step-tree-item-state-current>.to-step-tree-item-node .to-step-tree-item-icon{background:#0085d0}.to-step-tree-item-state-finished>.to-step-tree-item-node .to-step-tree-item-icon{background:#cce099}.to-echarts-pie{position:relative;margin:0 auto;display:inline-flex;align-items:center;overflow:hidden}.to-echarts-pie-legend{flex:1}.to-echarts-pie-pic{position:relative;align-self:center;display:inline-block;overflow:visible}.to-echarts-pie-background{position:absolute;pointer-events:none}.to-echarts-pie-background img{width:100%;height:100%;object-fit:contain}.to-echarts-pie-pic-content{position:relative}.to-echarts-pie-pic-text{pointer-events:none;position:absolute;z-index:2;left:50%;top:50%;transform:translate(-50%,-50%);text-align:center;width:100%}.to-echarts-pie-pic-value{font-size:2.4em}.to-echarts-pie-pic-label{font-size:1.5em}.to-echarts-pie.has-legend{display:flex;gap:1em;margin:0 auto}.to-echarts-pie.layout-v{flex-direction:column;align-items:inherit;text-align:center}.to-echarts-pie.side-top .to-echarts-pie-pic-text{bottom:0;transform:translate(-50%)}.to-echarts-pie.side-bottom .to-echarts-pie-pic-content{margin-top:-50%}.to-echarts-pie.side-bottom .to-echarts-pie-pic-text{top:0;transform:translate(-50%)}.to-echarts-bar[data-v-9ca896ae]{position:relative}.to-echarts-tooltip,.echarts-tooltip{z-index:3000000!important;pointer-events:none}.to-echarts-map.tip-custom>div:nth-child(2){padding:0!important;border:0 none!important;box-shadow:none!important;background:none!important;font-size:100%!important}.to-echarts-map.tip-custom>div:nth-child(2)>div:nth-child(2){display:none}