javascript/vueecharts
1
0
Fork 0
mirror of https://github.com/ecomfe/vue-echarts.git synced 2025-08-16 21:09:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix default behavior for notMerge, close #691

Browse Source
This commit is contained in:
Justineo
2023-02-08 16:22:51 +08:00
parent 4313d301e4
commit 6159c7d684
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 6.5.3
* Fixed default behavior for `notMerge` option (#691).
## 6.5.2 ## 6.5.2
* Added `dist/csp/*` to support strict CSP with extracted CSS file. * Added `dist/csp/*` to support strict CSP with extracted CSS file.

8
README.md
View File

@ -224,13 +224,11 @@ Drop `<script>` inside your HTML file and access the component via `window.VueEC
<summary>Vue 3 <a href="https://stackblitz.com/edit/vue-echarts-vue-3-global?file=index.html">Demo →</a></summary> <summary>Vue 3 <a href="https://stackblitz.com/edit/vue-echarts-vue-3-global?file=index.html">Demo →</a></summary>
<!-- vue3Scripts:start --> <!-- vue3Scripts:start -->
```html ```html
<script src="https://cdn.jsdelivr.net/npm/vue@3.2.45"></script> <script src="https://cdn.jsdelivr.net/npm/vue@3.2.45"></script>
<script src="https://cdn.jsdelivr.net/npm/echarts@5.4.1"></script> <script src="https://cdn.jsdelivr.net/npm/echarts@5.4.1"></script>
<script src="https://cdn.jsdelivr.net/npm/vue-echarts@6.5.2"></script> <script src="https://cdn.jsdelivr.net/npm/vue-echarts@6.5.3"></script>
``` ```
<!-- vue3Scripts:end --> <!-- vue3Scripts:end -->
```js ```js
@ -246,13 +244,11 @@ app.component('v-chart', VueECharts)
<summary>Vue 2 <a href="https://stackblitz.com/edit/vue-echarts-vue-2-global?file=index.html">Demo →</a></summary> <summary>Vue 2 <a href="https://stackblitz.com/edit/vue-echarts-vue-2-global?file=index.html">Demo →</a></summary>
<!-- vue2Scripts:start --> <!-- vue2Scripts:start -->
```html ```html
<script src="https://cdn.jsdelivr.net/npm/vue@2.7.14"></script> <script src="https://cdn.jsdelivr.net/npm/vue@2.7.14"></script>
<script src="https://cdn.jsdelivr.net/npm/echarts@5.4.1"></script> <script src="https://cdn.jsdelivr.net/npm/echarts@5.4.1"></script>
<script src="https://cdn.jsdelivr.net/npm/vue-echarts@6.5.2"></script> <script src="https://cdn.jsdelivr.net/npm/vue-echarts@6.5.3"></script>
``` ```
<!-- vue2Scripts:end --> <!-- vue2Scripts:end -->
```js ```js

4
README.zh-Hans.md
View File

@ -227,7 +227,7 @@ import "echarts";
```html ```html
<script src="https://cdn.jsdelivr.net/npm/vue@3.2.45"></script> <script src="https://cdn.jsdelivr.net/npm/vue@3.2.45"></script>
<script src="https://cdn.jsdelivr.net/npm/echarts@5.4.1"></script> <script src="https://cdn.jsdelivr.net/npm/echarts@5.4.1"></script>
<script src="https://cdn.jsdelivr.net/npm/vue-echarts@6.5.2"></script> <script src="https://cdn.jsdelivr.net/npm/vue-echarts@6.5.3"></script>
``` ```
<!-- vue3Scripts:end --> <!-- vue3Scripts:end -->
@ -247,7 +247,7 @@ app.component('v-chart', VueECharts)
```html ```html
<script src="https://cdn.jsdelivr.net/npm/vue@2.7.14"></script> <script src="https://cdn.jsdelivr.net/npm/vue@2.7.14"></script>
<script src="https://cdn.jsdelivr.net/npm/echarts@5.4.1"></script> <script src="https://cdn.jsdelivr.net/npm/echarts@5.4.1"></script>
<script src="https://cdn.jsdelivr.net/npm/vue-echarts@6.5.2"></script> <script src="https://cdn.jsdelivr.net/npm/vue-echarts@6.5.3"></script>
``` ```
<!-- vue2Scripts:end --> <!-- vue2Scripts:end -->

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "vue-echarts", "name": "vue-echarts",
"version": "6.5.2", "version": "6.5.3",
"description": "Vue.js component for Apache ECharts.", "description": "Vue.js component for Apache ECharts.",
"author": "GU Yiling <justice360@gmail.com>", "author": "GU Yiling <justice360@gmail.com>",
"scripts": { "scripts": {

5
src/ECharts.ts
View File

@ -232,8 +232,11 @@ export default defineComponent({
if (!chart.value) { if (!chart.value) {
init(); init();
} else { } else {
console.log(`notMerge: ${option !== oldOption}`);
chart.value.setOption(option, { chart.value.setOption(option, {
notMerge: option.value !== oldOption?.value, // mutating `option` will lead to `notMerge: false` and
// replacing it with new reference will lead to `notMerge: true`
notMerge: option !== oldOption,
...realUpdateOptions.value ...realUpdateOptions.value
}); });
} }