Merge remote changes with local modifications

- Add docx and html2pdf.js export functionality (from remote)
- Update backend with new API endpoints
- Sync local configuration changes
This commit is contained in:
2026-03-10 23:10:11 +08:00
parent 2ad57887cd
commit 8d89c2a0f6
6 changed files with 83 additions and 592 deletions
-13
View File
@@ -18,11 +18,9 @@ export const useSettingsStore = defineStore('settings', () => {
// 4. Preferences
const language = ref('auto')
const currency = ref('auto')
// const timezone = ref('auto') // removed
// 5. Background
const backgroundType = ref('default') // 'default' | 'warm' | 'reading' | 'image'
// const backgroundColor = ref('#ffffff') // removed
const backgroundImage = ref('')
const backgroundOpacity = ref(0.2) // 0.05 - 0.50
@@ -61,13 +59,10 @@ export const useSettingsStore = defineStore('settings', () => {
if (typeof data.privacyMode === 'boolean') privacyMode.value = data.privacyMode
if (data.language) language.value = data.language
if (data.currency) currency.value = data.currency
// if (data.timezone) timezone.value = data.timezone // timezone legacy ignore
if (data.backgroundType) {
// migrate color to default if needed, or mapped
if (data.backgroundType === 'color') backgroundType.value = 'default'
else backgroundType.value = data.backgroundType
}
// if (data.backgroundColor) backgroundColor.value = data.backgroundColor // removed
if (data.backgroundImage) backgroundImage.value = data.backgroundImage
if (data.backgroundOpacity) backgroundOpacity.value = data.backgroundOpacity
}
@@ -86,9 +81,7 @@ export const useSettingsStore = defineStore('settings', () => {
privacyMode: privacyMode.value,
language: language.value,
currency: currency.value,
// timezone: timezone.value, // removed
backgroundType: backgroundType.value,
// backgroundColor: backgroundColor.value, // removed
backgroundImage: backgroundImage.value,
backgroundOpacity: backgroundOpacity.value,
}
@@ -106,9 +99,7 @@ export const useSettingsStore = defineStore('settings', () => {
privacyMode.value = false
language.value = 'auto'
currency.value = 'auto'
// timezone.value = 'auto' // removed
backgroundType.value = 'default'
// backgroundColor.value = '#ffffff' // removed
backgroundImage.value = ''
backgroundOpacity.value = 0.2
saveSettings()
@@ -123,9 +114,7 @@ export const useSettingsStore = defineStore('settings', () => {
privacyMode,
language,
currency,
// timezone, // removed
backgroundType,
// backgroundColor, // removed
backgroundImage,
backgroundOpacity,
],
@@ -144,9 +133,7 @@ export const useSettingsStore = defineStore('settings', () => {
privacyMode,
language,
currency,
// timezone, // removed
backgroundType,
// backgroundColor, // removed
backgroundImage,
backgroundOpacity,
uiLanguage,