From 7ceb4189c0173fa810496b80bbbc3fd91a92c2b4 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Fri, 02 Apr 2021 14:25:40 +0800
Subject: [PATCH] 筛选组件显示微调
---
plugins/filter/CFilterDateRange.vue | 2 +-
plugins/filter/CFilter.vue | 16 +++++++++++-----
plugins/filter/cFilter.scss | 1 +
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/plugins/filter/CFilter.vue b/plugins/filter/CFilter.vue
index b02de13..c456b4c 100644
--- a/plugins/filter/CFilter.vue
+++ b/plugins/filter/CFilter.vue
@@ -17,6 +17,13 @@
:value="filterRes[bar.name]"
:onChange="evt=>handleBarChange(bar.name, evt)"
/>
+ <CFilterDateRange
+ v-if="bar.type==='dateRange'"
+ type="bar"
+ :label="bar.label"
+ :value="filterRes[bar.name]"
+ :onChange="evt=>handleItemChange(bar.name, evt)"
+ />
</view>
<view
class="c-filter-more"
@@ -40,7 +47,7 @@
>
<view
class="box"
- v-for="(item,index) of items"
+ v-for="(item,index) in items"
:key="index"
>
<CFilterSelect
@@ -93,11 +100,11 @@
},
props: {
// 筛选横条项目
- bar: Object,
+ bar: { type: Object, default: {} },
// 筛选展开层项目列表
- items: Array,
+ items: { type: Array, default: [] },
// 各个项目的选项列表
- selectOptions: Object,
+ selectOptions: { type: Object, default: {} },
// 筛选变化时的回调
onChange: Function,
},
@@ -120,7 +127,6 @@
this.onChange(this.filterRes);
},
handleItemChange(name, value) {
- console.log(name, value);
this.$set(this.filterRes, name, value);
this.itemsChanged = true;
// 如果变化值不为空
diff --git a/plugins/filter/CFilterDateRange.vue b/plugins/filter/CFilterDateRange.vue
index 85d7a08..cb204f0 100644
--- a/plugins/filter/CFilterDateRange.vue
+++ b/plugins/filter/CFilterDateRange.vue
@@ -24,7 +24,7 @@
{{label}}：
</view>
<view :class="selected ? 'filled':'empty'">
- {{selected ? value : ('请选择' + label)}}
+ {{selected ? value.replace(',', ' , ') : ('请选择' + label)}}
</view>
<view class="at-icon at-icon-chevron-down" />
</view>
diff --git a/plugins/filter/cFilter.scss b/plugins/filter/cFilter.scss
index 3c1a27d..0fca35e 100644
--- a/plugins/filter/cFilter.scss
+++ b/plugins/filter/cFilter.scss
@@ -111,6 +111,7 @@
color: #666;
}
.at-icon {
+ padding-left: 4px;
vertical-align: middle;
}
}
--
Gitblit v1.9.1