From 664d69fbe574bfaf3862d4804390e4b77df9fc19 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 23 Sep 2021 17:32:27 +0800
Subject: [PATCH] 实现抽屉公共组件，代替TaroUI的抽屉

---
 plugins/filter/CFilter.vue |   68 +++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/plugins/filter/CFilter.vue b/plugins/filter/CFilter.vue
index 51b0e7c..ee5a95e 100644
--- a/plugins/filter/CFilter.vue
+++ b/plugins/filter/CFilter.vue
@@ -13,14 +13,22 @@
                 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()"
         >
@@ -37,17 +45,18 @@
             <scroll-view
                 class="c-filter-drawer-list"
                 :scrollY="true"
+                v-if="drawerDisplay"
             >
                 <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)"
                     />
@@ -92,58 +101,81 @@
         CFilterDateRange,
     },
     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,
+            // 抽屉内容显示隐藏(抽屉展开动画完成后再渲染表单，否则出现动画卡顿)
+            drawerDisplay: false,
+            // 面板项有已选
+            itemsFilled: false,
+            // 本次打开是否有改变
             itemsChanged: false,
         };
     },
     methods: {
         handleOpen() {
             this.drawerShow = true;
+            this.$nextTick(() => {
+                setTimeout(() => {
+                    this.drawerDisplay = true;
+                }, 100);
+            });
         },
         handleBarChange(name, value) {
             this.$set(this.filterRes, name, value);
             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 => {
                 this.filterRes[key] = [][0];
             });
+            this.itemsFilled = false;
             this.itemsChanged = false;
             this.onChange(this.filterRes);
         },
         handleFinish() {
             this.drawerShow = false;
+            this.$nextTick(() => {
+                this.drawerDisplay = false;
+            });
+            // 有项目改变时，发送变化
+            if (this.itemsChanged) {
+                this.itemsChanged = false;
+                this.onChange(this.filterRes);
+            }
         },
     },
+    mounted() {},
 };
 </script>

--
Gitblit v1.9.1