From 758ffe976bb2ff00237be95baf6513ea4b98a032 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 02 Mar 2022 12:11:20 +0800
Subject: [PATCH] 实现单选式开关
---
plugins/filter/CFilter.vue | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/plugins/filter/CFilter.vue b/plugins/filter/CFilter.vue
index ee5a95e..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"
@@ -35,17 +38,14 @@
<text>更多筛选 </text>
<text class="arrow">»</text>
</view>
- <AtDrawer
+ <CDrawer
class="c-filter-drawer"
- mask
- right
:show="drawerShow"
:onClose="evt => handleFinish()"
>
<scroll-view
class="c-filter-drawer-list"
:scrollY="true"
- v-if="drawerDisplay"
>
<view
class="box"
@@ -81,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';
@@ -99,6 +101,7 @@
AtButton,
CFilterSelect,
CFilterDateRange,
+ CDrawer,
},
props: {
filterData: { type: Object, default: () => {} },
@@ -113,11 +116,9 @@
},
data() {
return {
- filterRes: this.filterData,
+ filterRes: this.filterData || {},
// 抽屉显示隐藏
drawerShow: false,
- // 抽屉内容显示隐藏(抽屉展开动画完成后再渲染表单，否则出现动画卡顿)
- drawerDisplay: false,
// 面板项有已选
itemsFilled: false,
// 本次打开是否有改变
@@ -127,11 +128,6 @@
methods: {
handleOpen() {
this.drawerShow = true;
- this.$nextTick(() => {
- setTimeout(() => {
- this.drawerDisplay = true;
- }, 100);
- });
},
handleBarChange(name, value) {
this.$set(this.filterRes, name, value);
@@ -158,6 +154,16 @@
},
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;
@@ -166,9 +172,6 @@
},
handleFinish() {
this.drawerShow = false;
- this.$nextTick(() => {
- this.drawerDisplay = false;
- });
// 有项目改变时，发送变化
if (this.itemsChanged) {
this.itemsChanged = false;
@@ -176,6 +179,8 @@
}
},
},
- mounted() {},
+ mounted() {
+ $(this.$refs.filter).parent().css({ transform: 'translate(0,0);' });
+ },
};
</script>
--
Gitblit v1.9.1