diff --git a/pkg/services/transaction_tags.go b/pkg/services/transaction_tags.go
index b900dd00..f9ccc639 100644
--- a/pkg/services/transaction_tags.go
+++ b/pkg/services/transaction_tags.go
@@ -184,7 +184,7 @@ func (s *TransactionTagService) GetAllTagIdsOfTransactions(c *core.Context, uid
}
var tagIndexes []*models.TransactionTagIndex
- err := s.UserDataDB(uid).NewSession(c).Where("uid=? AND deleted=?", uid, false).In("transaction_id", transactionIds).Find(&tagIndexes)
+ err := s.UserDataDB(uid).NewSession(c).Where("uid=? AND deleted=?", uid, false).In("transaction_id", transactionIds).OrderBy("transaction_id asc, tag_index_id asc").Find(&tagIndexes)
allTransactionTagIds := s.GetGroupedTransactionTagIds(tagIndexes)
diff --git a/src/lib/settings.js b/src/lib/settings.js
index febb0ac8..f45fdae8 100644
--- a/src/lib/settings.js
+++ b/src/lib/settings.js
@@ -16,6 +16,7 @@ const defaultSettings = {
timezoneUsedForStatisticsInHomePage: timezoneConstants.defaultTimezoneTypesUsedForStatistics,
itemsCountInTransactionListPage: 15,
showTotalAmountInTransactionListPage: true,
+ showTagInTransactionListPage: false,
showAccountBalance: true,
statistics: {
defaultChartDataType: statisticsConstants.defaultChartDataType,
@@ -196,6 +197,14 @@ export function setShowTotalAmountInTransactionListPage(value) {
setOption('showTotalAmountInTransactionListPage', value);
}
+export function isShowTagInTransactionListPage() {
+ return getOption('showTagInTransactionListPage');
+}
+
+export function setShowTagInTransactionListPage(value) {
+ setOption('showTagInTransactionListPage', value);
+}
+
export function isShowAccountBalance() {
return getOption('showAccountBalance');
}
diff --git a/src/locales/en.js b/src/locales/en.js
index 51e85098..7d00f245 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -1113,6 +1113,7 @@ export default {
'Transaction List Page': 'Transaction List Page',
'Transactions Per Page': 'Transactions Per Page',
'Show Monthly Total Amount': 'Show Monthly Total Amount',
+ 'Show Transaction Tag': 'Show Transaction Tag',
'Transaction Edit Page': 'Transaction Edit Page',
'Automatically Add Geolocation': 'Automatically Add Geolocation',
'Enable Animation': 'Enable Animation',
diff --git a/src/locales/zh_Hans.js b/src/locales/zh_Hans.js
index 4e54f9cc..f507c3e8 100644
--- a/src/locales/zh_Hans.js
+++ b/src/locales/zh_Hans.js
@@ -1113,6 +1113,7 @@ export default {
'Transaction List Page': '交易列表页面',
'Transactions Per Page': '每页交易数',
'Show Monthly Total Amount': '显示月度总金额',
+ 'Show Transaction Tag': '显示交易标签',
'Transaction Edit Page': '交易编辑页面',
'Automatically Add Geolocation': '自动添加地理位置',
'Enable Animation': '启用动画',
diff --git a/src/stores/setting.js b/src/stores/setting.js
index 6dacc905..a1e8e560 100644
--- a/src/stores/setting.js
+++ b/src/stores/setting.js
@@ -18,6 +18,7 @@ export const useSettingsStore = defineStore('settings', {
timezoneUsedForStatisticsInHomePage: settings.getTimezoneUsedForStatisticsInHomePage(),
itemsCountInTransactionListPage: settings.getItemsCountInTransactionListPage(),
showTotalAmountInTransactionListPage: settings.isShowTotalAmountInTransactionListPage(),
+ showTagInTransactionListPage: settings.isShowTagInTransactionListPage(),
showAccountBalance: settings.isShowAccountBalance(),
statistics: {
defaultChartDataType: settings.getStatisticsDefaultChartDataType(),
@@ -82,6 +83,10 @@ export const useSettingsStore = defineStore('settings', {
settings.setShowTotalAmountInTransactionListPage(value);
this.appSettings.showTotalAmountInTransactionListPage = value;
},
+ setShowTagInTransactionListPage(value) {
+ settings.setShowTagInTransactionListPage(value);
+ this.appSettings.showTagInTransactionListPage = value;
+ },
setShowAccountBalance(value) {
settings.setShowAccountBalance(value);
this.appSettings.showAccountBalance = value;
diff --git a/src/styles/mobile/font-size-default.css b/src/styles/mobile/font-size-default.css
index 3fb39089..a0812a5e 100644
--- a/src/styles/mobile/font-size-default.css
+++ b/src/styles/mobile/font-size-default.css
@@ -75,6 +75,9 @@
--ebk-transaction-day-of-week-font-size: 12px;
--ebk-transaction-account-arrow-font-size: 12px;
--ebk-transaction-account-arrow-margin-top: -1px;
+ --ebk-transaction-tag-chip-font-size: 13px;
+ --ebk-transaction-tag-chip-media-size: 19px;
+ --ebk-transaction-tag-chip-height: 19px;
--ebk-login-page-title-font-size: 28px;
--ebk-license-popup-title-font-size: 30px;
--ebk-license-content-font-size: 14px;
diff --git a/src/styles/mobile/font-size-large.css b/src/styles/mobile/font-size-large.css
index 4d61a5c1..bcb7d279 100644
--- a/src/styles/mobile/font-size-large.css
+++ b/src/styles/mobile/font-size-large.css
@@ -75,6 +75,9 @@
--ebk-transaction-day-of-week-font-size: 13px;
--ebk-transaction-account-arrow-font-size: 13px;
--ebk-transaction-account-arrow-margin-top: -2px;
+ --ebk-transaction-tag-chip-font-size: 13px;
+ --ebk-transaction-tag-chip-media-size: 20px;
+ --ebk-transaction-tag-chip-height: 20px;
--ebk-login-page-title-font-size: 28px;
--ebk-license-popup-title-font-size: 31px;
--ebk-license-content-font-size: 15px;
diff --git a/src/styles/mobile/font-size-small.css b/src/styles/mobile/font-size-small.css
index 532d011b..97741259 100644
--- a/src/styles/mobile/font-size-small.css
+++ b/src/styles/mobile/font-size-small.css
@@ -75,6 +75,9 @@
--ebk-transaction-day-of-week-font-size: 12px;
--ebk-transaction-account-arrow-font-size: 12px;
--ebk-transaction-account-arrow-margin-top: -1px;
+ --ebk-transaction-tag-chip-font-size: 13px;
+ --ebk-transaction-tag-chip-media-size: 18px;
+ --ebk-transaction-tag-chip-height: 18px;
--ebk-login-page-title-font-size: 28px;
--ebk-license-popup-title-font-size: 30px;
--ebk-license-content-font-size: 13px;
diff --git a/src/styles/mobile/font-size-x-large.css b/src/styles/mobile/font-size-x-large.css
index 17cbc862..4741e65a 100644
--- a/src/styles/mobile/font-size-x-large.css
+++ b/src/styles/mobile/font-size-x-large.css
@@ -75,6 +75,9 @@
--ebk-transaction-day-of-week-font-size: 14px;
--ebk-transaction-account-arrow-font-size: 14px;
--ebk-transaction-account-arrow-margin-top: -2px;
+ --ebk-transaction-tag-chip-font-size: 14px;
+ --ebk-transaction-tag-chip-media-size: 22px;
+ --ebk-transaction-tag-chip-height: 22px;
--ebk-login-page-title-font-size: 28px;
--ebk-license-popup-title-font-size: 32px;
--ebk-license-content-font-size: 16px;
diff --git a/src/styles/mobile/font-size-xx-large.css b/src/styles/mobile/font-size-xx-large.css
index 1a8e9e6a..17fcc593 100644
--- a/src/styles/mobile/font-size-xx-large.css
+++ b/src/styles/mobile/font-size-xx-large.css
@@ -75,6 +75,9 @@
--ebk-transaction-day-of-week-font-size: 15px;
--ebk-transaction-account-arrow-font-size: 15px;
--ebk-transaction-account-arrow-margin-top: -3px;
+ --ebk-transaction-tag-chip-font-size: 15px;
+ --ebk-transaction-tag-chip-media-size: 22px;
+ --ebk-transaction-tag-chip-height: 22px;
--ebk-login-page-title-font-size: 28px;
--ebk-license-popup-title-font-size: 36px;
--ebk-license-content-font-size: 17px;
diff --git a/src/styles/mobile/font-size-xxx-large.css b/src/styles/mobile/font-size-xxx-large.css
index 3e0e2c30..79f5d75c 100644
--- a/src/styles/mobile/font-size-xxx-large.css
+++ b/src/styles/mobile/font-size-xxx-large.css
@@ -75,6 +75,9 @@
--ebk-transaction-day-of-week-font-size: 17px;
--ebk-transaction-account-arrow-font-size: 17px;
--ebk-transaction-account-arrow-margin-top: -4px;
+ --ebk-transaction-tag-chip-font-size: 16px;
+ --ebk-transaction-tag-chip-media-size: 24px;
+ --ebk-transaction-tag-chip-height: 24px;
--ebk-login-page-title-font-size: 28px;
--ebk-license-popup-title-font-size: 38px;
--ebk-license-content-font-size: 19px;
diff --git a/src/styles/mobile/font-size-xxxx-large.css b/src/styles/mobile/font-size-xxxx-large.css
index 5a6497f9..c6bda399 100644
--- a/src/styles/mobile/font-size-xxxx-large.css
+++ b/src/styles/mobile/font-size-xxxx-large.css
@@ -75,6 +75,9 @@
--ebk-transaction-day-of-week-font-size: 19px;
--ebk-transaction-account-arrow-font-size: 19px;
--ebk-transaction-account-arrow-margin-top: -4px;
+ --ebk-transaction-tag-chip-font-size: 18px;
+ --ebk-transaction-tag-chip-media-size: 26px;
+ --ebk-transaction-tag-chip-height: 26px;
--ebk-login-page-title-font-size: 28px;
--ebk-license-popup-title-font-size: 40px;
--ebk-license-content-font-size: 21px;
diff --git a/src/styles/mobile/global.css b/src/styles/mobile/global.css
index f599c518..f66fc5d3 100644
--- a/src/styles/mobile/global.css
+++ b/src/styles/mobile/global.css
@@ -98,10 +98,12 @@ i.icon.la, i.icon.las, i.icon.lab {
/** custom class **/
:root {
--default-icon-color: #000;
+ --ebk-transaction-tag-chip-bg-color: rgba(0, 0, 0, 0.04);
}
:root.dark {
--default-icon-color: #fff;
+ --ebk-transaction-tag-chip-bg-color: rgba(255, 255, 255, 0.04);
}
.pin-codes-input {
diff --git a/src/views/desktop/app/settings/tabs/AppBasicSettingTab.vue b/src/views/desktop/app/settings/tabs/AppBasicSettingTab.vue
index 413f3b70..090d9b41 100644
--- a/src/views/desktop/app/settings/tabs/AppBasicSettingTab.vue
+++ b/src/views/desktop/app/settings/tabs/AppBasicSettingTab.vue
@@ -123,6 +123,17 @@
v-model="showTotalAmountInTransactionListPage"
/>
+