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

sort transaction tags by name (#487)

Browse Source
This commit is contained in:
MaysWind
2026-03-01 22:03:38 +08:00
parent a84f48ae8a
commit f5a7e2e2d6
22 changed files with 123 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/locales/de.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "Löschen",
"Duplicate": "Duplizieren",
"Sort": "Sortieren",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "Datum",
"Time": "Zeit",
"Color": "Farbe",
src/locales/en.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "Delete",
"Duplicate": "Duplicate",
"Sort": "Sort",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "Date",
"Time": "Time",
"Color": "Color",
src/locales/es.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "Borrar",
"Duplicate": "Duplicar",
"Sort": "Ordenar",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "Fecha",
"Time": "Hora",
"Color": "Color",
src/locales/fr.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "Supprimer",
"Duplicate": "Dupliquer",
"Sort": "Trier",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "Date",
"Time": "Heure",
"Color": "Couleur",
src/locales/it.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "Elimina",
"Duplicate": "Duplica",
"Sort": "Ordina",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "Data",
"Time": "Ora",
"Color": "Colore",
src/locales/ja.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "削除",
"Duplicate": "複製",
"Sort": "並べ替え",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "日付",
"Time": "時間",
"Color": "色",
src/locales/kn.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "ಅಳಿಸು",
"Duplicate": "ನಕಲು ಮಾಡು",
"Sort": "ವಿಂಗಡಿಸು",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "ದಿನಾಂಕ",
"Time": "ಸಮಯ",
"Color": "ಬಣ್ಣ",
src/locales/ko.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "삭제",
"Duplicate": "복제",
"Sort": "정렬",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "날짜",
"Time": "시간",
"Color": "색상",
src/locales/nl.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "Verwijderen",
"Duplicate": "Dupliceren",
"Sort": "Sorteren",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "Datum",
"Time": "Tijd",
"Color": "Kleur",
src/locales/pt_BR.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "Excluir",
"Duplicate": "Duplicar",
"Sort": "Classificar",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "Data",
"Time": "Hora",
"Color": "Cor",
src/locales/ru.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "Удалить",
"Duplicate": "Дублировать",
"Sort": "Сортировать",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "Дата",
"Time": "Время",
"Color": "Цвет",
src/locales/sl.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "Izbriši",
"Duplicate": "Podvoji",
"Sort": "Razvrsti",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "Datum",
"Time": "Čas",
"Color": "Barva",
src/locales/ta.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "நீக்கு",
"Duplicate": "நகலெடு",
"Sort": "வரிசைப்படுத்து",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "தேதி",
"Time": "நேரம்",
"Color": "நிறம்",
src/locales/th.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "ลบ",
"Duplicate": "ทำสำเนา",
"Sort": "จัดเรียง",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "วันที่",
"Time": "เวลา",
"Color": "สี",
src/locales/tr.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "Sil",
"Duplicate": "Çoğalt",
"Sort": "Sırala",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "Tarih",
"Time": "Zaman",
"Color": "Renk",
src/locales/uk.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "Видалити",
"Duplicate": "Дублювати",
"Sort": "Сортувати",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "Дата",
"Time": "Час",
"Color": "Колір",
src/locales/vi.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "Xóa",
"Duplicate": "Nhân đôi",
"Sort": "Sắp xếp",
"Sort by Name (A to Z)": "Sort by Name (A to Z)",
"Sort by Name (Z to A)": "Sort by Name (Z to A)",
"Date": "Ngày",
"Time": "Thời gian",
"Color": "Màu sắc",
src/locales/zh_Hans.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "删除",
"Duplicate": "复制",
"Sort": "排序",
"Sort by Name (A to Z)": "按名称排序（正序）",
"Sort by Name (Z to A)": "按名称排序（倒序）",
"Date": "日期",
"Time": "时间",
"Color": "颜色",
src/locales/zh_Hant.json
+2
View File
@@ -1496,6 +1496,8 @@
"Delete": "刪除",
"Duplicate": "複製",
"Sort": "排序",
"Sort by Name (A to Z)": "依名稱排序（正序）",
"Sort by Name (Z to A)": "依名稱排序（倒序）",
"Date": "日期",
"Time": "時間",
"Color": "顏色",
src/stores/transactionTag.ts
+52
View File
@@ -151,6 +151,57 @@ export const useTransactionTagsStore = defineStore('transactionTags', () => {
allTransactionTagGroups.value.splice(to, 0, allTransactionTagGroups.value.splice(from, 1)[0] as TransactionTagGroup);
}
function sortTagDisplayOrderByTagName(groupId: string, desc: boolean): boolean {
// update in the group list
const tagsInGroup = allTransactionTagsByGroupMap.value[groupId];
if (!tagsInGroup) {
return false;
}
const oldTagsInGroup: TransactionTag[] = [...tagsInGroup];
if (!desc) {
tagsInGroup.sort((a, b) => a.name.localeCompare(b.name, undefined, { // asc
numeric: true,
sensitivity: 'base'
}));
} else {
tagsInGroup.sort((a, b) => b.name.localeCompare(a.name, undefined, { // desc
numeric: true,
sensitivity: 'base'
}));
}
const isOrderChanged = !isEquals(oldTagsInGroup, tagsInGroup);
if (!isOrderChanged) {
return false;
}
// update in the main list
for (const [oldTag, oldIndex] of itemAndIndex(oldTagsInGroup)) {
const newTag = tagsInGroup[oldIndex];
if (!newTag || newTag.id === oldTag.id) {
continue;
}
for (const [tag, index] of itemAndIndex(allTransactionTags.value)) {
if (tag.id === oldTag.id) {
allTransactionTags.value.splice(index, 1, newTag);
break;
}
}
}
if (!transactionTagListStateInvalid.value) {
updateTransactionTagListInvalidState(true);
}
return true;
}
function updateTagDisplayOrderInTransactionTagList({ groupId, from, to }: { groupId: string, from: number, to: number }): void {
// update in the group list
const tagsInGroup = allTransactionTagsByGroupMap.value[groupId];
@@ -757,6 +808,7 @@ export const useTransactionTagsStore = defineStore('transactionTags', () => {
// computed states
allAvailableTagsCount,
// functions
sortTagDisplayOrderByTagName,
updateTransactionTagListInvalidState,
resetTransactionTags,
loadAllTagGroups,
src/views/desktop/tags/ListPage.vue
+19
View File
@@ -83,6 +83,15 @@
:title="tt('Change Group Display Order')"
v-if="allTagGroupsWithDefault.length >= 2"
@click="showChangeGroupDisplayOrderDialog"></v-list-item>
<v-divider class="my-2" v-if="tags.length > 1"/>
<v-list-item :prepend-icon="mdiSortAlphabeticalAscending"
:title="tt('Sort by Name (A to Z)')"
@click="sortByName(false)"
v-if="tags.length > 1"></v-list-item>
<v-list-item :prepend-icon="mdiSortAlphabeticalDescending"
:title="tt('Sort by Name (Z to A)')"
@click="sortByName(true)"
v-if="tags.length > 1"></v-list-item>
<v-divider class="my-2"/>
<v-list-item :prepend-icon="mdiEyeOutline"
:title="tt('Show Hidden Transaction Tags')"
@@ -347,6 +356,8 @@ import {
mdiPencilOutline,
mdiCheck,
mdiClose,
mdiSortAlphabeticalAscending,
mdiSortAlphabeticalDescending,
mdiEyeOffOutline,
mdiEyeOutline,
mdiSort,
@@ -589,6 +600,14 @@ function cancelSave(tag: TransactionTag): void {
}
}
function sortByName(desc: boolean): void {
const changed = transactionTagsStore.sortTagDisplayOrderByTagName(activeTagGroupId.value, desc);
if (changed) {
displayOrderModified.value = true;
}
}
function saveSortResult(): void {
if (!displayOrderModified.value) {
return;
src/views/mobile/tags/ListPage.vue
+14 -1
View File
@@ -194,8 +194,10 @@
<f7-actions-group v-if="allTagGroupsWithDefault.length >= 2">
<f7-actions-button @click="changeTagGroupDisplayOrder">{{ tt('Change Group Display Order') }}</f7-actions-button>
</f7-actions-group>
<f7-actions-group>
<f7-actions-group v-if="tags.length > 1">
<f7-actions-button @click="setSortable()">{{ tt('Sort') }}</f7-actions-button>
<f7-actions-button @click="sortByName(false)">{{ tt('Sort by Name (A to Z)') }}</f7-actions-button>
<f7-actions-button @click="sortByName(true)">{{ tt('Sort by Name (Z to A)') }}</f7-actions-button>
<f7-actions-button v-if="!showHidden" @click="showHidden = true">{{ tt('Show Hidden Transaction Tags') }}</f7-actions-button>
<f7-actions-button v-if="showHidden" @click="showHidden = false">{{ tt('Hide Hidden Transaction Tags') }}</f7-actions-button>
</f7-actions-group>
@@ -462,6 +464,17 @@ function remove(tag: TransactionTag | null, confirm: boolean): void {
});
}
function sortByName(desc: boolean): void {
showHidden.value = true;
sortable.value = true;
const changed = transactionTagsStore.sortTagDisplayOrderByTagName(activeTagGroupId.value, desc);
if (changed) {
displayOrderModified.value = true;
}
}
function setSortable(): void {
if (sortable.value || hasEditingTag.value) {
return;