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

fix(#519): replace mergeProps with simplified logic

Browse Source
This commit is contained in:
Justineo
2021-03-03 18:26:54 +08:00
parent 0664e6b23e
commit bef5ee70e5
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ECharts.ts
View File

@ -12,7 +12,6 @@ import {
onMounted,
onUnmounted,
h,
mergeProps,
PropType,
watchEffect,
Vue2
@ -36,7 +35,7 @@ import {
loadingProps
} from "./composables";
import "./style.css";
import { filterObjectValue } from "./utils";
import { omitOn } from "./utils";
const TAG_NAME = "x-vue-echarts";
@ -95,9 +94,7 @@ export default defineComponent({
const initOptions = toRef(props, "initOptions");
const loadingOptions = toRef(props, "loadingOptions");
const nonEventAttrs = computed(() =>
filterObjectValue(attrs, value => typeof value !== "function")
);
const nonEventAttrs = computed(() => omitOn(attrs));
function init(option?: Option) {
if (chart.value || !root.value) {
@ -244,9 +241,9 @@ export default defineComponent({
return exposed;
},
render() {
return h(
TAG_NAME,
mergeProps({ class: "echarts", ref: "root" }, this.nonEventAttrs)
);
const attrs = { ...this.nonEventAttrs };
attrs.ref = "root";
attrs.class = attrs.class ? ["echarts"].concat(attrs.class) : "echarts";
return h(TAG_NAME, attrs);
}
});