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 | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/plugins/filter/CFilter.vue b/plugins/filter/CFilter.vue index 5c680b3..c5b610a 100644 --- a/plugins/filter/CFilter.vue +++ b/plugins/filter/CFilter.vue @@ -13,25 +13,32 @@ 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()" > @@ -49,38 +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'" + v-if="item.type === 'radio'" 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)" /> <CFilterInput - v-if="item.type==='input'" + v-if="item.type === 'input'" type="item" :label="item.label" :value="filterRes[item.name]" - :onChange="evt=>handleItemChange(item.name, evt)" + :onChange="evt => handleItemChange(item.name, evt)" /> </view> </scroll-view> -- Gitblit v1.9.1