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

package/index.mjs

@@ -5,7 +5,6 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 import { defineComponent, ref, computed, resolveComponent, resolveDirective, withDirectives, openBlock, createElementBlock, normalizeClass, normalizeStyle, createBlock, createCommentVNode, createElementVNode, renderSlot, getCurrentInstance, nextTick, render, createVNode, inject, watch, unref, withKeys, vShow, toDisplayString, Fragment, renderList, vModelSelect, createTextVNode, withCtx, withModifiers, onMounted, useSlots, onBeforeUnmount, provide, vModelText, vModelDynamic, isVNode, useAttrs, resolveDynamicComponent, mergeProps, h, isRef, reactive, createSlots, normalizeProps, guardReactiveProps, onDeactivated, onActivated, Transition, onUnmounted, useCssVars, markRaw, toRaw } from "vue";
-import tinymce from "tinymce";
 const withInstall = (main, extra) => {
   main.install = (app) => {
     for (const comp of [main, ...Object.values(extra != null ? extra : {})]) {
@@ -9437,9 +9436,10 @@ const _sfc_main$Y = /* @__PURE__ */ defineComponent({
     title: { default: "" },
     color: { default: "" },
     mode: { default: "default" },
+    link: { type: Boolean, default: false },
     position: { default: "left" }
   },
-  emits: ["back"],
+  emits: ["back", "click"],
   setup(__props, { emit: __emit }) {
     const instance = getCurrentInstance();
     const elRef = ref(null);
@@ -9464,6 +9464,9 @@ const _sfc_main$Y = /* @__PURE__ */ defineComponent({
       if (props.mode) {
         arr.push(`mode-${props.mode}`);
       }
+      if (props.link) {
+        arr.push(`is-link`);
+      }
       if (props.position) {
         arr.push(`position-${props.position}`);
       }
@@ -9477,7 +9480,8 @@ const _sfc_main$Y = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock("div", {
         ref_key: "elRef",
         ref: elRef,
-        class: normalizeClass(["to-header", setClass.value])
+        class: normalizeClass(["to-header", setClass.value]),
+        onClick: ($event) => emit("click")
       }, [
         unref(slots).left || Boolean(hasBack.value) && props.position === "center" ? (openBlock(), createElementBlock("div", {
           key: 0,
@@ -9600,7 +9604,7 @@ const _sfc_main$Y = /* @__PURE__ */ defineComponent({
         }, [
           renderSlot(_ctx.$slots, "right")
         ])) : createCommentVNode("", true)
-      ], 2);
+      ], 10, ["onClick"]);
     };
   }
 });
@@ -9795,7 +9799,7 @@ const _sfc_main$X = /* @__PURE__ */ defineComponent({
       default: false
     }
   },
-  emits: ["update:modelValue", "click", "clear", "input", "keyup", "change", "keydown", "cut", "paste", "keypress", "focus", "blur"],
+  emits: ["update:modelValue", "click", "clear", "input", "keyup", "change", "keydown", "cut", "paste", "keypress", "focus", "blur", "enter", "ctrlenter"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
@@ -10039,6 +10043,12 @@ const _sfc_main$X = /* @__PURE__ */ defineComponent({
     function inputInput() {
       emit("input", data.value);
     }
+    function inputEnter() {
+      emit("enter", data.value);
+    }
+    function inputCtrlEnter() {
+      emit("ctrlenter", data.value);
+    }
     function clear() {
       data.value = "";
       clearVisible.value = false;
@@ -10124,7 +10134,12 @@ const _sfc_main$X = /* @__PURE__ */ defineComponent({
           readonly: __props.readonly,
           tabindex: props.tabindex,
           onKeyup: inputKeyup,
-          onKeydown: inputKeydown,
+          onKeydown: [
+            withModifiers(inputKeydown, ["exact"]),
+            withKeys(withModifiers(inputEnter, ["exact"]), ["enter"]),
+            withKeys(withModifiers(inputCtrlEnter, ["ctrl", "exact"]), ["enter"]),
+            withKeys(withModifiers(inputCtrlEnter, ["meta", "exact"]), ["enter"])
+          ],
           onCut: inputCut,
           onFocus: inputFocus,
           onBlur: inputBlur,
@@ -10132,7 +10147,7 @@ const _sfc_main$X = /* @__PURE__ */ defineComponent({
           onKeypress: inputKeyPress,
           onChange: inputChange,
           onInput: inputInput
-        }, null, 40, ["onUpdate:modelValue", "autocomplete", "maxlength", "placeholder", "disabled", "readonly", "tabindex"])), [
+        }, null, 40, ["onUpdate:modelValue", "autocomplete", "maxlength", "placeholder", "disabled", "readonly", "tabindex", "onKeydown"])), [
           [vModelText, data.value]
         ]) : props.type === "html" ? (openBlock(), createElementBlock("span", {
           key: 5,
@@ -10162,7 +10177,12 @@ const _sfc_main$X = /* @__PURE__ */ defineComponent({
             disabled: props.disabled,
             readonly: __props.readonly,
             onKeyup: inputKeyup,
-            onKeydown: inputKeydown,
+            onKeydown: [
+              withModifiers(inputKeydown, ["exact"]),
+              withKeys(withModifiers(inputEnter, ["exact"]), ["enter"]),
+              withKeys(withModifiers(inputCtrlEnter, ["ctrl", "exact"]), ["enter"]),
+              withKeys(withModifiers(inputCtrlEnter, ["meta", "exact"]), ["enter"])
+            ],
             onCut: inputCut,
             onFocus: inputFocus,
             onBlur: inputBlur,
@@ -10170,7 +10190,7 @@ const _sfc_main$X = /* @__PURE__ */ defineComponent({
             onKeypress: inputKeyPress,
             onChange: inputChange,
             onInput: inputInput
-          }, null, 40, ["onUpdate:modelValue", "autocomplete", "tabindex", "maxlength", "placeholder", "type", "disabled", "readonly"]), [
+          }, null, 40, ["onUpdate:modelValue", "autocomplete", "tabindex", "maxlength", "placeholder", "type", "disabled", "readonly", "onKeydown"]), [
             [vModelDynamic, data.value]
           ])
         ])),
@@ -10337,7 +10357,7 @@ const _sfc_main$W = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ToDivider = withInstall(_sfc_main$W);
+withInstall(_sfc_main$W);
 /*! @license DOMPurify 3.3.1 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.3.1/LICENSE */
 const {
   entries,
@@ -13790,6 +13810,7 @@ const _sfc_main$M = /* @__PURE__ */ defineComponent({
         ref: inputBox,
         "model-value": unref(datedisplay),
         class: "to-date-picker",
+        readonly: !props.inputable,
         required: __props.required,
         desc: __props.desc,
         color: __props.color,
@@ -13893,7 +13914,7 @@ const _sfc_main$M = /* @__PURE__ */ defineComponent({
           }, 8, ["lazy", "slide", "position", "width", "align"])
         ]),
         _: 1
-      }, 8, ["id", "model-value", "required", "desc", "color", "prefix", "suffix", "mode", "prop-error-type", "prop-error-tip", "fillet", "fillet-position", "placeholder", "disabled", "sp-chars", "link", "clearable", "width", "comparable", "onClear", "onInput"]);
+      }, 8, ["id", "model-value", "readonly", "required", "desc", "color", "prefix", "suffix", "mode", "prop-error-type", "prop-error-tip", "fillet", "fillet-position", "placeholder", "disabled", "sp-chars", "link", "clearable", "width", "comparable", "onClear", "onInput"]);
     };
   }
 });
