github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-01-23 01:30:26 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: useEcharts return invalid instance (#5360)
Some checks are pending
CI / Test (ubuntu-latest) (push) Waiting to run
Details
CI / Test (windows-latest) (push) Waiting to run
Details
CI / Lint (ubuntu-latest) (push) Waiting to run
Details
CI / Lint (windows-latest) (push) Waiting to run
Details
CI / Check (ubuntu-latest) (push) Waiting to run
Details
CI / Check (windows-latest) (push) Waiting to run
Details
CI / CI OK (push) Blocked by required conditions
Details
CodeQL / Analyze (${{ matrix.language }}) (none, javascript-typescript) (push) Waiting to run
Details
Deploy Website on push / Deploy Push Playground Ftp (push) Waiting to run
Details
Deploy Website on push / Deploy Push Docs Ftp (push) Waiting to run
Details
Deploy Website on push / Deploy Push Antd Ftp (push) Waiting to run
Details
Deploy Website on push / Deploy Push Element Ftp (push) Waiting to run
Details
Deploy Website on push / Deploy Push Naive Ftp (push) Waiting to run
Details
Release Drafter / update_release_draft (push) Waiting to run
Details

Browse Source
This commit is contained in:
Netfan 2025-01-12 09:54:37 +08:00 committed by GitHub
parent 6719e2679f
commit b785bc5704
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/effects/plugins/src/echarts/use-echarts.ts
View File

@ -2,6 +2,8 @@ import type { EChartsOption } from 'echarts';
import type { Ref } from 'vue'; import type { Ref } from 'vue';
import type { Nullable } from '@vben/types';
import type EchartsUI from './echarts-ui.vue'; import type EchartsUI from './echarts-ui.vue';
import { computed, nextTick, watch } from 'vue'; import { computed, nextTick, watch } from 'vue';
@ -50,7 +52,10 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
return chartInstance; return chartInstance;
}; };
const renderEcharts = (options: EChartsOption, clear = true) => { const renderEcharts = (
options: EChartsOption,
clear = true,
): Promise<Nullable<echarts.ECharts>> => {
cacheOptions = options; cacheOptions = options;
const currentOptions = { const currentOptions = {
...options, ...options,
@ -58,9 +63,8 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
}; };
return new Promise((resolve) => { return new Promise((resolve) => {
if (chartRef.value?.offsetHeight === 0) { if (chartRef.value?.offsetHeight === 0) {
useTimeoutFn(() => { useTimeoutFn(async () => {
renderEcharts(currentOptions); resolve(await renderEcharts(currentOptions));
resolve(null);
}, 30); }, 30);
return; return;
} }
@ -72,7 +76,7 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
} }
clear && chartInstance?.clear(); clear && chartInstance?.clear();
chartInstance?.setOption(currentOptions); chartInstance?.setOption(currentOptions);
resolve(null); resolve(chartInstance);
}, 30); }, 30);
}); });
}); });
@ -109,7 +113,7 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
return { return {
renderEcharts, renderEcharts,
resize, resize,
chartInstance, getChartInstance: () => chartInstance,
}; };
} }