diff --git a/internals/cli/src/commands/build/build-entry-app.ts b/internals/cli/src/commands/build/build-entry-app.ts index b9c98df4f8..ffe3f0faad 100644 --- a/internals/cli/src/commands/build/build-entry-app.ts +++ b/internals/cli/src/commands/build/build-entry-app.ts @@ -151,7 +151,7 @@ const buildFullRuntime = (mode: RunTimeModeType) => { .map((component) => { if (component.includes('Hui')) { return `${component}${joinStr}${component} as ${component - .replace('Huicharts', 'Charts') + .replace('Huicharts', 'Chart') .trim()}${joinStr}${component} as Tiny${component.trim()}` } return `${component}${joinStr}${component} as Tiny${component.trim()}` @@ -161,7 +161,7 @@ const buildFullRuntime = (mode: RunTimeModeType) => { .map((component) => { if (component.includes('Hui')) { return `${component}${joinStr}${component - .replace('Huicharts', 'Charts') + .replace('Huicharts', 'Chart') .trim()}: ${component}${joinStr}Tiny${component.trim()}: ${component}` } return `${component}${joinStr}Tiny${component.trim()}: ${component}` diff --git a/packages/vue/src/huicharts/huicharts-amap/src/autonavi-map.vue b/packages/vue/src/huicharts/huicharts-amap/src/autonavi-map.vue index 848906a98e..30d280f443 100644 --- a/packages/vue/src/huicharts/huicharts-amap/src/autonavi-map.vue +++ b/packages/vue/src/huicharts/huicharts-amap/src/autonavi-map.vue @@ -15,8 +15,7 @@ export default { mixins: [Core], data() { return { - iChartName: 'AutonaviMapChart', - option: {} + iChartName: 'AutonaviMapChart' } }, mounted() { diff --git a/packages/vue/src/huicharts/huicharts-bar/src/chart-bar.vue b/packages/vue/src/huicharts/huicharts-bar/src/chart-bar.vue index 829287733c..28944f0698 100644 --- a/packages/vue/src/huicharts/huicharts-bar/src/chart-bar.vue +++ b/packages/vue/src/huicharts/huicharts-bar/src/chart-bar.vue @@ -15,8 +15,7 @@ export default { mixins: [Core], data() { return { - iChartName: 'BarChart', - option: {} + iChartName: 'BarChart' } }, methods: { diff --git a/packages/vue/src/huicharts/huicharts-bmap/src/baidu-map.vue b/packages/vue/src/huicharts/huicharts-bmap/src/baidu-map.vue index 8529ec8320..75e41f65fa 100644 --- a/packages/vue/src/huicharts/huicharts-bmap/src/baidu-map.vue +++ b/packages/vue/src/huicharts/huicharts-bmap/src/baidu-map.vue @@ -15,8 +15,7 @@ export default { mixins: [Core], data() { return { - iChartName: 'BaiduMapChart', - option: {} + iChartName: 'BaiduMapChart' } }, methods: { @@ -27,10 +26,6 @@ export default { this.huiChartOption.tooltip = { show: false } } - if (!this.legendVisible) { - this.huiChartOption.legend = { show: false } - } - return } diff --git a/packages/vue/src/huicharts/huicharts-core/src/chart-core.ts b/packages/vue/src/huicharts/huicharts-core/src/chart-core.ts index 229f64cfe2..d0f44866d0 100644 --- a/packages/vue/src/huicharts/huicharts-core/src/chart-core.ts +++ b/packages/vue/src/huicharts/huicharts-core/src/chart-core.ts @@ -26,7 +26,7 @@ export default { }, width: { type: String, default: 'auto' }, height: { type: String, default: '400px' }, - events: { type: Object, default() {} }, + events: { type: Object, default() { } }, initOptions: { type: Object, default() { @@ -72,7 +72,7 @@ export default { }, extend: { type: Object, - default() {} + default() { } }, tooltipFormatter: { type: Function }, @@ -120,7 +120,7 @@ export default { }, setOptionOpts: { type: Object, - default() {} + default() { } }, colorMode: { type: String, @@ -351,9 +351,9 @@ export default { } else { this.huiChartOption = cloneDeep(this.options) } - let { huiChartOption } = this + let huiChartOption = cloneDeep(this.huiChartOption) if (!huiChartOption.theme) { - huiChartOption.theme = 'bpit-light' + huiChartOption.theme = 'cloud-light' } if (Array.isArray(this.colors) && this.colors.length > 0) { huiChartOption.color = cloneDeep(this.colors) @@ -389,7 +389,7 @@ export default { renderChart(huiChartOption) { // 设置默认theme为'cloud-light' if (!huiChartOption.theme) { - huiChartOption.theme = 'bpit-light' + huiChartOption.theme = 'cloud-light' } // 将外部colors放入配置项中 diff --git a/packages/vue/src/huicharts/huicharts-heatmap/src/chart-heatmap.vue b/packages/vue/src/huicharts/huicharts-heatmap/src/chart-heatmap.vue index f231f07e77..02fb7b4937 100644 --- a/packages/vue/src/huicharts/huicharts-heatmap/src/chart-heatmap.vue +++ b/packages/vue/src/huicharts/huicharts-heatmap/src/chart-heatmap.vue @@ -13,11 +13,6 @@ import { $prefix } from '@opentiny/vue-common' export default { name: $prefix + 'ChartHeatmap', mixins: [Core], - data() { - return { - option: {} - } - }, computed: { iChartName() { const { type } = this.settings diff --git a/packages/vue/src/huicharts/huicharts-histogram/src/chart-histogram.vue b/packages/vue/src/huicharts/huicharts-histogram/src/chart-histogram.vue index f9b6e83dd4..27ccbd2e61 100644 --- a/packages/vue/src/huicharts/huicharts-histogram/src/chart-histogram.vue +++ b/packages/vue/src/huicharts/huicharts-histogram/src/chart-histogram.vue @@ -15,8 +15,7 @@ export default { mixins: [Core], data() { return { - iChartName: 'BarChart', - option: {} + iChartName: 'BarChart' } }, methods: { diff --git a/packages/vue/src/huicharts/huicharts-line/src/chart-line.vue b/packages/vue/src/huicharts/huicharts-line/src/chart-line.vue index 411e3f0eb9..57ad4aaaae 100644 --- a/packages/vue/src/huicharts/huicharts-line/src/chart-line.vue +++ b/packages/vue/src/huicharts/huicharts-line/src/chart-line.vue @@ -29,7 +29,6 @@ export default { const option = line(columns, rows, this.settings, extra) this.huiChartOption = { - smooth: true, ...option } } diff --git a/packages/vue/src/huicharts/huicharts-sunburst/src/chart-sunburst.vue b/packages/vue/src/huicharts/huicharts-sunburst/src/chart-sunburst.vue index 9aa22839fa..03f101a113 100644 --- a/packages/vue/src/huicharts/huicharts-sunburst/src/chart-sunburst.vue +++ b/packages/vue/src/huicharts/huicharts-sunburst/src/chart-sunburst.vue @@ -15,8 +15,7 @@ export default { mixins: [Core], data() { return { - iChartName: 'SunburstChart', - option: {} + iChartName: 'SunburstChart' } }, methods: { diff --git a/packages/vue/src/huicharts/huicharts-tree/src/chart-tree.vue b/packages/vue/src/huicharts/huicharts-tree/src/chart-tree.vue index 4eff763e58..df4f003fa8 100644 --- a/packages/vue/src/huicharts/huicharts-tree/src/chart-tree.vue +++ b/packages/vue/src/huicharts/huicharts-tree/src/chart-tree.vue @@ -15,8 +15,7 @@ export default { mixins: [Core], data() { return { - iChartName: 'TreeChart', - option: {} + iChartName: 'TreeChart' } }, methods: {