From 18e73c7ef1104285462f30405e49eada762838fb Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 24 Nov 2021 18:20:53 +0800
Subject: [PATCH] 微调单行描述组件显示

---
 plugins/filter/CFilter.vue |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/plugins/filter/CFilter.vue b/plugins/filter/CFilter.vue
index c456b4c..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,7 +16,8 @@
                 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)"
             />
@@ -22,7 +26,7 @@
                 type="bar"
                 :label="bar.label"
                 :value="filterRes[bar.name]"
-                :onChange="evt=>handleItemChange(bar.name, evt)"
+                :onChange="evt=>handleBarChange(bar.name, evt)"
             />
         </view>
         <view
@@ -34,10 +38,8 @@
             <text>更多筛选 </text>
             <text class="arrow">»</text>
         </view>
-        <AtDrawer
+        <CDrawer
             class="c-filter-drawer"
-            mask
-            right
             :show="drawerShow"
             :onClose="evt => handleFinish()"
         >
@@ -54,7 +56,7 @@
                         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)"
                     />
@@ -79,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';
@@ -97,20 +101,23 @@
         AtButton,
         CFilterSelect,
         CFilterDateRange,
+        CDrawer,
     },
     props: {
+        filterData: { type: Object, default: () => {} },
         // 筛选横条项目
-        bar: { type: Object, default: {} },
+        bar: { type: Object, default: () => {} },
         // 筛选展开层项目列表
-        items: { type: Array, default: [] },
+        items: { type: Array, default: () => [] },
         // 各个项目的选项列表
-        selectOptions: { type: Object, default: {} },
+        selectOptions: { type: Object, default: () => {} },
         // 筛选变化时的回调
         onChange: Function,
     },
     data() {
         return {
-            filterRes: {},
+            filterRes: this.filterData || {},
+            // 抽屉显示隐藏
             drawerShow: false,
             // 面板项有已选
             itemsFilled: false,
@@ -147,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,5 +179,8 @@
             }
         },
     },
+    mounted() {
+        $(this.$refs.filter).parent().css({ transform: 'translate(0,0);' });
+    },
 };
 </script>

--
Gitblit v1.9.1