From 0fca4367d759fb02f6b490478331c634b11c6a50 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 18 Jul 2024 11:32:27 +0800
Subject: [PATCH] 修复公共工具集，周数转日期的计算问题
---
plugins/filter/CFilter.vue | 121 ++++++++++++++++++++++++++--------------
1 files changed, 78 insertions(+), 43 deletions(-)
diff --git a/plugins/filter/CFilter.vue b/plugins/filter/CFilter.vue
index 9a7d937..2517699 100644
--- a/plugins/filter/CFilter.vue
+++ b/plugins/filter/CFilter.vue
@@ -4,31 +4,41 @@
*/
<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()"
>
@@ -46,23 +56,42 @@
>
<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>
@@ -89,6 +118,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 +129,8 @@
AtButton,
CFilterSelect,
CFilterDateRange,
+ CFilterRadio,
+ CFilterInput,
CDrawer,
},
props: {
@@ -116,8 +149,6 @@
filterRes: this.filterData || {},
// 抽屉显示隐藏
drawerShow: false,
- // 抽屉内容显示隐藏(抽屉展开动画完成后再渲染表单，否则出现动画卡顿)
- // drawerDisplay: false,
// 面板项有已选
itemsFilled: false,
// 本次打开是否有改变
@@ -127,29 +158,32 @@
methods: {
handleOpen() {
this.drawerShow = true;
- // $(this.$refs.drawer).addClass('on');
},
- 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() {
@@ -171,7 +205,6 @@
this.onChange(this.filterRes);
},
handleFinish() {
- // $(this.$refs.drawer).removeClass('on');
this.drawerShow = false;
// 有项目改变时，发送变化
if (this.itemsChanged) {
@@ -180,6 +213,8 @@
}
},
},
- mounted() {},
+ mounted() {
+ $(this.$refs.filter).parent().css({ transform: 'translate(0,0);' });
+ },
};
</script>
--
Gitblit v1.9.1