diff --git a/src/packages/components/Charts/Bars/BarCommon/config.ts b/src/packages/components/Charts/Bars/BarCommon/config.ts index 58abf30e..bc5bd2d3 100644 --- a/src/packages/components/Charts/Bars/BarCommon/config.ts +++ b/src/packages/components/Charts/Bars/BarCommon/config.ts @@ -1,11 +1,12 @@ import { echartOptionProfixHandle, publicConfig } from '@/packages/public' import { BarCommonConfig } from './index' -import { ConfigType, CreateComponentType } from '@/packages/index.d' +import { CreateComponentType } from '@/packages/index.d' import omit from 'lodash/omit' +import cloneDeep from 'lodash/cloneDeep' export default class Config extends publicConfig implements CreateComponentType { public key = BarCommonConfig.key - public chartData: Exclude = omit(BarCommonConfig, ['node']) + public chartData = omit(cloneDeep(BarCommonConfig), ['node']) // 图表配置项 public option = echartOptionProfixHandle({ @@ -15,6 +16,9 @@ export default class Config extends publicConfig implements CreateComponentType type: 'shadow' } }, + legend: { + data: ["name1", "name2"] + }, xAxis: { type: 'category', data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] @@ -24,12 +28,14 @@ export default class Config extends publicConfig implements CreateComponentType }, series: [ { + name: 'name1', + type: 'bar', data: [120, 200, 150, 80, 70, 110, 130], - type: 'bar' }, { + name: 'name2', + type: 'bar', data: [130, 130, 312, 268, 155, 117, 160], - type: 'bar' } ] }) diff --git a/src/packages/components/Charts/Bars/BarCrossrange/config.ts b/src/packages/components/Charts/Bars/BarCrossrange/config.ts index 8fac8b67..5323bffc 100644 --- a/src/packages/components/Charts/Bars/BarCrossrange/config.ts +++ b/src/packages/components/Charts/Bars/BarCrossrange/config.ts @@ -1,12 +1,12 @@ import { echartOptionProfixHandle, publicConfig } from '@/packages/public' import { BarCrossrangefig } from './index' -import { ConfigType, CreateComponentType } from '@/packages/index.d' +import { CreateComponentType } from '@/packages/index.d' import omit from 'lodash/omit' export default class Config extends publicConfig implements CreateComponentType { public key: string = BarCrossrangefig.key - public chartData: Exclude = omit(BarCrossrangefig, ['node']) + public chartData = omit(BarCrossrangefig, ['node']) // 图表配置项 public option = echartOptionProfixHandle({ diff --git a/src/packages/components/Charts/Lines/LineCommon/config.ts b/src/packages/components/Charts/Lines/LineCommon/config.ts index 33877106..46ab7790 100644 --- a/src/packages/components/Charts/Lines/LineCommon/config.ts +++ b/src/packages/components/Charts/Lines/LineCommon/config.ts @@ -1,12 +1,12 @@ import { echartOptionProfixHandle, publicConfig } from '@/packages/public' import { LineCommonConfig } from './index' -import { ConfigType, CreateComponentType } from '@/packages/index.d' +import { CreateComponentType } from '@/packages/index.d' import omit from 'lodash/omit' export default class Config extends publicConfig implements CreateComponentType { public key: string = LineCommonConfig.key - public chartData: Exclude = omit(LineCommonConfig, ['node']) + public chartData = omit(LineCommonConfig, ['node']) // 图表配置项 public option = echartOptionProfixHandle({ diff --git a/src/packages/components/Charts/Pies/PieCommon/config.ts b/src/packages/components/Charts/Pies/PieCommon/config.ts index c3edac24..1e4910fb 100644 --- a/src/packages/components/Charts/Pies/PieCommon/config.ts +++ b/src/packages/components/Charts/Pies/PieCommon/config.ts @@ -1,12 +1,12 @@ import { echartOptionProfixHandle, publicConfig } from '@/packages/public' import { PieCommonConfig } from './index' -import { ConfigType, CreateComponentType } from '@/packages/index.d' +import { CreateComponentType } from '@/packages/index.d' import omit from 'lodash/omit' export default class Config extends publicConfig implements CreateComponentType { public key: string = PieCommonConfig.key - public chartData: Exclude = omit(PieCommonConfig, ['node']) + public chartData = omit(PieCommonConfig, ['node']) // 图表配置项 public option = echartOptionProfixHandle({ diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts index 14c9acdc..4c83cf3a 100644 --- a/src/packages/index.d.ts +++ b/src/packages/index.d.ts @@ -9,7 +9,6 @@ export type ConfigType = { package: string node: Component image: string | (() => Promise) - [T: string]: unknown } // 组件实例类 @@ -21,7 +20,7 @@ export interface PublicConfigType { } export interface CreateComponentType extends PublicConfigType { key: string - chartData: ConfigType + chartData: Omit option: object } diff --git a/src/settings/chartThemes/global.theme.json b/src/settings/chartThemes/global.theme.json index 2c4a0b05..66bb85ec 100644 --- a/src/settings/chartThemes/global.theme.json +++ b/src/settings/chartThemes/global.theme.json @@ -2,11 +2,11 @@ "title": { "show": true, "textStyle": { - "color": "#464646", + "color": "#BFBFBF", "fontSize": 18 }, "subtextStyle": { - "color": "#6e7079", + "color": "#A2A2A2", "fontSize": 14 } },