@@ -259,6 +319,7 @@ export function ExportDefaultsSettingsForm({
className={`select-trigger ${showExportExcelColumnsSelect ? 'open' : ''}`}
onClick={() => {
setShowExportExcelColumnsSelect(!showExportExcelColumnsSelect)
+ setShowExportFileNamingModeSelect(false)
setIsExportDateRangeDialogOpen(false)
}}
>
diff --git a/src/pages/ExportPage.tsx b/src/pages/ExportPage.tsx
index 750d496..1f95d36 100644
--- a/src/pages/ExportPage.tsx
+++ b/src/pages/ExportPage.tsx
@@ -1621,6 +1621,7 @@ function ExportPage() {
const [exportDefaultFormat, setExportDefaultFormat] = useState
('excel')
const [exportDefaultAvatars, setExportDefaultAvatars] = useState(true)
const [exportDefaultDateRangeSelection, setExportDefaultDateRangeSelection] = useState(() => createDefaultExportDateRangeSelection())
+ const [exportDefaultFileNamingMode, setExportDefaultFileNamingMode] = useState('classic')
const [exportDefaultMedia, setExportDefaultMedia] = useState({
images: true,
videos: true,
@@ -2270,7 +2271,7 @@ function ExportPage() {
setIsBaseConfigLoading(true)
let isReady = true
try {
- const [savedPath, savedFormat, savedAvatars, savedMedia, savedVoiceAsText, savedExcelCompactColumns, savedTxtColumns, savedConcurrency, savedImageDeepSearchOnMiss, savedSessionMap, savedContentMap, savedSessionRecordMap, savedSnsPostCount, savedWriteLayout, savedSessionNameWithTypePrefix, savedDefaultDateRange, exportCacheScope] = await Promise.all([
+ const [savedPath, savedFormat, savedAvatars, savedMedia, savedVoiceAsText, savedExcelCompactColumns, savedTxtColumns, savedConcurrency, savedImageDeepSearchOnMiss, savedSessionMap, savedContentMap, savedSessionRecordMap, savedSnsPostCount, savedWriteLayout, savedSessionNameWithTypePrefix, savedDefaultDateRange, savedFileNamingMode, exportCacheScope] = await Promise.all([
configService.getExportPath(),
configService.getExportDefaultFormat(),
configService.getExportDefaultAvatars(),
@@ -2287,6 +2288,7 @@ function ExportPage() {
configService.getExportWriteLayout(),
configService.getExportSessionNamePrefixEnabled(),
configService.getExportDefaultDateRange(),
+ configService.getExportDefaultFileNamingMode(),
ensureExportCacheScope()
])
@@ -2318,6 +2320,7 @@ function ExportPage() {
setExportDefaultExcelCompactColumns(savedExcelCompactColumns ?? true)
setExportDefaultConcurrency(savedConcurrency ?? 2)
setExportDefaultImageDeepSearchOnMiss(savedImageDeepSearchOnMiss ?? true)
+ setExportDefaultFileNamingMode(savedFileNamingMode ?? 'classic')
const resolvedDefaultDateRange = resolveExportDateRangeConfig(savedDefaultDateRange)
setExportDefaultDateRangeSelection(resolvedDefaultDateRange)
setTimeRangeSelection(resolvedDefaultDateRange)
@@ -4397,6 +4400,7 @@ function ExportPage() {
displayNamePreference: options.displayNamePreference,
exportConcurrency: options.exportConcurrency,
imageDeepSearchOnMiss: options.imageDeepSearchOnMiss,
+ fileNamingMode: exportDefaultFileNamingMode,
sessionLayout,
sessionNameWithTypePrefix,
dateRange: options.useAllTime
@@ -7089,6 +7093,9 @@ function ExportPage() {
if (patch.dateRange) {
setExportDefaultDateRangeSelection(patch.dateRange)
}
+ if (patch.fileNamingMode) {
+ setExportDefaultFileNamingMode(patch.fileNamingMode)
+ }
if (patch.media) {
const mediaPatch = patch.media
setExportDefaultMedia(mediaPatch)
diff --git a/src/pages/SettingsPage.tsx b/src/pages/SettingsPage.tsx
index 2d6c3f2..5c13eb1 100644
--- a/src/pages/SettingsPage.tsx
+++ b/src/pages/SettingsPage.tsx
@@ -1457,13 +1457,11 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
{
value: 'quote-top' as const,
label: '引用在上',
- description: '更接近当前 WeFlow 风格',
successMessage: '已切换为引用在上样式'
},
{
value: 'quote-bottom' as const,
label: '正文在上',
- description: '更接近微信 / 密语风格',
successMessage: '已切换为正文在上样式'
}
].map(option => {
@@ -1513,7 +1511,6 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
{option.label}
- {option.description}
diff --git a/src/pages/WelcomePage.tsx b/src/pages/WelcomePage.tsx
index 9c4feef..b344d16 100644
--- a/src/pages/WelcomePage.tsx
+++ b/src/pages/WelcomePage.tsx
@@ -31,6 +31,7 @@ const steps = [
{ id: 'image', title: '图片密钥', desc: '获取 XOR 与 AES 密钥' },
{ id: 'security', title: '安全防护', desc: '保护你的数据' }
]
+type SetupStepId = typeof steps[number]['id']
interface WelcomePageProps {
standalone?: boolean
@@ -438,6 +439,48 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
}
}
+ const jumpToStep = (stepId: SetupStepId) => {
+ const targetIndex = steps.findIndex(step => step.id === stepId)
+ if (targetIndex >= 0) setStepIndex(targetIndex)
+ }
+
+ const validateDbStepBeforeNext = async (): Promise => {
+ if (!dbPath) return '数据库目录步骤未完成：请先选择数据库目录'
+ if (dbPathValidationError) return `数据库目录步骤配置有误：${dbPathValidationError}`
+ try {
+ const wxids = await window.electronAPI.dbPath.scanWxids(dbPath)
+ if (!Array.isArray(wxids) || wxids.length === 0) {
+ return '数据库目录步骤配置有误：当前目录下未找到可用账号数据（缺少 db_storage），请重新选择微信数据目录'
+ }
+ } catch (e) {
+ return `数据库目录步骤配置有误：目录读取失败，请确认该路径可访问（${String(e)}）`
+ }
+ return null
+ }
+
+ const findConfigIssueBeforeConnect = async (): Promise<{ stepId: SetupStepId; message: string } | null> => {
+ const dbIssue = await validateDbStepBeforeNext()
+ if (dbIssue) return { stepId: 'db', message: dbIssue }
+
+ let scannedWxids: Array<{ wxid: string }> = []
+ try {
+ scannedWxids = await window.electronAPI.dbPath.scanWxids(dbPath)
+ } catch {
+ scannedWxids = []
+ }
+
+ if (!wxid) {
+ return { stepId: 'key', message: '解密密钥步骤未完成：请先选择微信账号 (wxid)' }
+ }
+ if (!scannedWxids.some(item => item.wxid === wxid)) {
+ return { stepId: 'key', message: `解密密钥步骤配置有误：微信账号「${wxid}」不在当前数据库目录中，请重新选择账号` }
+ }
+ if (!decryptKey || decryptKey.length !== 64) {
+ return { stepId: 'key', message: '解密密钥步骤未完成：请填写 64 位解密密钥' }
+ }
+ return null
+ }
+
const canGoNext = () => {
if (currentStep.id === 'intro') return true
if (currentStep.id === 'db') return Boolean(dbPath) && !dbPathValidationError
@@ -453,7 +496,15 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
return false
}
- const handleNext = () => {
+ const handleNext = async () => {
+ if (currentStep.id === 'db') {
+ const dbStepIssue = await validateDbStepBeforeNext()
+ if (dbStepIssue) {
+ setError(dbStepIssue)
+ return
+ }
+ }
+
if (!canGoNext()) {
if (currentStep.id === 'db' && !dbPath) setError('请先选择数据库目录')
else if (currentStep.id === 'db' && dbPathValidationError) setError(dbPathValidationError)
@@ -473,9 +524,12 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
}
const handleConnect = async () => {
- if (!dbPath) { setError('请先选择数据库目录'); return }
- if (!wxid) { setError('请填写微信ID'); return }
- if (!decryptKey || decryptKey.length !== 64) { setError('请填写 64 位解密密钥'); return }
+ const configIssue = await findConfigIssueBeforeConnect()
+ if (configIssue) {
+ setError(configIssue.message)
+ jumpToStep(configIssue.stepId)
+ return
+ }
setIsConnecting(true)
setError('')
@@ -484,7 +538,19 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
try {
const result = await window.electronAPI.wcdb.testConnection(dbPath, decryptKey, wxid)
if (!result.success) {
- setError(result.error || 'WCDB 连接失败')
+ const errorMessage = result.error || 'WCDB 连接失败'
+ if (errorMessage.includes('-3001')) {
+ const fallbackIssue = await findConfigIssueBeforeConnect()
+ if (fallbackIssue) {
+ setError(fallbackIssue.message)
+ jumpToStep(fallbackIssue.stepId)
+ } else {
+ setError(`数据库目录步骤配置有误：${errorMessage}`)
+ jumpToStep('db')
+ }
+ } else {
+ setError(errorMessage)
+ }
setLoading(false)
return
}
diff --git a/src/services/config.ts b/src/services/config.ts
index 16cf4e6..c949613 100644
--- a/src/services/config.ts
+++ b/src/services/config.ts
@@ -30,6 +30,7 @@ export const CONFIG_KEYS = {
EXPORT_DEFAULT_FORMAT: 'exportDefaultFormat',
EXPORT_DEFAULT_AVATARS: 'exportDefaultAvatars',
EXPORT_DEFAULT_DATE_RANGE: 'exportDefaultDateRange',
+ EXPORT_DEFAULT_FILE_NAMING_MODE: 'exportDefaultFileNamingMode',
EXPORT_DEFAULT_MEDIA: 'exportDefaultMedia',
EXPORT_DEFAULT_VOICE_AS_TEXT: 'exportDefaultVoiceAsText',
EXPORT_DEFAULT_EXCEL_COMPACT_COLUMNS: 'exportDefaultExcelCompactColumns',
@@ -114,6 +115,8 @@ export interface ExportDefaultMediaConfig {
files: boolean
}
+export type ExportFileNamingMode = 'classic' | 'date-range'
+
export type WindowCloseBehavior = 'ask' | 'tray' | 'quit'
export type QuoteLayout = 'quote-top' | 'quote-bottom'
export type UpdateChannel = 'stable' | 'preview' | 'dev'
@@ -434,6 +437,18 @@ export async function setExportDefaultDateRange(range: ExportDefaultDateRangeCon
await config.set(CONFIG_KEYS.EXPORT_DEFAULT_DATE_RANGE, range)
}
+// 获取导出默认文件命名方式
+export async function getExportDefaultFileNamingMode(): Promise {
+ const value = await config.get(CONFIG_KEYS.EXPORT_DEFAULT_FILE_NAMING_MODE)
+ if (value === 'classic' || value === 'date-range') return value
+ return null
+}
+
+// 设置导出默认文件命名方式
+export async function setExportDefaultFileNamingMode(mode: ExportFileNamingMode): Promise {
+ await config.set(CONFIG_KEYS.EXPORT_DEFAULT_FILE_NAMING_MODE, mode)
+}
+
// 获取导出默认媒体设置
export async function getExportDefaultMedia(): Promise {
const value = await config.get(CONFIG_KEYS.EXPORT_DEFAULT_MEDIA)
diff --git a/src/types/electron.d.ts b/src/types/electron.d.ts
index 83f8fbf..54b4a59 100644
--- a/src/types/electron.d.ts
+++ b/src/types/electron.d.ts
@@ -1005,6 +1005,7 @@ export interface ExportOptions {
exportVoiceAsText?: boolean
excelCompactColumns?: boolean
txtColumns?: string[]
+ fileNamingMode?: 'classic' | 'date-range'
sessionLayout?: 'shared' | 'per-session'
sessionNameWithTypePrefix?: boolean
displayNamePreference?: 'group-nickname' | 'remark' | 'nickname'
+
+ 
+
+
+ 
+
+
+ 
+
+
+ 
+
+
+ 
+
+
+ 
+ 
+ 
+