From 2bd821f59dd35b51efdc4ecef1d130f5e74e0d0f Mon Sep 17 00:00:00 2001 From: buvta <12312540+buvta@users.noreply.github.com> Date: Tue, 8 Dec 2020 12:20:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B7=A5=E5=85=B7=E6=A0=8F?= =?UTF-8?q?=E6=89=93=E5=BC=80=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/style.scss | 16 +++++++++------- src/components/Film.vue | 25 ++++++++++++++++--------- src/lib/element/index.js | 3 ++- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss index 4963996..8c9e728 100644 --- a/src/assets/scss/style.scss +++ b/src/assets/scss/style.scss @@ -175,6 +175,9 @@ font-size: 1rem; border: none; } + .el-select-dropdown__item .selected .hover{ + background-color: transparent; + } } > span{ .el-input-number{ @@ -194,15 +197,14 @@ } } } - .toolbar{ - display: flex; - align-items: center; - justify-content: flex-end; - z-index: 5; - .el-select { - padding-right: 20px; + .el-divider{ + .el-divider--horizontal{ + margin: 12px 0; } } + .toolbar{ + z-index: 5; + } .listpage-body{ height: calc(100% - 60px); overflow-y: auto; diff --git a/src/components/Film.vue b/src/components/Film.vue index ae7a00b..21ac2ed 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -47,10 +47,9 @@ - -
- +
+ - + 上映区间： - + 至 - +
+ + {{ showToolbar ? '隐藏工具栏' : '显示工具栏' }} +
(this.selectedAreas.length === 0) || this.selectedAreas.includes(x.area)) + if (!this.showToolbar) { + this.selectedAreas = this.selectedLangs = [] + this.selectedYears.start = 0 + this.selectedYears.end = new Date().getFullYear() + } + let filteredData = this.list.filter(x => (this.selectedAreas.length === 0) || this.selectedAreas.includes(x.area)) filteredData = filteredData.filter(x => (this.selectedLangs.length === 0) || this.selectedLangs.includes(x.lang)) filteredData = filteredData.filter(res => !this.setting.excludeR18Films || !this.containsR18Keywords(res.type)) filteredData = filteredData.filter(res => res.year >= this.selectedYears.start) filteredData = filteredData.filter(res => res.year <= this.selectedYears.end) + this.selectedClassName = this.type.name + ' ' + filteredData.length + '/' + this.recordcount this.areas = [...new Set(filteredData.map(ele => ele.area))].filter(x => x) this.langs = [...new Set(filteredData.map(ele => ele.lang))].filter(x => x) this.filteredList = filteredData diff --git a/src/lib/element/index.js b/src/lib/element/index.js index f366367..93f91e1 100644 --- a/src/lib/element/index.js +++ b/src/lib/element/index.js @@ -1,5 +1,5 @@ import Vue from 'vue' -import { Message, Button, Table, TableColumn, Tag, Input, InputNumber, Dialog, Form, FormItem, Switch, Select, Option, Checkbox, Autocomplete, Col, Tree } from 'element-ui' +import { Message, Button, Table, TableColumn, Tag, Input, InputNumber, Dialog, Form, FormItem, Switch, Select, Option, Checkbox, Autocomplete, Col, Tree, Divider } from 'element-ui' import Plugin from 'v-fit-columns' Vue.use(Button) Vue.use(Col) @@ -18,4 +18,5 @@ Vue.use(Option) Vue.use(Checkbox) Vue.use(Autocomplete) Vue.use(Tree) +Vue.use(Divider) Vue.prototype.$message = Message