Răsfoiți Sursa

fix: 修改图表类型错误

MTrun 3 ani în urmă
părinte
comite
2bdc489827

+ 10 - 4
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<ConfigType, ['node']> = 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'
       }
     ]
   })

+ 2 - 2
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<ConfigType, ['node']> = omit(BarCrossrangefig, ['node'])
+  public chartData = omit(BarCrossrangefig, ['node'])
 
   // 图表配置项
   public option = echartOptionProfixHandle({

+ 2 - 2
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<ConfigType, ['node']> = omit(LineCommonConfig, ['node'])
+  public chartData = omit(LineCommonConfig, ['node'])
 
   // 图表配置项
   public option = echartOptionProfixHandle({

+ 2 - 2
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<ConfigType, ['node']> = omit(PieCommonConfig, ['node'])
+  public chartData = omit(PieCommonConfig, ['node'])
 
   // 图表配置项
   public option = echartOptionProfixHandle({

+ 1 - 2
src/packages/index.d.ts

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

+ 2 - 2
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
     }
   },