From bc8f7123657eb2dde8a328928140c94ea0cc3d29 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 16 May 2024 11:52:06 +0800
Subject: [PATCH] Merge branch 'master' of ssh://dev.zhiheiot.com:29418/mob-components

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

diff --git a/plugins/filter/CFilter.vue b/plugins/filter/CFilter.vue
index 9a7d937..c5b610a 100644
--- a/plugins/filter/CFilter.vue
+++ b/plugins/filter/CFilter.vue
@@ -4,31 +4,41 @@
  */
 
 <template>
-    <view class="c-filter">
+    <view
+        class="c-filter"
+        ref="filter"
+    >
         <view
             class="c-filter-bar"
             v-if="bar"
         >
             <CFilterSelect
-                v-if="bar.type==='select'"
+                v-if="bar.type === 'select'"
                 type="bar"
                 :label="bar.label"
                 :options="selectOptions[bar.name] || []"
                 :cancelable="bar.cancelable"
                 :value="filterRes[bar.name]"
-                :onChange="evt=>handleBarChange(bar.name, evt)"
+                :onChange="evt => handleBarChange(bar.name, evt)"
             />
             <CFilterDateRange
-                v-if="bar.type==='dateRange'"
+                v-if="bar.type === 'dateRange'"
                 type="bar"
                 :label="bar.label"
                 :value="filterRes[bar.name]"
-                :onChange="evt=>handleBarChange(bar.name, evt)"
+                :onChange="evt => handleBarChange(bar.name, evt)"
+            />
+            <CFilterInput
+                v-if="bar.type === 'input'"
+                type="bar"
+                :label="bar.label"
+                :value="filterRes[bar.name]"
+                :onChange="evt => handleItemChange(bar.name, evt)"
             />
         </view>
         <view
             class="c-filter-more"
-            :class="itemsFilled?'on':''"
+            :class="itemsFilled ? 'on' : ''"
             v-if="items && items.length > 0"
             @tap="evt => handleOpen()"
         >
@@ -46,23 +56,38 @@
             >
                 <view
                     class="box"
-                    v-for="(item,index) in items"
+                    v-for="(item, index) in items"
                     :key="index"
                 >
                     <CFilterSelect
-                        v-if="item.type==='select'"
+                        v-if="item.type === 'select'"
                         type="item"
                         :label="item.label"
                         :options="selectOptions[item.name] || []"
                         :value="filterRes[item.name]"
-                        :onChange="evt=>handleItemChange(item.name, evt)"
+                        :onChange="evt => handleItemChange(item.name, evt)"
                     />
                     <CFilterDateRange
-                        v-if="item.type==='dateRange'"
+                        v-if="item.type === 'dateRange'"
                         type="item"
                         :label="item.label"
                         :value="filterRes[item.name]"
-                        :onChange="evt=>handleItemChange(item.name, evt)"
+                        :onChange="evt => handleItemChange(item.name, evt)"
+                    />
+                    <CFilterRadio
+                        v-if="item.type === 'radio'"
+                        type="item"
+                        :label="item.label"
+                        :options="selectOptions[item.name] || []"
+                        :value="filterRes[item.name]"
+                        :onChange="evt => handleItemChange(item.name, evt)"
+                    />
+                    <CFilterInput
+                        v-if="item.type === 'input'"
+                        type="item"
+                        :label="item.label"
+                        :value="filterRes[item.name]"
+                        :onChange="evt => handleItemChange(item.name, evt)"
                     />
                 </view>
             </scroll-view>
@@ -89,6 +114,8 @@
 import { CDrawer } from '@components/layout/drawer';
 import CFilterSelect from './CFilterSelect';
 import CFilterDateRange from './CFilterDateRange';
+import CFilterRadio from './CFilterRadio';
+import CFilterInput from './CFilterInput';
 import './cFilter.scss';
 
 export default {
@@ -98,6 +125,8 @@
         AtButton,
         CFilterSelect,
         CFilterDateRange,
+        CFilterRadio,
+        CFilterInput,
         CDrawer,
     },
     props: {
@@ -116,8 +145,6 @@
             filterRes: this.filterData || {},
             // 抽屉显示隐藏
             drawerShow: false,
-            // 抽屉内容显示隐藏(抽屉展开动画完成后再渲染表单，否则出现动画卡顿)
-            // drawerDisplay: false,
             // 面板项有已选
             itemsFilled: false,
             // 本次打开是否有改变
@@ -127,7 +154,6 @@
     methods: {
         handleOpen() {
             this.drawerShow = true;
-            // $(this.$refs.drawer).addClass('on');
         },
         handleBarChange(name, value) {
             this.$set(this.filterRes, name, value);
@@ -171,7 +197,6 @@
             this.onChange(this.filterRes);
         },
         handleFinish() {
-            // $(this.$refs.drawer).removeClass('on');
             this.drawerShow = false;
             // 有项目改变时，发送变化
             if (this.itemsChanged) {
@@ -180,6 +205,8 @@
             }
         },
     },
-    mounted() {},
+    mounted() {
+        $(this.$refs.filter).parent().css({ transform: 'translate(0,0);' });
+    },
 };
 </script>

--
Gitblit v1.9.1