fix: 修改图表类型错误

This commit is contained in:
MTrun 2022-02-24 10:21:33 +08:00
parent b8639ceb7e
commit 2bdc489827
6 changed files with 19 additions and 14 deletions

View File

@ -1,11 +1,12 @@
import { echartOptionProfixHandle, publicConfig } from '@/packages/public' import { echartOptionProfixHandle, publicConfig } from '@/packages/public'
import { BarCommonConfig } from './index' import { BarCommonConfig } from './index'
import { ConfigType, CreateComponentType } from '@/packages/index.d' import { CreateComponentType } from '@/packages/index.d'
import omit from 'lodash/omit' import omit from 'lodash/omit'
import cloneDeep from 'lodash/cloneDeep'
export default class Config extends publicConfig implements CreateComponentType { export default class Config extends publicConfig implements CreateComponentType {
public key = BarCommonConfig.key public key = BarCommonConfig.key
public chartData: Exclude<ConfigType, ['node']> = omit(BarCommonConfig, ['node']) public chartData = omit(cloneDeep(BarCommonConfig), ['node'])
// 图表配置项 // 图表配置项
public option = echartOptionProfixHandle({ public option = echartOptionProfixHandle({
@ -15,6 +16,9 @@ export default class Config extends publicConfig implements CreateComponentType
type: 'shadow' type: 'shadow'
} }
}, },
legend: {
data: ["name1", "name2"]
},
xAxis: { xAxis: {
type: 'category', type: 'category',
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
@ -24,12 +28,14 @@ export default class Config extends publicConfig implements CreateComponentType
}, },
series: [ series: [
{ {
name: 'name1',
type: 'bar',
data: [120, 200, 150, 80, 70, 110, 130], data: [120, 200, 150, 80, 70, 110, 130],
type: 'bar'
}, },
{ {
name: 'name2',
type: 'bar',
data: [130, 130, 312, 268, 155, 117, 160], data: [130, 130, 312, 268, 155, 117, 160],
type: 'bar'
} }
] ]
}) })

View File

@ -1,12 +1,12 @@
import { echartOptionProfixHandle, publicConfig } from '@/packages/public' import { echartOptionProfixHandle, publicConfig } from '@/packages/public'
import { BarCrossrangefig } from './index' import { BarCrossrangefig } from './index'
import { ConfigType, CreateComponentType } from '@/packages/index.d' import { CreateComponentType } from '@/packages/index.d'
import omit from 'lodash/omit' import omit from 'lodash/omit'
export default class Config extends publicConfig implements CreateComponentType { export default class Config extends publicConfig implements CreateComponentType {
public key: string = BarCrossrangefig.key public key: string = BarCrossrangefig.key
public chartData: Exclude<ConfigType, ['node']> = omit(BarCrossrangefig, ['node']) public chartData = omit(BarCrossrangefig, ['node'])
// 图表配置项 // 图表配置项
public option = echartOptionProfixHandle({ public option = echartOptionProfixHandle({

View File

@ -1,12 +1,12 @@
import { echartOptionProfixHandle, publicConfig } from '@/packages/public' import { echartOptionProfixHandle, publicConfig } from '@/packages/public'
import { LineCommonConfig } from './index' import { LineCommonConfig } from './index'
import { ConfigType, CreateComponentType } from '@/packages/index.d' import { CreateComponentType } from '@/packages/index.d'
import omit from 'lodash/omit' import omit from 'lodash/omit'
export default class Config extends publicConfig implements CreateComponentType { export default class Config extends publicConfig implements CreateComponentType {
public key: string = LineCommonConfig.key public key: string = LineCommonConfig.key
public chartData: Exclude<ConfigType, ['node']> = omit(LineCommonConfig, ['node']) public chartData = omit(LineCommonConfig, ['node'])
// 图表配置项 // 图表配置项
public option = echartOptionProfixHandle({ public option = echartOptionProfixHandle({

View File

@ -1,12 +1,12 @@
import { echartOptionProfixHandle, publicConfig } from '@/packages/public' import { echartOptionProfixHandle, publicConfig } from '@/packages/public'
import { PieCommonConfig } from './index' import { PieCommonConfig } from './index'
import { ConfigType, CreateComponentType } from '@/packages/index.d' import { CreateComponentType } from '@/packages/index.d'
import omit from 'lodash/omit' import omit from 'lodash/omit'
export default class Config extends publicConfig implements CreateComponentType { export default class Config extends publicConfig implements CreateComponentType {
public key: string = PieCommonConfig.key public key: string = PieCommonConfig.key
public chartData: Exclude<ConfigType, ['node']> = omit(PieCommonConfig, ['node']) public chartData = omit(PieCommonConfig, ['node'])
// 图表配置项 // 图表配置项
public option = echartOptionProfixHandle({ public option = echartOptionProfixHandle({

View File

@ -9,7 +9,6 @@ export type ConfigType = {
package: string package: string
node: Component node: Component
image: string | (() => Promise<typeof import('*.png')>) image: string | (() => Promise<typeof import('*.png')>)
[T: string]: unknown
} }
// 组件实例类 // 组件实例类
@ -21,7 +20,7 @@ export interface PublicConfigType {
} }
export interface CreateComponentType extends PublicConfigType { export interface CreateComponentType extends PublicConfigType {
key: string key: string
chartData: ConfigType chartData: Omit<ConfigType, 'node'>
option: object option: object
} }

View File

@ -2,11 +2,11 @@
"title": { "title": {
"show": true, "show": true,
"textStyle": { "textStyle": {
"color": "#464646", "color": "#BFBFBF",
"fontSize": 18 "fontSize": 18
}, },
"subtextStyle": { "subtextStyle": {
"color": "#6e7079", "color": "#A2A2A2",
"fontSize": 14 "fontSize": 14
} }
}, },