From 3b1ca0b819756c11d875e6f7542bf9c9944e940f Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 24 May 2024 15:23:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=20chart=E6=96=87?= =?UTF-8?q?=E6=A1=A3=20=E4=BB=A5=E5=8F=8A=E8=B0=83=E6=95=B4=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-docs/docs/.vitepress/sidebar.js | 4 ++- .../chartAutotopology/chartAutotopology.vue | 32 +++++++++++++++++++ .../chartChild/chartAutotopology/demo.vue | 9 ++++++ .../chartAutotopology/index.en-US.md | 19 +++++++++++ .../chartAutotopology/index.zh-CN.md | 19 +++++++++++ .../chartChild/chartDiagram/chartDiagram.vue | 32 +++++++++++++++++++ .../chart/chartChild/chartDiagram/demo.vue | 9 ++++++ .../chartChild/chartDiagram/index.en-US.md | 17 ++++++++++ .../chartChild/chartDiagram/index.zh-CN.md | 17 ++++++++++ .../chartChild/chartLegend/chartLegend.vue | 32 +++++++++++++++++++ .../src/chart/chartChild/chartLegend/demo.vue | 9 ++++++ .../chartChild/chartLegend/index.en-US.md | 7 ++++ .../chartChild/chartLegend/index.zh-CN.md | 6 ++++ .../chartTimeSeries/chartTimeSeries.vue | 17 +++++++++- .../chartChild/chartTimeSeries/index.en-US.md | 9 ++++++ .../chartChild/chartTimeSeries/index.zh-CN.md | 9 ++++++ nezha-docs/src/chart/index.en-US.md | 6 ++++ nezha-docs/src/chart/index.zh-CN.md | 5 +++ 18 files changed, 256 insertions(+), 2 deletions(-) create mode 100644 nezha-docs/src/chart/chartChild/chartAutotopology/chartAutotopology.vue create mode 100644 nezha-docs/src/chart/chartChild/chartAutotopology/demo.vue create mode 100644 nezha-docs/src/chart/chartChild/chartAutotopology/index.en-US.md create mode 100644 nezha-docs/src/chart/chartChild/chartAutotopology/index.zh-CN.md create mode 100644 nezha-docs/src/chart/chartChild/chartDiagram/chartDiagram.vue create mode 100644 nezha-docs/src/chart/chartChild/chartDiagram/demo.vue create mode 100644 nezha-docs/src/chart/chartChild/chartDiagram/index.en-US.md create mode 100644 nezha-docs/src/chart/chartChild/chartDiagram/index.zh-CN.md create mode 100644 nezha-docs/src/chart/chartChild/chartLegend/chartLegend.vue create mode 100644 nezha-docs/src/chart/chartChild/chartLegend/demo.vue create mode 100644 nezha-docs/src/chart/chartChild/chartLegend/index.en-US.md create mode 100644 nezha-docs/src/chart/chartChild/chartLegend/index.zh-CN.md diff --git a/nezha-docs/docs/.vitepress/sidebar.js b/nezha-docs/docs/.vitepress/sidebar.js index 11dd06901..b95e72edc 100644 --- a/nezha-docs/docs/.vitepress/sidebar.js +++ b/nezha-docs/docs/.vitepress/sidebar.js @@ -30,7 +30,9 @@ export const sidebar = { text: 'chart', link: '/chart', items: [ - {text: 'chartTimeSeries', link: '/chartTimeSeries'} + {text: 'chartTimeSeries', link: '/chartTimeSeries'}, + {text: 'chartAutotopology', link: '/chartAutotopology'}, + {text: 'chartDiagram', link: '/chartDiagram'}, ] } ] diff --git a/nezha-docs/src/chart/chartChild/chartAutotopology/chartAutotopology.vue b/nezha-docs/src/chart/chartChild/chartAutotopology/chartAutotopology.vue new file mode 100644 index 000000000..818e84111 --- /dev/null +++ b/nezha-docs/src/chart/chartChild/chartAutotopology/chartAutotopology.vue @@ -0,0 +1,32 @@ + + + diff --git a/nezha-docs/src/chart/chartChild/chartAutotopology/demo.vue b/nezha-docs/src/chart/chartChild/chartAutotopology/demo.vue new file mode 100644 index 000000000..bc8216a9c --- /dev/null +++ b/nezha-docs/src/chart/chartChild/chartAutotopology/demo.vue @@ -0,0 +1,9 @@ + + + + diff --git a/nezha-docs/src/chart/chartChild/chartAutotopology/index.en-US.md b/nezha-docs/src/chart/chartChild/chartAutotopology/index.en-US.md new file mode 100644 index 000000000..23d2bf7a5 --- /dev/null +++ b/nezha-docs/src/chart/chartChild/chartAutotopology/index.en-US.md @@ -0,0 +1,19 @@ +--- +map: + path: /chartAutotopology +--- + +# 关联组件 +1. meta2dMain topo图组件 + +```vue + + + + + +``` + +props 跟chartTimeSeries 一致 + + diff --git a/nezha-docs/src/chart/chartChild/chartAutotopology/index.zh-CN.md b/nezha-docs/src/chart/chartChild/chartAutotopology/index.zh-CN.md new file mode 100644 index 000000000..5665aa52e --- /dev/null +++ b/nezha-docs/src/chart/chartChild/chartAutotopology/index.zh-CN.md @@ -0,0 +1,19 @@ +--- +map: + path: /chartAutotopology +--- + +# 关联组件 +1. meta2dMain topo图组件 + +```vue + + + + + +``` + +props 跟chartTimeSeries 一致 + + diff --git a/nezha-docs/src/chart/chartChild/chartDiagram/chartDiagram.vue b/nezha-docs/src/chart/chartChild/chartDiagram/chartDiagram.vue new file mode 100644 index 000000000..818e84111 --- /dev/null +++ b/nezha-docs/src/chart/chartChild/chartDiagram/chartDiagram.vue @@ -0,0 +1,32 @@ + + + diff --git a/nezha-docs/src/chart/chartChild/chartDiagram/demo.vue b/nezha-docs/src/chart/chartChild/chartDiagram/demo.vue new file mode 100644 index 000000000..bc8216a9c --- /dev/null +++ b/nezha-docs/src/chart/chartChild/chartDiagram/demo.vue @@ -0,0 +1,9 @@ + + + + diff --git a/nezha-docs/src/chart/chartChild/chartDiagram/index.en-US.md b/nezha-docs/src/chart/chartChild/chartDiagram/index.en-US.md new file mode 100644 index 000000000..30198515b --- /dev/null +++ b/nezha-docs/src/chart/chartChild/chartDiagram/index.en-US.md @@ -0,0 +1,17 @@ +--- +map: + path: /chartDiagram +--- + +# 关联组件 +1. meta2dMain topo图组件 + +```vue +
+ +
+``` + +props 跟chartTimeSeries 一致 + + diff --git a/nezha-docs/src/chart/chartChild/chartDiagram/index.zh-CN.md b/nezha-docs/src/chart/chartChild/chartDiagram/index.zh-CN.md new file mode 100644 index 000000000..30198515b --- /dev/null +++ b/nezha-docs/src/chart/chartChild/chartDiagram/index.zh-CN.md @@ -0,0 +1,17 @@ +--- +map: + path: /chartDiagram +--- + +# 关联组件 +1. meta2dMain topo图组件 + +```vue +
+ +
+``` + +props 跟chartTimeSeries 一致 + + diff --git a/nezha-docs/src/chart/chartChild/chartLegend/chartLegend.vue b/nezha-docs/src/chart/chartChild/chartLegend/chartLegend.vue new file mode 100644 index 000000000..d3da9a219 --- /dev/null +++ b/nezha-docs/src/chart/chartChild/chartLegend/chartLegend.vue @@ -0,0 +1,32 @@ + + + diff --git a/nezha-docs/src/chart/chartChild/chartLegend/demo.vue b/nezha-docs/src/chart/chartChild/chartLegend/demo.vue new file mode 100644 index 000000000..bc8216a9c --- /dev/null +++ b/nezha-docs/src/chart/chartChild/chartLegend/demo.vue @@ -0,0 +1,9 @@ + + + + diff --git a/nezha-docs/src/chart/chartChild/chartLegend/index.en-US.md b/nezha-docs/src/chart/chartChild/chartLegend/index.en-US.md new file mode 100644 index 000000000..5c0223369 --- /dev/null +++ b/nezha-docs/src/chart/chartChild/chartLegend/index.en-US.md @@ -0,0 +1,7 @@ +--- +map: + path: /chartLegend +--- + + + diff --git a/nezha-docs/src/chart/chartChild/chartLegend/index.zh-CN.md b/nezha-docs/src/chart/chartChild/chartLegend/index.zh-CN.md new file mode 100644 index 000000000..7953f7767 --- /dev/null +++ b/nezha-docs/src/chart/chartChild/chartLegend/index.zh-CN.md @@ -0,0 +1,6 @@ +--- +map: + path: /chartLegend +--- + + diff --git a/nezha-docs/src/chart/chartChild/chartTimeSeries/chartTimeSeries.vue b/nezha-docs/src/chart/chartChild/chartTimeSeries/chartTimeSeries.vue index 713a13427..818e84111 100644 --- a/nezha-docs/src/chart/chartChild/chartTimeSeries/chartTimeSeries.vue +++ b/nezha-docs/src/chart/chartChild/chartTimeSeries/chartTimeSeries.vue @@ -4,7 +4,22 @@ const props = withDefaults(defineProps<{ * chart相关信息 主要是要里面的 id 以及 params */ chartInfo?: { }, - + /** + * chart数据 + */ + chartData?: [], + /** + * chart相应配置 + */ + chartOption?: { }, + /** + * 但是否显示全部数据 + */ + showAllData?: Boolean, + /** + * dashboard 相关变量 + */ + globalVariables?: [], }>(), { diff --git a/nezha-docs/src/chart/chartChild/chartTimeSeries/index.en-US.md b/nezha-docs/src/chart/chartChild/chartTimeSeries/index.en-US.md index 925cf7a35..b92df969c 100644 --- a/nezha-docs/src/chart/chartChild/chartTimeSeries/index.en-US.md +++ b/nezha-docs/src/chart/chartChild/chartTimeSeries/index.en-US.md @@ -7,4 +7,13 @@ map: # 关联组件 1. chart-legend legend 相关组件 +```vue +
+
+ +
+``` + diff --git a/nezha-docs/src/chart/chartChild/chartTimeSeries/index.zh-CN.md b/nezha-docs/src/chart/chartChild/chartTimeSeries/index.zh-CN.md index 01d1381b1..29299325c 100644 --- a/nezha-docs/src/chart/chartChild/chartTimeSeries/index.zh-CN.md +++ b/nezha-docs/src/chart/chartChild/chartTimeSeries/index.zh-CN.md @@ -7,4 +7,13 @@ map: # 关联组件 1. chart-legend legend 相关组件 +```vue +
+
+ +
+``` + diff --git a/nezha-docs/src/chart/index.en-US.md b/nezha-docs/src/chart/index.en-US.md index 098b749b7..dd48c1a8f 100644 --- a/nezha-docs/src/chart/index.en-US.md +++ b/nezha-docs/src/chart/index.en-US.md @@ -30,5 +30,11 @@ map: 25. chartSankey 桑葚图 26. chartFunnel 漏斗图 +# 备注 +大部分的组件props 跟chartTimeSeries 一致 + +下面只列举 chartTimeSeries 以及部分需要特殊注意的组件 + + diff --git a/nezha-docs/src/chart/index.zh-CN.md b/nezha-docs/src/chart/index.zh-CN.md index 217f1a432..37ac2cbc1 100644 --- a/nezha-docs/src/chart/index.zh-CN.md +++ b/nezha-docs/src/chart/index.zh-CN.md @@ -30,5 +30,10 @@ map: 25. chartSankey 桑葚图 26. chartFunnel 漏斗图 +# 备注 +大部分的组件props 跟chartTimeSeries 一致 + +下面只列举 chartTimeSeries 以及部分需要特殊注意的组件 + From be5c32d4b22a33797c10b7a5ae2fa04a9512fcb0 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 24 May 2024 15:35:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20config.json=20=E6=B7=BB=E5=8A=A0show?= =?UTF-8?q?Video=20=E6=8E=A7=E5=88=B6=E6=98=BE=E7=A4=BA=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-docs/docs/.vitepress/sidebar.js | 1 + .../src/chart/chartChild/chartLegend/chartLegend.vue | 6 +++--- .../src/chart/chartChild/chartLegend/index.zh-CN.md | 1 + nezha-fronted/src/components/common/login.vue | 9 ++++++--- nezha-fronted/static/config.json | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/nezha-docs/docs/.vitepress/sidebar.js b/nezha-docs/docs/.vitepress/sidebar.js index b95e72edc..bd3fe66de 100644 --- a/nezha-docs/docs/.vitepress/sidebar.js +++ b/nezha-docs/docs/.vitepress/sidebar.js @@ -33,6 +33,7 @@ export const sidebar = { {text: 'chartTimeSeries', link: '/chartTimeSeries'}, {text: 'chartAutotopology', link: '/chartAutotopology'}, {text: 'chartDiagram', link: '/chartDiagram'}, + {text: 'chartLegend', link: '/chartLegend'}, ] } ] diff --git a/nezha-docs/src/chart/chartChild/chartLegend/chartLegend.vue b/nezha-docs/src/chart/chartChild/chartLegend/chartLegend.vue index d3da9a219..055fcee57 100644 --- a/nezha-docs/src/chart/chartChild/chartLegend/chartLegend.vue +++ b/nezha-docs/src/chart/chartChild/chartLegend/chartLegend.vue @@ -7,11 +7,11 @@ const props = withDefaults(defineProps<{ /** * chart数据 */ - chartData?: [], + chartData?: Array, /** * legend 数据 */ - legends: [], + legends: Array, /** * 是否全屏 */ @@ -19,7 +19,7 @@ const props = withDefaults(defineProps<{ /** * 所有根据图表处理过后的数据 */ - series: [] + series: Array }>(), { diff --git a/nezha-docs/src/chart/chartChild/chartLegend/index.zh-CN.md b/nezha-docs/src/chart/chartChild/chartLegend/index.zh-CN.md index 7953f7767..2cbe8ea98 100644 --- a/nezha-docs/src/chart/chartChild/chartLegend/index.zh-CN.md +++ b/nezha-docs/src/chart/chartChild/chartLegend/index.zh-CN.md @@ -3,4 +3,5 @@ map: path: /chartLegend --- + diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index 3e8147065..9d475262c 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -1,9 +1,12 @@