diff --git a/doc/docs/.vuepress/config.js b/doc/docs/.vuepress/config.js
index e2c0bd4c..b0bc52f7 100644
--- a/doc/docs/.vuepress/config.js
+++ b/doc/docs/.vuepress/config.js
@@ -50,7 +50,7 @@ module.exports = {
title: '用户权限',
collapsable: false,
children: [
- {title: '权限管理', path: '/guide/authmanager'},
+ {title: '权限管理', path: '/guide/authManager'},
]
},
{
@@ -59,12 +59,13 @@ module.exports = {
children: [
{title: '数据源', path: '/guide/datasource'},
{title: '数据集', path: '/guide/dataset'},
- {title: '报表管理', path: '/guide/reportmanager'},
+ {title: '报表管理', path: '/guide/reportManager'},
{title: '大屏报表', path: '/guide/dashboard'},
{title: '表格报表', path: '/guide/excel'},
- {title: '导入导出', path: '/guide/importexport'},
- {title: '图表配置项', path: '/guide/chartsconfig'},
+ {title: '导入导出', path: '/guide/importExport'},
+ {title: '图表配置项', path: '/guide/chartsConfig'},
{title: '图表组件', path: '/guide/charts'},
+ {title: '图表联动', path: '/guide/chartsLinkage'},
]
},
{
diff --git a/doc/docs/guide/authmanager.md b/doc/docs/guide/authManager.md
similarity index 100%
rename from doc/docs/guide/authmanager.md
rename to doc/docs/guide/authManager.md
diff --git a/doc/docs/guide/charts.md b/doc/docs/guide/charts.md
index fa87b0c8..665ef8b9 100644
--- a/doc/docs/guide/charts.md
+++ b/doc/docs/guide/charts.md
@@ -95,6 +95,17 @@
**如有问题，请提交 [Issue](https://gitee.com/anji-plus/report/issues)
**
+### 双Y柱图
+
+数据集需要3个字段，其中一个字段作为“X轴”，另外两个数值字段选择“柱状”，左右Y轴分别代表选择柱状的俩种数值。
+
+
+#### 数据格式
+
+
+
+**如有问题，请提交 [Issue](https://gitee.com/anji-plus/report/issues)
**
+
## 折线图
### 折线图
@@ -298,7 +309,7 @@
基本操作和表格一致，通过配置栏的新增按钮和操作按钮对雷达顶点数量进行修改，可生成5边雷达，6边雷达等等，”key值“和”雷达顶点“保持一致，从最上端顶点逆时针规划其他顶点。
-### 数据格式
+#### 数据格式
数据格式和柱线、多柱线都是类似的，注意实际作为”名称“的字段，比如时间字段，有且只能有1个，其余是”雷达顶点“字段，不明白可以看静态数据格式。
@@ -306,13 +317,44 @@
**如有问题，请提交 [Issue](https://gitee.com/anji-plus/report/issues)
**
+## 刻度尺
+
+### 竖刻度尺
+
+刻度尺数值的颜色来源于配置的渐变色，渐变色分为0%-30%-50%-70%-100%，数值颜色的变化会随着数值所在颜色区间的变化而变化。通过刻度设定可以调整最大刻度，默认刻度是100。
+
+
+
+#### 数据格式
+
+单一的数值字段，可看静态数据。
+
+### 横刻度尺
+
+同竖刻度尺。
+
+
+#### 数据格式
+
+单一的数值字段，可看静态数据。
+
## 表单
### 下拉框
+组件联动的使用方式请看图表联动里面的详细描述。
+
#### 数据格式
-### 输入框
+“提交值”指的是下拉框提交给联动的组件字段名和字段值，“显示值”是指下拉框自身下拉按钮显示的值。动态数据需要至少1个字段，如果只有一个字段请选择“提交值”，最多2个字段，“提交值”“显示值”，只能选择一个，不能同时都选。
+注意下拉框的静态数据只是作为参考用的，并不参与解析。
+
+
+**如有问题，请提交 [Issue](https://gitee.com/anji-plus/report/issues)
**
+
+### 时间筛选器
+默认支持的时间格式是"yyyy-MM-dd HH:mm:ss"，其他日期格式暂不支持，需要自己把自己数据集中时间字段格式化成同种格式。
+
+
-#### 数据格式
diff --git a/doc/docs/guide/chartsconfig.md b/doc/docs/guide/chartsConfig.md
similarity index 100%
rename from doc/docs/guide/chartsconfig.md
rename to doc/docs/guide/chartsConfig.md
diff --git a/doc/docs/guide/chartsLinkage.md b/doc/docs/guide/chartsLinkage.md
new file mode 100644
index 00000000..5f0d07f6
--- /dev/null
+++ b/doc/docs/guide/chartsLinkage.md
@@ -0,0 +1,12 @@
+## 简要说明
+现有系统的联动分为：
+- 表单联动
+目前支持的有下拉框、时间筛选器俩种。
+
+- 图表联动：
+目前联动主要集中在柱状图、折线图、饼图等这种二维图表，二维图表是指图表只支持2个字段的数据集，当然并不是说需要3个字段的堆叠图（柱状/折线）不支持联动，而是这种三维图表去联动二维图表会带来一些问题，反之二维的去联动三维的同样存在问题，因此目前源代码中只添加了部分二维图表的联动。
+
+## 表单联动
+
+## 图表联动
+
diff --git a/doc/docs/guide/importexport.md b/doc/docs/guide/importExport.md
similarity index 100%
rename from doc/docs/guide/importexport.md
rename to doc/docs/guide/importExport.md
diff --git a/doc/docs/guide/reportmanager.md b/doc/docs/guide/reportManager.md
similarity index 100%
rename from doc/docs/guide/reportmanager.md
rename to doc/docs/guide/reportManager.md
diff --git a/doc/docs/picture/charts/img_33.png b/doc/docs/picture/charts/img_33.png
new file mode 100644
index 00000000..d7858343
Binary files /dev/null and b/doc/docs/picture/charts/img_33.png differ
diff --git a/doc/docs/picture/charts/img_34.png b/doc/docs/picture/charts/img_34.png
new file mode 100644
index 00000000..47662ac8
Binary files /dev/null and b/doc/docs/picture/charts/img_34.png differ
diff --git a/doc/docs/picture/charts/img_35.png b/doc/docs/picture/charts/img_35.png
new file mode 100644
index 00000000..c4284b0d
Binary files /dev/null and b/doc/docs/picture/charts/img_35.png differ
diff --git a/doc/docs/picture/charts/img_36.png b/doc/docs/picture/charts/img_36.png
new file mode 100644
index 00000000..82c7a39b
Binary files /dev/null and b/doc/docs/picture/charts/img_36.png differ
diff --git a/doc/docs/picture/charts/img_37.png b/doc/docs/picture/charts/img_37.png
new file mode 100644
index 00000000..a8bc236d
Binary files /dev/null and b/doc/docs/picture/charts/img_37.png differ
diff --git a/doc/docs/picture/charts/img_38.png b/doc/docs/picture/charts/img_38.png
new file mode 100644
index 00000000..5b72871e
Binary files /dev/null and b/doc/docs/picture/charts/img_38.png differ
diff --git a/doc/docs/picture/charts/img_39.png b/doc/docs/picture/charts/img_39.png
new file mode 100644
index 00000000..91887427
Binary files /dev/null and b/doc/docs/picture/charts/img_39.png differ
diff --git a/doc/docs/picture/charts/img_40.png b/doc/docs/picture/charts/img_40.png
new file mode 100644
index 00000000..6f37b2de
Binary files /dev/null and b/doc/docs/picture/charts/img_40.png differ
diff --git a/doc/docs/picture/charts/img_41.png b/doc/docs/picture/charts/img_41.png
new file mode 100644
index 00000000..188ac043
Binary files /dev/null and b/doc/docs/picture/charts/img_41.png differ