diff --git a/nezha-fronted/src/assets/css/components/common/v-md-editor.scss b/nezha-fronted/src/assets/css/components/common/v-md-editor.scss index e53380b96..1ca345fb1 100644 --- a/nezha-fronted/src/assets/css/components/common/v-md-editor.scss +++ b/nezha-fronted/src/assets/css/components/common/v-md-editor.scss @@ -38,7 +38,6 @@ font-size: 13px; font-weight: 600; padding: 3px 15px; - margin-bottom: -1px; color: $--color-text-regular; border: 1px solid $--border-color-light; background: $--alert-rule-background-color; 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 2bd47262a..f1cf5020e 100644 --- a/nezha-fronted/src/assets/css/components/page/notebook/notebook.scss +++ b/nezha-fronted/src/assets/css/components/page/notebook/notebook.scss @@ -107,6 +107,16 @@ .v-md-editor-preview{ padding: 0; } + .text-content{ + .el-scrollbar__wrap{ + margin-right: 0 !important; + margin-bottom: 0 !important; + overflow: hidden !important; + } + .el-scrollbar__bar{ + display: none; + } + } } .no-data{ text-align: center; diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index 80758cac1..d582e1583 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -146,10 +146,19 @@ export default { this.tableData = response.data.list const globalSearchId = this.$store.getters.getGlobalSearchId let detailViewRightObj = '' - if (globalSearchId) { - detailViewRightObj = this.tableData.find(item => item.id === globalSearchId) + if (this.tableId === 'notebookTable' && this.detailType === 'view') { // 防止详情视图编辑后切换到别的数据 + const obj = this.tableData.find(item => item.id === this.detailViewRightObj.id) + if (obj) { + detailViewRightObj = obj + } else { + detailViewRightObj = this.tableData[0] + } } else { - detailViewRightObj = this.tableData[0] + if (globalSearchId) { + detailViewRightObj = this.tableData.find(item => item.id === globalSearchId) + } else { + detailViewRightObj = this.tableData[0] + } } this.detailViewRightObj = this.$lodash.cloneDeep(detailViewRightObj) this.pageObj.total = response.data.total