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

modify style

Browse Source
This commit is contained in:
MaysWind
2024-08-04 19:50:17 +08:00
parent 24724bb19f
commit 0b17251f94
4 changed files with 82 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/consts/numeral.js
+2
View File
@@ -68,10 +68,12 @@ const allDigitGroupingSymbolMap = {
const allDigitGroupingType = {
None: {
type: 1,
enabled: false,
name: 'None'
},
ThousandsSeparator: {
type: 2,
enabled: true,
name: 'Thousands Separator'
}
};
src/lib/i18n.js
+2
View File
@@ -726,6 +726,7 @@ function getAllDigitGroupingTypes(translateFn) {
ret.push({
type: numeralConstants.defaultValue,
enabled: defaultDigitGroupingType.enabled,
displayName: `${translateFn('Language Default')} (${translateFn('numeral.' + defaultDigitGroupingType.name)})`
});
@@ -734,6 +735,7 @@ function getAllDigitGroupingTypes(translateFn) {
ret.push({
type: type.type,
enabled: type.enabled,
displayName: translateFn('numeral.' + type.name)
});
}
src/views/desktop/user/settings/tabs/UserBasicSettingTab.vue
+36 -22
View File
@@ -159,7 +159,11 @@
/>
</v-col>
</v-row>
</v-card-text>
<v-divider />
<v-card-text>
<v-row>
<v-col cols="12" md="6">
<v-select
@@ -213,7 +217,11 @@
/>
</v-col>
</v-row>
</v-card-text>
<v-divider />
<v-card-text>
<v-row>
<v-col cols="12" md="6">
<v-select
@@ -221,23 +229,10 @@
item-value="type"
persistent-placeholder
:disabled="loading || saving"
:label="$t('Decimal Separator')"
:placeholder="$t('Decimal Separator')"
:items="allDecimalSeparators"
v-model="newProfile.decimalSeparator"
/>
</v-col>
<v-col cols="12" md="6">
<v-select
item-title="displayName"
item-value="type"
persistent-placeholder
:disabled="loading || saving"
:label="$t('Digit Grouping Symbol')"
:placeholder="$t('Digit Grouping Symbol')"
:items="allDigitGroupingSymbols"
v-model="newProfile.digitGroupingSymbol"
:label="$t('Currency Display Mode')"
:placeholder="$t('Currency Display Mode')"
:items="allCurrencyDisplayTypes"
v-model="newProfile.currencyDisplayType"
/>
</v-col>
@@ -259,14 +254,33 @@
item-title="displayName"
item-value="type"
persistent-placeholder
:disabled="loading || saving"
:label="$t('Currency Display Mode')"
:placeholder="$t('Currency Display Mode')"
:items="allCurrencyDisplayTypes"
v-model="newProfile.currencyDisplayType"
:disabled="loading || saving || !getNameByKeyValue(allDigitGroupingTypes, newProfile.digitGrouping, 'type', 'enabled')"
:label="$t('Digit Grouping Symbol')"
:placeholder="$t('Digit Grouping Symbol')"
:items="allDigitGroupingSymbols"
v-model="newProfile.digitGroupingSymbol"
/>
</v-col>
<v-col cols="12" md="6">
<v-select
item-title="displayName"
item-value="type"
persistent-placeholder
:disabled="loading || saving"
:label="$t('Decimal Separator')"
:placeholder="$t('Decimal Separator')"
:items="allDecimalSeparators"
v-model="newProfile.decimalSeparator"
/>
</v-col>
</v-row>
</v-card-text>
<v-divider />
<v-card-text>
<v-row>
<v-col cols="12" md="6">
<v-select
item-title="displayName"
src/views/mobile/users/UserProfilePage.vue
+42 -26
View File
@@ -25,14 +25,23 @@
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Default Language" title="Language" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Default Currency" title="Currency" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="First Day of Week" title="Week Day" link="#"></f7-list-item>
</f7-list>
<f7-list strong inset dividers class="margin-vertical skeleton-text" v-if="loading">
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Long Date Format" title="YYYY-MM-DD" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Short Date Format" title="YYYY-MM-DD" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Long Time Format" title="HH:mm:ss" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Short Time Format" title="HH:mm" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Decimal Separator" title="Dot (.)" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Digit Grouping Symbol" title="Comma (,)" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Digit Grouping" title="Thousands Separator" link="#"></f7-list-item>
</f7-list>
<f7-list strong inset dividers class="margin-vertical skeleton-text" v-if="loading">
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Currency Display Mode" title="Currency Symbol" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Digit Grouping" title="Thousands Separator" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Digit Grouping Symbol" title="Comma (,)" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Decimal Separator" title="Dot (.)" link="#"></f7-list-item>
</f7-list>
<f7-list strong inset dividers class="margin-vertical skeleton-text" v-if="loading">
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Expense Amount Color" title="Amount Color" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Income Amount Color" title="Amount Color" link="#"></f7-list-item>
</f7-list>
@@ -159,7 +168,9 @@
v-for="weekDay in allWeekDays">{{ weekDay.displayName }}</option>
</select>
</f7-list-item>
</f7-list>
<f7-list form strong inset dividers class="margin-vertical" v-if="!loading">
<f7-list-item
class="list-item-with-header-and-title list-item-no-item-after"
:header="$t('Long Date Format')"
@@ -211,30 +222,19 @@
v-for="format in allShortTimeFormats">{{ format.displayName }}</option>
</select>
</f7-list-item>
</f7-list>
<f7-list form strong inset dividers class="margin-vertical" v-if="!loading">
<f7-list-item
class="list-item-with-header-and-title list-item-no-item-after"
:header="$t('Decimal Separator')"
:title="getNameByKeyValue(allDecimalSeparators, newProfile.decimalSeparator, 'type', 'displayName')"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Decimal Separator'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Decimal Separator'), popupCloseLinkText: $t('Done') }"
:header="$t('Currency Display Mode')"
:title="getNameByKeyValue(allCurrencyDisplayTypes, newProfile.currencyDisplayType, 'type', 'displayName')"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Currency Display Mode'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Currency Display Mode'), popupCloseLinkText: $t('Done') }"
>
<select v-model="newProfile.decimalSeparator">
<select v-model="newProfile.currencyDisplayType">
<option :value="format.type"
:key="format.type"
v-for="format in allDecimalSeparators">{{ format.displayName }}</option>
</select>
</f7-list-item>
<f7-list-item
class="list-item-with-header-and-title list-item-no-item-after"
:header="$t('Digit Grouping Symbol')"
:title="getNameByKeyValue(allDigitGroupingSymbols, newProfile.digitGroupingSymbol, 'type', 'displayName')"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Digit Grouping Symbol'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Digit Grouping Symbol'), popupCloseLinkText: $t('Done') }"
>
<select v-model="newProfile.digitGroupingSymbol">
<option :value="format.type"
:key="format.type"
v-for="format in allDigitGroupingSymbols">{{ format.displayName }}</option>
v-for="format in allCurrencyDisplayTypes">{{ format.displayName }}</option>
</select>
</f7-list-item>
@@ -253,17 +253,33 @@
<f7-list-item
class="list-item-with-header-and-title list-item-no-item-after"
:header="$t('Currency Display Mode')"
:title="getNameByKeyValue(allCurrencyDisplayTypes, newProfile.currencyDisplayType, 'type', 'displayName')"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Currency Display Mode'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Currency Display Mode'), popupCloseLinkText: $t('Done') }"
:disabled="!getNameByKeyValue(allDigitGroupingTypes, newProfile.digitGrouping, 'type', 'enabled')"
:header="$t('Digit Grouping Symbol')"
:title="getNameByKeyValue(allDigitGroupingSymbols, newProfile.digitGroupingSymbol, 'type', 'displayName')"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Digit Grouping Symbol'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Digit Grouping Symbol'), popupCloseLinkText: $t('Done') }"
>
<select v-model="newProfile.currencyDisplayType">
<select v-model="newProfile.digitGroupingSymbol">
<option :value="format.type"
:key="format.type"
v-for="format in allCurrencyDisplayTypes">{{ format.displayName }}</option>
v-for="format in allDigitGroupingSymbols">{{ format.displayName }}</option>
</select>
</f7-list-item>
<f7-list-item
class="list-item-with-header-and-title list-item-no-item-after"
:header="$t('Decimal Separator')"
:title="getNameByKeyValue(allDecimalSeparators, newProfile.decimalSeparator, 'type', 'displayName')"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Decimal Separator'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Decimal Separator'), popupCloseLinkText: $t('Done') }"
>
<select v-model="newProfile.decimalSeparator">
<option :value="format.type"
:key="format.type"
v-for="format in allDecimalSeparators">{{ format.displayName }}</option>
</select>
</f7-list-item>
</f7-list>
<f7-list form strong inset dividers class="margin-vertical" v-if="!loading">
<f7-list-item
class="list-item-with-header-and-title list-item-no-item-after"
:header="$t('Expense Amount Color')"