code refactor

This commit is contained in:
MaysWind
2020-11-22 14:00:36 +08:00
parent 9ab285a071
commit 9e1ec6d13c
6 changed files with 50 additions and 43 deletions
+36 -33
View File
@@ -44,6 +44,7 @@ const i18n = new VueI18n(getI18nOptions());
Vue.prototype.$version = version.getVersion;
Vue.prototype.$buildTime = version.getBuildTime;
Vue.prototype.$licenses = licenses;
Vue.prototype.$constants = {
currency: currency,
@@ -51,44 +52,46 @@ Vue.prototype.$constants = {
icons: icons,
account: account,
};
Vue.prototype.$utilities = utils;
Vue.prototype.$logger = logger;
Vue.prototype.$webauthn = webauthn;
Vue.prototype.$settings = settings;
Vue.prototype.$getDefaultLanguage = getDefaultLanguage;
Vue.prototype.$getAllLanguages = getAllLanguages;
Vue.prototype.$getLanguage = getLanguage;
Vue.prototype.$setLanguage = function (locale) {
if (settings.getLanguage() !== locale) {
settings.setLanguage(locale);
Vue.prototype.$locale = {
getDefaultLanguage: getDefaultLanguage,
getAllLanguages: getAllLanguages,
getLanguage: getLanguage,
setLanguage: function (locale) {
if (settings.getLanguage() !== locale) {
settings.setLanguage(locale);
}
i18n.locale = locale;
moment.locale(locale);
services.setLocale(locale);
document.querySelector('html').setAttribute('lang', locale);
return locale;
},
getAllCurrencies: function () {
const allCurrencyCodes = currency.all;
const allCurrencies = [];
for (let i = 0; i < allCurrencyCodes.length; i++) {
const code = allCurrencyCodes[i];
allCurrencies.push({
code: code,
displayName: i18n.t(`currency.${code}`)
});
}
allCurrencies.sort(function(c1, c2){
return c1.displayName.localeCompare(c2.displayName);
})
return allCurrencies;
}
i18n.locale = locale;
moment.locale(locale);
services.setLocale(locale);
document.querySelector('html').setAttribute('lang', locale);
return locale;
};
Vue.prototype.$getAllCurrencies = function () {
const allCurrencyCodes = currency.all;
const allCurrencies = [];
for (let i = 0; i < allCurrencyCodes.length; i++) {
const code = allCurrencyCodes[i];
allCurrencies.push({
code: code,
displayName: i18n.t(`currency.${code}`)
});
}
allCurrencies.sort(function(c1, c2){
return c1.displayName.localeCompare(c2.displayName);
})
return allCurrencies;
};
Vue.prototype.$isUserRegistrationEnabled = settings.isUserRegistrationEnabled;
Vue.prototype.$alert = function (message, confirmCallback) {
let parameters = {};
@@ -171,7 +174,7 @@ if (settings.getLanguage()) {
logger.info(`No language is set, use browser default ${getDefaultLanguage()}`);
}
Vue.prototype.$setLanguage(settings.getLanguage() || getDefaultLanguage());
Vue.prototype.$locale.setLanguage(settings.getLanguage() || getDefaultLanguage());
if (userstate.isUserLogined()) {
if (!settings.isEnableApplicationLock()) {
+5 -5
View File
@@ -110,10 +110,10 @@ export default {
return 'v' + this.$version();
},
allLanguages() {
return this.$getAllLanguages();
return this.$locale.getAllLanguages();
},
isUserRegistrationEnabled() {
return this.$isUserRegistrationEnabled();
return this.$settings.isUserRegistrationEnabled();
},
inputIsEmpty() {
return !this.username || !this.password;
@@ -134,10 +134,10 @@ export default {
},
currentLanguageName() {
const currentLocale = this.$i18n.locale;
let lang = this.$getLanguage(currentLocale);
let lang = this.$locale.getLanguage(currentLocale);
if (!lang) {
lang = this.$getLanguage(this.$getDefaultLanguage());
lang = this.$locale.getLanguage(this.$locale.getDefaultLanguage());
}
return lang.displayName;
@@ -289,7 +289,7 @@ export default {
}
},
changeLanguage(locale) {
this.$setLanguage(locale);
this.$locale.setLanguage(locale);
}
}
};
+2 -2
View File
@@ -92,14 +92,14 @@ export default {
return userInfo.nickname || userInfo.username || this.$t('User');
},
allLanguages() {
return this.$getAllLanguages();
return this.$locale.getAllLanguages();
},
currentLocale: {
get: function () {
return this.$i18n.locale;
},
set: function (value) {
this.$setLanguage(value);
this.$locale.setLanguage(value);
}
},
isEnableApplicationLock() {
+5 -1
View File
@@ -93,7 +93,7 @@ export default {
},
computed: {
allCurrencies() {
return this.$getAllCurrencies();
return this.$locale.getAllCurrencies();
},
inputIsEmpty() {
return !!this.inputEmptyProblemMessage;
@@ -161,6 +161,10 @@ export default {
if (self.$utilities.isString(data.result.token)) {
self.$user.updateTokenAndUserInfo(data.result);
if (self.$settings.isAutoUpdateExchangeRatesData()) {
self.$services.autoRefreshLatestExchangeRates();
}
}
self.$toast('You have been successfully registered');
+1 -1
View File
@@ -339,7 +339,7 @@ export default {
return ret;
},
allCurrencies() {
return this.$getAllCurrencies();
return this.$locale.getAllCurrencies();
}
},
created() {
+1 -1
View File
@@ -126,7 +126,7 @@ export default {
},
computed: {
allCurrencies() {
return this.$getAllCurrencies();
return this.$locale.getAllCurrencies();
},
inputIsNotChanged() {
return !!this.inputIsNotChangedProblemMessage;