From 60740b3e2b56ca458194bf472dd08eb8c53156c9 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 25 Oct 2021 14:42:21 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9AalertMessage=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=BB=84=E5=90=88=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/labelFilter/clickSearch.vue | 7 +- .../components/page/alert/alertMessage.vue | 179 +++++++++++++++++- 2 files changed, 178 insertions(+), 8 deletions(-) diff --git a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue index f26c7bc2b..6ebb9e013 100644 --- a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue +++ b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue @@ -6,7 +6,7 @@ @@ -89,7 +89,7 @@ export default { let top switch (type) { case 'checkBox': { - top = 4 + top = 8 break } case 'dropdownCheckBox': { @@ -317,7 +317,7 @@ export default { this.$set(item, 'isFocus', isFocus) }, needMore (type, item, expand) { - const contentWidth = this.$refs.searchContentBox[0].offsetWidth - 210 + const contentWidth = this.$refs.searchContentBox[0].offsetWidth - 240 // 窗口尺寸没改变,则只重排当前type if (type && contentWidth === this.contentWidth) { this.titleSearchListCopy[type].width = 0 @@ -367,6 +367,7 @@ export default { changShowMore (type) { // this.changeMoreNum = 0 this.titleSearchListCopy[type].showMore = !this.titleSearchListCopy[type].showMore + // this.needMore() // this.$nextTick(() => { // this.changeMoreNum++ // }) diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index 93655a5c9..a26f891c9 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -8,7 +8,7 @@ :api="url" :custom-table-title.sync="tools.customTableTitle" :from="fromRoute.alertMessage" - :layout="['searchInput', 'elementSet', 'pagination']" + :layout="['searchInput', 'elementSet', 'clickSearch', 'pagination']" :search-msg="searchMsg" @search="search" v-loading="tools.loading" @@ -24,6 +24,9 @@ +