diff --git a/src/packages/components/Charts/Mores/Point/config.vue b/src/packages/components/Charts/Mores/Point/config.vue deleted file mode 100644 index 44a7bc22..00000000 --- a/src/packages/components/Charts/Mores/Point/config.vue +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/src/packages/components/Charts/Mores/Point/index.ts b/src/packages/components/Charts/Mores/Point/index.ts deleted file mode 100644 index 54b5fc37..00000000 --- a/src/packages/components/Charts/Mores/Point/index.ts +++ /dev/null @@ -1,14 +0,0 @@ -import image from '@/assets/images/chart/charts/Point.png' -import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' -import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' - -export const PointConfig: ConfigType = { - key: 'Point', - chartKey: 'VPoint', - conKey: 'VCPoint', - title: '热力图', - category: ChatCategoryEnum.MORE, - categoryName: ChatCategoryEnumName.MORE, - package: PackagesCategoryEnum.CHARTS, - image -} diff --git a/src/packages/components/Charts/Mores/Point/index.vue b/src/packages/components/Charts/Mores/Point/index.vue deleted file mode 100644 index 31fe77be..00000000 --- a/src/packages/components/Charts/Mores/Point/index.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/packages/components/Charts/Mores/index.ts b/src/packages/components/Charts/Mores/index.ts index 8b5eb07c..7539cf21 100644 --- a/src/packages/components/Charts/Mores/index.ts +++ b/src/packages/components/Charts/Mores/index.ts @@ -2,8 +2,7 @@ import { ProcessConfig } from './Process/index' import { RadarConfig } from './Radar/index' import { FunnelConfig } from './Funnel/index' import { HeatmapConfig } from './Heatmap/index' -import { PointConfig } from './Point/index' import { WaterPoloConfig } from './WaterPolo/index' import { TreeMapConfig } from './TreeMap/index' -export default [ProcessConfig, RadarConfig, FunnelConfig, HeatmapConfig, PointConfig, WaterPoloConfig, TreeMapConfig] \ No newline at end of file +export default [ProcessConfig, RadarConfig, FunnelConfig, HeatmapConfig, WaterPoloConfig, TreeMapConfig] diff --git a/src/packages/components/Charts/Scatter/Common/config.vue b/src/packages/components/Charts/Scatter/Common/config.vue deleted file mode 100644 index a79b3358..00000000 --- a/src/packages/components/Charts/Scatter/Common/config.vue +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/packages/components/Charts/Scatter/Common/index.vue b/src/packages/components/Charts/Scatter/Common/index.vue deleted file mode 100644 index b2172e1c..00000000 --- a/src/packages/components/Charts/Scatter/Common/index.vue +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/src/packages/components/Charts/Scatter/Common/config.ts b/src/packages/components/Charts/Scatters/ScatterCommon/config.ts similarity index 67% rename from src/packages/components/Charts/Scatter/Common/config.ts rename to src/packages/components/Charts/Scatters/ScatterCommon/config.ts index 5e9e64b6..b9a2d443 100644 --- a/src/packages/components/Charts/Scatter/Common/config.ts +++ b/src/packages/components/Charts/Scatters/ScatterCommon/config.ts @@ -7,11 +7,9 @@ import dataJson from './data.json' export const includes = ['legend', 'xAxis', 'yAxis'] export const seriesItem = { - type: 'bar', - barWidth: null, - itemStyle: { - color: null, - borderRadius: 0 + type: 'scatter', + emphasis: { + focus: 'series' } } @@ -56,48 +54,56 @@ export const option = { { type: 'value', scale: true, - axisLabel: { - formatter: '{value} cm' - }, + // axisLabel: { + // formatter: '{value} cm' + // }, splitLine: { show: false } } ], + yAxis: [ { type: 'value', scale: true, - axisLabel: { - formatter: '{value} kg' - }, + // axisLabel: { + // formatter: '{value} kg' + // }, splitLine: { show: false } } ], - series: [ - { - name: 'Data1', - type: 'scatter', - emphasis: { - focus: 'series' - }, - // symbolSize: 12, - symbolSize: (item: number[]) => (item[1] / item[0]) * 30, - datasetIndex: 0 - }, - { - name: 'Data2', - type: 'scatter', - emphasis: { - focus: 'series' - }, - // symbolSize: 12, - symbolSize: (item: number[]) => (item[1] / item[0]) * 30, - datasetIndex: 1 - } - ] + + // series: [ + // { + // name: 'Data1', + // type: 'scatter', + // emphasis: { + // focus: 'series' + // }, + // // symbolSize: 12, + // symbolSize: (item: number[]) => (item[1] / item[0]) * 30, + // datasetIndex: 0 + // }, + // { + // name: 'Data2', + // type: 'scatter', + // emphasis: { + // focus: 'series' + // }, + // // symbolSize: 12, + // symbolSize: (item: number[]) => (item[1] / item[0]) * 30, + // datasetIndex: 1 + // } + // ] + + series: dataJson.map((item, index) => ({ + ...seriesItem, + name: item.dimensions[0], + datasetIndex: index + })) } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Charts/Scatters/ScatterCommon/config.vue b/src/packages/components/Charts/Scatters/ScatterCommon/config.vue new file mode 100644 index 00000000..c8e59af4 --- /dev/null +++ b/src/packages/components/Charts/Scatters/ScatterCommon/config.vue @@ -0,0 +1,18 @@ + + + diff --git a/src/packages/components/Charts/Scatter/Common/data.json b/src/packages/components/Charts/Scatters/ScatterCommon/data.json similarity index 99% rename from src/packages/components/Charts/Scatter/Common/data.json rename to src/packages/components/Charts/Scatters/ScatterCommon/data.json index 6c764849..3919beb5 100644 --- a/src/packages/components/Charts/Scatter/Common/data.json +++ b/src/packages/components/Charts/Scatters/ScatterCommon/data.json @@ -1,5 +1,6 @@ [ { + "dimensions": ["data1"], "source": [ [161.2, 51.6], [167.5, 59.0], @@ -264,6 +265,7 @@ ] }, { + "dimensions": ["data2"], "source": [ [174.0, 65.6], [175.3, 71.8], diff --git a/src/packages/components/Charts/Scatter/Common/index.ts b/src/packages/components/Charts/Scatters/ScatterCommon/index.ts similarity index 61% rename from src/packages/components/Charts/Scatter/Common/index.ts rename to src/packages/components/Charts/Scatters/ScatterCommon/index.ts index c7c07001..a0dbbfb3 100644 --- a/src/packages/components/Charts/Scatter/Common/index.ts +++ b/src/packages/components/Charts/Scatters/ScatterCommon/index.ts @@ -1,14 +1,15 @@ import image from '@/assets/images/chart/charts/Point.png' -import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const ScatterCommonConfig: ConfigType = { - key: 'Scatter', - chartKey: 'VScatter', - conKey: 'VCScatter', + key: 'ScatterCommon', + chartKey: 'VScatterCommon', + conKey: 'VCScatterCommon', title: '散点图', category: ChatCategoryEnum.SCATTER, categoryName: ChatCategoryEnumName.SCATTER, package: PackagesCategoryEnum.CHARTS, + chartFrame: ChartFrameEnum.ECHARTS, image } diff --git a/src/packages/components/Charts/Scatters/ScatterCommon/index.vue b/src/packages/components/Charts/Scatters/ScatterCommon/index.vue new file mode 100644 index 00000000..8116bf05 --- /dev/null +++ b/src/packages/components/Charts/Scatters/ScatterCommon/index.vue @@ -0,0 +1,72 @@ + + + diff --git a/src/packages/components/Charts/Scatters/index.ts b/src/packages/components/Charts/Scatters/index.ts new file mode 100644 index 00000000..4e885112 --- /dev/null +++ b/src/packages/components/Charts/Scatters/index.ts @@ -0,0 +1,3 @@ +import { ScatterCommonConfig } from './ScatterCommon/index' + +export default [ScatterCommonConfig] diff --git a/src/packages/components/Charts/index.ts b/src/packages/components/Charts/index.ts index 2dd3e54b..35bca20e 100644 --- a/src/packages/components/Charts/index.ts +++ b/src/packages/components/Charts/index.ts @@ -1,7 +1,8 @@ import Bars from './Bars' import Pies from './Pies' import Lines from './Lines' +import Scatters from './Scatters' import Mores from './Mores' import Maps from './Maps' -export const ChartList = [...Bars, ...Pies, ...Lines, ...Maps, ...Mores] +export const ChartList = [...Bars, ...Pies, ...Lines, ...Scatters, ...Maps, ...Mores]