@@ -14310,6 +14331,7 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
     title: { default: "" },
     height: { default: "" },
     changePic: { type: Boolean, default: false },
+    align: { default: "" },
     beforeChange: { type: Function, default: null },
     beforeRemove: { type: Function, default: null }
   },
@@ -14328,8 +14350,12 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
     const slot = useSlots();
     watch(
       () => props.modelValue,
-      (val) => {
-        selectValue.value = val;
+      (val, old) => {
+        if (val || val === 0) {
+          selectValue.value = val;
+        } else {
+          emit("update:modelValue", old);
+        }
       },
       { immediate: true }
     );
@@ -14346,12 +14372,18 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
       initData();
     });
     function initData() {
-      if (props.data) {
+      if (props.data && props.data.length) {
         if (typeof props.data === "string") {
           _data.value = props.data.split(",").map((item) => ({ label: item, value: item }));
         } else if (Array.isArray(props.data) && props.data.length) {
           _data.value = props.data;
         }
+        if (!selectValue.value && selectValue.value !== 0) {
+          const hasNoOnItems = !_data.value.some((item) => item.on);
+          if (hasNoOnItems) {
+            selectValue.value = _data.value[0].value;
+          }
+        }
       }
       if (props.over === "control") {
         nextTick(() => {
@@ -14361,16 +14393,8 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
     }
     const setTabStyle = computed(() => {
       let obj = {};
-      if (props.itemWidth) {
-        if (!isNaN(Number(props.itemWidth))) {
-          obj.width = props.itemWidth + "em";
-        } else {
-          if (props.itemWidth === "avg") {
-            obj.width = 100 / _data.value.length + "%";
-          } else {
-            obj.width = props.itemWidth;
-          }
-        }
+      if (props.itemWidth && !isNaN(Number(props.itemWidth)) && props.itemWidth !== "avg") {
+        obj.width = props.itemWidth + "em";
       }
       return obj;
     });
@@ -14396,6 +14420,12 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
       if (props.itemDir) {
         arr.push(`item-dir-${props.itemDir}`);
       }
+      if (props.itemWidth === "avg") {
+        arr.push(`item-width-avg`);
+      }
+      if (props.align) {
+        arr.push(`align-${props.align}`);
+      }
       return arr;
     });
     const setUlClass = computed(() => {
@@ -15961,9 +15991,10 @@ const _sfc_main$C = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       const _component_to_icon = resolveComponent("to-icon");
+      const _directive_size = resolveDirective("size");
       return withDirectives((openBlock(), createBlock(resolveDynamicComponent(__props.link ? "a" : "span"), {
-        ref: "el",
-        href: __props.href ? __props.href : "javscript:void(0)",
+        ref: "$el2",
+        href: __props.href ? __props.href : __props.link ? "javscript:void(0)" : "",
         class: normalizeClass(["to-text", setClass.value]),
         style: normalizeStyle(setStyle.value)
       }, {
@@ -15971,7 +16002,7 @@ const _sfc_main$C = /* @__PURE__ */ defineComponent({
           renderSlot(_ctx.$slots, "icon", {}, () => [
             props.icon ? (openBlock(), createBlock(_component_to_icon, {
               key: 0,
-              mode: "text-icon",
+              class: "to-text-icon",
               value: props.icon
             }, null, 8, ["value"])) : createCommentVNode("", true)
           ]),
@@ -15984,7 +16015,7 @@ const _sfc_main$C = /* @__PURE__ */ defineComponent({
         ]),
         _: 3
       }, 8, ["href", "class", "style"])), [
-        [unref(vSizeDirective), __props.size]
+        [_directive_size, __props.size]
       ]);
     };
   }
@@ -22052,10 +22083,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
   },
   __name: "collapse-item",
   props: {
-    padding: { default: 1 },
-    paddingPosition: { default: "ltrb" },
     value: { default: "" },
-    name: { default: "" },
     title: { default: "" },
     disabled: { type: Boolean, default: false }
   },
@@ -22065,11 +22093,11 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     const isActive = ref(false);
     const Store = inject("Store");
-    Store.addChild(props.name);
+    Store.addChild(props.value);
     watch(
       () => Store.activeValue.value,
       (value) => {
-        if (value.includes(props.name)) {
+        if (value.includes(props.value)) {
           isActive.value = true;
         } else {
           isActive.value = false;
@@ -22083,80 +22111,55 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       let h2 = containerRef.value.clientHeight / em + "em";
       return h2;
     });
-    const hasUnit = (val) => /[a-z%]+$/i.test(val);
-    const setStyle = computed(() => {
-      const obj = {};
-      if (String(props.padding).trim()) {
-        const padded = String(props.padding).trim().split(/\s+/).map((val) => {
-          return hasUnit(val) ? val : `${val}em`;
-        }).join(" ");
-        obj.padding = padded;
-      }
-      if (!props.paddingPosition.includes("t")) {
-        obj.paddingTop = 0;
-      }
-      if (!props.paddingPosition.includes("r")) {
-        obj.paddingRight = 0;
-      }
-      if (!props.paddingPosition.includes("b")) {
-        obj.paddingBottom = 0;
-      }
-      if (!props.paddingPosition.includes("l")) {
-        obj.paddingLeft = 0;
-      }
-      return obj;
-    });
     function itemClick() {
       if (!props.disabled) {
-        Store.setActiveValues(props.name);
+        Store.setActiveValues(props.value);
         nextTick(() => {
           emit("change", isActive.value);
         });
       }
     }
-    function titleClick(e) {
-      if (!props.disabled) {
-        emit("title-click", e);
-      }
-    }
     return (_ctx, _cache) => {
+      const _component_to_icon = resolveComponent("to-icon");
+      const _component_to_header = resolveComponent("to-header");
       return openBlock(), createElementBlock("div", {
-        class: normalizeClass(["to-collapse-item", __props.disabled ? "is-disabled" : ""])
+        class: normalizeClass(["to-collapse-item", __props.disabled ? "is-dis" : "", isActive.value ? "is-on" : ""])
       }, [
-        createElementVNode("div", {
-          class: normalizeClass(["to-collapse-item-header", isActive.value ? "is-active" : ""]),
-          style: normalizeStyle(setStyle.value),
-          onClick: itemClick
-        }, [
-          createElementVNode("span", {
-            class: "title",
-            onClick: titleClick
-          }, [
-            renderSlot(_ctx.$slots, "title", {}, () => [
-              createElementVNode("span", null, toDisplayString(__props.title), 1)
-            ])
-          ]),
-          renderSlot(_ctx.$slots, "icon", {}, () => [
-            createElementVNode("span", { class: "icon" }, [
-              createVNode(unref(ToIcon), { value: "next" })
-            ])
-          ])
-        ], 6),
+        renderSlot(_ctx.$slots, "header", {
+          item: { isOn: isActive.value, title: __props.title, isDisabled: __props.disabled }
+        }, () => [
+          createVNode(_component_to_header, {
+            link: "",
+            class: normalizeClass(["to-collapse-item-header"]),
+            onClick: itemClick
+          }, {
+            title: withCtx(() => [
+              renderSlot(_ctx.$slots, "title", {}, () => [
+                createTextVNode(toDisplayString(__props.title), 1)
+              ])
+            ]),
+            default: withCtx(() => [
+              renderSlot(_ctx.$slots, "fn"),
+              createVNode(_component_to_icon, {
+                value: "next",
+                class: "to-collapse-item-arrow"
+              })
+            ]),
+            _: 3
+          })
+        ]),
         createElementVNode("div", {
           class: "to-collapse-item-content",
-          style: normalizeStyle({
-            height: isActive.value ? calcHeight.value : "0px"
-          })
+          style: normalizeStyle({ height: isActive.value ? calcHeight.value : "0px" })
         }, [
           createElementVNode("div", {
             ref_key: "containerRef",
             ref: containerRef,
-            class: "content-container"
+            class: "to-collapse-item-wrapper"
           }, [
             renderSlot(_ctx.$slots, "default")
           ], 512)
-        ], 4),
-        createVNode(unref(ToDivider))
+        ], 4)
       ], 2);
     };
   }
@@ -22193,19 +22196,19 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
         deep: true
       }
     );
-    function addChild(name) {
-      allChildren.value.push(name);
+    function addChild(value) {
+      allChildren.value.push(value);
     }
-    function setActiveValues(name) {
-      if (activeValue.value.includes(name)) {
-        let idx = activeValue.value.findIndex((item) => item === name);
+    function setActiveValues(value) {
+      if (activeValue.value.includes(value)) {
+        let idx = activeValue.value.findIndex((item) => item === value);
         idx !== -1 && activeValue.value.splice(idx, 1);
       } else {
         if (props.accordion) {
           activeValue.value = [];
-          activeValue.value.push(name);
+          activeValue.value.push(value);
         } else {
-          activeValue.value.push(name);
+          activeValue.value.push(value);
         }
       }
     }
@@ -24648,6 +24651,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   props: editorProps,
   emits: editorEmits,
   setup(__props, { expose: __expose, emit: __emit }) {
+    const tinymce = window.tinymce;
     const props = __props;
     const emit = __emit;
     const instance = getCurrentInstance();
@@ -24681,11 +24685,13 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     const initTinymce = () => {
       if (!tinymce) {
         console.warn("TinyMCE is not loaded yet, waiting...");
-        setTimeout(initTinymce, 1e3);
+        setTimeout(initTinymce, 100);
         return;
       }
       tinymce.init({
         selector: "#" + tinymceId.value,
+        // 关键：把工具栏渲染到自定义容器，否则在部分 TinyMCE 版本下可能不显示
+        fixed_toolbar_container: "#" + tinymceId.value + "_toolbar-container",
         language: languageTypeList[props.language],
         height: getHeightWithUnit(props.height),
         body_class: "panel-body ",
@@ -24695,8 +24701,9 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         plugins,
         end_container_on_empty_block: true,
         powerpaste_word_import: "clean",
-        skin: false,
-        codesample_content_css: false,
+        // TinyMCE v4 使用 skin: false 容易导致 UI 样式缺失而“看起来没渲染”，改为默认皮肤
+        skin: void 0,
+        codesample_content_css: void 0,
         code_dialog_height: 450,
         code_dialog_width: 1e3,
         advlist_bullet_styles: "square",
@@ -24886,7 +24893,10 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         createElementVNode("div", {
           id: tinymceId.value + "_toolbar-container"
         }, null, 8, ["id"]),
-        createElementVNode("div", { id: tinymceId.value }, [
+        createElementVNode("div", {
+          id: tinymceId.value,
+          style: { "min-height": "200px", "border": "1px solid var(--to-border-color, #dcdfe6)" }
+        }, [
           createElementVNode("p")
         ], 8, ["id"])
       ]);
@@ -25651,6 +25661,14 @@ const echartsBarProps = {
     type: Array,
     default: () => []
   },
+  chartsType: {
+    type: String,
+    default: "bar"
+  },
+  xAxisData: {
+    type: Array,
+    default: () => []
+  },
   color: {
     type: [String, Array, Object],
     default: "#03a9f4"
@@ -25671,6 +25689,10 @@ const echartsBarProps = {
     type: Boolean,
     default: false
   },
+  d3dShape: {
+    type: String,
+    default: "cube"
+  },
   isHorizontal: {
     type: Boolean,
     default: false
@@ -25743,6 +25765,14 @@ const echartsBarProps = {
   tipFontSize: {
     type: [String, Number],
     default: 1
+  },
+  smooth: {
+    type: [Boolean, Number],
+    default: false
+  },
+  interval: {
+    type: Number,
+    default: 0
   }
 };
 const echartsBarEmits = {
@@ -25804,9 +25834,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const axisConfig = computed(() => {
       const categoryAxis = {
         type: "category",
-        data: props.data.map((item) => item.name),
+        data: isMultiSeries.value ? props.xAxisData : props.data.map((item) => item.name),
         axisLabel: {
-          interval: 0,
+          interval: props.interval,
           rotate: props.rotate,
           fontSize: Number(props.fontSize) * currentEm.value,
           color: props.isHorizontal ? props.yAxisStyle.textColor : props.xAxisStyle.textColor
@@ -25928,12 +25958,14 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         color: props.yAxisStyle.textColor
       };
     };
+    const isMultiSeries = computed(() => {
+      return props.data.length > 0 && isArray(props.data[0].value);
+    });
     const seriesConfig = computed(() => {
       if (!echartsLib)
         return [];
       if (!props.is3d) {
         const series = [];
-        const isMultiSeries = props.data.length > 0 && isArray(props.data[0].value);
         const maxValue = Math.max(
           ...props.data.map((item) => {
             if (isArray(item.value)) {
@@ -25942,74 +25974,40 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             return item.value;
           })
         );
-        if (isMultiSeries) {
-          const seriesCount = props.data[0].value.length;
-          for (let i = 0; i < seriesCount; i++) {
+        if (isMultiSeries.value) {
+          props.data.forEach((item, i) => {
             if (props.showShadow) {
               series.push({
-                name: props.data[0].seriesNames ? props.data[0].seriesNames[i] : `系列${i + 1}`,
-                type: "bar",
-                data: props.data.map(() => ({
-                  value: maxValue,
-                  itemStyle: {
-                    color: new echartsLib.graphic.LinearGradient(
-                      ...props.isHorizontal ? [
-                        0,
-                        0,
-                        1,
-                        0,
-                        [
-                          { offset: 0, color: "rgba(0, 0, 0, 0.4)" },
-                          { offset: 0.5, color: "rgba(0, 0, 0, 0.25)" },
-                          { offset: 1, color: "rgba(0, 0, 0, 0)" }
-                        ]
-                      ] : [
-                        0,
-                        0,
-                        0,
-                        1,
-                        [
-                          { offset: 0, color: "rgba(0, 0, 0, 0)" },
-                          { offset: 0.5, color: "rgba(0, 0, 0, 0.25)" },
-                          { offset: 1, color: "rgba(0, 0, 0, 0.4)" }
-                        ]
-                      ]
-                    )
-                  }
-                })),
+                name: item.name,
+                type: item.type ? item.type : props.chartsType,
+                data: item.value,
                 barWidth: Number(props.barSize) * currentEm.value,
                 barGap: "-100%",
                 z: 1,
                 silent: true,
-                animation: false
+                animation: false,
+                smooth: item.smooth || props.smooth
               });
             }
             series.push({
-              name: props.data[0].seriesNames ? props.data[0].seriesNames[i] : `系列${i + 1}`,
-              type: "bar",
-              data: props.data.map((item) => item.value[i]),
+              name: item.name,
+              type: item.type ? item.type : props.chartsType,
+              data: item.value,
               barWidth: Number(props.barSize) * currentEm.value,
               itemStyle: {
                 borderRadius: Number(props.borderRadius) * currentEm.value,
-                color: isArray(props.color) ? new echartsLib.graphic.LinearGradient(...props.isHorizontal ? [0, 0, 1, 0] : [0, 0, 0, 1], [
-                  {
-                    offset: 0,
-                    color: props.color[i].start
-                  },
-                  {
-                    offset: 1,
-                    color: props.color[i].end
-                  }
-                ]) : props.color
+                color: getItemColor(item, i)
               },
+              areaStyle: item.areaStyle ? item.areaStyle : null,
               label: getSeriesLabelConfig(),
-              z: 2
+              z: 2,
+              smooth: item.smooth || props.smooth
             });
-          }
+          });
         } else {
           if (props.showShadow) {
             series.push({
-              type: "bar",
+              type: props.chartsType,
               data: props.data.map(() => ({
                 value: maxValue,
                 itemStyle: {
@@ -26042,16 +26040,18 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               barGap: "-100%",
               z: 1,
               silent: true,
-              animation: false
+              animation: false,
+              smooth: props.smooth
             });
           }
           series.push({
-            type: "bar",
+            type: props.chartsType,
             data: props.data.map((item) => item.value),
             barWidth: Number(props.barSize) * currentEm.value,
             itemStyle: getItemStyle(),
             label: getSeriesLabelConfig(),
-            z: 2
+            z: 2,
+            smooth: props.smooth
           });
         }
         return series;
@@ -26059,6 +26059,18 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         return get3dSeriesConfig();
       }
     });
+    const getItemColor = (item, i) => {
+      let color = null;
+      if (isArray(props.color)) {
+        color = props.color[i];
+      } else {
+        color = props.color;
+      }
+      if (item.linearGradient) {
+        color = item.linearGradient;
+      }
+      return color;
+    };
     const tooltipConfig = computed(() => {
       if (!props.showTooltip) {
         return { show: false };
@@ -26417,12 +26429,107 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       });
       return series;
     };
+    const getVerticalCylinder3dSeries = () => {
+      if (!echartsLib)
+        return [];
+      const values = props.data.map((item) => item.value);
+      const barWidth = Number(props.barSize) * currentEm.value * 1.25;
+      const rx = barWidth / 2;
+      const ry = Math.max(2, barWidth * 0.28);
+      return [
+        {
+          type: "custom",
+          renderItem: (params, api) => {
+            const value = api.value(1);
+            const coord = api.coord([api.value(0), value]);
+            const x = coord[0];
+            const yTop = coord[1];
+            const yBottom = api.coord([api.value(0), 0])[1];
+            const height = Math.abs(yBottom - yTop);
+            const color = getItemStyle().color;
+            const colorStops = typeof color === "object" && color.colorStops ? color.colorStops : [
+              { offset: 0, color: "#4facfe" },
+              { offset: 1, color: "#00f2fe" }
+            ];
+            const topMainColor = colorStops[0].color;
+            const bottomMainColor = colorStops[colorStops.length - 1].color;
+            const children = [];
+            children.push({
+              type: "rect",
+              shape: { x: x - rx, y: yTop, width: rx * 2, height },
+              style: { fill: new echartsLib.graphic.LinearGradient(0, 0, 0, 1, colorStops), opacity: 0.9 },
+              z: 2
+            });
+            children.push({
+              type: "rect",
+              shape: { x: x - rx * 0.72, y: yTop, width: rx * 0.38, height },
+              style: {
+                fill: new echartsLib.graphic.LinearGradient(0, 0, 1, 0, [
+                  { offset: 0, color: "rgba(140,200,255,0.32)" },
+                  { offset: 1, color: "rgba(140,200,255,0.04)" }
+                ])
+              },
+              z: 3
+            });
+            children.push({
+              type: "ellipse",
+              shape: { cx: x, cy: yTop, rx, ry },
+              style: {
+                fill: new echartsLib.graphic.RadialGradient(0.5, 0.42, 0.82, [
+                  { offset: 0, color: adjustSingleColor(topMainColor, 0.35) },
+                  { offset: 0.32, color: adjustSingleColor(topMainColor, 0.08) },
+                  { offset: 0.72, color: topMainColor },
+                  { offset: 1, color: adjustSingleColor(bottomMainColor, -0.22) }
+                ]),
+                lineWidth: 1,
+                stroke: "rgba(170,200,255,0.55)"
+              },
+              z: 5
+            });
+            children.push({
+              type: "ellipse",
+              shape: { cx: x, cy: yBottom - ry * 0.15, rx: rx * 1.02, ry: ry * 1.05 },
+              style: {
+                fill: adjustSingleColor(bottomMainColor, 0.05),
+                opacity: 0.9,
+                lineWidth: 1,
+                stroke: adjustSingleColor(bottomMainColor, 0.15)
+              },
+              z: 6
+            });
+            if (props.showValue) {
+              children.push({
+                type: "text",
+                style: {
+                  text: String(value),
+                  textAlign: "center",
+                  textVerticalAlign: "bottom",
+                  fontSize: Number(props.fontSize) * currentEm.value,
+                  fill: "#fff",
+                  fontWeight: "bold",
+                  x,
+                  y: yTop - ry - 8,
+                  textShadowBlur: 4,
+                  textShadowColor: "rgba(0,0,0,0.5)"
+                },
+                z: 6
+              });
+            }
+            return { type: "group", children };
+          },
+          data: values.map((val, index) => [index, val]),
+          z: 1
+        }
+      ];
+    };
     const get3dSeriesConfig = () => {
       if (props.isHorizontal) {
         return getHorizontal3dSeries();
-      } else {
-        return getVertical3dSeries();
       }
+      if (props.d3dShape === "cylinder") {
+        return getVerticalCylinder3dSeries();
+      }
+      return getVertical3dSeries();
     };
     const initChart = (retry = 0) => {
       window.setTimeout(async () => {
@@ -26551,8 +26658,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const echartsBar_vue_vue_type_style_index_0_scoped_707c1175_lang = "";
-const EchartsBar = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-707c1175"]]);
+const echartsBar_vue_vue_type_style_index_0_scoped_4f4fca0e_lang = "";
+const EchartsBar = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-4f4fca0e"]]);
 const ToEchartsBar = withInstall(EchartsBar);
 const DEFAULT_VIEW_CONTROL = {
   zoomSensitivity: 0,
@@ -26561,6 +26668,10 @@ const DEFAULT_VIEW_CONTROL = {
   distance: 100
 };
 const echartsMapProps = {
+  nameMap: {
+    type: Object,
+    default: () => ({})
+  },
   shadow: {
     type: String,
     default: ""
@@ -26688,6 +26799,18 @@ const echartsMapProps = {
   speed: {
     type: [String, Number],
     default: 3e3
+  },
+  showOutline: {
+    type: Boolean,
+    default: false
+  },
+  outlineColor: {
+    type: String,
+    default: "#000"
+  },
+  outlineWidth: {
+    type: [String, Number],
+    default: 2
   }
 };
 const echartsMapEmits = {
@@ -29218,7 +29341,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             show: true,
             color: props.fontColor,
             fontSize: Number(props.fontSize) * currentEm.value,
-            formatter: (e) => ` ${e.name} `
+            formatter: (e) => {
+              var _a3, _b;
+              return ` ${(_b = (_a3 = props.nameMap) == null ? void 0 : _a3[e.name]) != null ? _b : e.name} `;
+            }
           },
           itemStyle: {
             color: props.color || "#65bbff",
@@ -29257,7 +29383,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           show: true,
           color: props.fontColor,
           fontSize: Number(props.fontSize) * currentEm.value,
-          formatter: (e) => ` ${e.name} `
+          formatter: (e) => {
+            var _a3, _b;
+            return ` ${(_b = (_a3 = props.nameMap) == null ? void 0 : _a3[e.name]) != null ? _b : e.name} `;
+          }
         },
         itemStyle: {
           shadowBlur: itemShadowParts[0] ? Number(itemShadowParts[0]) * currentEm.value : 0,
@@ -29294,6 +29423,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const getOption = (geoName, mapData) => {
       var _a2;
+      const baseSeries = getBaseSeries(geoName, mapData);
       const shadowParts = parseShadow(props.shadow);
       const { min, max: max2 } = getMinMax(mapData);
       return {
@@ -29306,16 +29436,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         },
         geo: {
-          show: Boolean(props.shadow),
+          // 轮廓线与底部阴影共用 geo：
+          // - shadow：用 geo 的 areaColor 作为底部投影层
+          // - showOutline：用 geo 的 borderColor/borderWidth 画最外围轮廓线
+          show: Boolean(props.shadow) || props.showOutline,
           map: geoName,
           roam: false,
-          top: shadowParts[0] ? Number(shadowParts[0]) * currentEm.value : currentEm.value,
+          top: props.shadow ? shadowParts[0] ? Number(shadowParts[0]) * currentEm.value : currentEm.value : 0,
           bottom: 0,
           silent: true,
           label: { show: false },
           itemStyle: {
-            areaColor: (_a2 = shadowParts[1]) != null ? _a2 : "rgba(0,0,0,0.3)",
-            borderWidth: 0
+            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 尖刺
+            borderJoin: "round",
+            borderMiterLimit: 2
           }
         },
         visualMap: showVisualMap() ? {
@@ -29340,7 +29477,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             color: props.colorRange.length ? props.colorRange : [props.colorStart, props.colorEnd]
           }
         } : { show: false },
-        series: [getBaseSeries(geoName, mapData), ...props.flag || []]
+        series: [baseSeries, ...props.flag || []]
       };
     };
     const renderTooltip = (params) => {