@vtj/charts 0.12.22 → 0.12.24

package/dist/index.mjs

@@ -1,31 +1,31 @@
-import * as v from "echarts";
-import { reactive as w, ref as f, onMounted as h, unref as b, markRaw as S, onUnmounted as d, watch as p, shallowRef as j, defineComponent as g, h as m, toRefs as y, computed as C } from "vue";
+import * as h from "echarts";
+import { reactive as w, ref as f, onMounted as v, unref as b, markRaw as S, onUnmounted as d, watch as p, shallowRef as j, defineComponent as g, h as m, toRefs as y, computed as C } from "vue";
 import { useResizeObserver as E } from "@vueuse/core";
-import { kebabCase as M, camelCase as x, debounce as k } from "@vtj/utils";
+import { kebabCase as x, camelCase as M, debounce as k } from "@vtj/utils";
 /**!
  * Copyright (c) 2025, VTJ.PRO All rights reserved.
  * @name @vtj/charts 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.12.22
+ * @version 0.12.24
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-const I = "0.12.22";
-function J(a) {
+const T = "0.12.24";
+function J(s) {
   const o = w({});
-  for (const [c, e] of Object.entries(a)) {
-    const [r, ...s] = M(c).split("-");
+  for (const [u, e] of Object.entries(s)) {
+    const [r, ...a] = x(u).split("-");
     if (r === "on" && typeof e == "function") {
-      const t = x(s.join("-"));
+      const t = M(a.join("-"));
       o[t] = e;
     }
   }
   return o;
 }
-function L(a, o, c) {
-  const e = f(), r = J(c);
-  return h(() => {
-    const t = b(a);
-    if (t && (e.value || (e.value = S(v.init(t))), e.value)) {
+function L(s, o, u) {
+  const e = f(), r = J(u);
+  return v(() => {
+    const t = b(s);
+    if (t && (e.value || (e.value = S(h.init(t))), e.value)) {
       for (const [i, n] of Object.entries(r))
         e.value.on(i, n);
       e.value.setOption(o.value || {});
@@ -43,7 +43,7 @@ function L(a, o, c) {
     },
     { deep: !0 }
   ), E(
-    a,
+    s,
     k(() => {
       e.value && e.value.resize();
     }, 150)
@@ -52,31 +52,31 @@ function L(a, o, c) {
     getEChart: () => e.value
   };
 }
-function X(a, o, c) {
-  const e = f(), r = j(null), s = f({}), t = async (i, n) => {
-    const u = e.value?.instance;
-    u && u.showLoading();
+function X(s, o, u) {
+  const e = f(), r = j(null), a = f({}), t = async (i, n) => {
+    const c = e.value?.instance;
+    c && c.showLoading();
     const l = typeof n == "string" ? await fetch(n).then((O) => O.json()).catch(() => null) : n;
-    return u && u.hideLoading(), l && v.registerMap(i, l), l;
+    return c && c.hideLoading(), l && h.registerMap(i, l), l;
   };
-  return p([a, o], async () => {
-    r.value = await t(a.value, o.value);
+  return p([s, o], async () => {
+    r.value = await t(s.value, o.value);
   }), p(r, (i) => {
     if (i) {
-      const n = c.option || {};
-      n.geo && (n.geo.map = a.value), (n.series || []).map((l) => {
-        l?.type === "map" && (l.map = a.value);
-      }), s.value = n;
+      const n = u.option || {};
+      n.geo && (n.geo.map = s.value), (n.series || []).map((l) => {
+        l?.type === "map" && (l.map = s.value);
+      }), a.value = n;
     }
-  }), h(async () => {
-    r.value = await t(a.value, o.value);
+  }), v(async () => {
+    r.value = await t(s.value, o.value);
   }), d(() => {
     const i = e.value?.instance;
     i && i.hideLoading();
   }), {
     chartRef: e,
     geoJSON: r,
-    option: s
+    option: a
   };
 }
 const R = g({
@@ -94,28 +94,28 @@ const R = g({
       type: Object
     }
   },
-  setup(a, { expose: o, attrs: c }) {
-    const { width: e, height: r, option: s } = y(a), t = f(), i = C(() => ({
+  setup(s, { expose: o, attrs: u }) {
+    const { width: e, height: r, option: a } = y(s), t = f(), i = C(() => ({
       width: e.value,
       height: r.value
-    })), { instance: n, getEChart: u } = L(t, s, c);
+    })), { instance: n, getEChart: c } = L(t, a, u);
     return o({
       elRef: t,
-      option: s,
+      option: a,
       instance: n,
-      getEChart: u
+      getEChart: c
     }), {
       elRef: t,
-      option: s,
+      option: a,
       styles: i,
       instance: n,
-      getEChart: u
+      getEChart: c
     };
   },
   render() {
     return m("div", { class: "x-chart", ref: "elRef", style: this.styles });
   }
-}), T = g({
+}), N = g({
   name: "XMapChart",
   inheritAttrs: !1,
   props: {
@@ -129,16 +129,16 @@ const R = g({
     }
   },
   emits: ["ready"],
-  async setup(a, { attrs: o, emit: c }) {
-    const { name: e, geoJson: r } = y(a), { chartRef: s, geoJSON: t, option: i } = X(e, r, o), n = C(() => s.value?.instance);
-    return h(() => {
-      c("ready", n.value);
+  async setup(s, { attrs: o, emit: u }) {
+    const { name: e, geoJson: r } = y(s), { chartRef: a, geoJSON: t, option: i } = X(e, r, o), n = C(() => a.value?.instance);
+    return p(t, async (c) => {
+      c && u("ready", c);
     }), {
-      chartRef: s,
+      chartRef: a,
       option: i,
       instance: n,
-      getChartRef: () => s.value,
-      getEChart: () => s.value?.getEChart(),
+      getChartRef: () => a.value,
+      getEChart: () => a.value?.getEChart(),
       geoJSON: t
     };
   },
@@ -155,11 +155,11 @@ const R = g({
     );
   },
   methods: {}
-}), V = [R];
+}), V = [R, N];
 export {
-  I as VTJ_CHARTS_VERSION,
+  T as VTJ_CHARTS_VERSION,
   R as XChart,
-  T as XMapChart,
+  N as XMapChart,
   V as components,
-  v as echarts
+  h as echarts
 };

package/dist/index.umd.js

@@ -2,6 +2,6 @@
  * Copyright (c) 2025, VTJ.PRO All rights reserved.
  * @name @vtj/charts 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.12.22
+ * @version 0.12.24
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
- */const h="0.12.22";function V(n){const a=Vue.reactive({});for(const[l,e]of Object.entries(n)){const[i,...o]=VtjUtils.kebabCase(l).split("-");if(i==="on"&&typeof e=="function"){const s=VtjUtils.camelCase(o.join("-"));a[s]=e}}return a}function m(n,a,l){const e=Vue.ref(),i=V(l);return Vue.onMounted(()=>{const s=Vue.unref(n);if(s&&(e.value||(e.value=Vue.markRaw(echarts.init(s))),e.value)){for(const[c,t]of Object.entries(i))e.value.on(c,t);e.value.setOption(a.value||{})}}),Vue.onUnmounted(()=>{if(e.value){for(const s of Object.keys(i))e.value.off(s);e.value.dispose()}}),Vue.watch(a,async s=>{e.value&&e.value.setOption(s||{})},{deep:!0}),VueUse.useResizeObserver(n,VtjUtils.debounce(()=>{e.value&&e.value.resize()},150)),{instance:e,getEChart:()=>e.value}}function y(n,a,l){const e=Vue.ref(),i=Vue.shallowRef(null),o=Vue.ref({}),s=async(c,t)=>{var g;const u=(g=e.value)==null?void 0:g.instance;u&&u.showLoading();const f=typeof t=="string"?await fetch(t).then(j=>j.json()).catch(()=>null):t;return u&&u.hideLoading(),f&&echarts.registerMap(c,f),f};return Vue.watch([n,a],async()=>{i.value=await s(n.value,a.value)}),Vue.watch(i,c=>{if(c){const t=l.option||{};t.geo&&(t.geo.map=n.value),(t.series||[]).map(f=>{(f==null?void 0:f.type)==="map"&&(f.map=n.value)}),o.value=t}}),Vue.onMounted(async()=>{i.value=await s(n.value,a.value)}),Vue.onUnmounted(()=>{var t;const c=(t=e.value)==null?void 0:t.instance;c&&c.hideLoading()}),{chartRef:e,geoJSON:i,option:o}}const p=Vue.defineComponent({name:"XChart",props:{width:{type:String,default:"100%"},height:{type:String,default:"400px"},option:{type:Object}},setup(n,{expose:a,attrs:l}){const{width:e,height:i,option:o}=Vue.toRefs(n),s=Vue.ref(),c=Vue.computed(()=>({width:e.value,height:i.value})),{instance:t,getEChart:u}=m(s,o,l);return a({elRef:s,option:o,instance:t,getEChart:u}),{elRef:s,option:o,styles:c,instance:t,getEChart:u}},render(){return Vue.h("div",{class:"x-chart",ref:"elRef",style:this.styles})}}),C=Vue.defineComponent({name:"XMapChart",inheritAttrs:!1,props:{geoJson:{type:[String,Object],default:"https://unpkg.com/vtj-geojson@0.1.3/geo/100000/100000.geoJson"},name:{type:String,default:"china"}},emits:["ready"],async setup(n,{attrs:a,emit:l}){const{name:e,geoJson:i}=Vue.toRefs(n),{chartRef:o,geoJSON:s,option:c}=y(e,i,a),t=Vue.computed(()=>{var u;return(u=o.value)==null?void 0:u.instance});return Vue.onMounted(()=>{l("ready",t.value)}),{chartRef:o,option:c,instance:t,getChartRef:()=>o.value,getEChart:()=>{var u;return(u=o.value)==null?void 0:u.getEChart()},geoJSON:s}},render(){return Vue.h(p,{...this.$attrs,ref:"chartRef",class:"x-map-chart",option:this.option},this.$slots)},methods:{}}),v=[p];var b=echarts;const d=Symbol("INSTALLED_KEY");function S(n){n[d]||(n[d]=!0,v.forEach(a=>{a.name&&n.component(a.name,a)}))}r.INSTALLED_KEY=d,r.VTJ_CHARTS_VERSION=h,r.XChart=p,r.XMapChart=C,r.components=v,r.echarts=b,r.install=S,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})});
+ */const h="0.12.24";function m(t){const s=Vue.reactive({});for(const[l,e]of Object.entries(t)){const[u,...i]=VtjUtils.kebabCase(l).split("-");if(u==="on"&&typeof e=="function"){const n=VtjUtils.camelCase(i.join("-"));s[n]=e}}return s}function y(t,s,l){const e=Vue.ref(),u=m(l);return Vue.onMounted(()=>{const n=Vue.unref(t);if(n&&(e.value||(e.value=Vue.markRaw(echarts.init(n))),e.value)){for(const[c,a]of Object.entries(u))e.value.on(c,a);e.value.setOption(s.value||{})}}),Vue.onUnmounted(()=>{if(e.value){for(const n of Object.keys(u))e.value.off(n);e.value.dispose()}}),Vue.watch(s,async n=>{e.value&&e.value.setOption(n||{})},{deep:!0}),VueUse.useResizeObserver(t,VtjUtils.debounce(()=>{e.value&&e.value.resize()},150)),{instance:e,getEChart:()=>e.value}}function C(t,s,l){const e=Vue.ref(),u=Vue.shallowRef(null),i=Vue.ref({}),n=async(c,a)=>{var V;const o=(V=e.value)==null?void 0:V.instance;o&&o.showLoading();const f=typeof a=="string"?await fetch(a).then(j=>j.json()).catch(()=>null):a;return o&&o.hideLoading(),f&&echarts.registerMap(c,f),f};return Vue.watch([t,s],async()=>{u.value=await n(t.value,s.value)}),Vue.watch(u,c=>{if(c){const a=l.option||{};a.geo&&(a.geo.map=t.value),(a.series||[]).map(f=>{(f==null?void 0:f.type)==="map"&&(f.map=t.value)}),i.value=a}}),Vue.onMounted(async()=>{u.value=await n(t.value,s.value)}),Vue.onUnmounted(()=>{var a;const c=(a=e.value)==null?void 0:a.instance;c&&c.hideLoading()}),{chartRef:e,geoJSON:u,option:i}}const p=Vue.defineComponent({name:"XChart",props:{width:{type:String,default:"100%"},height:{type:String,default:"400px"},option:{type:Object}},setup(t,{expose:s,attrs:l}){const{width:e,height:u,option:i}=Vue.toRefs(t),n=Vue.ref(),c=Vue.computed(()=>({width:e.value,height:u.value})),{instance:a,getEChart:o}=y(n,i,l);return s({elRef:n,option:i,instance:a,getEChart:o}),{elRef:n,option:i,styles:c,instance:a,getEChart:o}},render(){return Vue.h("div",{class:"x-chart",ref:"elRef",style:this.styles})}}),v=Vue.defineComponent({name:"XMapChart",inheritAttrs:!1,props:{geoJson:{type:[String,Object],default:"https://unpkg.com/vtj-geojson@0.1.3/geo/100000/100000.geoJson"},name:{type:String,default:"china"}},emits:["ready"],async setup(t,{attrs:s,emit:l}){const{name:e,geoJson:u}=Vue.toRefs(t),{chartRef:i,geoJSON:n,option:c}=C(e,u,s),a=Vue.computed(()=>{var o;return(o=i.value)==null?void 0:o.instance});return Vue.watch(n,async o=>{o&&l("ready",o)}),{chartRef:i,option:c,instance:a,getChartRef:()=>i.value,getEChart:()=>{var o;return(o=i.value)==null?void 0:o.getEChart()},geoJSON:n}},render(){return Vue.h(p,{...this.$attrs,ref:"chartRef",class:"x-map-chart",option:this.option},this.$slots)},methods:{}}),g=[p,v];var b=echarts;const d=Symbol("INSTALLED_KEY");function S(t){t[d]||(t[d]=!0,g.forEach(s=>{s.name&&t.component(s.name,s)}))}r.INSTALLED_KEY=d,r.VTJ_CHARTS_VERSION=h,r.XChart=p,r.XMapChart=v,r.components=g,r.echarts=b,r.install=S,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vtj/charts",
   "private": false,
-  "version": "0.12.22",
+  "version": "0.12.24",
   "type": "module",
   "keywords": [
     "低代码引擎",
@@ -26,8 +26,8 @@
   "dependencies": {
     "@vueuse/core": "~13.1.0",
     "echarts": "~5.6.0",
-    "@vtj/icons": "~0.12.22",
-    "@vtj/utils": "~0.12.22"
+    "@vtj/icons": "~0.12.24",
+    "@vtj/utils": "~0.12.24"
   },
   "devDependencies": {
     "@vtj/cli": "~0.12.2"

package/types/version.d.ts

@@ -2,7 +2,7 @@
  * Copyright (c) 2025, VTJ.PRO All rights reserved.
  * @name @vtj/charts
  * @author CHC chenhuachun1549@dingtalk.com
- * @version 0.12.21
+ * @version 0.12.23
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-export declare const version = "0.12.21";
+export declare const version = "0.12.23";