From 541ce8a0835365e1a429469259404743be2ed900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Fri, 11 Aug 2023 22:20:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=9F=B1=E7=8A=B6?= =?UTF-8?q?=E5=9B=BE=20&=20=E6=8A=98=E7=BA=BF=E5=9B=BE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=92=8C=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/chart/charts/bar_line.png | Bin 0 -> 26552 bytes .../components/Charts/Bars/BarLine/config.ts | 75 +++++++++++++++++ .../{COMBINATIONS => Bars}/BarLine/config.vue | 50 ++++++------ .../{COMBINATIONS => Bars}/BarLine/data.json | 2 +- .../components/Charts/Bars/BarLine/index.ts | 16 ++++ .../{COMBINATIONS => Bars}/BarLine/index.vue | 45 ++++++----- src/packages/components/Charts/Bars/index.ts | 11 +-- .../Charts/COMBINATIONS/BarLine/config.ts | 76 ------------------ .../Charts/COMBINATIONS/BarLine/index.ts | 16 ---- .../components/Charts/COMBINATIONS/index.ts | 3 - src/packages/components/Charts/index.d.ts | 1 - src/packages/components/Charts/index.ts | 3 +- 12 files changed, 151 insertions(+), 147 deletions(-) create mode 100644 src/assets/images/chart/charts/bar_line.png create mode 100644 src/packages/components/Charts/Bars/BarLine/config.ts rename src/packages/components/Charts/{COMBINATIONS => Bars}/BarLine/config.vue (71%) rename src/packages/components/Charts/{COMBINATIONS => Bars}/BarLine/data.json (99%) create mode 100644 src/packages/components/Charts/Bars/BarLine/index.ts rename src/packages/components/Charts/{COMBINATIONS => Bars}/BarLine/index.vue (65%) delete mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/config.ts delete mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/index.ts delete mode 100644 src/packages/components/Charts/COMBINATIONS/index.ts diff --git a/src/assets/images/chart/charts/bar_line.png b/src/assets/images/chart/charts/bar_line.png new file mode 100644 index 0000000000000000000000000000000000000000..441fff93c36af67428469c6e2a90d5aab4ad6ec8 GIT binary patch literal 26552 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 literal 0 HcmV?d00001 diff --git a/src/packages/components/Charts/Bars/BarLine/config.ts b/src/packages/components/Charts/Bars/BarLine/config.ts new file mode 100644 index 00000000..4c6c1805 --- /dev/null +++ b/src/packages/components/Charts/Bars/BarLine/config.ts @@ -0,0 +1,75 @@ +import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public' +import { BarLineConfig } from './index' +import { CreateComponentType } from '@/packages/index.d' +import cloneDeep from 'lodash/cloneDeep' +import dataJson from './data.json' + +export const includes = ['legend', 'xAxis', 'yAxis', 'grid'] +// 柱状折线组合图 分别定义series +// 写死name可以定义legend显示的名称 +export const barSeriesItem = { + type: 'bar', + barWidth: 15, + label: { + show: true, + position: 'top', + color: '#fff', + fontSize: 12 + }, + itemStyle: { + color: null, + borderRadius: 2 + } +} + +export const lineSeriesItem = { + type: 'line', + symbol: 'circle', + label: { + show: true, + position: 'top', + color: '#fff', + fontSize: 12 + }, + symbolSize: 5, //设定实心点的大小 + itemStyle: { + color: '#FFE47A', + borderWidth: 1 + }, + lineStyle: { + type: 'solid', + width: 3, + color: null + } +} + +export const option = { + tooltip: { + show: true, + trigger: 'axis', + axisPointer: { + show: true, + type: 'shadow' + } + }, + legend: { + data: null + }, + xAxis: { + show: true, + type: 'category' + }, + yAxis: { + show: true, + type: 'value' + }, + dataset: { ...dataJson }, + series: [barSeriesItem, lineSeriesItem] +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = BarLineConfig.key + public chartConfig = cloneDeep(BarLineConfig) + // 图表配置项 + public option = echartOptionProfixHandle(option, includes) +} diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/config.vue b/src/packages/components/Charts/Bars/BarLine/config.vue similarity index 71% rename from src/packages/components/Charts/COMBINATIONS/BarLine/config.vue rename to src/packages/components/Charts/Bars/BarLine/config.vue index b2f7c476..6a76ebdb 100644 --- a/src/packages/components/Charts/COMBINATIONS/BarLine/config.vue +++ b/src/packages/components/Charts/Bars/BarLine/config.vue @@ -1,43 +1,48 @@ \ No newline at end of file + diff --git a/src/packages/components/Charts/Bars/index.ts b/src/packages/components/Charts/Bars/index.ts index a101acbd..4ab9a776 100644 --- a/src/packages/components/Charts/Bars/index.ts +++ b/src/packages/components/Charts/Bars/index.ts @@ -1,5 +1,6 @@ -import { BarCommonConfig } from './BarCommon/index' -import { BarCrossrangeConfig } from './BarCrossrange/index' -import { CapsuleChartConfig } from './CapsuleChart/index' - -export default [BarCommonConfig, BarCrossrangeConfig, CapsuleChartConfig] +import { BarCommonConfig } from './BarCommon/index' +import { BarCrossrangeConfig } from './BarCrossrange/index' +import { CapsuleChartConfig } from './CapsuleChart/index' +import { BarLineConfig } from './BarLine/index' + +export default [BarCommonConfig, BarCrossrangeConfig, BarLineConfig, CapsuleChartConfig] diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/config.ts b/src/packages/components/Charts/COMBINATIONS/BarLine/config.ts deleted file mode 100644 index b62c4bab..00000000 --- a/src/packages/components/Charts/COMBINATIONS/BarLine/config.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public' -import { BarLineConfig } from './index' -import { CreateComponentType } from '@/packages/index.d' -import cloneDeep from 'lodash/cloneDeep' -import dataJson from './data.json' - - -export const includes = ['legend', 'xAxis', 'yAxis', 'grid'] -// 柱状折线组合图 分别定义series -// 写死name可以定义legend显示的名称 -export const barSeriesItem = { - type: 'bar', - barWidth: 15, - label: { - show: true, - position: 'top', - color: '#fff', - fontSize: 12 - }, - itemStyle: { - color: null, - borderRadius: 2 - } -} - -export const lineSeriesItem = { - type: 'line', - symbol: "circle", - label: { - show: true, - position: 'top', - color: '#fff', - fontSize: 12 - }, - symbolSize: 5, //设定实心点的大小 - itemStyle: { - color: '#FFE47A', - borderWidth: 1 - }, - lineStyle: { - type: 'solid', - width: 3, - color: null - } -} - -export const option = { - tooltip: { - show: true, - trigger: 'axis', - axisPointer: { - show: true, - type: 'shadow' - } - }, - legend: { - data:null - }, - xAxis: { - show: true, - type: 'category' - }, - yAxis: { - show: true, - type: 'value' - }, - dataset: { ...dataJson }, - series: [barSeriesItem, lineSeriesItem] -} - -export default class Config extends PublicConfigClass implements CreateComponentType { - public key = BarLineConfig.key - public chartConfig = cloneDeep(BarLineConfig) - // 图表配置项 - public option = echartOptionProfixHandle(option, includes) -} \ No newline at end of file diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts b/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts deleted file mode 100644 index 1c236ed2..00000000 --- a/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -// 公共类型声明 -import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' -// 当前[信息模块]分类声明 -import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' - -export const BarLineConfig: ConfigType = { - key: 'BarLine', - chartKey: 'VBarLine', - conKey: 'VCBarLine', - title: '柱状加折线图', - category: ChatCategoryEnum.COMBINATIONS, - categoryName: ChatCategoryEnumName.COMBINATION, - package: PackagesCategoryEnum.CHARTS, - chartFrame: ChartFrameEnum.ECHARTS, - image: 'bar_x.png' -} \ No newline at end of file diff --git a/src/packages/components/Charts/COMBINATIONS/index.ts b/src/packages/components/Charts/COMBINATIONS/index.ts deleted file mode 100644 index 3a131a97..00000000 --- a/src/packages/components/Charts/COMBINATIONS/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { BarLineConfig } from './BarLine/index' - -export default [BarLineConfig] \ No newline at end of file diff --git a/src/packages/components/Charts/index.d.ts b/src/packages/components/Charts/index.d.ts index 2f88e1df..d7cc2714 100644 --- a/src/packages/components/Charts/index.d.ts +++ b/src/packages/components/Charts/index.d.ts @@ -5,7 +5,6 @@ export enum ChatCategoryEnum { LINE = 'Lines', SCATTER = 'Scatters', MAP = 'Maps', - COMBINATIONS = 'COMBINATIONS', MORE = 'Mores' } diff --git a/src/packages/components/Charts/index.ts b/src/packages/components/Charts/index.ts index 63e5d657..20ffcc66 100644 --- a/src/packages/components/Charts/index.ts +++ b/src/packages/components/Charts/index.ts @@ -3,7 +3,6 @@ import Pies from './Pies' import Lines from './Lines' import Scatters from './Scatters' import Mores from './Mores' -import COMBINATIONS from "./COMBINATIONS"; import Maps from './Maps' -export const ChartList = [...Bars, ...Lines, ...Pies, ...Scatters, ...Maps,...COMBINATIONS, ...Mores] +export const ChartList = [...Bars, ...Lines, ...Pies, ...Scatters, ...Maps, ...Mores]