jimmy/weflow-new
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/hicccc77/WeFlow into dev

Browse Source
This commit is contained in:
cc committed 2026-07-02 14:58:57 +08:00
2 parents 7804985ab8 64b7d9c35e
commit cabedf034f
6 files changed
+67 -65
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

package-lock.json
Generated
+48 -55
View File
@@ -23,12 +23,12 @@
"koffi": "^2.9.0",
"lucide-react": "^1.8.0",
"react": "^19.2.3",
"react-dom": "^19.2.3",
"react-dom": "^19.2.7",
"react-markdown": "^10.1.0",
"react-router-dom": "^7.18.0",
"react-virtuoso": "^4.18.5",
"react-virtuoso": "^4.18.10",
"remark-gfm": "^4.0.1",
"sherpa-onnx-node": "^1.10.38",
"sherpa-onnx-node": "^1.13.3",
"silk-wasm": "^3.7.1",
"wechat-emojis": "^1.0.2",
"zustand": "^5.0.2"
@@ -37,7 +37,7 @@
"@electron/rebuild": "^4.0.2",
"@types/react": "^19.1.0",
"@types/react-dom": "^19.1.0",
"@vitejs/plugin-react": "^6.0.1",
"@vitejs/plugin-react": "^6.0.3",
"electron": "^41.1.1",
"electron-builder": "^26.8.1",
"esbuild": "^0.28.1",
@@ -2389,9 +2389,9 @@
}
},
"node_modules/@rolldown/pluginutils": {
"version": "1.0.0-rc.7",
"resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.7.tgz",
"integrity": "sha512-qujRfC8sFVInYSPPMLQByRh7zhwkGFS4+tyMQ83srV1qrxL4g8E2tyxVVyxd0+8QeBM1mIk9KbWxkegRr76XzA==",
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz",
"integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
"dev": true,
"license": "MIT"
},
@@ -2611,13 +2611,13 @@
"license": "ISC"
},
"node_modules/@vitejs/plugin-react": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-6.0.1.tgz",
"integrity": "sha512-l9X/E3cDb+xY3SWzlG1MOGt2usfEHGMNIaegaUGFsLkb3RCn/k8/TOXBcab+OndDI4TBtktT8/9BwwW8Vi9KUQ==",
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-6.0.3.tgz",
"integrity": "sha512-vmFvco5/QuC2f9Oj+wTk0+9XeDFkHxSamwZKYc7MxYwKICfvUvlMhqKI0VuICPltGqh1neqBKDvO4kes1ya8vg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@rolldown/pluginutils": "1.0.0-rc.7"
"@rolldown/pluginutils": "^1.0.1"
},
"engines": {
"node": "^20.19.0 || >=22.12.0"
@@ -8122,24 +8122,24 @@
}
},
"node_modules/react": {
"version": "19.2.4",
"resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
"integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
"version": "19.2.7",
"resolved": "https://registry.npmjs.org/react/-/react-19.2.7.tgz",
"integrity": "sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==",
"license": "MIT",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/react-dom": {
"version": "19.2.4",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
"integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
"version": "19.2.7",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.7.tgz",
"integrity": "sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==",
"license": "MIT",
"dependencies": {
"scheduler": "^0.27.0"
},
"peerDependencies": {
"react": "^19.2.4"
"react": "^19.2.7"
}
},
"node_modules/react-markdown": {
@@ -8208,9 +8208,9 @@
}
},
"node_modules/react-virtuoso": {
"version": "4.18.5",
"resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.18.5.tgz",
"integrity": "sha512-QDyNjyNEuurZG67SOmzYyxEkQYSyGmAMixOI6M15L/Q4CF39EgG+88y6DgZRo0q7rmy0HPx3Fj90I8/tPdnRCQ==",
"version": "4.18.10",
"resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.18.10.tgz",
"integrity": "sha512-P6GIZ7kWAPOYB2H16yRQNgy+VF9pJOuTFw1EUc1EAtCj5WxVSAF1Sql3x3fbLwaLeBFsiPnu+3U9o6sIOyTdFw==",
"license": "MIT",
"peerDependencies": {
"react": ">=16 || >=17 || >= 18 || >= 19",
@@ -8492,13 +8492,6 @@
"@rolldown/binding-win32-x64-msvc": "1.1.3"
}
},
"node_modules/rolldown/node_modules/@rolldown/pluginutils": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz",
"integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
"dev": true,
"license": "MIT"
},
"node_modules/safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -8716,9 +8709,9 @@
}
},
"node_modules/sherpa-onnx-darwin-arm64": {
"version": "1.12.35",
"resolved": "https://registry.npmjs.org/sherpa-onnx-darwin-arm64/-/sherpa-onnx-darwin-arm64-1.12.35.tgz",
"integrity": "sha512-WGIABo3ruBXE/7FhAdaVNuM+ZKx0B7jkA+jT22k5TxUcw58nWzgkY6k+CPdM14lfaaXR+jPWdDrM4gXl/bP4RQ==",
"version": "1.13.3",
"resolved": "https://registry.npmjs.org/sherpa-onnx-darwin-arm64/-/sherpa-onnx-darwin-arm64-1.13.3.tgz",
"integrity": "sha512-9x86Cbf+BDFONdtCPM3cnjvtAW0ER8tMaHK5pVfz+SHPt8GeuwRXaiR/BzcByFBUyxCgmceO09/WMZOCi44P/g==",
"cpu": [
"arm64"
],
@@ -8729,9 +8722,9 @@
]
},
"node_modules/sherpa-onnx-darwin-x64": {
"version": "1.12.35",
"resolved": "https://registry.npmjs.org/sherpa-onnx-darwin-x64/-/sherpa-onnx-darwin-x64-1.12.35.tgz",
"integrity": "sha512-hzWQm4CJhGyf3N9Sd1Oobcdz49FauuSCmhrm5vRqydyNsANjs89wATHAuatPAtinpBkgEqacDPrGz+1A/BWpNA==",
"version": "1.13.3",
"resolved": "https://registry.npmjs.org/sherpa-onnx-darwin-x64/-/sherpa-onnx-darwin-x64-1.13.3.tgz",
"integrity": "sha512-TVQ35g7JIpDPB1lUDdcog+JtI0cI45ZzOnvHXm0DtWs/dgxnJXtWMY3uLRtBbLnysV9j5ljffwZ1IX9VDHsCzQ==",
"cpu": [
"x64"
],
@@ -8742,9 +8735,9 @@
]
},
"node_modules/sherpa-onnx-linux-arm64": {
"version": "1.12.35",
"resolved": "https://registry.npmjs.org/sherpa-onnx-linux-arm64/-/sherpa-onnx-linux-arm64-1.12.35.tgz",
"integrity": "sha512-9glJ+dRv/rFWz/61tiKfaR9Gj+8B6sXi7NBgwBAnO/+ygu/WAjBfQRz2+S0YIy1dxqu7ng246TBNnx1M2XaNXA==",
"version": "1.13.3",
"resolved": "https://registry.npmjs.org/sherpa-onnx-linux-arm64/-/sherpa-onnx-linux-arm64-1.13.3.tgz",
"integrity": "sha512-uDtZkkoP6QQ/3DHOscCpEZ2WpaiHUQsDpbyYaHURrJ7DbsjqGnS6G8l+R589Ro5Bf282QElzBy3okwxXbt3Kxw==",
"cpu": [
"arm64"
],
@@ -8755,9 +8748,9 @@
]
},
"node_modules/sherpa-onnx-linux-x64": {
"version": "1.12.35",
"resolved": "https://registry.npmjs.org/sherpa-onnx-linux-x64/-/sherpa-onnx-linux-x64-1.12.35.tgz",
"integrity": "sha512-h+v4Yed8T+k1qLlKX2LTGoXP/11ycz7jbqC2f80kDWgz9J8m46mOBa/H20wVkLyQPy1vG1O5iH5Fe5Wh4QlLhw==",
"version": "1.13.3",
"resolved": "https://registry.npmjs.org/sherpa-onnx-linux-x64/-/sherpa-onnx-linux-x64-1.13.3.tgz",
"integrity": "sha512-OFVK0GYwKwKNsjxbPmfcLQm/dfA0IwAoiIQJ96s+eFYcDqhlapcY06ocdb7SNluGBcM7xgU5jEW2QXBkMIOEvQ==",
"cpu": [
"x64"
],
@@ -8768,23 +8761,23 @@
]
},
"node_modules/sherpa-onnx-node": {
"version": "1.12.35",
"resolved": "https://registry.npmjs.org/sherpa-onnx-node/-/sherpa-onnx-node-1.12.35.tgz",
"integrity": "sha512-RHCgV+9fos/ZxP0MsIL7JPU9K3YHnIDmwtX674ChQZY6DLVaIQaju+J3hDqzRu1R3agnDg9WDf01zsT46NC7SQ==",
"version": "1.13.3",
"resolved": "https://registry.npmjs.org/sherpa-onnx-node/-/sherpa-onnx-node-1.13.3.tgz",
"integrity": "sha512-3XEiRvfZ73QoKDZqweAkAOb+OA2LPMKcLcRY6zngjhwZ1ymV6xagdahepYzeDRIzVq0nRjhUe8IaRdlRMYoamw==",
"license": "Apache-2.0",
"optionalDependencies": {
"sherpa-onnx-darwin-arm64": "^1.12.35",
"sherpa-onnx-darwin-x64": "^1.12.35",
"sherpa-onnx-linux-arm64": "^1.12.35",
"sherpa-onnx-linux-x64": "^1.12.35",
"sherpa-onnx-win-ia32": "^1.12.35",
"sherpa-onnx-win-x64": "^1.12.35"
"sherpa-onnx-darwin-arm64": "^1.13.3",
"sherpa-onnx-darwin-x64": "^1.13.3",
"sherpa-onnx-linux-arm64": "^1.13.3",
"sherpa-onnx-linux-x64": "^1.13.3",
"sherpa-onnx-win-ia32": "^1.13.3",
"sherpa-onnx-win-x64": "^1.13.3"
}
},
"node_modules/sherpa-onnx-win-ia32": {
"version": "1.12.35",
"resolved": "https://registry.npmjs.org/sherpa-onnx-win-ia32/-/sherpa-onnx-win-ia32-1.12.35.tgz",
"integrity": "sha512-6H6BSdXXWtz92AuvOmr4w/QvCofxXbfbNKT7jCxdE7Nd4AvinLJxT02vbnL6T54vuXd9chu0QvQrDl1tuRphAA==",
"version": "1.13.3",
"resolved": "https://registry.npmjs.org/sherpa-onnx-win-ia32/-/sherpa-onnx-win-ia32-1.13.3.tgz",
"integrity": "sha512-VDZh1M7Ccx/bkP3WwBCFoJzwAwq+b5nR1KRkYRz5p1w5bfhzfa3ACBGr7vpUt5AGUge4qSLe0MSKXyKtSmy1uA==",
"cpu": [
"ia32"
],
@@ -8795,9 +8788,9 @@
]
},
"node_modules/sherpa-onnx-win-x64": {
"version": "1.12.35",
"resolved": "https://registry.npmjs.org/sherpa-onnx-win-x64/-/sherpa-onnx-win-x64-1.12.35.tgz",
"integrity": "sha512-+GLrxwaEvpJAO0KZgKulfd4qUR089MD+TjE5jVSugMTq4Eh/R/TpPPqYQGibRZVPHW7Se1ABfHGapZQoFMHH5Q==",
"version": "1.13.3",
"resolved": "https://registry.npmjs.org/sherpa-onnx-win-x64/-/sherpa-onnx-win-x64-1.13.3.tgz",
"integrity": "sha512-ZQzcSmFvZK4jzmtWckqxocDUuEjYnBV2MHrDD21HPTeUMfGdE9yfvuSPpesIVfdzKbQzIQY42RAcfZEGWu0FbQ==",
"cpu": [
"x64"
],
package.json
+5 -5
View File
@@ -37,12 +37,12 @@
"koffi": "^2.9.0",
"lucide-react": "^1.8.0",
"react": "^19.2.3",
"react-dom": "^19.2.3",
"react-dom": "^19.2.7",
"react-markdown": "^10.1.0",
"react-router-dom": "^7.18.0",
"react-virtuoso": "^4.18.5",
"react-virtuoso": "^4.18.10",
"remark-gfm": "^4.0.1",
"sherpa-onnx-node": "^1.10.38",
"sherpa-onnx-node": "^1.13.3",
"silk-wasm": "^3.7.1",
"wechat-emojis": "^1.0.2",
"zustand": "^5.0.2"
@@ -51,8 +51,8 @@
"@electron/rebuild": "^4.0.2",
"@types/react": "^19.1.0",
"@types/react-dom": "^19.1.0",
"@vitejs/plugin-react": "^6.0.1",
"electron": "^42.5.1",
"@vitejs/plugin-react": "^6.0.3",
"electron": "^41.1.1",
"electron-builder": "^26.8.1",
"esbuild": "^0.28.1",
"sass": "^1.98.0",
src/pages/Export/ExportPage.tsx
+3 -2
View File
@@ -26,7 +26,7 @@ import { useAutomationRunner, useAutomationStore } from './hooks/useAutomation'
import { AutomationModal } from './components/Automation/AutomationModal'
import { AutomationTaskForm } from './components/Automation/AutomationTaskForm'
import type { SessionRow } from './types'
import type { SessionRow, TextExportFormat } from './types'
import { getSelectionScopeFromRows, resolveScopeDisplayNames } from './utils/session'
import {
emitSingleExportDialogStatus,
@@ -144,8 +144,9 @@ function ExportPage() {
const handleExportDefaultsChanged = useCallback((patch: ExportDefaultsSettingsPatch) => {
updateOptions({
...(patch.format ? { defaultFormat: patch.format as any } : {}),
...(patch.format ? { format: patch.format as TextExportFormat } : {}),
...(patch.avatars !== undefined ? { exportAvatars: patch.avatars } : {}),
...(patch.fileNamingMode !== undefined ? { fileNamingMode: patch.fileNamingMode } : {}),
})
}, [updateOptions])
src/pages/Export/constants.ts
+2 -1
View File
@@ -175,7 +175,8 @@ export const createDefaultExportOptions = (): import('./types').ExportOptions =>
excelCompactColumns: true,
txtColumns: defaultTxtColumns,
displayNamePreference: 'remark',
exportConcurrency: 2
exportConcurrency: 2,
fileNamingMode: 'classic'
})
// ─── Empty progress factory ──────────────────────────────────
src/pages/Export/hooks/useExportConfig.ts
+8 -2
View File
@@ -62,7 +62,8 @@ export function useExportConfig(): ExportConfigResult {
pathStyle,
excelCompact,
txtCols,
concurrency
concurrency,
fileNamingMode
] = await Promise.all([
configService.getExportPath(),
configService.getExportWriteLayout(),
@@ -74,7 +75,8 @@ export function useExportConfig(): ExportConfigResult {
configService.getExportDefaultPathStyle(),
configService.getExportDefaultExcelCompactColumns(),
configService.getExportDefaultTxtColumns(),
configService.getExportDefaultConcurrency()
configService.getExportDefaultConcurrency(),
configService.getExportDefaultFileNamingMode()
])
if (!isMounted) return
@@ -118,6 +120,7 @@ export function useExportConfig(): ExportConfigResult {
if (typeof excelCompact === 'boolean') newOptions.excelCompactColumns = excelCompact
if (Array.isArray(txtCols)) newOptions.txtColumns = txtCols
if (typeof concurrency === 'number' && concurrency > 0) newOptions.exportConcurrency = concurrency
if (fileNamingMode === 'classic' || fileNamingMode === 'date-range') newOptions.fileNamingMode = fileNamingMode
// Date range
setRawDateRangeConfigState(dateRange)
@@ -192,6 +195,9 @@ export function useExportConfig(): ExportConfigResult {
if (patch.exportConcurrency !== undefined) {
void configService.setExportDefaultConcurrency(patch.exportConcurrency)
}
if (patch.fileNamingMode !== undefined) {
void configService.setExportDefaultFileNamingMode(patch.fileNamingMode)
}
// Auto-derive exportMedia
next.exportMedia = (
src/pages/Export/types.ts
+1
View File
@@ -75,6 +75,7 @@ export interface ExportOptions {
txtColumns: string[]
displayNamePreference: DisplayNamePreference
exportConcurrency: number
fileNamingMode: 'classic' | 'date-range'
}
// ─── Session ─────────────────────────────────────────────────