diff --git a/src/assets/images/chart/charts/bar_y.png b/src/assets/images/chart/charts/bar_y.png
index 6a1c738d..c5c01995 100644
Binary files a/src/assets/images/chart/charts/bar_y.png and b/src/assets/images/chart/charts/bar_y.png differ
diff --git a/src/assets/images/chart/charts/bar_y2.png b/src/assets/images/chart/charts/bar_y2.png
index c5c01995..6a1c738d 100644
Binary files a/src/assets/images/chart/charts/bar_y2.png and b/src/assets/images/chart/charts/bar_y2.png differ
diff --git a/src/assets/images/chart/charts/variable.png b/src/assets/images/chart/charts/water_variable.png
similarity index 100%
rename from src/assets/images/chart/charts/variable.png
rename to src/assets/images/chart/charts/water_variable.png
diff --git a/src/packages/components/Chart/Bars/BarCommon/index.ts b/src/packages/components/Chart/Bars/BarCommon/index.ts
index b3668a38..aa094bbf 100644
--- a/src/packages/components/Chart/Bars/BarCommon/index.ts
+++ b/src/packages/components/Chart/Bars/BarCommon/index.ts
@@ -1,12 +1,12 @@
-import barCommon from './index.vue'
+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'
-export const barCommonConfig: ConfigType = {
+export const BarCommonConfig: ConfigType = {
key: 'BarCommon',
- title: '基础',
+ title: '柱状图',
category: ChatCategoryEnum.BAR,
- node: barCommon,
+ node: BarCommon,
image: image
}
diff --git a/src/packages/components/Chart/Bars/BarCrossrange/index.ts b/src/packages/components/Chart/Bars/BarCrossrange/index.ts
new file mode 100644
index 00000000..de724b0c
--- /dev/null
+++ b/src/packages/components/Chart/Bars/BarCrossrange/index.ts
@@ -0,0 +1,12 @@
+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'
+
+export const BarCrossrangefig: ConfigType = {
+ key: 'BarCrossrange',
+ title: '横向柱状图',
+ category: ChatCategoryEnum.BAR,
+ node: BarCrossrange,
+ image: image
+}
diff --git a/src/packages/components/Chart/Bars/BarCrossrange/index.vue b/src/packages/components/Chart/Bars/BarCrossrange/index.vue
new file mode 100644
index 00000000..f3abbb36
--- /dev/null
+++ b/src/packages/components/Chart/Bars/BarCrossrange/index.vue
@@ -0,0 +1,13 @@
+
+
+ 柱状图组件渲染
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/Chart/Bars/index.ts b/src/packages/components/Chart/Bars/index.ts
index 56544510..82c295c6 100644
--- a/src/packages/components/Chart/Bars/index.ts
+++ b/src/packages/components/Chart/Bars/index.ts
@@ -1,3 +1,4 @@
-import { barCommonConfig } from './BarCommon/index'
+import { BarCommonConfig } from './BarCommon/index'
+import { BarCrossrangefig } from './BarCrossrange/index'
-export default [barCommonConfig]
+export default [BarCommonConfig, BarCrossrangefig]
diff --git a/src/packages/components/Chart/Lines/LineCommon/index.ts b/src/packages/components/Chart/Lines/LineCommon/index.ts
new file mode 100644
index 00000000..4d1ad1f3
--- /dev/null
+++ b/src/packages/components/Chart/Lines/LineCommon/index.ts
@@ -0,0 +1,12 @@
+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'
+
+export const LineCommonConfig: ConfigType = {
+ key: 'LineCommon',
+ title: '折线图',
+ category: ChatCategoryEnum.LINE,
+ node: LineCommon,
+ image: image
+}
diff --git a/src/packages/components/Chart/Lines/LineCommon/index.vue b/src/packages/components/Chart/Lines/LineCommon/index.vue
new file mode 100644
index 00000000..850cdeef
--- /dev/null
+++ b/src/packages/components/Chart/Lines/LineCommon/index.vue
@@ -0,0 +1,13 @@
+
+
+ line组件渲染
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/Chart/Lines/LineGradientSingle/index.ts b/src/packages/components/Chart/Lines/LineGradientSingle/index.ts
new file mode 100644
index 00000000..2efbe40e
--- /dev/null
+++ b/src/packages/components/Chart/Lines/LineGradientSingle/index.ts
@@ -0,0 +1,12 @@
+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'
+
+export const LineGradientSingleConfig: ConfigType = {
+ key: 'LineGradientSingle',
+ title: '折线面积图',
+ category: ChatCategoryEnum.LINE,
+ node: LineGradientSingle,
+ image: image
+}
diff --git a/src/packages/components/Chart/Lines/LineGradientSingle/index.vue b/src/packages/components/Chart/Lines/LineGradientSingle/index.vue
new file mode 100644
index 00000000..850cdeef
--- /dev/null
+++ b/src/packages/components/Chart/Lines/LineGradientSingle/index.vue
@@ -0,0 +1,13 @@
+
+
+ line组件渲染
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/Chart/Lines/LineGradients/index.ts b/src/packages/components/Chart/Lines/LineGradients/index.ts
new file mode 100644
index 00000000..75e34a6b
--- /dev/null
+++ b/src/packages/components/Chart/Lines/LineGradients/index.ts
@@ -0,0 +1,12 @@
+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'
+
+export const LineGradientsConfig: ConfigType = {
+ key: 'LineGradientSingle',
+ title: '折线面积图',
+ category: ChatCategoryEnum.LINE,
+ node: LineGradients,
+ image: image
+}
diff --git a/src/packages/components/Chart/Lines/LineGradients/index.vue b/src/packages/components/Chart/Lines/LineGradients/index.vue
new file mode 100644
index 00000000..850cdeef
--- /dev/null
+++ b/src/packages/components/Chart/Lines/LineGradients/index.vue
@@ -0,0 +1,13 @@
+
+
+ line组件渲染
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/Chart/Lines/index.ts b/src/packages/components/Chart/Lines/index.ts
new file mode 100644
index 00000000..7ff11929
--- /dev/null
+++ b/src/packages/components/Chart/Lines/index.ts
@@ -0,0 +1,5 @@
+import { LineCommonConfig } from './LineCommon/index'
+import { LineGradientSingleConfig } from './LineGradientSingle/index'
+import { LineGradientsConfig } from './LineGradients/index'
+
+export default [LineCommonConfig, LineGradientSingleConfig, LineGradientsConfig]
diff --git a/src/packages/components/Chart/Mores/Variable/index.ts b/src/packages/components/Chart/Mores/Variable/index.ts
new file mode 100644
index 00000000..4a0aabc9
--- /dev/null
+++ b/src/packages/components/Chart/Mores/Variable/index.ts
@@ -0,0 +1,12 @@
+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'
+
+export const VariableConfig: ConfigType = {
+ key: 'Variable',
+ title: '折线面积图',
+ category: ChatCategoryEnum.MORE,
+ node: Variable,
+ image: image
+}
diff --git a/src/packages/components/Chart/Mores/Variable/index.vue b/src/packages/components/Chart/Mores/Variable/index.vue
new file mode 100644
index 00000000..31fe77be
--- /dev/null
+++ b/src/packages/components/Chart/Mores/Variable/index.vue
@@ -0,0 +1,13 @@
+
+
+ 水波
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/Chart/Mores/index.ts b/src/packages/components/Chart/Mores/index.ts
new file mode 100644
index 00000000..9f12964c
--- /dev/null
+++ b/src/packages/components/Chart/Mores/index.ts
@@ -0,0 +1,3 @@
+import { VariableConfig } from './Variable/index'
+
+export default [VariableConfig,]
diff --git a/src/packages/components/Chart/Pies/PieCommon/index.ts b/src/packages/components/Chart/Pies/PieCommon/index.ts
index bbb19251..6b41e4ae 100644
--- a/src/packages/components/Chart/Pies/PieCommon/index.ts
+++ b/src/packages/components/Chart/Pies/PieCommon/index.ts
@@ -1,12 +1,12 @@
-import node from './index.vue'
+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'
-export const pieCommonConfig: ConfigType = {
+export const PieCommonConfig: ConfigType = {
key: 'PieCommon',
- title: '饼图',
+ title: '计量图',
category: ChatCategoryEnum.PIE,
- node: node,
+ node: PieCommon,
image
}
diff --git a/src/packages/components/Chart/Pies/index.ts b/src/packages/components/Chart/Pies/index.ts
index beb6f3dd..f5ce290b 100644
--- a/src/packages/components/Chart/Pies/index.ts
+++ b/src/packages/components/Chart/Pies/index.ts
@@ -1,3 +1,3 @@
-import { pieCommonConfig } from './PieCommon/index'
+import { PieCommonConfig } from './PieCommon/index'
-export default [pieCommonConfig]
\ No newline at end of file
+export default [PieCommonConfig]
\ No newline at end of file
diff --git a/src/packages/components/Chart/index.d.ts b/src/packages/components/Chart/index.d.ts
index ab81fa27..c6022f2c 100644
--- a/src/packages/components/Chart/index.d.ts
+++ b/src/packages/components/Chart/index.d.ts
@@ -1,4 +1,6 @@
export enum ChatCategoryEnum {
BAR = '柱状图',
- PIE = '饼图'
+ PIE = '饼图',
+ LINE = '折线图',
+ MORE = '更多'
}
\ No newline at end of file
diff --git a/src/packages/components/Chart/index.ts b/src/packages/components/Chart/index.ts
index 5a1a777c..b3caac9a 100644
--- a/src/packages/components/Chart/index.ts
+++ b/src/packages/components/Chart/index.ts
@@ -1,4 +1,6 @@
-import Bar from './Bars'
-import Pie from './Pies'
+import Bars from './Bars'
+import Pies from './Pies'
+import Lines from './Lines'
+import Mores from './Mores'
-export const ChartList = [...Bar, ...Pie]
+export const ChartList = [...Bars, ...Pies, ...Lines, ...Mores]
diff --git a/src/packages/components/Decorate/borders/borderCommon/index.ts b/src/packages/components/Decorate/borders/borderCommon/index.ts
index d5945afb..43375c1f 100644
--- a/src/packages/components/Decorate/borders/borderCommon/index.ts
+++ b/src/packages/components/Decorate/borders/borderCommon/index.ts
@@ -3,8 +3,8 @@ import image from '@/assets/images/chart/decorates/border.png'
import { ConfigType } from '@/packages/index.d'
import { ChatCategoryEnum } from '../../index.d'
-export const borderCommonConfig: ConfigType = {
- key: 'Border',
+export const BorderCommonConfig: ConfigType = {
+ key: 'BorderCommon',
title: '边框',
category: ChatCategoryEnum.Border,
node: BorderCommon,
diff --git a/src/packages/components/Decorate/borders/index.ts b/src/packages/components/Decorate/borders/index.ts
index 1ca71c3f..1a05dd61 100644
--- a/src/packages/components/Decorate/borders/index.ts
+++ b/src/packages/components/Decorate/borders/index.ts
@@ -1,3 +1,3 @@
-import { borderCommonConfig } from './BorderCommon/index'
+import { BorderCommonConfig } from './BorderCommon/index'
-export default [borderCommonConfig]
+export default [BorderCommonConfig]
diff --git a/src/packages/components/Information/Texts/TextCommon/index.ts b/src/packages/components/Information/Texts/TextCommon/index.ts
index 6b63d6cd..d1117c08 100644
--- a/src/packages/components/Information/Texts/TextCommon/index.ts
+++ b/src/packages/components/Information/Texts/TextCommon/index.ts
@@ -3,10 +3,10 @@ import image from '@/assets/images/chart/informations/text_static.png'
import { ConfigType } from '@/packages/index.d'
import { ChatCategoryEnum } from '../../index.d'
-export const textCommonConfig: ConfigType = {
+export const TextCommonConfig: ConfigType = {
key: 'Text',
title: '文字',
- category: ChatCategoryEnum.text,
+ category: ChatCategoryEnum.TEXT,
node: TextCommon,
image
}
diff --git a/src/packages/components/Information/Texts/index.ts b/src/packages/components/Information/Texts/index.ts
index 328b89ed..60f9e456 100644
--- a/src/packages/components/Information/Texts/index.ts
+++ b/src/packages/components/Information/Texts/index.ts
@@ -1,3 +1,3 @@
-import { textCommonConfig } from './TextCommon/index'
+import { TextCommonConfig } from './TextCommon/index'
-export default [textCommonConfig]
+export default [TextCommonConfig]
diff --git a/src/packages/components/Information/Titles/TitleCommon/index.ts b/src/packages/components/Information/Titles/TitleCommon/index.ts
new file mode 100644
index 00000000..18b7fa18
--- /dev/null
+++ b/src/packages/components/Information/Titles/TitleCommon/index.ts
@@ -0,0 +1,12 @@
+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'
+
+export const TitleCommonConfig: ConfigType = {
+ key: 'Text',
+ title: '标题',
+ category: ChatCategoryEnum.TITLE,
+ node: TitleCommon,
+ image
+}
diff --git a/src/packages/components/Information/Titles/TitleCommon/index.vue b/src/packages/components/Information/Titles/TitleCommon/index.vue
new file mode 100644
index 00000000..bc3b4761
--- /dev/null
+++ b/src/packages/components/Information/Titles/TitleCommon/index.vue
@@ -0,0 +1,13 @@
+
+
+ 标题
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/Information/Titles/index.ts b/src/packages/components/Information/Titles/index.ts
new file mode 100644
index 00000000..0e69df00
--- /dev/null
+++ b/src/packages/components/Information/Titles/index.ts
@@ -0,0 +1,3 @@
+import { TitleCommonConfig } from './TitleCommon/index'
+
+export default [TitleCommonConfig]
diff --git a/src/packages/components/Information/index.d.ts b/src/packages/components/Information/index.d.ts
index b956a06b..1bc0cb1a 100644
--- a/src/packages/components/Information/index.d.ts
+++ b/src/packages/components/Information/index.d.ts
@@ -1,3 +1,4 @@
export enum ChatCategoryEnum {
- text = '文本',
+ TEXT = '文本',
+ TITLE = '标题'
}
\ No newline at end of file
diff --git a/src/packages/components/Information/index.ts b/src/packages/components/Information/index.ts
index ad5a347e..f4f30d55 100644
--- a/src/packages/components/Information/index.ts
+++ b/src/packages/components/Information/index.ts
@@ -1,3 +1,4 @@
import Texts from './Texts'
+import Titles from './Titles'
-export const InformationList = [...Texts]
+export const InformationList = [...Texts, ...Titles]
diff --git a/src/packages/components/Tables/TableCategory/index.ts b/src/packages/components/Tables/TableCategory/index.ts
new file mode 100644
index 00000000..b2b48dda
--- /dev/null
+++ b/src/packages/components/Tables/TableCategory/index.ts
@@ -0,0 +1,12 @@
+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'
+
+export const TableCategoryConfig: ConfigType = {
+ key: 'TableCategory',
+ title: '归类表格',
+ category: ChatCategoryEnum.table,
+ node: TableCategory,
+ image
+}
diff --git a/src/packages/components/Tables/TableCategory/index.vue b/src/packages/components/Tables/TableCategory/index.vue
new file mode 100644
index 00000000..ebda1e9c
--- /dev/null
+++ b/src/packages/components/Tables/TableCategory/index.vue
@@ -0,0 +1,13 @@
+
+
+ 表格
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/Tables/index.ts b/src/packages/components/Tables/index.ts
index de7abe60..456db9b4 100644
--- a/src/packages/components/Tables/index.ts
+++ b/src/packages/components/Tables/index.ts
@@ -1,3 +1,4 @@
-import { tableCommonConfig } from './tableCommon/index'
+import { TableCommonConfig } from './TableCommon/index'
+import { TableCategoryConfig } from './TableCategory/index'
-export const TableList = [tableCommonConfig]
+export const TableList = [TableCommonConfig, TableCategoryConfig]
diff --git a/src/packages/components/Tables/tableCommon/index.ts b/src/packages/components/Tables/tableCommon/index.ts
index f03a6061..d565c9a9 100644
--- a/src/packages/components/Tables/tableCommon/index.ts
+++ b/src/packages/components/Tables/tableCommon/index.ts
@@ -3,8 +3,8 @@ import image from '@/assets/images/chart/Tables/tables.png'
import { ConfigType } from '@/packages/index.d'
import { ChatCategoryEnum } from '../index.d'
-export const tableCommonConfig: ConfigType = {
- key: 'Border',
+export const TableCommonConfig: ConfigType = {
+ key: 'TableCommon',
title: '表格',
category: ChatCategoryEnum.table,
node: TableCommon,
diff --git a/src/views/chart/components/ContentCharts/components/ItemBox/index.vue b/src/views/chart/components/ContentCharts/components/ItemBox/index.vue
index 6547c4b9..3d260d1a 100644
--- a/src/views/chart/components/ContentCharts/components/ItemBox/index.vue
+++ b/src/views/chart/components/ContentCharts/components/ItemBox/index.vue
@@ -38,7 +38,16 @@ $centerHeight: 80px;
width: $itemWidth;
overflow: hidden;
border-radius: 6px;
+ cursor: pointer;
+ border: 1px solid rgba(0,0,0,0);
@include filter-bg-color("background-color2");
+ @extend .go-transition;
+ &:hover {
+ @include hover-border-color('background-color4');
+ .list-img {
+ transform: scale(1.1);
+ }
+ }
.list-header {
display: flex;
align-items: center;
@@ -53,9 +62,11 @@ $centerHeight: 80px;
.list-center {
padding: 6px 0;
height: $centerHeight;
+ overflow: hidden;
.list-img {
height: 100%;
border-radius: 6px;
+ @extend .go-transition;
}
}
}
diff --git a/src/views/chart/components/ContentCharts/components/OptionContent/index.vue b/src/views/chart/components/ContentCharts/components/OptionContent/index.vue
index bfcc6864..3f6af633 100644
--- a/src/views/chart/components/ContentCharts/components/OptionContent/index.vue
+++ b/src/views/chart/components/ContentCharts/components/OptionContent/index.vue
@@ -10,13 +10,15 @@
@update:value="clickItemHandle"
/>
-
+
+
+