From 7262c4af2278178e07863233fff007bd7f31f21c Mon Sep 17 00:00:00 2001 From: MTrun <1262327911@qq.com> Date: Tue, 18 Jan 2022 21:41:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=88=97=E8=A1=A8=E7=9A=84=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E9=94=AE=E5=90=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Chart/Bars/BarCommon/index.ts | 3 +- .../Chart/Bars/BarCrossrange/index.ts | 3 +- .../Chart/Lines/LineCommon/index.ts | 3 +- .../Chart/Lines/LineGradientSingle/index.ts | 3 +- .../Chart/Lines/LineGradients/index.ts | 3 +- .../components/Chart/Maps/MapChine/index.ts | 3 +- .../components/Chart/Mores/Funnel/index.ts | 3 +- .../components/Chart/Mores/Heatmap/index.ts | 3 +- .../components/Chart/Mores/Point/index.ts | 3 +- .../components/Chart/Mores/Radar/index.ts | 3 +- .../components/Chart/Mores/TreeMap/index.ts | 3 +- .../components/Chart/Mores/Variable/index.ts | 3 +- .../components/Chart/Pies/PieCommon/index.ts | 3 +- src/packages/components/Chart/index.d.ts | 12 ++++++-- .../components/Decorate/Mores/Number/index.ts | 3 +- .../components/Decorate/Mores/Time/index.ts | 3 +- .../Decorate/Mores/Weather/index.ts | 3 +- .../Decorate/Mores/WeatherTime/index.ts | 3 +- .../Decorate/borders/borderCommon/index.ts | 3 +- src/packages/components/Decorate/index.d.ts | 5 ++++ .../Information/Mores/Image/index.ts | 3 +- .../Information/Mores/TextCloud/index.ts | 3 +- .../Information/Texts/TextCommon/index.ts | 3 +- .../Titles/TitleBevelAngle/index.ts | 3 +- .../Information/Titles/TitleCommon/index.ts | 3 +- .../Information/Titles/TitlePro/index.ts | 3 +- .../components/Information/index.d.ts | 6 ++++ .../{Tables => Table}/TableCategory/index.ts | 5 ++-- .../{Tables => Table}/TableCategory/index.vue | 0 src/packages/components/Table/index.d.ts | 7 +++++ .../components/{Tables => Table}/index.ts | 0 .../{Tables => Table}/tableCommon/index.ts | 5 ++-- .../{Tables => Table}/tableCommon/index.vue | 0 src/packages/components/Tables/index.d.ts | 3 -- src/packages/index.d.ts | 1 + src/packages/index.ts | 2 +- .../chart/components/ContentBox/index.vue | 1 + .../components/ItemBox/index.vue | 7 +++-- .../OptionContent/hooks/handleOptions.hook.ts | 29 ------------------- .../components/OptionContent/index.vue | 20 ++++++++----- .../chart/components/ContentCharts/index.vue | 1 + 41 files changed, 103 insertions(+), 73 deletions(-) rename src/packages/components/{Tables => Table}/TableCategory/index.ts (66%) rename src/packages/components/{Tables => Table}/TableCategory/index.vue (100%) create mode 100644 src/packages/components/Table/index.d.ts rename src/packages/components/{Tables => Table}/index.ts (100%) rename src/packages/components/{Tables => Table}/tableCommon/index.ts (64%) rename src/packages/components/{Tables => Table}/tableCommon/index.vue (100%) delete mode 100644 src/packages/components/Tables/index.d.ts delete mode 100644 src/views/chart/components/ContentCharts/components/OptionContent/hooks/handleOptions.hook.ts diff --git a/src/packages/components/Chart/Bars/BarCommon/index.ts b/src/packages/components/Chart/Bars/BarCommon/index.ts index cdf8c9a6..9bca8fcf 100644 --- a/src/packages/components/Chart/Bars/BarCommon/index.ts +++ b/src/packages/components/Chart/Bars/BarCommon/index.ts @@ -1,12 +1,13 @@ import BarCommon from './index.vue' import image from '@/assets/images/chart/charts/bar_x.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const BarCommonConfig: ConfigType = { key: 'VBarCommon', title: '柱状图', category: ChatCategoryEnum.BAR, + categoryName: ChatCategoryEnumName.BAR, node: BarCommon, image: image } diff --git a/src/packages/components/Chart/Bars/BarCrossrange/index.ts b/src/packages/components/Chart/Bars/BarCrossrange/index.ts index 3abfd8cd..46b86452 100644 --- a/src/packages/components/Chart/Bars/BarCrossrange/index.ts +++ b/src/packages/components/Chart/Bars/BarCrossrange/index.ts @@ -1,12 +1,13 @@ import BarCrossrange from './index.vue' import image from '@/assets/images/chart/charts/bar_y.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const BarCrossrangefig: ConfigType = { key: 'VBarCrossrange', title: '横向柱状图', category: ChatCategoryEnum.BAR, + categoryName: ChatCategoryEnumName.BAR, node: BarCrossrange, image: image } diff --git a/src/packages/components/Chart/Lines/LineCommon/index.ts b/src/packages/components/Chart/Lines/LineCommon/index.ts index a83f7c53..fa736084 100644 --- a/src/packages/components/Chart/Lines/LineCommon/index.ts +++ b/src/packages/components/Chart/Lines/LineCommon/index.ts @@ -1,12 +1,13 @@ import LineCommon from './index.vue' import image from '@/assets/images/chart/charts/line.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const LineCommonConfig: ConfigType = { key: 'VLineCommon', title: '折线图', category: ChatCategoryEnum.LINE, + categoryName: ChatCategoryEnumName.LINE, node: LineCommon, image: image } diff --git a/src/packages/components/Chart/Lines/LineGradientSingle/index.ts b/src/packages/components/Chart/Lines/LineGradientSingle/index.ts index 3f30d1cd..b642e2f0 100644 --- a/src/packages/components/Chart/Lines/LineGradientSingle/index.ts +++ b/src/packages/components/Chart/Lines/LineGradientSingle/index.ts @@ -1,12 +1,13 @@ import LineGradientSingle from './index.vue' import image from '@/assets/images/chart/charts/line_gradient_single.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const LineGradientSingleConfig: ConfigType = { key: 'VLineGradientSingle', title: '折线面积图', category: ChatCategoryEnum.LINE, + categoryName: ChatCategoryEnumName.LINE, node: LineGradientSingle, image: image } diff --git a/src/packages/components/Chart/Lines/LineGradients/index.ts b/src/packages/components/Chart/Lines/LineGradients/index.ts index 948246ed..5c5d6309 100644 --- a/src/packages/components/Chart/Lines/LineGradients/index.ts +++ b/src/packages/components/Chart/Lines/LineGradients/index.ts @@ -1,12 +1,13 @@ import LineGradients from './index.vue' import image from '@/assets/images/chart/charts/line_gradient2.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const LineGradientsConfig: ConfigType = { key: 'VLineGradientSingle', title: '折线面积图', category: ChatCategoryEnum.LINE, + categoryName: ChatCategoryEnumName.LINE, node: LineGradients, image: image } diff --git a/src/packages/components/Chart/Maps/MapChine/index.ts b/src/packages/components/Chart/Maps/MapChine/index.ts index 85816e43..42200a7c 100644 --- a/src/packages/components/Chart/Maps/MapChine/index.ts +++ b/src/packages/components/Chart/Maps/MapChine/index.ts @@ -1,12 +1,13 @@ import MapChine from './index.vue' import image from '@/assets/images/chart/charts/map.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const MapChineConfig: ConfigType = { key: 'VMapChine', title: '北京地图', category: ChatCategoryEnum.MAP, + categoryName: ChatCategoryEnumName.MAP, node: MapChine, image: image } diff --git a/src/packages/components/Chart/Mores/Funnel/index.ts b/src/packages/components/Chart/Mores/Funnel/index.ts index b7e15f76..6660edfa 100644 --- a/src/packages/components/Chart/Mores/Funnel/index.ts +++ b/src/packages/components/Chart/Mores/Funnel/index.ts @@ -1,12 +1,13 @@ import Funnel from './index.vue' import image from '@/assets/images/chart/charts/funnel.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const FunnelConfig: ConfigType = { key: 'VFunnel', title: '漏斗图', category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, node: Funnel, image: image } diff --git a/src/packages/components/Chart/Mores/Heatmap/index.ts b/src/packages/components/Chart/Mores/Heatmap/index.ts index 257c3ac2..77d8c34b 100644 --- a/src/packages/components/Chart/Mores/Heatmap/index.ts +++ b/src/packages/components/Chart/Mores/Heatmap/index.ts @@ -1,12 +1,13 @@ import Heatmap from './index.vue' import image from '@/assets/images/chart/charts/heatmap.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const HeatmapConfig: ConfigType = { key: 'VHeatmap', title: '热力图', category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, node: Heatmap, image: image } diff --git a/src/packages/components/Chart/Mores/Point/index.ts b/src/packages/components/Chart/Mores/Point/index.ts index ef6fe4a6..018bac7c 100644 --- a/src/packages/components/Chart/Mores/Point/index.ts +++ b/src/packages/components/Chart/Mores/Point/index.ts @@ -1,12 +1,13 @@ import Point from './index.vue' import image from '@/assets/images/chart/charts/Point.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const PointConfig: ConfigType = { key: 'VPoint', title: '热力图', category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, node: Point, image: image } diff --git a/src/packages/components/Chart/Mores/Radar/index.ts b/src/packages/components/Chart/Mores/Radar/index.ts index b6222191..f14f4359 100644 --- a/src/packages/components/Chart/Mores/Radar/index.ts +++ b/src/packages/components/Chart/Mores/Radar/index.ts @@ -1,12 +1,13 @@ import Radar from './index.vue' import image from '@/assets/images/chart/charts/radar.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const RadarConfig: ConfigType = { key: 'VRadar', title: '雷达', category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, node: Radar, image: image } diff --git a/src/packages/components/Chart/Mores/TreeMap/index.ts b/src/packages/components/Chart/Mores/TreeMap/index.ts index f17a0ec1..af6b40e7 100644 --- a/src/packages/components/Chart/Mores/TreeMap/index.ts +++ b/src/packages/components/Chart/Mores/TreeMap/index.ts @@ -1,12 +1,13 @@ import TreeMap from './index.vue' import image from '@/assets/images/chart/charts/tree_map.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const TreeMapConfig: ConfigType = { key: 'VTreeMap', title: '树形分布', category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, node: TreeMap, image: image } diff --git a/src/packages/components/Chart/Mores/Variable/index.ts b/src/packages/components/Chart/Mores/Variable/index.ts index 5339ec68..dec01ff4 100644 --- a/src/packages/components/Chart/Mores/Variable/index.ts +++ b/src/packages/components/Chart/Mores/Variable/index.ts @@ -1,12 +1,13 @@ import Variable from './index.vue' import image from '@/assets/images/chart/charts/water_variable.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const VariableConfig: ConfigType = { key: 'VVariable', title: '折线面积图', category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, node: Variable, image: image } diff --git a/src/packages/components/Chart/Pies/PieCommon/index.ts b/src/packages/components/Chart/Pies/PieCommon/index.ts index 918ca0f6..595633b2 100644 --- a/src/packages/components/Chart/Pies/PieCommon/index.ts +++ b/src/packages/components/Chart/Pies/PieCommon/index.ts @@ -1,12 +1,13 @@ import PieCommon from './index.vue' import image from '@/assets/images/chart/charts/pie.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const PieCommonConfig: ConfigType = { key: 'VPieCommon', title: '计量图', category: ChatCategoryEnum.PIE, + categoryName: ChatCategoryEnumName.PIE, node: PieCommon, image } diff --git a/src/packages/components/Chart/index.d.ts b/src/packages/components/Chart/index.d.ts index 9ea3a91a..9441b897 100644 --- a/src/packages/components/Chart/index.d.ts +++ b/src/packages/components/Chart/index.d.ts @@ -1,7 +1,15 @@ export enum ChatCategoryEnum { + BAR = 'bar', + PIE = 'pie', + LINE = 'line', + MAP = 'map', + MORE = 'more' +} + +export enum ChatCategoryEnumName { BAR = '柱状图', PIE = '饼图', LINE = '折线图', - MORE = '更多', - MAP = '地图' + MAP = '地图', + MORE = '更多' } \ No newline at end of file diff --git a/src/packages/components/Decorate/Mores/Number/index.ts b/src/packages/components/Decorate/Mores/Number/index.ts index 1694355b..28f68b1f 100644 --- a/src/packages/components/Decorate/Mores/Number/index.ts +++ b/src/packages/components/Decorate/Mores/Number/index.ts @@ -1,12 +1,13 @@ import Number from './index.vue' import image from '@/assets/images/chart/decorates/number.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' export const NumberConfig: ConfigType = { key: 'VNumber', title: '数字翻牌', category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, node: Number, image } diff --git a/src/packages/components/Decorate/Mores/Time/index.ts b/src/packages/components/Decorate/Mores/Time/index.ts index fae7cbdb..a556ff5c 100644 --- a/src/packages/components/Decorate/Mores/Time/index.ts +++ b/src/packages/components/Decorate/Mores/Time/index.ts @@ -1,12 +1,13 @@ import Time from './index.vue' import image from '@/assets/images/chart/decorates/time.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' export const TimeConfig: ConfigType = { key: 'VTime', title: '时间', category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, node: Time, image } diff --git a/src/packages/components/Decorate/Mores/Weather/index.ts b/src/packages/components/Decorate/Mores/Weather/index.ts index 6f91f799..358c3d35 100644 --- a/src/packages/components/Decorate/Mores/Weather/index.ts +++ b/src/packages/components/Decorate/Mores/Weather/index.ts @@ -1,12 +1,13 @@ import Weather from './index.vue' import image from '@/assets/images/chart/decorates/weather.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' export const WeatherConfig: ConfigType = { key: 'VWeather', title: '天气', category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, node: Weather, image } diff --git a/src/packages/components/Decorate/Mores/WeatherTime/index.ts b/src/packages/components/Decorate/Mores/WeatherTime/index.ts index dc8c9a6b..a45c54a6 100644 --- a/src/packages/components/Decorate/Mores/WeatherTime/index.ts +++ b/src/packages/components/Decorate/Mores/WeatherTime/index.ts @@ -1,12 +1,13 @@ import WeatherTime from './index.vue' import image from '@/assets/images/chart/decorates/weather_time.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' export const WeatherTimeConfig: ConfigType = { key: 'VWeatherTime', title: '天气和时间', category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, node: WeatherTime, image } diff --git a/src/packages/components/Decorate/borders/borderCommon/index.ts b/src/packages/components/Decorate/borders/borderCommon/index.ts index c9fc5999..04d3de2a 100644 --- a/src/packages/components/Decorate/borders/borderCommon/index.ts +++ b/src/packages/components/Decorate/borders/borderCommon/index.ts @@ -1,12 +1,13 @@ import BorderCommon from './index.vue' import image from '@/assets/images/chart/decorates/border.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' export const BorderCommonConfig: ConfigType = { key: 'VBorderCommon', title: '边框', category: ChatCategoryEnum.BORDER, + categoryName: ChatCategoryEnumName.BORDER, node: BorderCommon, image } diff --git a/src/packages/components/Decorate/index.d.ts b/src/packages/components/Decorate/index.d.ts index e124df4a..13e22039 100644 --- a/src/packages/components/Decorate/index.d.ts +++ b/src/packages/components/Decorate/index.d.ts @@ -1,4 +1,9 @@ export enum ChatCategoryEnum { + BORDER = 'BORDER', + MORE = 'MORE' +} + +export enum ChatCategoryEnumName { BORDER = '边框', MORE = '更多' } \ No newline at end of file diff --git a/src/packages/components/Information/Mores/Image/index.ts b/src/packages/components/Information/Mores/Image/index.ts index db9dd515..179fe4ab 100644 --- a/src/packages/components/Information/Mores/Image/index.ts +++ b/src/packages/components/Information/Mores/Image/index.ts @@ -1,12 +1,13 @@ import Image from './index.vue' import image from '@/assets/images/chart/informations/photo.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' export const ImageConfig: ConfigType = { key: 'VImage', title: '图片', category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, node: Image, image } diff --git a/src/packages/components/Information/Mores/TextCloud/index.ts b/src/packages/components/Information/Mores/TextCloud/index.ts index 56aab195..c15ada59 100644 --- a/src/packages/components/Information/Mores/TextCloud/index.ts +++ b/src/packages/components/Information/Mores/TextCloud/index.ts @@ -1,12 +1,13 @@ import TextCloud from './index.vue' import image from '@/assets/images/chart/informations/words_cloud.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' export const TextCloudConfig: ConfigType = { key: 'VTextCloud', title: '词云', category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, node: TextCloud, image } diff --git a/src/packages/components/Information/Texts/TextCommon/index.ts b/src/packages/components/Information/Texts/TextCommon/index.ts index b3f29fab..c40a1696 100644 --- a/src/packages/components/Information/Texts/TextCommon/index.ts +++ b/src/packages/components/Information/Texts/TextCommon/index.ts @@ -1,12 +1,13 @@ import TextCommon from './index.vue' import image from '@/assets/images/chart/informations/text_static.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' export const TextCommonConfig: ConfigType = { key: 'VText', title: '文字', category: ChatCategoryEnum.TEXT, + categoryName: ChatCategoryEnumName.TEXT, node: TextCommon, image } diff --git a/src/packages/components/Information/Titles/TitleBevelAngle/index.ts b/src/packages/components/Information/Titles/TitleBevelAngle/index.ts index 184d2c4c..718d7e2f 100644 --- a/src/packages/components/Information/Titles/TitleBevelAngle/index.ts +++ b/src/packages/components/Information/Titles/TitleBevelAngle/index.ts @@ -1,12 +1,13 @@ import TitleBevelAngle from './index.vue' import image from '@/assets/images/chart/informations/title_diamond2.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' export const TitleBevelAngleConfig: ConfigType = { key: 'VTitleBevelAngle', title: '斜角标题', category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, node: TitleBevelAngle, image } diff --git a/src/packages/components/Information/Titles/TitleCommon/index.ts b/src/packages/components/Information/Titles/TitleCommon/index.ts index 84d34396..07ef76b5 100644 --- a/src/packages/components/Information/Titles/TitleCommon/index.ts +++ b/src/packages/components/Information/Titles/TitleCommon/index.ts @@ -1,12 +1,13 @@ import TitleCommon from './index.vue' import image from '@/assets/images/chart/informations/title_diamond.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' export const TitleCommonConfig: ConfigType = { key: 'VText', title: '普通标题', category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, node: TitleCommon, image } \ No newline at end of file diff --git a/src/packages/components/Information/Titles/TitlePro/index.ts b/src/packages/components/Information/Titles/TitlePro/index.ts index 2889bb43..c920aee5 100644 --- a/src/packages/components/Information/Titles/TitlePro/index.ts +++ b/src/packages/components/Information/Titles/TitlePro/index.ts @@ -1,12 +1,13 @@ import TitlePro from './index.vue' import image from '@/assets/images/chart/informations/title_main.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../../index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' export const TitleProConfig: ConfigType = { key: 'VTitlePro', title: '中心标题', category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, node: TitlePro, image } diff --git a/src/packages/components/Information/index.d.ts b/src/packages/components/Information/index.d.ts index 75ae48f2..61750e77 100644 --- a/src/packages/components/Information/index.d.ts +++ b/src/packages/components/Information/index.d.ts @@ -1,4 +1,10 @@ export enum ChatCategoryEnum { + TEXT = 'TEXT', + TITLE = 'TITLE', + MORE = 'MORE' +} + +export enum ChatCategoryEnumName { TEXT = '文本', TITLE = '标题', MORE = '更多' diff --git a/src/packages/components/Tables/TableCategory/index.ts b/src/packages/components/Table/TableCategory/index.ts similarity index 66% rename from src/packages/components/Tables/TableCategory/index.ts rename to src/packages/components/Table/TableCategory/index.ts index 70ecda18..5516f475 100644 --- a/src/packages/components/Tables/TableCategory/index.ts +++ b/src/packages/components/Table/TableCategory/index.ts @@ -1,12 +1,13 @@ import TableCategory from './index.vue' import image from '@/assets/images/chart/Tables/tables_categary.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../index.d' export const TableCategoryConfig: ConfigType = { key: 'VTableCategory', title: '归类表格', - category: ChatCategoryEnum.table, + category: ChatCategoryEnum.TABLE, + categoryName: ChatCategoryEnumName.TABLE, node: TableCategory, image } diff --git a/src/packages/components/Tables/TableCategory/index.vue b/src/packages/components/Table/TableCategory/index.vue similarity index 100% rename from src/packages/components/Tables/TableCategory/index.vue rename to src/packages/components/Table/TableCategory/index.vue diff --git a/src/packages/components/Table/index.d.ts b/src/packages/components/Table/index.d.ts new file mode 100644 index 00000000..315ba3f7 --- /dev/null +++ b/src/packages/components/Table/index.d.ts @@ -0,0 +1,7 @@ +export enum ChatCategoryEnum { + TABLE = 'TABLE', +} + +export enum ChatCategoryEnumName { + TABLE = '表格', +} \ No newline at end of file diff --git a/src/packages/components/Tables/index.ts b/src/packages/components/Table/index.ts similarity index 100% rename from src/packages/components/Tables/index.ts rename to src/packages/components/Table/index.ts diff --git a/src/packages/components/Tables/tableCommon/index.ts b/src/packages/components/Table/tableCommon/index.ts similarity index 64% rename from src/packages/components/Tables/tableCommon/index.ts rename to src/packages/components/Table/tableCommon/index.ts index 85c9e95b..285397f8 100644 --- a/src/packages/components/Tables/tableCommon/index.ts +++ b/src/packages/components/Table/tableCommon/index.ts @@ -1,12 +1,13 @@ import TableCommon from './index.vue' import image from '@/assets/images/chart/Tables/tables.png' import { ConfigType } from '@/packages/index.d' -import { ChatCategoryEnum } from '../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../index.d' export const TableCommonConfig: ConfigType = { key: 'VTableCommon', title: '表格', - category: ChatCategoryEnum.table, + category: ChatCategoryEnum.TABLE, + categoryName: ChatCategoryEnumName.TABLE, node: TableCommon, image } diff --git a/src/packages/components/Tables/tableCommon/index.vue b/src/packages/components/Table/tableCommon/index.vue similarity index 100% rename from src/packages/components/Tables/tableCommon/index.vue rename to src/packages/components/Table/tableCommon/index.vue diff --git a/src/packages/components/Tables/index.d.ts b/src/packages/components/Tables/index.d.ts deleted file mode 100644 index 27470ddc..00000000 --- a/src/packages/components/Tables/index.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export enum ChatCategoryEnum { - table = '表格', -} \ No newline at end of file diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts index 11148627..dd124ac3 100644 --- a/src/packages/index.d.ts +++ b/src/packages/index.d.ts @@ -5,6 +5,7 @@ export type ConfigType = { key: string title: string category: string + categoryName: string node: Component image: string | (() => Promise) [T: string]: unknown diff --git a/src/packages/index.ts b/src/packages/index.ts index 57f233dd..90e0f87a 100644 --- a/src/packages/index.ts +++ b/src/packages/index.ts @@ -2,7 +2,7 @@ import { PackagesCategoryEnum, PackagesType } from '@/packages/index.d' import { ChartList } from '@/packages/components/Chart/index' import { DecorateList } from '@/packages/components/Decorate/index' import { InformationList } from '@/packages/components/Information/index' -import { TableList } from '@/packages/components/Tables/index' +import { TableList } from '@/packages/components/Table/index' // 所有图表 let packagesList: PackagesType = { diff --git a/src/views/chart/components/ContentBox/index.vue b/src/views/chart/components/ContentBox/index.vue index 063ae2b4..442046f6 100644 --- a/src/views/chart/components/ContentBox/index.vue +++ b/src/views/chart/components/ContentBox/index.vue @@ -1,4 +1,5 @@