From 2f2be05b8caedd31bfd9d68110ea8c1267971f03 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Fri, 07 Mar 2025 12:22:37 +0800
Subject: [PATCH] 知识库,优化文案

---
 plugins/filter/CFilter.vue |  151 ++++++++++++++++++++++++++++++++------------------
 1 files changed, 97 insertions(+), 54 deletions(-)

diff --git a/plugins/filter/CFilter.vue b/plugins/filter/CFilter.vue
index d18c281..2517699 100644
--- a/plugins/filter/CFilter.vue
+++ b/plugins/filter/CFilter.vue
@@ -4,67 +4,94 @@
  */
 
 <template>
-    <view class="c-filter">
-        <view
-            class="c-filter-bar"
-            v-if="bar"
-        >
+    <view
+        class="c-filter"
+        ref="filter"
+    >
+        <view class="c-filter-bar">
             <CFilterSelect
-                v-if="bar.type==='select'"
-                type="bar"
+                v-if="bar.type === 'select'"
+                place="bar"
                 :label="bar.label"
+                :name="bar.name"
                 :options="selectOptions[bar.name] || []"
+                :cancelable="bar.cancelable"
                 :value="filterRes[bar.name]"
-                :onChange="evt=>handleBarChange(bar.name, evt)"
+                :onChange="evt => handleChange(evt)"
             />
             <CFilterDateRange
-                v-if="bar.type==='dateRange'"
-                type="bar"
+                v-else-if="bar.type === 'dateRange'"
+                place="bar"
+                :name="bar.name"
                 :label="bar.label"
                 :value="filterRes[bar.name]"
-                :onChange="evt=>handleBarChange(bar.name, evt)"
+                :onChange="evt => handleChange(evt)"
+            />
+            <CFilterInput
+                v-else-if="bar.type === 'input'"
+                place="bar"
+                :name="bar.name"
+                :label="bar.label"
+                :value="filterRes[bar.name]"
+                :onChange="evt => handleChange(evt)"
             />
         </view>
         <view
             class="c-filter-more"
-            :class="itemsFilled?'on':''"
+            :class="itemsFilled ? 'on' : ''"
             v-if="items && items.length > 0"
             @tap="evt => handleOpen()"
         >
             <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"
-                    v-for="(item,index) in items"
+                    v-for="(item, index) in items"
                     :key="index"
                 >
                     <CFilterSelect
-                        v-if="item.type==='select'"
-                        type="item"
+                        v-if="item.type === 'select'"
+                        place="item"
                         :label="item.label"
+                        :name="item.name"
                         :options="selectOptions[item.name] || []"
                         :value="filterRes[item.name]"
-                        :onChange="evt=>handleItemChange(item.name, evt)"
+                        :onChange="evt => handleChange(evt)"
                     />
                     <CFilterDateRange
-                        v-if="item.type==='dateRange'"
-                        type="item"
+                        v-else-if="item.type === 'dateRange'"
+                        place="item"
                         :label="item.label"
+                        :name="item.name"
                         :value="filterRes[item.name]"
-                        :onChange="evt=>handleItemChange(item.name, evt)"
+                        :onChange="evt => handleChange(evt)"
+                    />
+                    <CFilterRadio
+                        v-else-if="item.type === 'radio'"
+                        place="item"
+                        :label="item.label"
+                        :name="item.name"
+                        :options="selectOptions[item.name] || []"
+                        :value="filterRes[item.name]"
+                        :onChange="evt => handleChange(evt)"
+                    />
+                    <CFilterInput
+                        v-else-if="item.type === 'input'"
+                        place="item"
+                        :label="item.label"
+                        :name="item.name"
+                        :value="filterRes[item.name]"
+                        :onChange="evt => handleChange(evt)"
                     />
                 </view>
             </scroll-view>
@@ -80,15 +107,19 @@
                     :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 CFilterRadio from './CFilterRadio';
+import CFilterInput from './CFilterInput';
 import './cFilter.scss';
 
 export default {
@@ -98,8 +129,12 @@
         AtButton,
         CFilterSelect,
         CFilterDateRange,
+        CFilterRadio,
+        CFilterInput,
+        CDrawer,
     },
     props: {
+        filterData: { type: Object, default: () => {} },
         // 筛选横条项目
         bar: { type: Object, default: () => {} },
         // 筛选展开层项目列表
@@ -111,9 +146,9 @@
     },
     data() {
         return {
-            filterRes: {},
+            filterRes: this.filterData || {},
+            // 抽屉显示隐藏
             drawerShow: false,
-            drawerDisplay: false,
             // 面板项有已选
             itemsFilled: false,
             // 本次打开是否有改变
@@ -123,37 +158,46 @@
     methods: {
         handleOpen() {
             this.drawerShow = true;
-            this.$nextTick(() => {
-                setTimeout(() => {
-                    this.drawerDisplay = true;
-                }, 80);
-            });
         },
-        handleBarChange(name, value) {
-            this.$set(this.filterRes, name, value);
-            this.onChange(this.filterRes);
-        },
-        handleItemChange(name, value) {
-            this.$set(this.filterRes, name, value);
-            this.itemsChanged = true;
-            // 如果变化值不为空
-            if (typeof value !== 'undefined') {
-                this.itemsFilled = true;
+        handleChange(changed) {
+            // 横条项
+            if (changed.place === 'bar') {
+                this.$set(this.filterRes, changed.name, changed.value);
+                this.onChange(this.filterRes);
             }
-            // 为空是检查所有面板值是否为空
-            else {
-                let valuehas = false;
-                for (let item of this.items) {
-                    if (typeof this.filterRes[item.name] !== 'undefined') {
-                        valuehas = true;
-                        break;
-                    }
+            // 展开项
+            else if (changed.place === 'item') {
+                this.$set(this.filterRes, changed.name, changed.value);
+                this.itemsChanged = true;
+                // 如果变化值不为空
+                if (typeof value !== 'undefined') {
+                    this.itemsFilled = true;
                 }
-                this.itemsFilled = valuehas;
+                // 为空时检查所有面板值是否为空
+                else {
+                    let valuehas = false;
+                    for (let item of this.items) {
+                        if (typeof this.filterRes[item.name] !== 'undefined') {
+                            valuehas = true;
+                            break;
+                        }
+                    }
+                    this.itemsFilled = valuehas;
+                }
             }
         },
         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 +206,6 @@
         },
         handleFinish() {
             this.drawerShow = false;
-            this.$nextTick(() => {
-                this.drawerDisplay = false;
-            });
             // 有项目改变时,发送变化
             if (this.itemsChanged) {
                 this.itemsChanged = false;
@@ -172,6 +213,8 @@
             }
         },
     },
-    mounted() {},
+    mounted() {
+        $(this.$refs.filter).parent().css({ transform: 'translate(0,0);' });
+    },
 };
 </script>

--
Gitblit v1.9.1