zhengchen.tao/ezbookkeeping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support "Add Another" in transaction add page / dialog (#471)

Browse Source
This commit is contained in:
MaysWind
2026-03-02 00:54:17 +08:00
parent d2ce801277
commit 732c256db2
29 changed files with 336 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/mobile/settings/PageSettingsPage.vue
+40 -5
View File
@@ -71,7 +71,7 @@
</f7-list>
<f7-block-title>{{ tt('Transaction List Page') }}</f7-block-title>
<f7-list strong inset dividers>
<f7-list strong inset dividers class="settings-list">
<f7-list-item>
<template #after-title>
{{ tt('Show Monthly Total Amount') }}
@@ -91,7 +91,33 @@
</f7-list>
<f7-block-title>{{ tt('Transaction Edit Page') }}</f7-block-title>
<f7-list strong inset dividers>
<f7-list strong inset dividers class="settings-list">
<f7-list-item
class="item-truncate-after-text"
link="#"
@click="showQuickAddButtonActionInMobileTransactionEditPagePopup = true"
>
<template #after-title>
<div class="item-actual-title">
<span>{{ tt('Quick Add Button Action') }}</span>
</div>
</template>
<template #after>
{{ findDisplayNameByType(allTransactionQuickAddButtonActionTypes, quickAddButtonActionInMobileTransactionEditPage) }}
</template>
<list-item-selection-popup value-type="item"
key-field="type" value-field="type"
title-field="displayName"
:title="tt('Quick Add Button Action')"
:enable-filter="true"
:filter-placeholder="tt('Quick Add Button Action')"
:filter-no-items-text="tt('No results')"
:items="allTransactionQuickAddButtonActionTypes"
v-model:show="showQuickAddButtonActionInMobileTransactionEditPagePopup"
v-model="quickAddButtonActionInMobileTransactionEditPage">
</list-item-selection-popup>
</f7-list-item>
<f7-list-item
class="item-truncate-after-text"
link="#"
@@ -138,7 +164,7 @@
</f7-list>
<f7-block-title>{{ tt('Account List Page') }}</f7-block-title>
<f7-list strong inset dividers>
<f7-list strong inset dividers class="settings-list">
<f7-list-item
class="item-truncate-after-text"
link="/settings/filter/account?type=accountListTotalAmount"
@@ -168,7 +194,7 @@
</f7-list>
<f7-block-title>{{ tt('Exchange Rates Data Page') }}</f7-block-title>
<f7-list strong inset dividers>
<f7-list strong inset dividers class="settings-list">
<f7-list-item
class="item-truncate-after-text"
link="#"
@@ -209,11 +235,12 @@ import { useSettingsStore } from '@/stores/setting.ts';
import { useAccountsStore } from '@/stores/account.ts';
import { useTransactionCategoriesStore } from '@/stores/transactionCategory.ts';
import type { TypeAndDisplayName } from '@/core/base.ts';
import { CategoryType } from '@/core/category.ts';
import { findNameByValue, findDisplayNameByType } from '@/lib/common.ts';
const { tt } = useI18n();
const { tt, getAllTransactionQuickAddButtonActionTypes } = useI18n();
const { showToast } = useI18nUIComponents();
const {
loadingAccounts,
@@ -242,9 +269,17 @@ const accountsStore = useAccountsStore();
const transactionCategoriesStore = useTransactionCategoriesStore();
const showTimezoneUsedForStatisticsInHomePagePopup = ref<boolean>(false);
const showQuickAddButtonActionInMobileTransactionEditPagePopup = ref<boolean>(false);
const showAutoSaveTransactionDraftPopup = ref<boolean>(false);
const showCurrencySortByInExchangeRatesPagePopup = ref<boolean>(false);
const allTransactionQuickAddButtonActionTypes = computed<TypeAndDisplayName[]>(() => getAllTransactionQuickAddButtonActionTypes());
const quickAddButtonActionInMobileTransactionEditPage = computed<number>({
get: () => settingsStore.appSettings.quickAddButtonActionInMobileTransactionEditPage,
set: (value) => settingsStore.setQuickAddButtonActionInMobileTransactionEditPage(value)
});
const alwaysShowTransactionPicturesInMobileTransactionEditPage = computed<boolean>({
get: () => settingsStore.appSettings.alwaysShowTransactionPicturesInMobileTransactionEditPage,
set: (value) => settingsStore.setAlwaysShowTransactionPicturesInMobileTransactionEditPage(value)
src/views/mobile/transactions/EditPage.vue
+87 -35
View File
@@ -5,7 +5,7 @@
<f7-nav-title :title="tt(title)"></f7-nav-title>
<f7-nav-right :class="{ 'navbar-compact-icons': true, 'disabled': loading }" v-if="mode !== TransactionEditPageMode.View || transaction.type !== TransactionType.ModifyBalance">
<f7-link icon-f7="ellipsis" @click="showMoreActionSheet = true"></f7-link>
<f7-link icon-f7="checkmark_alt" :class="{ 'disabled': inputIsEmpty || submitting }" @click="save" v-if="mode !== TransactionEditPageMode.View"></f7-link>
<f7-link icon-f7="checkmark_alt" :class="{ 'disabled': inputIsEmpty || submitting }" @click="save(AfterSaveAction.GoBack)" v-if="mode !== TransactionEditPageMode.View"></f7-link>
</f7-nav-right>
</f7-navbar>
@@ -470,12 +470,27 @@
</f7-actions>
<template #fixed>
<f7-fab position="right-bottom" :class="{ 'disabled': inputIsEmpty || submitting }"
:text="tt(saveButtonTitle)"
@click="save" v-if="mode !== TransactionEditPageMode.View">
<f7-fab id="quick-save-fab" position="right-bottom" :class="{ 'disabled': inputIsEmpty || submitting }"
:text="tt(quickSaveButtonTitle)"
@click="quickSave" v-if="mode !== TransactionEditPageMode.View">
</f7-fab>
</template>
<f7-popover class="quick-save-popover" target-el="#quick-save-fab"
v-model:opened="showQuickSavePopover">
<f7-list>
<f7-list-item link="#" no-chevron popover-close
:title="tt(TransactionQuickAddButtonActionType.SaveAndGoBack.name)"
@click="save(AfterSaveAction.GoBack)"></f7-list-item>
<f7-list-item link="#" no-chevron popover-close
:title="tt(TransactionQuickAddButtonActionType.SaveAndAddNewTransaction.name)"
@click="save(AfterSaveAction.StayWithNewTransaction)"></f7-list-item>
<f7-list-item link="#" no-chevron popover-close
:title="tt(TransactionQuickAddButtonActionType.SaveAndKeepCurrentData.name)"
@click="save(AfterSaveAction.StayWithCurrentTransaction)"></f7-list-item>
</f7-list>
</f7-popover>
<f7-photo-browser ref="pictureBrowser" type="popup" navbar-of-text="/"
:navbar-show-count="true" :exposition="false"
:photos="transactionPictures" :thumbs="transactionThumbs" />
@@ -493,6 +508,7 @@ import {
TransactionEditPageMode,
TransactionEditPageType,
GeoLocationStatus,
AfterSaveAction,
useTransactionEditPageBase
} from '@/views/base/transactions/TransactionEditPageBase.ts';
@@ -505,7 +521,7 @@ import { useTransactionsStore } from '@/stores/transaction.ts';
import { useTransactionTemplatesStore } from '@/stores/transactionTemplate.ts';
import { CategoryType } from '@/core/category.ts';
import { TransactionEditScopeType, TransactionType } from '@/core/transaction.ts';
import { TransactionType, TransactionEditScopeType, TransactionQuickAddButtonActionType } from '@/core/transaction.ts';
import { ScheduledTemplateFrequencyType, TemplateType } from '@/core/template.ts';
import { TRANSACTION_MAX_AMOUNT, TRANSACTION_MIN_AMOUNT } from '@/consts/transaction.ts';
import { KnownErrorCode } from '@/consts/api.ts';
@@ -523,6 +539,7 @@ import {
import { formatCoordinate } from '@/lib/coordinate.ts';
import { generateRandomUUID } from '@/lib/misc.ts';
import { getTransactionPrimaryCategoryName, getTransactionSecondaryCategoryName } from '@/lib/category.ts';
import { type SetTransactionOptions } from '@/lib/transaction.ts';
import { getMapProvider, isTransactionPicturesEnabled } from '@/lib/server_settings.ts';
import logger from '@/lib/logger.ts';
@@ -554,6 +571,7 @@ const {
clientSessionId,
loading,
submitting,
submitted,
uploadingPicture,
geoLocationStatus,
setGeoLocationByClickMap,
@@ -574,7 +592,7 @@ const {
hasVisibleTransferCategories,
canAddTransactionPicture,
title,
saveButtonTitle,
quickSaveButtonTitle,
sourceAmountTitle,
sourceAccountTitle,
transferInAmountTitle,
@@ -588,6 +606,7 @@ const {
inputEmptyProblemMessage,
inputIsEmpty,
setTransactionModel,
updateTransactionModelByAfterSaveAction,
updateTransactionTime,
updateTransactionTimezone,
swapTransactionData,
@@ -609,10 +628,10 @@ const pictureInput = useTemplateRef<HTMLInputElement>('pictureInput');
const isSupportClipboard = !!navigator.clipboard;
const loadingError = ref<unknown | null>(null);
const submitted = ref<boolean>(false);
const removingPictureId = ref<string | null>(null);
const transactionDateTimeSheetMode = ref<string>('time');
const showTimeInDefaultTimezone = ref<boolean>(false);
const showQuickSavePopover = ref<boolean>(false);
const showTimezonePopup = ref<boolean>(false);
const showGeoLocationActionSheet = ref<boolean>(false);
const showMoreActionSheet = ref<boolean>(false);
@@ -825,6 +844,20 @@ function getFontClassByAmount(amount: number): string {
}
}
function getQueryTransactionOptions(): SetTransactionOptions {
return {
time: query['time'] ? parseInt(query['time']) : undefined,
type: query['type'] ? parseInt(query['type']) : 0,
categoryId: query['categoryId'],
accountId: query['accountId'],
destinationAccountId: query['destinationAccountId'],
amount: query['amount'] ? parseInt(query['amount']) : undefined,
destinationAmount: query['destinationAmount'] ? parseInt(query['destinationAmount']) : undefined,
tagIds: query['tagIds'],
comment: query['comment']
};
}
function init(): void {
if (!pageTypeAndMode) {
showToast('Parameter Invalid');
@@ -875,16 +908,16 @@ function init(): void {
}
}
const queryType = query['type'] ? parseInt(query['type']) : 0;
const initOptions = getQueryTransactionOptions();
if (queryType &&
queryType >= TransactionType.Income &&
queryType <= TransactionType.Transfer) {
transaction.value.type = queryType;
} else if (queryType === TransactionType.ModifyBalance &&
if (initOptions.type &&
initOptions.type >= TransactionType.Income &&
initOptions.type <= TransactionType.Transfer) {
transaction.value.type = initOptions.type;
} else if (initOptions.type === TransactionType.ModifyBalance &&
pageTypeAndMode.type === TransactionEditPageType.Transaction &&
mode.value === TransactionEditPageMode.View) {
transaction.value.type = queryType;
transaction.value.type = initOptions.type;
}
if (mode.value === TransactionEditPageMode.Add) {
@@ -926,17 +959,7 @@ function init(): void {
setTransactionModel(
fromTransaction,
{
time: query['time'] ? parseInt(query['time']) : undefined,
type: queryType,
categoryId: query['categoryId'],
accountId: query['accountId'],
destinationAccountId: query['destinationAccountId'],
amount: query['amount'] ? parseInt(query['amount']) : undefined,
destinationAmount: query['destinationAmount'] ? parseInt(query['destinationAmount']) : undefined,
tagIds: query['tagIds'],
comment: query['comment']
},
initOptions,
pageTypeAndMode.type === TransactionEditPageType.Transaction && (mode.value === TransactionEditPageMode.Edit || mode.value === TransactionEditPageMode.View)
);
@@ -974,7 +997,7 @@ function init(): void {
});
}
function save(): void {
function save(afterAction: AfterSaveAction): void {
const router = props.f7router;
if (mode.value === TransactionEditPageMode.View) {
@@ -1000,20 +1023,26 @@ function save(): void {
clientSessionId: clientSessionId.value
}).then(() => {
submitting.value = false;
submitted.value = true;
hideLoading();
if (mode.value === TransactionEditPageMode.Add) {
showToast('You have added a new transaction');
} else if (mode.value === TransactionEditPageMode.Edit) {
showToast('You have saved this transaction');
}
if (mode.value === TransactionEditPageMode.Add && query['noTransactionDraft'] !== 'true' && !addByTemplateId.value && !duplicateFromId.value) {
transactionsStore.clearTransactionDraft();
}
submitted.value = true;
router.back();
if (mode.value === TransactionEditPageMode.Add && (afterAction === AfterSaveAction.StayWithNewTransaction || afterAction === AfterSaveAction.StayWithCurrentTransaction)) {
showToast('You have added a new transaction');
updateTransactionModelByAfterSaveAction(afterAction, getQueryTransactionOptions());
clientSessionId.value = generateRandomUUID();
} else {
if (mode.value === TransactionEditPageMode.Add) {
showToast('You have added a new transaction');
} else if (mode.value === TransactionEditPageMode.Edit) {
showToast('You have saved this transaction');
}
router.back();
}
}).catch(error => {
submitting.value = false;
hideLoading();
@@ -1062,6 +1091,7 @@ function save(): void {
clientSessionId: clientSessionId.value
}).then(() => {
submitting.value = false;
submitted.value = true;
hideLoading();
if (mode.value === TransactionEditPageMode.Add) {
@@ -1070,7 +1100,6 @@ function save(): void {
showToast('You have saved this template');
}
submitted.value = true;
router.back();
}).catch(error => {
submitting.value = false;
@@ -1083,6 +1112,29 @@ function save(): void {
}
}
function quickSave(): void {
if (mode.value === TransactionEditPageMode.View) {
return;
}
if (pageTypeAndMode?.type === TransactionEditPageType.Transaction && mode.value === TransactionEditPageMode.Add) {
const quickAddActionType = settingsStore.appSettings.quickAddButtonActionInMobileTransactionEditPage;
if (quickAddActionType === TransactionQuickAddButtonActionType.OpenMenu.type) {
showQuickSavePopover.value = true;
return;
} else if (quickAddActionType === TransactionQuickAddButtonActionType.SaveAndAddNewTransaction.type) {
save(AfterSaveAction.StayWithNewTransaction);
return;
} else if (quickAddActionType === TransactionQuickAddButtonActionType.SaveAndKeepCurrentData.type) {
save(AfterSaveAction.StayWithCurrentTransaction);
return;
}
}
save(AfterSaveAction.GoBack);
}
function pasteAmount(type: 'sourceAmount' | 'destinationAmount'): void {
if (mode.value === TransactionEditPageMode.View || !isSupportClipboard) {
return;