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

fix: move events collecting from init to setup

Browse Source
This commit is contained in:
Yue JIN
2024-04-23 14:17:23 +08:00
committed by GU Yiling
parent 898195c770
commit 09808a47d2
1 changed files with 52 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/ECharts.ts
View File

@ -101,22 +101,6 @@ export default defineComponent({
// @ts-expect-error listeners for Vue 2 compatibility // @ts-expect-error listeners for Vue 2 compatibility
const listeners = getCurrentInstance().proxy.$listeners; const listeners = getCurrentInstance().proxy.$listeners;
function init(option?: Option) {
if (!inner.value) {
return;
}
const instance = (chart.value = initChart(
inner.value,
realTheme.value,
realInitOptions.value
));
if (props.group) {
instance.group = props.group;
}
const realListeners: Record<string, any> = {}; const realListeners: Record<string, any> = {};
if (!listeners) { if (!listeners) {
@ -136,9 +120,9 @@ export default defineComponent({
// Collect native DOM events // Collect native DOM events
if (event.indexOf("native:") === 0) { if (event.indexOf("native:") === 0) {
// native:click -> onClick // native:click -> onClick
const nativeKey = `on${event const nativeKey = `on${event.charAt(7).toUpperCase()}${event.slice(
.charAt(7) 8
.toUpperCase()}${event.slice(8)}`; )}`;
nativeListeners[nativeKey] = attrs[key]; nativeListeners[nativeKey] = attrs[key];
return; return;
@ -163,14 +147,28 @@ export default defineComponent({
// &~!native:click -> &~!click // &~!native:click -> &~!click
Object.keys(listeners).forEach(key => { Object.keys(listeners).forEach(key => {
if (NATIVE_EVENT_RE.test(key)) { if (NATIVE_EVENT_RE.test(key)) {
nativeListeners[key.replace(NATIVE_EVENT_RE, "$1")] = nativeListeners[key.replace(NATIVE_EVENT_RE, "$1")] = listeners[key];
listeners[key];
} else { } else {
realListeners[key] = listeners[key]; realListeners[key] = listeners[key];
} }
}); });
} }
function init(option?: Option) {
if (!inner.value) {
return;
}
const instance = (chart.value = initChart(
inner.value,
realTheme.value,
realInitOptions.value
));
if (props.group) {
instance.group = props.group;
}
Object.keys(realListeners).forEach(key => { Object.keys(realListeners).forEach(key => {
let handler = realListeners[key]; let handler = realListeners[key];