From 0482f1627049d9b86148470da9cb3d6a1c181f60 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 20 Jul 2022 15:25:11 +0800
Subject: [PATCH] 修复空图片回调两次的问题
---
plugins/filter/CFilter.vue | 83 ++++++++++++++++++++++++++++++-----------
1 files changed, 60 insertions(+), 23 deletions(-)
diff --git a/plugins/filter/CFilter.vue b/plugins/filter/CFilter.vue
index 51b0e7c..bca1b5d 100644
--- a/plugins/filter/CFilter.vue
+++ b/plugins/filter/CFilter.vue
@@ -4,7 +4,10 @@
*/
<template>
- <view class="c-filter">
+ <view
+ class="c-filter"
+ ref="filter"
+ >
<view
class="c-filter-bar"
v-if="bar"
@@ -13,24 +16,30 @@
v-if="bar.type==='select'"
type="bar"
:label="bar.label"
- :options="selectOptions[bar.name]"
+ :options="selectOptions[bar.name] || []"
+ :cancelable="bar.cancelable"
+ :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=>handleBarChange(bar.name, evt)"
/>
</view>
<view
class="c-filter-more"
- :class="itemsChanged?'on':''"
+ :class="itemsFilled?'on':''"
v-if="items && items.length > 0"
@tap="evt => handleOpen()"
>
<text>更多筛选 </text>
<text class="arrow">»</text>
</view>
- <AtDrawer
+ <CDrawer
class="c-filter-drawer"
- mask
- right
:show="drawerShow"
:onClose="evt => handleFinish()"
>
@@ -40,14 +49,14 @@
>
<view
class="box"
- v-for="(item,index) of items"
+ v-for="(item,index) in items"
:key="index"
>
<CFilterSelect
v-if="item.type==='select'"
type="item"
:label="item.label"
- :options="selectOptions[item.name]"
+ :options="selectOptions[item.name] || []"
:value="filterRes[item.name]"
:onChange="evt=>handleItemChange(item.name, evt)"
/>
@@ -72,13 +81,15 @@
:onClick="evt => handleFinish()"
>完成</AtButton>
</view>
- </AtDrawer>
+ </CDrawer>
</view>
</template>
<script>
import Taro from '@tarojs/taro';
+import { $ } from '@tarojs/extend';
import { AtDrawer, AtButton } from 'taro-ui-vue';
+import { CDrawer } from '@components/layout/drawer';
import CFilterSelect from './CFilterSelect';
import CFilterDateRange from './CFilterDateRange';
import './cFilter.scss';
@@ -90,21 +101,27 @@
AtButton,
CFilterSelect,
CFilterDateRange,
+ CDrawer,
},
props: {
+ filterData: { type: Object, default: () => {} },
// 筛选横条项目
- bar: Object,
+ bar: { type: Object, default: () => {} },
// 筛选展开层项目列表
- items: Array,
+ items: { type: Array, default: () => [] },
// 各个项目的选项列表
- selectOptions: Object,
+ selectOptions: { type: Object, default: () => {} },
// 筛选变化时的回调
onChange: Function,
},
data() {
return {
- filterRes: {},
+ filterRes: this.filterData || {},
+ // 抽屉显示隐藏
drawerShow: false,
+ // 面板项有已选
+ itemsFilled: false,
+ // 本次打开是否有改变
itemsChanged: false,
};
},
@@ -117,33 +134,53 @@
this.onChange(this.filterRes);
},
handleItemChange(name, value) {
- this.handleBarChange(name, value);
- if (value || typeof value !== 'undefined') {
- this.itemsChanged = true;
- } else {
+ this.$set(this.filterRes, name, value);
+ this.itemsChanged = true;
+ // 如果变化值不为空
+ if (typeof value !== 'undefined') {
+ this.itemsFilled = true;
+ }
+ // 为空是检查所有面板值是否为空
+ else {
let valuehas = false;
- for (let item of items) {
- if (
- this.filterRes[item.name] ||
- typeof this.filterRes[item.name] !== 'undefined'
- ) {
+ for (let item of this.items) {
+ if (typeof this.filterRes[item.name] !== 'undefined') {
valuehas = true;
break;
}
}
- this.itemsChanged = valuehas;
+ this.itemsFilled = valuehas;
}
},
handleClean() {
Object.keys(this.filterRes).forEach(key => {
+ // 如果不能取消，跳过
+ if (key === this.bar.name && this.bar.cancelable === false) {
+ return;
+ }
+ for (let item of this.items) {
+ if (key === item.name && item.cancelable === false) {
+ return;
+ }
+ }
+ // 清除值
this.filterRes[key] = [][0];
});
+ this.itemsFilled = false;
this.itemsChanged = false;
this.onChange(this.filterRes);
},
handleFinish() {
this.drawerShow = false;
+ // 有项目改变时，发送变化
+ if (this.itemsChanged) {
+ this.itemsChanged = false;
+ this.onChange(this.filterRes);
+ }
},
},
+ mounted() {
+ $(this.$refs.filter).parent().css({ transform: 'translate(0,0);' });
+ },
};
</script>
--
Gitblit v1.9.1