From 2d38b5b632538824b6d6c91e396d6ac99e46ef32 Mon Sep 17 00:00:00 2001 From: zyh Date: Wed, 20 Sep 2023 18:19:32 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-3174=20feat=EF=BC=9Anotebook=20=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rightBox/chartRightBox/chartRightBox.scss | 8 ++ .../components/page/notebook/notebook.scss | 3 +- .../src/components/chart/chart/chartText.vue | 15 ++- .../src/components/chart/chartHeaderMixin.js | 9 ++ .../common/bottomBox/tabs/notebookTab.vue | 38 ++++-- .../common/rightBox/chart/chartConfig.vue | 1 + .../common/rightBox/chart/chartRightBox.vue | 121 ++++++++++-------- .../rightBox/chart/otherChartConfig.vue | 6 +- .../common/table/settings/notebookTable.vue | 8 +- .../src/components/page/notebook/notebook.vue | 10 +- nezha-fronted/src/permission.js | 2 +- 11 files changed, 142 insertions(+), 79 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss index 0b079a253..d4ba810b9 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss @@ -18,6 +18,14 @@ background: $--color-primary; border: none; } + .notebook-datasource-tab{ + .el-tabs__nav{ + width: 100%; + > div{ + width: 33.33%; + } + } + } } .right-box__container{ .chart-config{ diff --git a/nezha-fronted/src/assets/css/components/page/notebook/notebook.scss b/nezha-fronted/src/assets/css/components/page/notebook/notebook.scss index 1808f30e5..53138da05 100644 --- a/nezha-fronted/src/assets/css/components/page/notebook/notebook.scss +++ b/nezha-fronted/src/assets/css/components/page/notebook/notebook.scss @@ -108,13 +108,14 @@ box-sizing: border-box; height: 100%; padding: 10px; + padding-top: 0; .markdownEditor { height: 100% !important; } .notebook-editor-btn{ height: 41px; position: absolute; - top: 10px; + top: 0px; right: 20px; display: flex; align-items: center; diff --git a/nezha-fronted/src/components/chart/chart/chartText.vue b/nezha-fronted/src/components/chart/chart/chartText.vue index da1573717..a8c26abc8 100644 --- a/nezha-fronted/src/components/chart/chart/chartText.vue +++ b/nezha-fronted/src/components/chart/chart/chartText.vue @@ -1,7 +1,7 @@