mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-16 07:57:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

use for-of statements to replace for and for-in

Browse Source
This commit is contained in:
MaysWind
2025-09-14 17:18:01 +08:00
parent 4700446ca0
commit 1a8ce7d58d
29 changed files with 455 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/mobile/accounts/EditPage.vue
+20 -19
View File
@@ -370,7 +370,7 @@
<template #default>
<div class="grid grid-cols-2">
<div class="list-item-subitem no-chevron">
<a class="item-link" href="#" @click="subAccountContexts[idx].showIconSelectionSheet = true">
<a class="item-link" href="#" @click="subAccountContexts[idx]!.showIconSelectionSheet = true">
<div class="item-content">
<div class="item-inner">
<div class="item-header">
@@ -387,12 +387,12 @@
<icon-selection-sheet :all-icon-infos="ALL_ACCOUNT_ICONS"
:color="subAccount.color"
v-model:show="subAccountContexts[idx].showIconSelectionSheet"
v-model:show="subAccountContexts[idx]!.showIconSelectionSheet"
v-model="subAccount.icon"
></icon-selection-sheet>
</div>
<div class="list-item-subitem no-chevron">
<a class="item-link" href="#" @click="subAccountContexts[idx].showColorSelectionSheet = true">
<a class="item-link" href="#" @click="subAccountContexts[idx]!.showColorSelectionSheet = true">
<div class="item-content">
<div class="item-inner">
<div class="item-header">
@@ -408,7 +408,7 @@
</a>
<color-selection-sheet :all-color-infos="ALL_ACCOUNT_COLORS"
v-model:show="subAccountContexts[idx].showColorSelectionSheet"
v-model:show="subAccountContexts[idx]!.showColorSelectionSheet"
v-model="subAccount.color"
></color-selection-sheet>
</div>
@@ -422,7 +422,7 @@
:class="{ 'disabled': editAccountId && !isNewAccount(subAccount) }"
:header="tt('Currency')"
:no-chevron="!!editAccountId && !isNewAccount(subAccount)"
@click="subAccountContexts[idx].showCurrencyPopup = true"
@click="subAccountContexts[idx]!.showCurrencyPopup = true"
>
<template #title>
<div class="no-padding no-margin">
@@ -438,7 +438,7 @@
:filter-placeholder="tt('Currency')"
:filter-no-items-text="tt('No results')"
:items="allCurrencies"
v-model:show="subAccountContexts[idx].showCurrencyPopup"
v-model:show="subAccountContexts[idx]!.showCurrencyPopup"
v-model="subAccount.currency">
</list-item-selection-popup>
</f7-list-item>
@@ -449,13 +449,13 @@
:class="{ 'disabled': editAccountId && !isNewAccount(subAccount) }"
:header="account.isLiability ? tt('Sub-account Outstanding Balance') : tt('Sub-account Balance')"
:title="formatAccountDisplayBalance(subAccount)"
@click="subAccountContexts[idx].showBalanceSheet = true"
@click="subAccountContexts[idx]!.showBalanceSheet = true"
>
<number-pad-sheet :min-value="TRANSACTION_MIN_AMOUNT"
:max-value="TRANSACTION_MAX_AMOUNT"
:currency="subAccount.currency"
:flip-negative="account.isLiability"
v-model:show="subAccountContexts[idx].showBalanceSheet"
v-model:show="subAccountContexts[idx]!.showBalanceSheet"
v-model="subAccount.balance"
></number-pad-sheet>
</f7-list-item>
@@ -467,15 +467,15 @@
v-if="!editAccountId || isNewAccount(subAccount)"
>
<template #header>
<div class="account-edit-balancetime-header" @click="showDateTimeDialog(subAccountContexts[idx], 'time')">{{ tt('Sub-account Balance Time') }}</div>
<div class="account-edit-balancetime-header" @click="showDateTimeDialog(subAccountContexts[idx] as AccountContext, 'time')">{{ tt('Sub-account Balance Time') }}</div>
</template>
<template #title>
<div class="account-edit-balancetime-title">
<div @click="showDateTimeDialog(subAccountContexts[idx], 'date')">{{ formatAccountBalanceDate(subAccount) }}</div>&nbsp;<div class="account-edit-balancetime-time" @click="showDateTimeDialog(subAccountContexts[idx], 'time')">{{ formatAccountBalanceTime(subAccount) }}</div>
<div @click="showDateTimeDialog(subAccountContexts[idx] as AccountContext, 'date')">{{ formatAccountBalanceDate(subAccount) }}</div>&nbsp;<div class="account-edit-balancetime-time" @click="showDateTimeDialog(subAccountContexts[idx] as AccountContext, 'time')">{{ formatAccountBalanceTime(subAccount) }}</div>
</div>
</template>
<date-time-selection-sheet :init-mode="subAccountContexts[idx].balanceDateTimeSheetMode"
v-model:show="subAccountContexts[idx].showBalanceDateTimeSheet"
<date-time-selection-sheet :init-mode="subAccountContexts[idx]!.balanceDateTimeSheetMode"
v-model:show="subAccountContexts[idx]!.showBalanceDateTimeSheet"
v-model="subAccount.balanceTime">
</date-time-selection-sheet>
</f7-list-item>
@@ -526,6 +526,7 @@ import { useAccountEditPageBaseBase } from '@/views/base/accounts/AccountEditPag
import { useAccountsStore } from '@/stores/account.ts';
import { itemAndIndex } from '@/core/base.ts';
import type { LocalizedCurrencyInfo } from '@/core/currency.ts';
import { AccountType } from '@/core/account.ts';
import { ALL_ACCOUNT_ICONS } from '@/consts/icon.ts';
@@ -709,14 +710,14 @@ function addSubAccountAndContext(): void {
}
}
function removeSubAccount(subAccount: Account | null, confirm: boolean): void {
if (!subAccount) {
function removeSubAccount(currentSubAccount: Account | null, confirm: boolean): void {
if (!currentSubAccount) {
showAlert('An error occurred');
return;
}
if (!confirm) {
subAccountToDelete.value = subAccount;
subAccountToDelete.value = currentSubAccount;
showDeleteActionSheet.value = true;
return;
}
@@ -724,10 +725,10 @@ function removeSubAccount(subAccount: Account | null, confirm: boolean): void {
showDeleteActionSheet.value = false;
subAccountToDelete.value = null;
for (let i = 0; i < subAccounts.value.length; i++) {
if (subAccounts.value[i] === subAccount) {
subAccounts.value.splice(i, 1);
subAccountContexts.value.splice(i, 1);
for (const [subAccount, index] of itemAndIndex(subAccounts.value)) {
if (subAccount === currentSubAccount) {
subAccounts.value.splice(index, 1);
subAccountContexts.value.splice(index, 1);
}
}
}
src/views/mobile/categories/ListPage.vue
+2 -2
View File
@@ -140,13 +140,13 @@ const categories = computed<TransactionCategory[]>(() => {
return [];
}
return transactionCategoriesStore.allTransactionCategories[categoryType.value];
return transactionCategoriesStore.allTransactionCategories[categoryType.value] ?? [];
} else if (primaryCategoryId.value && primaryCategoryId.value !== '' && primaryCategoryId.value !== '0') {
if (!transactionCategoriesStore.allTransactionCategoriesMap || !transactionCategoriesStore.allTransactionCategoriesMap[primaryCategoryId.value]) {
return [];
}
return transactionCategoriesStore.allTransactionCategoriesMap[primaryCategoryId.value].subCategories || [];
return transactionCategoriesStore.allTransactionCategoriesMap[primaryCategoryId.value]?.subCategories ?? [];
} else {
return [];
}
src/views/mobile/transactions/EditPage.vue
+4 -4
View File
@@ -684,9 +684,9 @@ const transactionPictures = computed<Record<string, string | undefined>[]>(() =>
return thumbs;
}
for (let i = 0; i < transaction.value.pictures.length; i++) {
for (const picture of transaction.value.pictures) {
thumbs.push({
url: getTransactionPictureUrl(transaction.value.pictures[i])
url: getTransactionPictureUrl(picture)
});
}
@@ -700,8 +700,8 @@ const transactionThumbs = computed<(string | undefined)[]>(() => {
return thumbs;
}
for (let i = 0; i < transaction.value.pictures.length; i++) {
thumbs.push(getTransactionPictureUrl(transaction.value.pictures[i]));
for (const picture of transaction.value.pictures) {
thumbs.push(getTransactionPictureUrl(picture));
}
return thumbs;
src/views/mobile/transactions/ListPage.vue
+13 -21
View File
@@ -200,7 +200,7 @@
v-for="(transaction, idx) in transactionMonthList.items"
>
<template #media>
<div class="display-flex flex-direction-column transaction-date" :style="getTransactionDateStyle(transaction, idx > 0 ? transactionMonthList.items[idx - 1] : null)">
<div class="display-flex flex-direction-column transaction-date" :style="getTransactionDateStyle(transaction, idx > 0 ? transactionMonthList.items[idx - 1] : undefined)">
<span class="transaction-day full-line flex-direction-column">
{{ getCalendarDisplayDayOfMonthFromUnixTime(transaction.time) }}
</span>
@@ -252,7 +252,7 @@
<div class="item-footer">
<div class="transaction-tags" v-if="showTagInTransactionListPage && transaction.tagIds && transaction.tagIds.length">
<f7-chip media-text-color="var(--f7-chip-text-color)" class="transaction-tag"
:text="allTransactionTags[tagId].name"
:text="allTransactionTags[tagId]?.name"
:key="tagId"
v-for="tagId in transaction.tagIds">
<template #media>
@@ -373,7 +373,7 @@
:class="getCategoryListItemCheckedClass(category, queryAllFilterCategoryIds)"
:key="category.id"
v-for="category in categories"
v-show="!category.hidden || query.categoryIds === category.id || (allCategories[query.categoryIds] && allCategories[query.categoryIds].parentId === category.id)"
v-show="!category.hidden || query.categoryIds === category.id || (allCategories[query.categoryIds] && allCategories[query.categoryIds]?.parentId === category.id)"
>
<template #media>
<ItemIcon icon-type="category" :icon-id="category.icon" :color="category.color"></ItemIcon>
@@ -439,7 +439,7 @@
:class="{ 'list-item-selected': query.accountIds === account.id, 'item-in-multiple-selection': queryAllFilterAccountIdsCount > 1 && queryAllFilterAccountIds[account.id] }"
:key="account.id"
v-for="account in allAccounts"
v-show="(!account.hidden && (!allAccountsMap[account.parentId] || !allAccountsMap[account.parentId].hidden)) || query.accountIds === account.id"
v-show="(!account.hidden && (!allAccountsMap[account.parentId] || !allAccountsMap[account.parentId]!.hidden)) || query.accountIds === account.id"
@click="changeAccountFilter(account.id)"
>
<template #media>
@@ -597,7 +597,7 @@ import { useTransactionCategoriesStore } from '@/stores/transactionCategory.ts';
import { useTransactionTagsStore } from '@/stores/transactionTag.ts';
import { type TransactionMonthList, useTransactionsStore } from '@/stores/transaction.ts';
import type { TypeAndDisplayName } from '@/core/base.ts';
import { type TypeAndDisplayName, keys } from '@/core/base.ts';
import { TextDirection } from '@/core/text.ts';
import {
type TextualYearMonth,
@@ -742,9 +742,7 @@ const transactions = computed<TransactionMonthList[]>(() => {
const transactions :Transaction[] = [];
for (let i = 0; i < transactionData.items.length; i++) {
const transaction = transactionData.items[i];
for (const transaction of transactionData.items) {
if (transaction.gregorianCalendarYearDashMonthDashDay === currentCalendarDate.value) {
transactions.push(transaction);
}
@@ -778,7 +776,7 @@ const noTransaction = computed<boolean>(() => {
if (pageType.value === TransactionListPageType.List.type) {
return transactionsStore.noTransaction;
} else if (pageType.value === TransactionListPageType.Calendar.type) {
return !transactions.value || !transactions.value.length || !transactions.value[0].items || !transactions.value[0].items.length;
return !transactions.value || !transactions.value.length || !transactions.value[0]!.items || !transactions.value[0]!.items.length;
} else {
return true;
}
@@ -832,8 +830,7 @@ function setTransactionMonthListHeights(reset: boolean): Promise<unknown> {
if (transactions.value && transactions.value.length) {
const heights: Record<string, number> = getElementActualHeights('.transaction-month-list');
for (let i = 0; i < transactions.value.length - 1; i++) {
const transactionMonthList = transactions.value[i];
for (const transactionMonthList of transactions.value) {
const yearDashMonth = transactionMonthList.yearDashMonth;
const domId = getTransactionMonthListDomId(yearDashMonth);
const height = heights[domId];
@@ -851,8 +848,7 @@ function setTransactionInvisibleYearMonthList(): void {
return;
}
for (let i = 0; i < transactions.value.length - 1; i++) {
const transactionMonthList = transactions.value[i];
for (const transactionMonthList of transactions.value) {
const yearDashMonth = transactionMonthList.yearDashMonth;
const titleDomId = getTransactionMonthTitleDomId(yearDashMonth);
@@ -875,7 +871,7 @@ function setTransactionInvisibleYearMonthList(): void {
}
}
function getTransactionDateStyle(transaction: Transaction, previousTransaction: Transaction | null): Record<string, string> {
function getTransactionDateStyle(transaction: Transaction, previousTransaction: Transaction | undefined): Record<string, string> {
if (!previousTransaction || transaction.gregorianCalendarDayOfMonth !== previousTransaction.gregorianCalendarDayOfMonth) {
return {};
}
@@ -893,8 +889,8 @@ function getCategoryListItemCheckedClass(category: TransactionCategory, queryCat
}
if (category.subCategories) {
for (let i = 0; i < category.subCategories.length; i++) {
if (queryCategoryIds && queryCategoryIds[category.subCategories[i].id]) {
for (const subCategory of category.subCategories) {
if (queryCategoryIds && queryCategoryIds[subCategory.id]) {
return {
'list-item-checked': true
};
@@ -1208,11 +1204,7 @@ function changeTypeFilter(type: number): void {
if (type && query.value.categoryIds) {
newCategoryFilter = '';
for (const categoryId in queryAllFilterCategoryIds.value) {
if (!Object.prototype.hasOwnProperty.call(queryAllFilterCategoryIds.value, categoryId)) {
continue;
}
for (const categoryId of keys(queryAllFilterCategoryIds.value)) {
const category = allCategories.value[categoryId];
if (category && category.type === transactionTypeToCategoryType(type)) {