code refactor

This commit is contained in:
MaysWind
2021-04-05 22:27:08 +08:00
parent d43e7fa542
commit 5da71ff4ff
8 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -56,7 +56,7 @@ export default {
const self = this; const self = this;
return { return {
baseCurrency: self.$store.getters.currentUserDefaultCurrency || self.$t('default.currency'), baseCurrency: self.$store.getters.currentUserDefaultCurrency,
updating: false updating: false
}; };
}, },
+1 -1
View File
@@ -186,7 +186,7 @@ export default {
return this.$store.state.transactionOverview; return this.$store.state.transactionOverview;
}, },
defaultCurrency() { defaultCurrency() {
return this.$store.getters.currentUserDefaultCurrency || this.$t('default.currency'); return this.$store.getters.currentUserDefaultCurrency;
}, },
firstDayOfWeek() { firstDayOfWeek() {
if (this.$utilities.isNumber(this.$store.getters.currentUserFirstDayOfWeek)) { if (this.$utilities.isNumber(this.$store.getters.currentUserFirstDayOfWeek)) {
+3 -3
View File
@@ -197,7 +197,7 @@ export default {
confirmPassword: '', confirmPassword: '',
email: '', email: '',
nickname: '', nickname: '',
defaultCurrency: self.$t('default.currency'), defaultCurrency: self.$store.state.defaultSetting.currency,
firstDayOfWeek: self.$constants.datetime.allWeekDays[self.$t('default.firstDayOfWeek')] ? self.$constants.datetime.allWeekDays[self.$t('default.firstDayOfWeek')].type : 0 firstDayOfWeek: self.$constants.datetime.allWeekDays[self.$t('default.firstDayOfWeek')] ? self.$constants.datetime.allWeekDays[self.$t('default.firstDayOfWeek')].type : 0
}, },
submitting: false, submitting: false,
@@ -227,13 +227,13 @@ export default {
return this.$i18n.locale; return this.$i18n.locale;
}, },
set: function (value) { set: function (value) {
const isCurrencyDefault = this.user.defaultCurrency === this.$t('default.currency'); const isCurrencyDefault = this.user.defaultCurrency === this.$store.state.defaultSetting.currency;
const isFirstWeekDayDefault = this.user.firstDayOfWeek === (this.$constants.datetime.allWeekDays[this.$t('default.firstDayOfWeek')] ? this.$constants.datetime.allWeekDays[this.$t('default.firstDayOfWeek')].type : 0); const isFirstWeekDayDefault = this.user.firstDayOfWeek === (this.$constants.datetime.allWeekDays[this.$t('default.firstDayOfWeek')] ? this.$constants.datetime.allWeekDays[this.$t('default.firstDayOfWeek')].type : 0);
this.$locale.setLanguage(value); this.$locale.setLanguage(value);
if (isCurrencyDefault) { if (isCurrencyDefault) {
this.user.defaultCurrency = this.$t('default.currency'); this.user.defaultCurrency = this.$store.state.defaultSetting.currency;
} }
if (isFirstWeekDayDefault) { if (isFirstWeekDayDefault) {
+2 -2
View File
@@ -327,7 +327,7 @@ export default {
name: '', name: '',
icon: self.$constants.icons.defaultAccountIconId, icon: self.$constants.icons.defaultAccountIconId,
color: self.$constants.colors.defaultAccountColor, color: self.$constants.colors.defaultAccountColor,
currency: self.$store.getters.currentUserDefaultCurrency || self.$t('default.currency'), currency: self.$store.getters.currentUserDefaultCurrency,
balance: 0, balance: 0,
comment: '', comment: '',
visible: true, visible: true,
@@ -461,7 +461,7 @@ export default {
name: '', name: '',
icon: self.account.icon, icon: self.account.icon,
color: self.account.color, color: self.account.color,
currency: self.$store.getters.currentUserDefaultCurrency || self.$t('default.currency'), currency: self.$store.getters.currentUserDefaultCurrency,
balance: 0, balance: 0,
comment: '', comment: '',
visible: true, visible: true,
+1 -1
View File
@@ -220,7 +220,7 @@ export default {
}, },
computed: { computed: {
defaultCurrency() { defaultCurrency() {
return this.$store.getters.currentUserDefaultCurrency || this.$t('default.currency'); return this.$store.getters.currentUserDefaultCurrency;
}, },
allAccountCategories() { allAccountCategories() {
return this.$constants.account.allCategories; return this.$constants.account.allCategories;
+1 -1
View File
@@ -263,7 +263,7 @@ export default {
}, },
computed: { computed: {
defaultCurrency() { defaultCurrency() {
return this.$store.getters.currentUserDefaultCurrency || this.$t('default.currency'); return this.$store.getters.currentUserDefaultCurrency;
}, },
firstDayOfWeek() { firstDayOfWeek() {
if (this.$utilities.isNumber(this.$store.getters.currentUserFirstDayOfWeek)) { if (this.$utilities.isNumber(this.$store.getters.currentUserFirstDayOfWeek)) {
+1 -1
View File
@@ -347,7 +347,7 @@ export default {
} }
}, },
defaultCurrency() { defaultCurrency() {
return this.$store.getters.currentUserDefaultCurrency || this.$t('default.currency'); return this.$store.getters.currentUserDefaultCurrency;
}, },
defaultTimezoneOffset() { defaultTimezoneOffset() {
return this.$locale.defaultTimezoneOffset; return this.$locale.defaultTimezoneOffset;
+1 -1
View File
@@ -528,7 +528,7 @@ export default {
} }
} }
return this.$store.getters.currentUserDefaultCurrency || this.$t('default.currency'); return this.$store.getters.currentUserDefaultCurrency;
}, },
currentTimezoneOffsetMinutes() { currentTimezoneOffsetMinutes() {
return this.$utilities.getTimezoneOffsetMinutes(); return this.$utilities.getTimezoneOffsetMinutes();