From d96e8edbe496bde2875c75864a39324b1d8e5b70 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 24 Mar 2022 12:02:14 +0800
Subject: [PATCH] 优化跨页面数据传递

---
 plugins/filter/CFilter.vue |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/plugins/filter/CFilter.vue b/plugins/filter/CFilter.vue
index d18c281..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"
@@ -14,6 +17,7 @@
                 type="bar"
                 :label="bar.label"
                 :options="selectOptions[bar.name] || []"
+                :cancelable="bar.cancelable"
                 :value="filterRes[bar.name]"
                 :onChange="evt=>handleBarChange(bar.name, evt)"
             />
@@ -34,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"
@@ -80,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';
@@ -98,8 +101,10 @@
         AtButton,
         CFilterSelect,
         CFilterDateRange,
+        CDrawer,
     },
     props: {
+        filterData: { type: Object, default: () => {} },
         // 筛选横条项目
         bar: { type: Object, default: () => {} },
         // 筛选展开层项目列表
@@ -111,9 +116,9 @@
     },
     data() {
         return {
-            filterRes: {},
+            filterRes: this.filterData || {},
+            // 抽屉显示隐藏
             drawerShow: false,
-            drawerDisplay: false,
             // 面板项有已选
             itemsFilled: false,
             // 本次打开是否有改变
@@ -123,11 +128,6 @@
     methods: {
         handleOpen() {
             this.drawerShow = true;
-            this.$nextTick(() => {
-                setTimeout(() => {
-                    this.drawerDisplay = true;
-                }, 80);
-            });
         },
         handleBarChange(name, value) {
             this.$set(this.filterRes, name, value);
@@ -154,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;
@@ -162,9 +172,6 @@
         },
         handleFinish() {
             this.drawerShow = false;
-            this.$nextTick(() => {
-                this.drawerDisplay = false;
-            });
             // 有项目改变时，发送变化
             if (this.itemsChanged) {
                 this.itemsChanged = false;
@@ -172,6 +179,8 @@
             }
         },
     },
-    mounted() {},
+    mounted() {
+        $(this.$refs.filter).parent().css({ transform: 'translate(0,0);' });
+    },
 };
 </script>

--
Gitblit v1.9.1