From f97bff5a5e292123260a95612b65bc36c3d4342d Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 30 Sep 2021 11:34:27 +0800
Subject: [PATCH] 优化图片上传组件，屏蔽非图片格式，增加限制数量

---
 plugins/filter/CFilter.vue |   46 +++++++++++++++++++++++++++-------------------
 1 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/plugins/filter/CFilter.vue b/plugins/filter/CFilter.vue
index eccc16e..9a7d937 100644
--- a/plugins/filter/CFilter.vue
+++ b/plugins/filter/CFilter.vue
@@ -14,6 +14,7 @@
                 type="bar"
                 :label="bar.label"
                 :options="selectOptions[bar.name] || []"
+                :cancelable="bar.cancelable"
                 :value="filterRes[bar.name]"
                 :onChange="evt=>handleBarChange(bar.name, evt)"
             />
@@ -22,7 +23,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,17 +35,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 +78,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,22 +98,26 @@
         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,
-            drawerDisplay: false,
+            // 抽屉内容显示隐藏(抽屉展开动画完成后再渲染表单，否则出现动画卡顿)
+            // drawerDisplay: false,
             // 面板项有已选
             itemsFilled: false,
             // 本次打开是否有改变
@@ -123,11 +127,7 @@
     methods: {
         handleOpen() {
             this.drawerShow = true;
-            this.$nextTick(() => {
-                setTimeout(() => {
-                    this.drawerDisplay = true;
-                }, 80);
-            });
+            // $(this.$refs.drawer).addClass('on');
         },
         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;
@@ -161,10 +171,8 @@
             this.onChange(this.filterRes);
         },
         handleFinish() {
+            // $(this.$refs.drawer).removeClass('on');
             this.drawerShow = false;
-            this.$nextTick(() => {
-                this.drawerDisplay = false;
-            });
             // 有项目改变时，发送变化
             if (this.itemsChanged) {
                 this.itemsChanged = false;

--
Gitblit v1.9.1