javascript/vueecharts
1
0
Fork 0
mirror of https://github.com/ecomfe/vue-echarts.git synced 2025-10-28 11:33:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: v-on not working in 2.7 (fix #636)

Browse Source
This commit is contained in:
Justineo
2022-07-12 12:25:42 +08:00
parent 4aaca62b89
commit 0ddc499755
5 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ECharts.ts
View File

@ -12,13 +12,14 @@ import {
onUnmounted,
h,
nextTick,
PropType,
watchEffect,
getCurrentInstance,
Vue2,
InjectionKey
type PropType,
type InjectionKey
} from "vue-demi";
import { init as initChart } from "echarts/core";
import {
import type {
EChartsType,
EventTarget,
Option,
@ -36,8 +37,8 @@ import {
useLoading,
loadingProps
} from "./composables";
import "./style.css";
import { omitOn } from "./utils";
import "./style.css";
const TAG_NAME = "x-vue-echarts";
@ -46,8 +47,10 @@ if (Vue2) {
}
export const THEME_KEY = "ecTheme" as unknown as InjectionKey<ThemeInjection>;
export const INIT_OPTIONS_KEY = "ecInitOptions" as unknown as InjectionKey<InitOptionsInjection>;
export const UPDATE_OPTIONS_KEY = "ecUpdateOptions" as unknown as InjectionKey<UpdateOptionsInjection>;
export const INIT_OPTIONS_KEY =
"ecInitOptions" as unknown as InjectionKey<InitOptionsInjection>;
export const UPDATE_OPTIONS_KEY =
"ecUpdateOptions" as unknown as InjectionKey<UpdateOptionsInjection>;
export { LOADING_OPTIONS_KEY } from "./composables";
export default defineComponent({
@ -65,20 +68,13 @@ export default defineComponent({
...loadingProps
},
inheritAttrs: false,
// @ts-expect-error listeners for Vue 2 compatibility
setup(props, { attrs, listeners }) {
setup(props, { attrs }) {
const root = shallowRef<HTMLElement>();
const chart = shallowRef<EChartsType>();
const manualOption = shallowRef<Option>();
const defaultTheme = inject(THEME_KEY, null);
const defaultInitOptions = inject(
INIT_OPTIONS_KEY,
null
);
const defaultUpdateOptions = inject(
UPDATE_OPTIONS_KEY,
null
);
const defaultInitOptions = inject(INIT_OPTIONS_KEY, null);
const defaultUpdateOptions = inject(UPDATE_OPTIONS_KEY, null);
const { autoresize, manualUpdate, loading, loadingOptions } = toRefs(props);
@ -94,6 +90,9 @@ export default defineComponent({
);
const nonEventAttrs = computed(() => omitOn(attrs));
// @ts-expect-error listeners for Vue 2 compatibility
const listeners = getCurrentInstance().proxy.$listeners;
function init(option?: Option) {
if (!root.value) {
return;