mirror of
https://github.com/mayswind/ezbookkeeping.git
synced 2026-05-20 01:34:24 +08:00
show filter being used in tab bar in transaction list page
This commit is contained in:
@@ -132,6 +132,20 @@ i.icon.la, i.icon.las, i.icon.lab {
|
|||||||
height: 13px;
|
height: 13px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tabbar-text-with-ellipsis > span {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
text-align: center;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
word-break: break-all;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tabbar-item-changed {
|
||||||
|
color: var(--f7-theme-color);
|
||||||
|
}
|
||||||
|
|
||||||
.nested-list-item .item-title {
|
.nested-list-item .item-title {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -440,6 +440,7 @@ export default {
|
|||||||
'Last month': 'Last month',
|
'Last month': 'Last month',
|
||||||
'This year': 'This year',
|
'This year': 'This year',
|
||||||
'Last year': 'Last year',
|
'Last year': 'Last year',
|
||||||
|
'Custom Date': 'Custom Date',
|
||||||
'Begin Time': 'Begin Time',
|
'Begin Time': 'Begin Time',
|
||||||
'End Time': 'End Time',
|
'End Time': 'End Time',
|
||||||
'Custom': 'Custom',
|
'Custom': 'Custom',
|
||||||
|
|||||||
@@ -440,6 +440,7 @@ export default {
|
|||||||
'Last month': '上月',
|
'Last month': '上月',
|
||||||
'This year': '今年',
|
'This year': '今年',
|
||||||
'Last year': '去年',
|
'Last year': '去年',
|
||||||
|
'Custom Date': '自定义日期',
|
||||||
'Begin Time': '开始时间',
|
'Begin Time': '开始时间',
|
||||||
'End Time': '结束时间',
|
'End Time': '结束时间',
|
||||||
'Custom': '自定义',
|
'Custom': '自定义',
|
||||||
|
|||||||
@@ -24,17 +24,17 @@
|
|||||||
</f7-navbar>
|
</f7-navbar>
|
||||||
|
|
||||||
<f7-toolbar tabbar bottom>
|
<f7-toolbar tabbar bottom>
|
||||||
<f7-link popover-open=".date-popover-menu">
|
<f7-link class="tabbar-text-with-ellipsis" popover-open=".date-popover-menu">
|
||||||
<span :class="{ 'tabbar-item-changed': query.maxTime > 0 || query.minTime > 0 }">{{ $t('Date') }}</span>
|
<span :class="{ 'tabbar-item-changed': query.maxTime > 0 || query.minTime > 0 }">{{ query.dateType | dateName('Date') | t }}</span>
|
||||||
</f7-link>
|
</f7-link>
|
||||||
<f7-link popover-open=".type-popover-menu">
|
<f7-link class="tabbar-text-with-ellipsis" popover-open=".type-popover-menu">
|
||||||
<span :class="{ 'tabbar-item-changed': query.type > 0 }">{{ $t('Type') }}</span>
|
<span :class="{ 'tabbar-item-changed': query.type > 0 }">{{ query.type | typeName('Type') | t }}</span>
|
||||||
</f7-link>
|
</f7-link>
|
||||||
<f7-link popover-open=".category-popover-menu" :class="{ 'disabled': query.type === 1 }">
|
<f7-link class="tabbar-text-with-ellipsis" popover-open=".category-popover-menu" :class="{ 'disabled': query.type === 1 }">
|
||||||
<span :class="{ 'tabbar-item-changed': query.categoryId > 0 }">{{ $t('Category') }}</span>
|
<span :class="{ 'tabbar-item-changed': query.categoryId > 0 }">{{ query.categoryId | categoryName(allCategories, $t('Category')) }}</span>
|
||||||
</f7-link>
|
</f7-link>
|
||||||
<f7-link popover-open=".account-popover-menu">
|
<f7-link class="tabbar-text-with-ellipsis" popover-open=".account-popover-menu">
|
||||||
<span :class="{ 'tabbar-item-changed': query.accountId > 0 }">{{ $t('Account') }}</span>
|
<span :class="{ 'tabbar-item-changed': query.accountId > 0 }">{{ query.accountId | accountName(allAccounts, $t('Account')) }}</span>
|
||||||
</f7-link>
|
</f7-link>
|
||||||
</f7-toolbar>
|
</f7-toolbar>
|
||||||
|
|
||||||
@@ -948,6 +948,62 @@ export default {
|
|||||||
color: 'transparent'
|
color: 'transparent'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
dateName(dateType, defaultName) {
|
||||||
|
switch (dateType){
|
||||||
|
case 1:
|
||||||
|
return 'Today';
|
||||||
|
case 2:
|
||||||
|
return 'Yesterday';
|
||||||
|
case 3:
|
||||||
|
return 'Recent 7 days';
|
||||||
|
case 4:
|
||||||
|
return 'Recent 30 days';
|
||||||
|
case 5:
|
||||||
|
return 'This week';
|
||||||
|
case 6:
|
||||||
|
return 'Last week';
|
||||||
|
case 7:
|
||||||
|
return 'This month';
|
||||||
|
case 8:
|
||||||
|
return 'Last month';
|
||||||
|
case 9:
|
||||||
|
return 'This year';
|
||||||
|
case 10:
|
||||||
|
return 'Last year';
|
||||||
|
case 11:
|
||||||
|
return 'Custom Date';
|
||||||
|
default:
|
||||||
|
return defaultName;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
typeName(type, defaultName) {
|
||||||
|
switch (type){
|
||||||
|
case 1:
|
||||||
|
return 'Modify Balance';
|
||||||
|
case 2:
|
||||||
|
return 'Income';
|
||||||
|
case 3:
|
||||||
|
return 'Expense';
|
||||||
|
case 4:
|
||||||
|
return 'Transfer';
|
||||||
|
default:
|
||||||
|
return defaultName;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
categoryName(categoryId, allCategories, defaultName) {
|
||||||
|
if (allCategories[categoryId]) {
|
||||||
|
return allCategories[categoryId].name;
|
||||||
|
}
|
||||||
|
|
||||||
|
return defaultName;
|
||||||
|
},
|
||||||
|
accountName(accountId, allAccounts, defaultName) {
|
||||||
|
if (allAccounts[accountId]) {
|
||||||
|
return allAccounts[accountId].name;
|
||||||
|
}
|
||||||
|
|
||||||
|
return defaultName;
|
||||||
|
},
|
||||||
income(value, incomplete) {
|
income(value, incomplete) {
|
||||||
return '+' + value + (incomplete ? '+' : '');
|
return '+' + value + (incomplete ? '+' : '');
|
||||||
},
|
},
|
||||||
@@ -1032,10 +1088,6 @@ export default {
|
|||||||
transform: scaleY(calc(1 / var(--f7-device-pixel-ratio)));
|
transform: scaleY(calc(1 / var(--f7-device-pixel-ratio)));
|
||||||
}
|
}
|
||||||
|
|
||||||
.tabbar-item-changed {
|
|
||||||
color: var(--f7-theme-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.date-popover-menu .popover-inner, .category-popover-menu .popover-inner, .account-popover-menu .popover-inner {
|
.date-popover-menu .popover-inner, .category-popover-menu .popover-inner, .account-popover-menu .popover-inner {
|
||||||
max-height: 400px;
|
max-height: 400px;
|
||||||
overflow-Y: auto;
|
overflow-Y: auto;
|
||||||
|
|||||||
Reference in New Issue
Block a user