yangchunjin/SoonMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化bug

Browse Source
This commit is contained in:
24kycj
2026-09-09 10:36:42 +08:00
parent 19858f9a62
commit ac566846c9
36 changed files with 1325 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/index.ts
+8 -16
View File
@@ -1,4 +1,4 @@
import { app, BrowserWindow, dialog, globalShortcut, screen } from 'electron'
import { app, BrowserWindow, dialog, globalShortcut } from 'electron'
import { join } from 'path'
app.commandLine.appendSwitch('disable-gpu-shader-disk-cache')
@@ -14,10 +14,12 @@ if (!gotSingleInstanceLock) {
app.quit()
}
import { ensureConsoleUtf8 } from './utils/ensure-console-utf8'
import { suppressKnownDllStderr } from './utils/suppress-dll-stderr'
import { loadAppFileConfig, applyFileConfigToStore } from './services/app-config'
import { migrateTraceConfig, setTraceWebContents } from './utils/trace-bridge'
ensureConsoleUtf8()
suppressKnownDllStderr()
process.on('uncaughtException', (err) => {
@@ -41,24 +43,12 @@ function focusMainWindow(): void {
mainWindow.focus()
}
function getDefaultWindowSize(): { width: number; height: number } {
const { width: sw, height: sh } = screen.getPrimaryDisplay().workAreaSize
let w = Math.max(1280, Math.min(Math.floor(sw * 0.85), 1600))
let h = contentHeightForWidth(w)
const maxH = Math.floor(sh * 0.85)
if (h > maxH) {
h = Math.max(contentHeightForWidth(MIN_CONTENT_WIDTH), maxH)
w = Math.round((h * DESIGN_WIDTH) / DESIGN_HEIGHT)
}
return { width: w, height: h }
}
function createWindow(): void {
const { width, height } = getDefaultWindowSize()
// 目标设备屏幕为 720x360，窗口默认 1:1 显示设计稿大小
mainWindow = new BrowserWindow({
useContentSize: true,
width,
height,
width: DESIGN_WIDTH,
height: DESIGN_HEIGHT,
minWidth: MIN_CONTENT_WIDTH,
minHeight: contentHeightForWidth(MIN_CONTENT_WIDTH),
show: false,
@@ -94,6 +84,8 @@ function createWindow(): void {
mainWindow.on('resize', () => {
if (!mainWindow) return
// 最大化时让窗口填满屏幕，不强制 2:1 内容比例
if (mainWindow.isMaximized()) return
const [cw, ch] = mainWindow.getContentSize()
const wantH = contentHeightForWidth(cw)
if (Math.abs(ch - wantH) > 2) {
app/src/main/ipc/register-handlers.ts
+29 -1
View File
@@ -107,7 +107,9 @@ export function registerIpcHandlers(): void {
ribbonType: cached?.ribbonType ?? '—',
ribbonAmount: cached?.ribbonAmount ?? '—',
statusText: parsed.statusText,
serialNo: cached?.serialNo ?? '—'
serialNo: cached?.serialNo ?? '—',
printerName: cached?.printerName ?? '—',
isSingleSide: cached?.isSingleSide ?? false
}
configStore.set('lastPrinterStatus', snapshot)
return ok({ statusText: parsed.statusText, statusCode: code })
@@ -152,6 +154,32 @@ export function registerIpcHandlers(): void {
}
})
// 读卡：移动卡片到读取区（SAPI_PrinterMovetousbreader）
tracedHandle('dll:printer-read-card', async () => {
try {
assertReady()
const dll = await loadDllModule()
if (!dll.isUsbReaderApiAvailable()) return fail(CS_FAIL, 'USB_READER_API_UNAVAILABLE')
const code = dll.dllPrinterMoveToUsbReader()
return code === CS_OK ? ok() : fail(code, '读卡失败')
} catch (err) {
return fail(CS_FAIL, String(err))
}
})
// 退卡：移动卡片到出卡区（SAPI_PrinterMovetohopper）
tracedHandle('dll:printer-eject-card', async () => {
try {
assertReady()
const dll = await loadDllModule()
if (!dll.isHopperApiAvailable()) return fail(CS_FAIL, 'HOPPER_API_UNAVAILABLE')
const code = dll.dllPrinterMoveToHopper()
return code === CS_OK ? ok() : fail(code, '退卡失败')
} catch (err) {
return fail(CS_FAIL, String(err))
}
})
tracedHandle('dll:printer-error-str', async (_e, errorNo?: number) => {
if (!mainAppState.initialized) return ok({ text: '' })
try {
app/src/main/services/open-design-app.ts
+3 -1
View File
@@ -23,7 +23,9 @@ export async function openDesignApp(
const target = path.resolve(exePath.trim())
const err = await shell.openPath(target)
if (err) {
return { ok: false, message: err }
// 用户在 UAC/系统弹窗中点击"否"或被系统拒绝时，shell.openPath 返回通用错误字符串
// 不把原始 "Failed to Open Path" 直接抛给用户，给出可读说明
return { ok: false, message: '打开设计软件失败，可能已被取消或需要管理员权限' }
}
return { ok: true }
}
app/src/main/services/work-dll.service.ts
+41 -1
View File
@@ -24,6 +24,8 @@ let SAPI_Init: any = null
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let SAPI_GetPrinterInfo: any = null
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let SAPI_FreePrinterInfo: any = null
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let SAPI_GetPrinterErrorStr: any = null
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let SAPI_RestJobEx: any = null
@@ -77,6 +79,20 @@ function traceCall<T>(name: string, args: Record<string, unknown> | undefined, f
}
}
function freePrinterInfoPtr(ptr: number): void {
if (!ptr) return
// DLL 堆分配的缓冲区必须用 DLL 导出的释放函数；koffi.free 会触发 STATUS_HEAP_CORRUPTION
if (SAPI_FreePrinterInfo) {
try {
SAPI_FreePrinterInfo(ptr)
} catch (e) {
log.warn('SAPI_FreePrinterInfo failed', e)
}
return
}
log.warn('SAPI_FreePrinterInfo unavailable; printer info buffer not freed')
}
function readPrinterJsonFromOutPtr(len: number, outPtr: Buffer): { code: number; json?: Record<string, unknown> } {
if (len <= 0) return { code: len }
const ptr = koffi.decode(outPtr, 0, 'void *') as number
@@ -90,7 +106,7 @@ function readPrinterJsonFromOutPtr(len: number, outPtr: Buffer): { code: number;
return { code: len }
}
} finally {
koffi.free(ptr)
freePrinterInfoPtr(ptr)
}
}
@@ -110,6 +126,13 @@ function loadLibrary(): void {
SAPI_GetUsbCopyState = lib.func('int __stdcall SAPI_GetUsbCopyState(_Out_ int *, _Out_ int *)')
SAPI_PrinterResetprinter = lib.func('int __stdcall SAPI_PrinterResetprinter()')
try {
SAPI_FreePrinterInfo = lib.func('void __stdcall SAPI_FreePrinterInfo(void *)')
} catch {
SAPI_FreePrinterInfo = null
log.warn('SAPI_FreePrinterInfo not in workDll')
}
try {
SAPI_UploadFile = lib.func('int __stdcall SAPI_UploadFile(str, str, str)')
hasUploadApi = true
@@ -151,6 +174,15 @@ function loadLibrary(): void {
emitTrace('[dll] SAPI_PrinterMovetousbreader not in workDll (optional)')
}
try {
SAPI_PrinterMovetohopper = lib.func('int __stdcall SAPI_PrinterMovetohopper()')
hasHopperApi = true
} catch {
SAPI_PrinterMovetohopper = null
hasHopperApi = false
emitTrace('[dll] SAPI_PrinterMovetohopper not in workDll (optional)')
}
try {
SAPI_GetPrinterCardPosition = lib.func('int __stdcall SAPI_GetPrinterCardPosition(_Out_ int *)')
hasCardPositionApi = true
@@ -354,6 +386,14 @@ export function dllPrinterMoveToUsbReader(): number {
})
}
export function dllPrinterMoveToHopper(): number {
return traceCall('SAPI_PrinterMovetohopper', undefined, () => {
loadLibrary()
if (!SAPI_PrinterMovetohopper) throw new Error('HOPPER_API_UNAVAILABLE')
return SAPI_PrinterMovetohopper() as number
})
}
export function dllPrinterReject(): number {
return traceCall('SAPI_PrinterMovetoreject', undefined, () => {
loadLibrary()
app/src/main/utils/ensure-console-utf8.ts
+21
View File
@@ -0,0 +1,21 @@
import koffi from 'koffi'
/** Windows 控制台默认多为 GBK，DLL 日志为 UTF-8，会导致中文乱码。 */
export function ensureConsoleUtf8(): void {
if (process.platform !== 'win32') return
try {
const kernel32 = koffi.load('kernel32.dll')
const SetConsoleOutputCP = kernel32.func('bool __stdcall SetConsoleOutputCP(uint32)')
const SetConsoleCP = kernel32.func('bool __stdcall SetConsoleCP(uint32)')
SetConsoleOutputCP(65001)
SetConsoleCP(65001)
} catch {
/* ignore: no console or API unavailable */
}
try {
if (process.stdout.setDefaultEncoding) process.stdout.setDefaultEncoding('utf8')
if (process.stderr.setDefaultEncoding) process.stderr.setDefaultEncoding('utf8')
} catch {
/* ignore */
}
}
app/src/renderer/src/api/cardsoon.ts
+10
View File
@@ -34,6 +34,16 @@ export async function dllPrinterReject(): Promise<IpcResult> {
return api().invoke('dll:printer-reject') as Promise<IpcResult>
}
/** 读卡：移动卡片到读取区（SAPI_PrinterMovetousbreader） */
export async function dllPrinterReadCard(): Promise<IpcResult> {
return api().invoke('dll:printer-read-card') as Promise<IpcResult>
}
/** 退卡：移动卡片到出卡区（SAPI_PrinterMovetohopper） */
export async function dllPrinterEjectCard(): Promise<IpcResult> {
return api().invoke('dll:printer-eject-card') as Promise<IpcResult>
}
export async function dllRejectAvailable(): Promise<IpcResult<{ available: boolean }>> {
return api().invoke('dll:reject-available') as Promise<IpcResult<{ available: boolean }>>
}
app/src/renderer/src/assets/icons/index.ts
+6 -2
View File
@@ -13,7 +13,9 @@ export const ICON_NAMES = [
'plus',
'exchange',
'stop',
'warning'
'warning',
'id-card',
'eject'
] as const
export type IconName = (typeof ICON_NAMES)[number]
@@ -34,5 +36,7 @@ export const ICON_FA_CLASS: Record<IconName, string> = {
plus: 'fas fa-plus',
exchange: 'fas fa-exchange-alt',
stop: 'fas fa-stop',
warning: 'fas fa-exclamation-triangle'
warning: 'fas fa-exclamation-triangle',
'id-card': 'fas fa-id-card',
eject: 'fas fa-eject'
}
app/src/renderer/src/components/AppFooter.vue
+11 -3
View File
@@ -1,7 +1,15 @@
<template>
<footer class="c-footer">
<div>版本V1.0</div>
<div>www.cardsoon.com</div>
<div>版权所有 © 2026 卡树科技</div>
<div class="c-footer__version">{{ t('footer.version', { version: appVersion }) }}</div>
<div>{{ t('footer.website') }}</div>
<div>{{ t('footer.copyright') }}</div>
</footer>
</template>
<script setup lang="ts">
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
// 构建时由 electron.vite.config.ts 从 package.json version 注入
const appVersion = __APP_VERSION__
</script>
app/src/renderer/src/components/AppHeader.vue
+65 -9
View File
@@ -5,16 +5,24 @@
<div class="c-header__center">
<div v-if="mode" class="c-mode-badge c-mode-badge--home">{{ mode }}</div>
<div class="c-status-capsule">
<span>色带: <b>{{ status.ribbonType }}</b></span>
<span>余量: <b>{{ status.ribbonAmount }}</b></span>
<span
>状态: <b :class="statusTone">{{ status.statusText }}</b></span
>
<span>序列号: <b>{{ status.serialNo }}</b></span>
<span>{{ t('header.ribbon') }}: <b>{{ status.ribbonType }}</b></span>
<span>{{ t('header.ribbonAmount') }}: <b>{{ status.ribbonAmount }}</b></span>
<span>{{ t('header.status') }}: <b :class="statusTone">{{ displayStatusText }}</b></span>
<span>{{ t('header.serialNo') }}: <b>{{ status.serialNo }}</b></span>
</div>
</div>
<div class="c-header__actions-slot">
<div class="c-header-actions">
<select
class="c-lang-select"
:value="currentLocale"
@change="onLocaleChange"
:title="t('common.select')"
>
<option v-for="opt in LOCALE_OPTIONS" :key="opt.value" :value="opt.value">
{{ opt.label }}
</option>
</select>
<slot />
</div>
</div>
@@ -24,16 +32,64 @@
<script setup lang="ts">
import { computed } from 'vue'
import { useI18n } from 'vue-i18n'
import { useConfigStore } from '@/stores/config'
import { LOCALE_OPTIONS, persistLocale, type AppLocale } from '@/i18n'
defineProps<{ mode?: string }>()
const configStore = useConfigStore()
const status = computed(() => configStore.printer)
const { t, locale } = useI18n()
const currentLocale = computed(() => locale.value)
function onLocaleChange(e: Event): void {
const val = (e.target as HTMLSelectElement).value as AppLocale
locale.value = val
persistLocale(val)
}
// 打印机状态文本来自主进程（中文），在前端按已知值做多语言映射
const PRINTER_STATUS_MAP: Record<string, string> = {
空闲: 'printerStatus.idle',
忙碌: 'printerStatus.busy',
正在打印: 'printerStatus.printing',
未连接打印机: 'printerStatus.notConnected',
未初始化: 'printerStatus.notInitialized',
初始化失败: 'printerStatus.initFailed',
就绪: 'printerStatus.ready'
}
const displayStatusText = computed(() => {
const raw = status.value.statusText
const key = PRINTER_STATUS_MAP[raw]
return key ? t(key) : raw
})
const statusTone = computed(() => {
const t = status.value.statusText
if (t.includes('未初始化') || t.includes('未连接') || t.includes('失败')) return 'c-status-warn'
return ''
const toneMap: Record<string, string> = {
[t('printerStatus.notInitialized')]: 'c-status-warn',
[t('printerStatus.notConnected')]: 'c-status-warn',
[t('printerStatus.initFailed')]: 'c-status-warn'
}
return toneMap[displayStatusText.value] || ''
})
</script>
<style scoped>
.c-lang-select {
height: 28px;
font-size: 12px;
border: 1px solid #dcdfe6;
border-radius: 4px;
background: #fff;
color: #303133;
cursor: pointer;
padding: 0 6px;
outline: none;
}
.c-lang-select:hover {
border-color: #409eff;
}
</style>
app/src/renderer/src/components/NetworkPathDialog.vue
+19 -17
View File
@@ -4,69 +4,69 @@
<div v-if="visible" class="npd-mask" @mousedown.self="onCancel">
<div class="npd-dialog" role="dialog" aria-modal="true" aria-labelledby="npd-title">
<div class="npd-header">
<span id="npd-title" class="npd-title">添加网络位置</span>
<button type="button" class="npd-close" aria-label="关闭" @click="onCancel">×</button>
<span id="npd-title" class="npd-title">{{ t('networkDialog.title') }}</span>
<button type="button" class="npd-close" :aria-label="t('common.close')" @click="onCancel">×</button>
</div>
<div class="npd-body">
<p class="npd-hint">凭据用于访问已添加的映射盘或网络共享路径,请确认主机可访问且账号有效。</p>
<p class="npd-hint">{{ t('networkDialog.hint') }}</p>
<label class="npd-field">
<span class="npd-label">主机(IP 或主机名)<span class="npd-req">*</span></span>
<span class="npd-label">{{ t('networkDialog.host') }}<span class="npd-req">*</span></span>
<input
v-model.trim="host"
type="text"
class="c-input"
placeholder="例如 192.168.1.100 或 nas-server"
:placeholder="t('networkDialog.hostPlaceholder')"
:class="{ 'is-invalid': touched && !hostValid }"
@blur="touched = true"
/>
</label>
<label class="npd-field">
<span class="npd-label">共享名(可选)</span>
<span class="npd-label">{{ t('networkDialog.share') }}</span>
<input
v-model.trim="share"
type="text"
class="c-input"
placeholder="例如 share,留空表示只挂载到根"
:placeholder="t('networkDialog.sharePlaceholder')"
/>
</label>
<label class="npd-field">
<span class="npd-label">用户名<span class="npd-req">*</span></span>
<span class="npd-label">{{ t('networkDialog.userName') }}<span class="npd-req">*</span></span>
<input
v-model.trim="userName"
type="text"
class="c-input"
placeholder="例如 admin"
:placeholder="t('networkDialog.userNamePlaceholder')"
:class="{ 'is-invalid': touched && !userNameValid }"
@blur="touched = true"
/>
</label>
<label class="npd-field">
<span class="npd-label">密码<span class="npd-req">*</span></span>
<span class="npd-label">{{ t('networkDialog.password') }}<span class="npd-req">*</span></span>
<input
v-model="password"
type="password"
class="c-input"
placeholder="请输入密码"
:placeholder="t('networkDialog.errPassword')"
:class="{ 'is-invalid': touched && !passwordValid }"
@blur="touched = true"
/>
</label>
<div v-if="previewUrl" class="npd-preview">
<span class="npd-preview-label">目标 UNC</span>
<span class="npd-preview-label">{{ t('networkDialog.targetUNC') }}</span>
<code class="npd-preview-path">{{ previewUrl }}</code>
</div>
<p v-if="touched && errorText" class="npd-error">{{ errorText }}</p>
</div>
<div class="npd-footer">
<button type="button" class="c-button-cs" @click="onCancel">取消</button>
<button type="button" class="c-button-cs" @click="onCancel">{{ t('common.cancel') }}</button>
<button type="button" class="c-button-cs npd-primary" :disabled="!canConfirm" @click="onConfirm">
确定
{{ t('common.confirm') }}
</button>
</div>
</div>
@@ -77,6 +77,7 @@
<script setup lang="ts">
import { computed, ref, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import { buildNetworkUrl } from '@shared/network-host'
import { useNetworkAuthStore } from '@/stores/networkAuth'
@@ -92,6 +93,7 @@ const emit = defineEmits<{
}>()
const netStore = useNetworkAuthStore()
const { t } = useI18n()
const host = ref('')
const share = ref('')
@@ -109,9 +111,9 @@ const canConfirm = computed(() => hostValid.value && userNameValid.value && pass
const previewUrl = computed(() => (hostValid.value ? buildNetworkUrl(host.value, share.value) : ''))
const errorText = computed(() => {
if (!hostValid.value) return '主机名/IP 不合法'
if (!userNameValid.value) return '请输入用户名'
if (!passwordValid.value) return '请输入密码'
if (!hostValid.value) return t('networkDialog.errHostInvalid')
if (!userNameValid.value) return t('networkDialog.errUserName')
if (!passwordValid.value) return t('networkDialog.errPassword')
return ''
})
app/src/renderer/src/components/WorkflowSteps.vue
+15 -12
View File
@@ -12,6 +12,7 @@
<script setup lang="ts">
import { computed } from 'vue'
import { useI18n } from 'vue-i18n'
const props = withDefaults(
defineProps<{
@@ -23,20 +24,22 @@ const props = withDefaults(
{ activeStep: 2, mode: 'running', variant: 'distribute' }
)
const distributeSteps = [
{ key: 'prep', label: '任务准备' },
{ key: 'copy', label: '拷贝数据' },
{ key: 'print', label: '打印卡片' },
{ key: 'done', label: '完成' }
] as const
const { t } = useI18n()
const collectSteps = [
{ key: 'prep', label: '任务准备' },
{ key: 'copy', label: '拷贝数据' },
{ key: 'done', label: '完成' }
] as const
const distributeSteps = computed(() => [
{ key: 'prep', label: t('workflow.taskPrep') },
{ key: 'copy', label: t('workflow.copyData') },
{ key: 'print', label: t('workflow.printCard') },
{ key: 'done', label: t('workflow.complete') }
])
const steps = computed(() => (props.variant === 'collect' ? collectSteps : distributeSteps))
const collectSteps = computed(() => [
{ key: 'prep', label: t('workflow.taskPrep') },
{ key: 'copy', label: t('workflow.copyData') },
{ key: 'done', label: t('workflow.complete') }
])
const steps = computed(() => (props.variant === 'collect' ? collectSteps.value : distributeSteps.value))
const failedStep = computed(() => props.failedStep ?? (props.mode === 'failed' ? 3 : -1))
app/src/renderer/src/composables/useAppBootstrap.ts
+10 -5
View File
@@ -1,10 +1,15 @@
import { onMounted } from 'vue'
import i18n from '@/i18n'
import { notify } from '@/composables/useNotify'
import { refreshPrinterAfterInit } from '@/composables/usePrinterStatus'
import { configGet, dllInit, dllRejectAvailable } from '@/api/cardsoon'
import { useAppStore } from '@/stores/app'
import { useConfigStore } from '@/stores/config'
function t(key: string): string {
return i18n.global.t(key)
}
let bootstrapped = false
function placeholderStatus(configStore: ReturnType<typeof useConfigStore>, text: string): void {
@@ -41,7 +46,7 @@ export function useAppBootstrap(): void {
const cfg = await hydrateFromConfig()
if (cfg.ok && cfg.data?.dllInitialized) {
appStore.setInitialized(true)
placeholderStatus(configStore, '就绪')
placeholderStatus(configStore, t('printerStatus.ready'))
await syncRejectApi()
window.setTimeout(() => void refreshPrinterAfterInit(), 1500)
return
@@ -51,16 +56,16 @@ export function useAppBootstrap(): void {
configStore.setSharedDir(sharedDir)
const init = await dllInit({ sharedDir })
if (!init.ok) {
appStore.setInitialized(false, init.message || 'Init 失败')
configStore.setPrinter({ ...configStore.printer, statusText: '初始化失败' })
notify.error(init.message || '初始化失败，请检查任务目录权限')
appStore.setInitialized(false, init.message || t('printerStatus.initFailed'))
configStore.setPrinter({ ...configStore.printer, statusText: t('printerStatus.initFailed') })
notify.error(init.message || t('notify.initFailedHint'))
return
}
appStore.setInitialized(true)
const initMeta = init.data as { warning?: string } | undefined
if (initMeta?.warning) notify.warning(initMeta.warning)
placeholderStatus(configStore, initMeta?.warning ? '未连接打印机' : '就绪')
placeholderStatus(configStore, initMeta?.warning ? t('printerStatus.notConnected') : t('printerStatus.ready'))
await syncRejectApi()
window.setTimeout(() => void refreshPrinterAfterInit(), 1500)
}
app/src/renderer/src/composables/useNotify.ts
+10 -3
View File
@@ -1,5 +1,10 @@
import i18n from '@/i18n'
import { useToastStore, type ToastType } from '@/stores/toast'
function t(key: string, named?: Record<string, unknown>): string {
return i18n.global.t(key, named ?? {})
}
function push(type: ToastType, message: string, durationMs = 4500): void {
useToastStore().push(type, message, durationMs)
}
@@ -11,9 +16,11 @@ export const notify = {
info: (message: string, durationMs?: number) => push('info', message, durationMs)
}
const INIT_HINT = '系统未就绪，请重启应用或检查打印机与任务目录'
/** 未初始化等业务拦截时的统一提示 */
export function notifyRequireInit(action?: string): void {
notify.warning(action ? `系统未就绪，无法${action}` : INIT_HINT)
if (action) {
notify.warning(t('notify.notReadyAction', { action }))
} else {
notify.warning(t('notify.notReady'))
}
}
app/src/renderer/src/composables/usePrinterStatus.ts
+3 -1
View File
@@ -26,7 +26,9 @@ export async function refreshPrinterInfo(): Promise<void> {
...store.printer,
ribbonType: parsed.ribbonType,
ribbonAmount: parsed.ribbonAmount,
serialNo: parsed.serialNo
serialNo: parsed.serialNo,
printerName: parsed.printerName,
isSingleSide: parsed.isSingleSide
})
} catch {
/* ignore */
app/src/renderer/src/constants/selectOptions.ts
+32 -20
View File
@@ -1,28 +1,40 @@
import type { ComposerTranslation } from 'vue-i18n'
export interface SelectOption {
label: string
value: string | number
}
export const COPY_TYPE_OPTIONS: SelectOption[] = [
{ label: '文件拷贝', value: 0 },
{ label: '镜像刻录', value: 1 }
]
type T = ComposerTranslation
export const FORMAT_TYPE_OPTIONS: SelectOption[] = [
{ label: '不格式化', value: 'none' },
{ label: 'Fat32', value: 'fat32' },
{ label: 'exFat', value: 'exfat' },
{ label: 'NTFS', value: 'ntfs' }
]
export function copyTypeOptions(t: T): SelectOption[] {
return [
{ label: t('copyType.fileCopy'), value: 0 },
{ label: t('copyType.imageBurn'), value: 1 }
]
}
export const PRIORITY_OPTIONS: SelectOption[] = [
{ label: '低', value: 'low' },
{ label: '中', value: 'mid' },
{ label: '高', value: 'high' }
]
export function formatTypeOptions(t: T): SelectOption[] {
return [
{ label: t('formatType.none'), value: 'none' },
{ label: t('formatType.fat32'), value: 'fat32' },
{ label: t('formatType.exfat'), value: 'exfat' },
{ label: t('formatType.ntfs'), value: 'ntfs' }
]
}
export const RIBBON_TYPE_OPTIONS: SelectOption[] = [
{ label: '任何', value: 'any' },
{ label: 'YMCKO', value: 'YMCKO' },
{ label: 'YMCK', value: 'YMCK' }
]
export function priorityOptions(t: T): SelectOption[] {
return [
{ label: t('common.low'), value: 'low' },
{ label: t('common.mid'), value: 'mid' },
{ label: t('common.high'), value: 'high' }
]
}
export function ribbonTypeOptions(t: T): SelectOption[] {
return [
{ label: t('common.any'), value: 'any' },
{ label: 'YMCKO', value: 'YMCKO' },
{ label: 'YMCK', value: 'YMCK' }
]
}
app/src/renderer/src/env.d.ts
Vendored
+2
View File
@@ -14,6 +14,8 @@ interface CardsoonApi {
}
declare global {
/** 构建时由 electron.vite.config.ts 从 package.json version 注入 */
const __APP_VERSION__: string
interface Window {
cardsoonApi: CardsoonApi
}
app/src/renderer/src/i18n/index.ts
+45
View File
@@ -0,0 +1,45 @@
import { createI18n } from 'vue-i18n'
import zhCN from './locales/zh-CN'
import enUS from './locales/en-US'
import zhTW from './locales/zh-TW'
export type AppLocale = 'zh-CN' | 'en-US' | 'zh-TW'
export const LOCALE_OPTIONS: { value: AppLocale; label: string }[] = [
{ value: 'zh-CN', label: '中文' },
{ value: 'en-US', label: 'English' },
{ value: 'zh-TW', label: '繁體中文' }
]
const STORAGE_KEY = 'app-locale'
function detectInitialLocale(): AppLocale {
try {
const saved = localStorage.getItem(STORAGE_KEY) as AppLocale | null
if (saved && LOCALE_OPTIONS.some((o) => o.value === saved)) return saved
} catch {
/* localStorage may be unavailable */
}
return 'zh-CN'
}
export function persistLocale(locale: AppLocale): void {
try {
localStorage.setItem(STORAGE_KEY, locale)
} catch {
/* ignore */
}
}
const i18n = createI18n({
legacy: false,
locale: detectInitialLocale(),
fallbackLocale: 'zh-CN',
messages: {
'zh-CN': zhCN,
'en-US': enUS,
'zh-TW': zhTW
}
})
export default i18n
app/src/renderer/src/i18n/locales/en-US.ts
+190
View File
@@ -0,0 +1,190 @@
export default {
common: {
cancel: 'Cancel',
confirm: 'OK',
close: 'Close',
addPath: 'Add Path',
clear: 'Clear',
submit: 'Submit',
home: 'Home',
stop: 'Stop',
back: 'Back',
reset: 'Reset',
select: 'Select',
resetPrinter: 'Reset Printer',
discardCard: 'Discard Card',
templateDesign: 'Template Design',
low: 'Low',
mid: 'Medium',
high: 'High',
any: 'Any'
},
header: {
modeHome: 'CardSoon Data Card Printer',
modeDistribute: 'Data Distribution Mode',
modeCollect: 'Data Collection Mode',
ribbon: 'Ribbon',
ribbonAmount: 'Remaining',
status: 'Status',
serialNo: 'Serial No.'
},
footer: {
version: 'Version v{version}',
website: 'www.cardsoon.com',
copyright: 'Copyright © 2026 CardSoon Technology'
},
home: {
toolsTitle: 'Tools',
tasksTitle: 'Tasks',
dataDistribute: 'Data Distribution',
dataDistributeDesc: 'Distribute data to print cards',
dataCollect: 'Data Collection',
dataCollectDesc: 'Collect data from cards'
},
distributeConfig: {
pathConfig: 'Path Configuration',
addNetworkLocation: 'Add Network Location',
pathHint: 'The system will copy all items under this directory, excluding the folder itself',
netCredConfigured: 'Network credentials configured: {hosts}',
volumeLabel: 'Volume Label',
copyType: 'Copy Type',
formatType: 'Format Type',
dongle: 'Dongle',
dongleHint: '(101 = unlimited)',
dongleAuthLabel: 'Auth Code',
donglePassword: 'Enter authorization code',
templatePreview: 'Label Preview',
addLabel: 'Add Label',
doubleSide: 'Double-sided',
singleSideHint: 'Single-side printer detected, please select a side (front or back)',
frontSide: 'Front',
backSide: 'Back',
imageFieldNotSelected: 'No image selected',
templateLoaded: 'Label template loaded',
templateNoPreview: 'Template opened, but no previewable content found',
cleared: 'Cleared, restored to initial state',
netCredSaved: 'Network credentials saved',
loadProgress: 'Loaded: {loaded} GB / {total} GB ({percent}%)',
calculating: 'Calculating…',
sizeUnknown: 'Size unknown',
pathInvalid: 'Invalid path',
pathReady: '{size} · Pending copy',
pathPattern: '{dir}\\*.*'
},
copyType: {
fileCopy: 'File Copy',
imageBurn: 'Image Burn'
},
formatType: {
none: 'No Format',
fat32: 'Fat32',
exfat: 'exFat',
ntfs: 'NTFS'
},
dataCollect: {
importPath: 'Data Import Path',
cardOutput: 'Card Output Direction',
forwardOutput: 'Forward Output',
backwardOutput: 'Backward Output',
noDirSelected: 'No directory selected'
},
running: {
taskFailed: 'Task Failed',
taskCompleted: 'Task Completed',
collectCompleted: 'Collection Completed',
dataCollecting: 'Collecting Data',
taskRunning: 'Task Running',
waitingCard: 'Waiting for Card',
failedSubCollect: 'Please check the reader and card, insert a backup card to retry',
failedSubDistribute: 'Please check device issues, insert a backup card to retry',
completedSubCollect: 'Click Back, or insert a backup card to continue',
completedSubDistribute: 'Click Back, or insert a backup card to start next',
collectingHint: 'Reading from card and writing to import directory',
waitCardHint: 'Please insert a data card, the task will run automatically',
runningHint: 'Task in progress, please wait',
progressCounter: 'Task completed {success} times, with {fail} failures.'
},
networkDialog: {
title: 'Add Network Location',
hint: 'Credentials are used to access mapped drives or network shares. Please confirm the host is accessible and the account is valid.',
host: 'Host (IP or Hostname)',
share: 'Share Name (optional)',
userName: 'Username',
password: 'Password',
targetUNC: 'Target UNC',
hostPlaceholder: 'e.g. 192.168.1.100 or nas-server',
sharePlaceholder: 'e.g. share, leave empty to mount root only',
userNamePlaceholder: 'e.g. admin',
errHostInvalid: 'Invalid hostname/IP',
errUserName: 'Please enter username',
errPassword: 'Please enter password'
},
workflow: {
taskPrep: 'Task Preparation',
copyData: 'Copy Data',
printCard: 'Print Card',
complete: 'Complete'
},
notify: {
resetSent: 'Reset command sent',
resetFailed: 'Reset failed',
rejectUnavailable: 'Discard card API not supported in current environment',
cardRejected: 'Card discarded',
readCardSent: 'Card moved to reader',
readCardFailed: 'Read card failed',
ejectCardSent: 'Card ejected to outlet',
ejectCardFailed: 'Eject card failed',
operationFailed: 'Operation failed',
designStarted: 'Design app started',
designFailed: 'Failed to open design app, please check cardsoon.config.json',
designCancelled: 'Failed to open design app, may have been cancelled or requires admin privileges',
notReady: 'System not ready, please restart the app or check printer and task directory',
notReadyAction: 'System not ready, cannot {action}',
stopDistribute: 'Please stop the data distribution task first',
usbCollecting: 'USB collection in progress, please wait',
usbCollectInProgress: 'Data collection in progress, please stop it on the task page first',
usbCollectComplete: 'USB collection completed',
pathOpenFailed: 'Failed to open directory picker',
templateOpenFailed: 'Failed to open template picker',
templateParseFailed: 'Template parsing failed',
dirInvalid: 'Import directory invalid, cannot continue',
resubmitCollectFailed: 'Failed to resubmit collection task',
resubmitFailed: 'Resubmit failed',
pollStartFailed: 'Failed to start task polling',
pollMonitorFailed: 'Cannot monitor card position, please click Back or resubmit manually',
queryJobFailed: 'Query task failed: {code}',
queryUsbFailed: 'Query USB task failed: {code}',
cancelIssue: 'Issue occurred while cancelling task',
selectDirFirst: 'Please select a data import directory first',
selectDirFirstShort: 'Please select a data import directory first',
startUsbFailed: 'Failed to start USB collection',
usbWaitComplete: 'Please wait for USB collection to complete',
cannotEnterRunning: 'Cannot enter running page, task cancelled',
initFailedHint: 'Initialization failed, please check task directory permissions'
},
validation: {
noTask: 'Please configure a copy path or print template',
invalidTemplate: 'Please select a .soon template',
pathEmpty: 'Path cannot be empty',
pathNotExist: 'Path does not exist: {paths}',
noFilesToCopy: 'No files to copy under the path',
netCredMissing: 'Please configure network location credentials first: {host}',
templateNotExist: 'Template file does not exist',
printFlagMismatch: 'Print side mismatch, please reselect',
singleSideMustPick: 'Single-side printer, please select front or back',
dongleAuthRequired: 'Please enter authorization code',
dongleCountInvalid: 'Dongle count must be 0 or 1-101',
createJobFailed: 'Failed to create task',
csvGenFailed: 'Failed to generate print variable CSV'
},
printerStatus: {
idle: 'Idle',
busy: 'Busy',
printing: 'Printing',
notConnected: 'Printer not connected',
notInitialized: 'Not initialized',
initFailed: 'Initialization failed',
ready: 'Ready',
unknown: '—'
}
}
app/src/renderer/src/i18n/locales/zh-CN.ts
+191
View File
@@ -0,0 +1,191 @@
export default {
common: {
cancel: '取消',
confirm: '确定',
close: '关闭',
addPath: '添加路径',
clear: '清空',
submit: '提交',
home: '首页',
stop: '停止',
back: '返回',
reset: '重置',
select: '选择',
resetPrinter: '重置打印机',
discardCard: '废弃卡片',
templateDesign: '模板设计',
low: '低',
mid: '中',
high: '高',
any: '任何'
},
header: {
modeHome: '卡树数据卡打印机软件',
modeDistribute: '数据分发模式',
modeCollect: '数据收集模式',
ribbon: '色带',
ribbonAmount: '余量',
status: '状态',
serialNo: '序列号'
},
footer: {
version: '版本 v{version}',
website: 'www.cardsoon.com',
copyright: '版权所有 © 2026 卡树科技'
},
home: {
toolsTitle: '工具',
tasksTitle: '任务',
dataDistribute: '数据分发',
dataDistributeDesc: '分发数据到打印卡片',
dataCollect: '数据收集',
dataCollectDesc: '从卡片收集导入数据'
},
distributeConfig: {
pathConfig: '路径配置',
addNetworkLocation: '添加网络位置',
pathHint: '系统将拷贝该目录下的所有子项，但不包含文件夹本身',
netCredConfigured: '已配置网络凭据：{hosts}',
volumeLabel: '卷标',
copyType: '拷贝类型',
formatType: '格式化类型',
dongle: '加密狗',
dongleHint: '（101 为不限次数）',
dongleAuthLabel: '授权码',
donglePassword: '请输入授权码',
templatePreview: '标签预览',
addLabel: '添加标签',
doubleSide: '双面',
singleSideHint: '当前为单面打印机，请选择打印面（正面或背面）',
frontSide: 'FRONT',
backSide: 'BACK',
imageFieldNotSelected: '未选择图片',
templateLoaded: '已加载标签模板',
templateNoPreview: '模板已打开，但未解析到可预览内容',
cleared: '已清空，已恢复初始状态',
netCredSaved: '网络凭据已保存',
loadProgress: '已加载: {loaded} GB / {total} GB ({percent}%)',
calculating: '计算中…',
sizeUnknown: '大小未知',
pathInvalid: '路径无效',
pathReady: '{size} · 待拷贝',
pathPattern: '{dir}\\*.*'
},
copyType: {
fileCopy: '文件拷贝',
imageBurn: '镜像刻录'
},
formatType: {
none: '不格式化',
fat32: 'Fat32',
exfat: 'exFat',
ntfs: 'NTFS'
},
dataCollect: {
importPath: '数据导入地址',
cardOutput: '出卡方向',
forwardOutput: '向前出卡',
backwardOutput: '向后出卡',
noDirSelected: '未选择目录'
},
running: {
taskFailed: '任务失败',
taskCompleted: '任务已完成',
collectCompleted: '收集已完成',
dataCollecting: '数据收集中',
taskRunning: '任务执行中',
waitingCard: '等待插卡',
failedSubCollect: '请检查读卡器与卡片，插入备卡位可自动重试',
failedSubDistribute: '请检查设备故障，插入备卡位可自动重试',
completedSubCollect: '请点击返回，或插入备卡位继续下一张',
completedSubDistribute: '请点击返回，或插入备卡位自动开始下一张',
collectingHint: '正在从卡片读取并写入导入目录',
waitCardHint: '请插入数据卡，任务将自动执行',
runningHint: '任务执行中，请稍候',
progressCounter: '任务已经完成{success}次，其中失败次数是{fail}。'
},
networkDialog: {
title: '添加网络位置',
hint: '凭据用于访问已添加的映射盘或网络共享路径,请确认主机可访问且账号有效。',
host: '主机(IP 或主机名)',
share: '共享名(可选)',
userName: '用户名',
password: '密码',
targetUNC: '目标 UNC',
hostPlaceholder: '例如 192.168.1.100 或 nas-server',
sharePlaceholder: '例如 share,留空表示只挂载到根',
userNamePlaceholder: '例如 admin',
errHostInvalid: '主机名/IP 不合法',
errUserName: '请输入用户名',
errPassword: '请输入密码'
},
workflow: {
taskPrep: '任务准备',
copyData: '拷贝数据',
printCard: '打印卡片',
complete: '完成'
},
notify: {
resetSent: '已发送重置指令',
resetFailed: '重置失败',
rejectUnavailable: '当前环境不支持废卡接口',
cardRejected: '已废弃卡片',
readCardSent: '已送卡到读卡区',
readCardFailed: '读卡失败',
ejectCardSent: '已退卡到出卡区',
ejectCardFailed: '退卡失败',
operationFailed: '操作失败',
designStarted: '已启动设计软件',
designFailed: '打开设计软件失败，请检查 cardsoon.config.json',
designCancelled: '打开设计软件失败，可能已被取消或需要管理员权限',
notReady: '系统未就绪，请重启应用或检查打印机与任务目录',
notReadyAction: '系统未就绪，无法{action}',
stopDistribute: '请先停止数据分发任务',
usbCollecting: 'USB 收集进行中，请等待完成',
usbCollectInProgress: '数据收集进行中，请先在任务页停止',
usbCollectComplete: 'USB 收集完成',
pathOpenFailed: '打开目录选择失败',
templateOpenFailed: '打开模板选择失败',
templateParseFailed: '模板解析失败',
dirInvalid: '导入目录无效，无法继续',
resubmitCollectFailed: '重新提交收集任务失败',
resubmitFailed: '重新提交失败',
pollStartFailed: '启动任务轮询失败',
pollMonitorFailed: '无法监控卡位，请手动点击返回或重新提交',
queryJobFailed: '查询任务失败: {code}',
queryUsbFailed: '查询 USB 任务失败: {code}',
cancelIssue: '取消任务时出现问题',
selectDirFirst: '请先选择数据导入目录',
selectDirFirstShort: '请先选择数据导入目录',
startUsbFailed: '启动 USB 收集失败',
usbWaitComplete: '请先等待 USB 收集完成',
cannotEnterRunning: '无法进入运行页，已取消任务',
initFailedHint: '初始化失败，请检查任务目录权限'
},
validation: {
noTask: '请配置拷贝路径或打印模板',
invalidTemplate: '请选择 .soon 模板',
pathEmpty: '路径不能为空',
pathNotExist: '路径不存在: {paths}',
noFilesToCopy: '拷贝路径下没有可拷贝的文件',
netCredMissing: '请先配置网络位置凭据: {host}',
templateNotExist: '模板文件不存在',
printFlagMismatch: '打印面数不匹配，请重新选择',
singleSideMustPick: '当前为单面打印机，请选择正面或背面',
pickSideRequired: '请选择打印面（正面或背面）后再提交',
dongleAuthRequired: '请输入授权码',
dongleCountInvalid: '加密狗次数须为 0 或 1-101',
createJobFailed: '创建任务失败',
csvGenFailed: '生成打印变量 CSV 失败'
},
printerStatus: {
idle: '空闲',
busy: '忙碌',
printing: '正在打印',
notConnected: '未连接打印机',
notInitialized: '未初始化',
initFailed: '初始化失败',
ready: '就绪',
unknown: '—'
}
}
app/src/renderer/src/i18n/locales/zh-TW.ts
+191
View File
@@ -0,0 +1,191 @@
export default {
common: {
cancel: '取消',
confirm: '確定',
close: '關閉',
addPath: '新增路徑',
clear: '清空',
submit: '提交',
home: '首頁',
stop: '停止',
back: '返回',
reset: '重設',
select: '選擇',
resetPrinter: '重設印表機',
discardCard: '廢棄卡片',
templateDesign: '模板設計',
low: '低',
mid: '中',
high: '高',
any: '任何'
},
header: {
modeHome: '卡樹數據卡印表機軟體',
modeDistribute: '數據分發模式',
modeCollect: '數據收集模式',
ribbon: '色帶',
ribbonAmount: '餘量',
status: '狀態',
serialNo: '序號'
},
footer: {
version: '版本 v{version}',
website: 'www.cardsoon.com',
copyright: '版權所有 © 2026 卡樹科技'
},
home: {
toolsTitle: '工具',
tasksTitle: '任務',
dataDistribute: '數據分發',
dataDistributeDesc: '分發數據到列印卡片',
dataCollect: '數據收集',
dataCollectDesc: '從卡片收集匯入數據'
},
distributeConfig: {
pathConfig: '路徑配置',
addNetworkLocation: '新增網路位置',
pathHint: '系統將拷貝該目錄下的所有子項，但不包含資料夾本身',
netCredConfigured: '已配置網路憑證：{hosts}',
volumeLabel: '卷標',
copyType: '拷貝類型',
formatType: '格式化類型',
dongle: '加密狗',
dongleHint: '（101 為不限次數）',
dongleAuthLabel: '授權碼',
donglePassword: '請輸入授權碼',
templatePreview: '標籤預覽',
addLabel: '新增標籤',
doubleSide: '雙面',
singleSideHint: '當前為單面印表機，請選擇列印面（正面或背面）',
frontSide: 'FRONT',
backSide: 'BACK',
imageFieldNotSelected: '未選擇圖片',
templateLoaded: '已載入標籤模板',
templateNoPreview: '模板已開啟，但未解析到可預覽內容',
cleared: '已清空，已恢復初始狀態',
netCredSaved: '網路憑證已儲存',
loadProgress: '已載入: {loaded} GB / {total} GB ({percent}%)',
calculating: '計算中…',
sizeUnknown: '大小未知',
pathInvalid: '路徑無效',
pathReady: '{size} · 待拷貝',
pathPattern: '{dir}\\*.*'
},
copyType: {
fileCopy: '檔案拷貝',
imageBurn: '鏡像燒錄'
},
formatType: {
none: '不格式化',
fat32: 'Fat32',
exfat: 'exFat',
ntfs: 'NTFS'
},
dataCollect: {
importPath: '數據匯入地址',
cardOutput: '出卡方向',
forwardOutput: '向前出卡',
backwardOutput: '向後出卡',
noDirSelected: '未選擇目錄'
},
running: {
taskFailed: '任務失敗',
taskCompleted: '任務已完成',
collectCompleted: '收集已完成',
dataCollecting: '數據收集中',
taskRunning: '任務執行中',
waitingCard: '等待插卡',
failedSubCollect: '請檢查讀卡器與卡片，插入備卡位可自動重試',
failedSubDistribute: '請檢查設備故障，插入備卡位可自動重試',
completedSubCollect: '請點擊返回，或插入備卡位繼續下一張',
completedSubDistribute: '請點擊返回，或插入備卡位自動開始下一張',
collectingHint: '正在從卡片讀取並寫入匯入目錄',
waitCardHint: '請插入數據卡，任務將自動執行',
runningHint: '任務執行中，請稍候',
progressCounter: '任務已經完成{success}次，其中失敗次數是{fail}。'
},
networkDialog: {
title: '新增網路位置',
hint: '憑證用於存取已新增的映射盤或網路共享路徑,請確認主機可存取且帳號有效。',
host: '主機(IP 或主機名)',
share: '共享名(可選)',
userName: '使用者名稱',
password: '密碼',
targetUNC: '目標 UNC',
hostPlaceholder: '例如 192.168.1.100 或 nas-server',
sharePlaceholder: '例如 share,留空表示只掛載到根',
userNamePlaceholder: '例如 admin',
errHostInvalid: '主機名/IP 不合法',
errUserName: '請輸入使用者名稱',
errPassword: '請輸入密碼'
},
workflow: {
taskPrep: '任務準備',
copyData: '拷貝數據',
printCard: '列印卡片',
complete: '完成'
},
notify: {
resetSent: '已發送重設指令',
resetFailed: '重設失敗',
rejectUnavailable: '當前環境不支援廢卡介面',
cardRejected: '已廢棄卡片',
readCardSent: '已送卡到讀卡區',
readCardFailed: '讀卡失敗',
ejectCardSent: '已退卡到出卡區',
ejectCardFailed: '退卡失敗',
operationFailed: '操作失敗',
designStarted: '已啟動設計軟體',
designFailed: '開啟設計軟體失敗，請檢查 cardsoon.config.json',
designCancelled: '開啟設計軟體失敗，可能已被取消或需要管理員權限',
notReady: '系統未就緒，請重啟應用或檢查印表機與任務目錄',
notReadyAction: '系統未就緒，無法{action}',
stopDistribute: '請先停止數據分發任務',
usbCollecting: 'USB 收集進行中，請等待完成',
usbCollectInProgress: '數據收集進行中，請先在任務頁停止',
usbCollectComplete: 'USB 收集完成',
pathOpenFailed: '開啟目錄選擇失敗',
templateOpenFailed: '開啟模板選擇失敗',
templateParseFailed: '模板解析失敗',
dirInvalid: '匯入目錄無效，無法繼續',
resubmitCollectFailed: '重新提交收集任務失敗',
resubmitFailed: '重新提交失敗',
pollStartFailed: '啟動任務輪詢失敗',
pollMonitorFailed: '無法監控卡位，請手動點擊返回或重新提交',
queryJobFailed: '查詢任務失敗: {code}',
queryUsbFailed: '查詢 USB 任務失敗: {code}',
cancelIssue: '取消任務時出現問題',
selectDirFirst: '請先選擇數據匯入目錄',
selectDirFirstShort: '請先選擇數據匯入目錄',
startUsbFailed: '啟動 USB 收集失敗',
usbWaitComplete: '請先等待 USB 收集完成',
cannotEnterRunning: '無法進入運行頁，已取消任務',
initFailedHint: '初始化失敗，請檢查任務目錄權限'
},
validation: {
noTask: '請配置拷貝路徑或列印模板',
invalidTemplate: '請選擇 .soon 模板',
pathEmpty: '路徑不能為空',
pathNotExist: '路徑不存在: {paths}',
noFilesToCopy: '拷貝路徑下沒有可拷貝的檔案',
netCredMissing: '請先配置網路位置憑證: {host}',
templateNotExist: '模板檔案不存在',
printFlagMismatch: '列印面數不匹配，請重新選擇',
singleSideMustPick: '當前為單面印表機，請選擇正面或背面',
pickSideRequired: '請選擇列印面（正面或背面）後再提交',
dongleAuthRequired: '請輸入授權碼',
dongleCountInvalid: '加密狗次數須為 0 或 1-101',
createJobFailed: '建立任務失敗',
csvGenFailed: '生成列印變數 CSV 失敗'
},
printerStatus: {
idle: '空閒',
busy: '忙碌',
printing: '正在列印',
notConnected: '未連接印表機',
notInitialized: '未初始化',
initFailed: '初始化失敗',
ready: '就緒',
unknown: '—'
}
}
app/src/renderer/src/main.ts
+4
View File
@@ -2,6 +2,8 @@ import { createApp } from 'vue'
import { createPinia } from 'pinia'
import i18n from '@/i18n'
import { configGet } from '@/api/cardsoon'
import { useNetworkAuthStore } from '@/stores/networkAuth'
@@ -70,6 +72,8 @@ const pinia = createPinia()
app.use(pinia)
app.use(i18n)
app.use(router)
app/src/renderer/src/styles/pages/page2.css
+18
View File
@@ -73,6 +73,24 @@
color: var(--cs-primary);
}
/* 读卡 / 退卡 并排按钮行 */
.m-tool-row {
display: flex;
gap: 8px;
}
.m-tool-btn--half {
flex: 1;
min-width: 0;
justify-content: center;
padding: 0 8px;
gap: 6px;
}
.m-tool-btn--half i {
width: 16px;
}
/* ========== 垂直分隔线 ========== */
.m-divider {
width: 1px;
app/src/renderer/src/styles/pages/page4.css
+10
View File
@@ -117,7 +117,17 @@
font-size: 9px;
border-radius: 3px;
border: 1px solid #ced4da;
margin-left: 3px;
}
/* 授权码标签 */
.m-panel-toolbar .c-checkbox-item .dog-auth-label {
font-size: 9px;
color: #495057;
font-weight: 500;
margin-left: 6px;
flex-shrink: 0;
white-space: nowrap;
}
/* 提示文字 */
app/src/renderer/src/types/printer.ts
+7 -1
View File
@@ -3,11 +3,17 @@ export interface PrinterStatusDisplay {
ribbonAmount: string
statusText: string
serialNo: string
/** 打印机型号/名称（如 TH80），用于判断单/双面能力 */
printerName: string
/** 是否为单面打印机（如 TH80），单面打印机不能选"双面"打印 */
isSingleSide: boolean
}
export const defaultPrinterStatus: PrinterStatusDisplay = {
ribbonType: '—',
ribbonAmount: '—',
statusText: '—',
serialNo: '—'
serialNo: '—',
printerName: '—',
isSingleSide: false
}
app/src/renderer/src/utils/createDistributeJob.ts
+8 -3
View File
@@ -1,3 +1,4 @@
import i18n from '@/i18n'
import { genTaskId } from '@shared/gen-task-id'
import { buildJobConfig } from '@/utils/buildJobConfig'
import { resolveJobTasks } from '@/utils/validateJobConfig'
@@ -6,6 +7,10 @@ import { dllJobCreate, fsWriteJobCsv } from '@/api/cardsoon'
import { useJobStore } from '@/stores/job'
import type { DistributeFormState } from '@/stores/distributeForm'
function t(key: string, named?: Record<string, unknown>): string {
return i18n.global.t(key, named ?? {})
}
function printFieldRows(form: DistributeFormState) {
return (form.templatePreview?.fields ?? []).map((f) => ({
originName: f.originName || f.label.replace(/\[.*\]$/, ''),
@@ -18,7 +23,7 @@ async function buildJobJson(
): Promise<{ ok: true; json: string } | { ok: false; message: string }> {
const { hasCopy, hasPrint } = resolveJobTasks(form)
if (!hasCopy && !hasPrint) {
return { ok: false, message: '请配置拷贝路径或打印模板' }
return { ok: false, message: t('validation.noTask') }
}
const taskId = genTaskId()
@@ -28,7 +33,7 @@ async function buildJobJson(
if (rows.length > 0) {
const csv = await fsWriteJobCsv({ taskId, rows })
if (!csv.ok || !csv.data?.path) {
return { ok: false, message: csv.message || '生成打印变量 CSV 失败' }
return { ok: false, message: csv.message || t('validation.csvGenFailed') }
}
udfFile = csv.data.path
}
@@ -71,7 +76,7 @@ export async function createDistributeJob(
const created = await dllJobCreate(json, opts)
if (!created.ok || !created.data?.jobId) {
return { ok: false, message: created.message || '创建任务失败' }
return { ok: false, message: created.message || t('validation.createJobFailed') }
}
return { ok: true, jobId: created.data.jobId }
}
app/src/renderer/src/utils/validateJobConfig.ts
+8 -3
View File
@@ -1,4 +1,9 @@
import type { DistributeFormState } from '@/stores/distributeForm'
import i18n from '@/i18n'
function t(key: string, named?: Record<string, unknown>): string {
return i18n.global.t(key, named ?? {})
}
export function resolveJobTasks(f: DistributeFormState): { hasCopy: boolean; hasPrint: boolean } {
const hasCopy = f.pathList.some((p) => !!p.path.trim())
@@ -8,8 +13,8 @@ export function resolveJobTasks(f: DistributeFormState): { hasCopy: boolean; has
export function validateJobConfig(f: DistributeFormState): string | null {
const { hasCopy, hasPrint } = resolveJobTasks(f)
if (!hasCopy && !hasPrint) return '请配置拷贝路径或打印模板'
if (hasPrint && !/\.soon$/i.test(f.templateFile.trim())) return '请选择 .soon 模板'
if (hasCopy && f.pathList.some((p) => !p.path.trim())) return '路径不能为空'
if (!hasCopy && !hasPrint) return t('validation.noTask')
if (hasPrint && !/\.soon$/i.test(f.templateFile.trim())) return t('validation.invalidTemplate')
if (hasCopy && f.pathList.some((p) => !p.path.trim())) return t('validation.pathEmpty')
return null
}
app/src/renderer/src/utils/validateJobPreflight.ts
+24 -7
View File
@@ -1,8 +1,14 @@
import type { DistributeFormState } from '@/stores/distributeForm'
import i18n from '@/i18n'
import { fsPathExists } from '@/api/cardsoon'
import { resolveJobTasks, validateJobConfig } from '@/utils/validateJobConfig'
import { resolveCopyNetworkHosts } from '@/utils/copyNetworkHosts'
import { useNetworkAuthStore } from '@/stores/networkAuth'
import { useConfigStore } from '@/stores/config'
function t(key: string, named?: Record<string, unknown>): string {
return i18n.global.t(key, named ?? {})
}
function totalCopyBytes(form: DistributeFormState): number {
return form.pathList.reduce((sum, item) => sum + (item.sizeBytes || 0), 0)
@@ -27,10 +33,10 @@ export async function validateJobPreflight(form: DistributeFormState): Promise<s
if (paths.length > 0) {
const ex = await fsPathExists(paths)
if (ex.ok && ex.data?.missing.length) {
return `路径不存在: ${ex.data.missing.join(', ')}`
return t('validation.pathNotExist', { paths: ex.data.missing.join(', ') })
}
if (totalCopyBytes(form) <= 0) {
return '拷贝路径下没有可拷贝的文件'
return t('validation.noFilesToCopy')
}
}
@@ -40,7 +46,7 @@ export async function validateJobPreflight(form: DistributeFormState): Promise<s
for (const host of hosts) {
const cred = netStore.getCredential(host)
if (!cred?.userName?.trim() || !cred.password) {
return `请先配置网络位置凭据: ${host}`
return t('validation.netCredMissing', { host })
}
}
}
@@ -50,22 +56,33 @@ export async function validateJobPreflight(form: DistributeFormState): Promise<s
const soon = form.templateFile.trim()
const ex = await fsPathExists([soon])
if (ex.ok && ex.data?.missing.length) {
return '模板文件不存在'
return t('validation.templateNotExist')
}
const preview = form.templatePreview
if (preview && printFlagMismatch(form.printFlag, preview.templateFlag)) {
return '打印面数不匹配，请重新选择'
return t('validation.printFlagMismatch')
}
// 单面打印机：双面模板必须显式选择正面或背面，且不能选双面
const configStore = useConfigStore()
if (configStore.printer.isSingleSide) {
if (preview && preview.templateFlag === 1 && form.printFlag !== 2 && form.printFlag !== 3) {
return t('validation.pickSideRequired')
}
if (form.printFlag === 1) {
return t('validation.singleSideMustPick')
}
}
}
if (form.dongleEnabled) {
if (!form.dongleAuthCode.trim()) {
return '请输入授权码'
return t('validation.dongleAuthRequired')
}
const n = form.dongleInstallCount
if (!Number.isInteger(n) || n < 0 || n > 101) {
return '加密狗次数须为 0 或 1-101'
return t('validation.dongleCountInvalid')
}
}
app/src/renderer/src/views/DataCollectView.vue
+18 -16
View File
@@ -1,12 +1,12 @@
<template>
<AppShell>
<AppHeader mode="数据收集模式">
<AppHeader :mode="t('header.modeCollect')">
<div class="c-nav-group">
<NavButton icon="home" label="首页" @click="goHome" />
<NavButton icon="trash" label="清空" @click="collectStore.reset()" />
<NavButton icon="home" :label="t('common.home')" @click="goHome" />
<NavButton icon="trash" :label="t('common.clear')" @click="collectStore.reset()" />
<NavButton
icon="check-circle"
label="提交"
:label="t('common.submit')"
variant="primary"
:active="true"
:disabled="!canSubmit"
@@ -18,34 +18,34 @@
<section class="m-config-panel">
<h3 class="m-panel-title">
<AppIcon name="folder-open" size="sm" />
数据导入地址
{{ t('dataCollect.importPath') }}
</h3>
<div class="m-path-box">
<span class="m-path-text" :title="collectStore.destPath || undefined">{{
collectStore.destPath || '未选择目录'
collectStore.destPath || t('dataCollect.noDirSelected')
}}</span>
</div>
<button type="button" class="m-path-btn" @click="addPath">
<AppIcon name="plus" size="sm" />
添加路径
{{ t('common.addPath') }}
</button>
</section>
<div class="m-divider-v" />
<section class="m-config-panel">
<h3 class="m-panel-title">
<AppIcon name="exchange" size="sm" />
出卡方向
{{ t('dataCollect.cardOutput') }}
</h3>
<div class="m-radio-group">
<label class="m-radio-item">
<input v-model="collectStore.cardOutput" type="radio" :value="1" />
<span class="radio-custom" />
<span>向前出卡</span>
<span>{{ t('dataCollect.forwardOutput') }}</span>
</label>
<label class="m-radio-item">
<input v-model="collectStore.cardOutput" type="radio" :value="2" />
<span class="radio-custom" />
<span>向后出卡</span>
<span>{{ t('dataCollect.backwardOutput') }}</span>
</label>
</div>
</section>
@@ -57,6 +57,7 @@
<script setup lang="ts">
import { computed } from 'vue'
import { useRouter } from 'vue-router'
import { useI18n } from 'vue-i18n'
import { notify, notifyRequireInit } from '@/composables/useNotify'
import AppShell from '@/layouts/AppShell.vue'
import AppHeader from '@/components/AppHeader.vue'
@@ -68,6 +69,7 @@ import { useAppStore } from '@/stores/app'
import { dialogOpenDirectory, dllUsbCopy } from '@/api/cardsoon'
const router = useRouter()
const { t } = useI18n()
const collectStore = useCollectStore()
const appStore = useAppStore()
@@ -79,7 +81,7 @@ const canSubmit = computed(
async function addPath(): Promise<void> {
const r = await dialogOpenDirectory()
if (!r.ok) {
notify.error(r.message || '打开目录选择失败')
notify.error(r.message || t('notify.pathOpenFailed'))
return
}
const picked = r.data?.paths[0]
@@ -88,21 +90,21 @@ async function addPath(): Promise<void> {
async function onSubmit(): Promise<void> {
if (!canUse.value) {
notifyRequireInit('开始 USB 收集')
notifyRequireInit(t('notify.startUsbFailed'))
return
}
if (appStore.mode === 'distributing') {
notify.warning('请先停止数据分发任务')
notify.warning(t('notify.stopDistribute'))
return
}
const dest = collectStore.destPath.trim()
if (!dest) {
notify.warning('请先选择数据导入目录')
notify.warning(t('notify.selectDirFirst'))
return
}
const r = await dllUsbCopy(dest, collectStore.cardOutput)
if (!r.ok) {
notify.error(r.message || '启动 USB 收集失败')
notify.error(r.message || t('notify.startUsbFailed'))
return
}
appStore.setMode('usbCopying')
@@ -111,7 +113,7 @@ async function onSubmit(): Promise<void> {
function goHome(): void {
if (appStore.mode === 'usbCopying') {
notify.warning('数据收集进行中，请先在任务页停止')
notify.warning(t('notify.usbCollectInProgress'))
return
}
router.push('/home')
app/src/renderer/src/views/DistributeConfigView.vue
+85 -41
View File
@@ -1,12 +1,12 @@
<template>
<AppShell>
<AppHeader mode="数据分发模式">
<AppHeader :mode="t('header.modeDistribute')">
<div class="c-nav-group">
<NavButton icon="home" label="首页" @click="router.push('/home')" />
<NavButton icon="trash" label="清空" @click="onClear" />
<NavButton icon="home" :label="t('common.home')" @click="router.push('/home')" />
<NavButton icon="trash" :label="t('common.clear')" @click="onClear" />
<NavButton
icon="check-circle"
label="提交"
:label="t('common.submit')"
variant="primary"
:active="true"
:disabled="!canSubmit"
@@ -17,38 +17,38 @@
<main class="app-shell__main l-main-flex">
<section class="c-panel m-panel--left">
<div class="c-panel__header">
<span class="c-panel__title">路径配置</span>
<span class="c-panel__title">{{ t('distributeConfig.pathConfig') }}</span>
<div class="c-nav-group">
<button type="button" class="c-button-cs" @click="addPath">
添加路径
{{ t('common.addPath') }}
</button>
<button type="button" class="c-button-cs" @click="openNetworkDialog">
添加网络位置
{{ t('distributeConfig.addNetworkLocation') }}
</button>
</div>
</div>
<div class="m-path-hint">
<AppIcon name="info-circle" size="sm" />
<span>系统将拷贝该目录下的所有子项，但不包含文件夹本身</span>
<span>{{ t('distributeConfig.pathHint') }}</span>
</div>
<div v-if="configuredHosts.length" class="m-net-cred-hint">
已配置网络凭据：{{ configuredHosts.join('、') }}
{{ t('distributeConfig.netCredConfigured', { hosts: configuredHosts.join('、') }) }}
</div>
<div class="m-panel-toolbar">
<div class="toolbar-row">
<div class="toolbar-item">
<span>卷标</span>
<span>{{ t('distributeConfig.volumeLabel') }}</span>
<input v-model="formStore.volumeLabel" type="text" class="c-input" />
</div>
<div class="toolbar-item">
<span>拷贝类型</span>
<AppSelect v-model="formStore.copyType" :items="COPY_TYPE_OPTIONS" />
<span>{{ t('distributeConfig.copyType') }}</span>
<AppSelect v-model="formStore.copyType" :items="copyTypeItems" />
</div>
</div>
<div class="toolbar-row">
<div class="toolbar-item">
<span>格式化类型</span>
<AppSelect v-model="formStore.formatType" :items="FORMAT_TYPE_OPTIONS" />
<span>{{ t('distributeConfig.formatType') }}</span>
<AppSelect v-model="formStore.formatType" :items="formatTypeItems" />
</div>
<label class="c-checkbox-item">
<input
@@ -56,7 +56,7 @@
type="checkbox"
@change="onDongleToggle"
/>
<span>加密狗</span>
<span>{{ t('distributeConfig.dongle') }}</span>
<input
:value="dongleInputValue"
type="number"
@@ -68,14 +68,16 @@
@input="onDongleCountInput"
/>
<span class="dog-hint">{{ dongleHint }}</span>
<input
v-if="formStore.dongleEnabled"
v-model="formStore.dongleAuthCode"
type="password"
class="c-input dog-auth"
placeholder="授权码"
@input="onDongleAuthInput"
/>
<template v-if="formStore.dongleEnabled">
<span class="dog-auth-label">{{ t('distributeConfig.dongleAuthLabel') }}</span>
<input
v-model="formStore.dongleAuthCode"
type="password"
class="c-input dog-auth"
:placeholder="t('distributeConfig.donglePassword')"
@input="onDongleAuthInput"
/>
</template>
</label>
</div>
</div>
@@ -99,18 +101,33 @@
</section>
<section class="c-panel m-panel--right">
<div class="c-panel__header">
<span class="c-panel__title">标签预览</span>
<span class="c-panel__title">{{ t('distributeConfig.templatePreview') }}</span>
<div class="c-nav-group">
<button type="button" class="c-button-cs" @click="pickTemplate">
添加标签
{{ t('distributeConfig.addLabel') }}
</button>
</div>
</div>
<div v-if="hasTemplatePreview && hasDoubleSide" class="m-print-side-picker">
<label class="m-print-side-option">
<input v-model="formStore.printFlag" type="radio" :value="1" />
<span>双面</span>
</label>
<div v-if="templatePreviewLoaded && hasDoubleSide" class="m-print-side-picker">
<template v-if="isSingleSidePrinter">
<label class="m-print-side-option">
<input v-model="formStore.printFlag" type="radio" :value="2" />
<span>{{ t('distributeConfig.frontSide') }}</span>
</label>
<label class="m-print-side-option">
<input v-model="formStore.printFlag" type="radio" :value="3" />
<span>{{ t('distributeConfig.backSide') }}</span>
</label>
<span v-if="!sidePicked" class="m-print-side-hint">
{{ t('distributeConfig.singleSideHint') }}
</span>
</template>
<template v-else>
<label class="m-print-side-option">
<input v-model="formStore.printFlag" type="radio" :value="1" />
<span>{{ t('distributeConfig.doubleSide') }}</span>
</label>
</template>
</div>
<div class="c-preview-area">
<div
@@ -155,7 +172,7 @@
<span class="c-path-cell__text" :title="row.value">{{
imageFieldLabel(row.value)
}}</span>
<button type="button" class="c-field-pick" @click="pickFieldImage(idx)">选择</button>
<button type="button" class="c-field-pick" @click="pickFieldImage(idx)">{{ t('common.select') }}</button>
</td>
<td v-else-if="isTextField(row)">
<input
@@ -186,6 +203,7 @@
<script setup lang="ts">
import { computed, ref } from 'vue'
import { useI18n } from 'vue-i18n'
import { useRouter } from 'vue-router'
import { cleanPathPattern } from '@shared/path-pattern'
import { extractDriveLetter } from '@shared/network-host'
@@ -197,11 +215,12 @@ import NavButton from '@/components/NavButton.vue'
import AppIcon from '@/components/AppIcon.vue'
import AppSelect from '@/components/AppSelect.vue'
import NetworkPathDialog from '@/components/NetworkPathDialog.vue'
import { COPY_TYPE_OPTIONS, FORMAT_TYPE_OPTIONS } from '@/constants/selectOptions'
import { copyTypeOptions, formatTypeOptions } from '@/constants/selectOptions'
import { CARD_CAPACITY_BYTES, CARD_CAPACITY_GB } from '@/constants/cardCapacity'
import { useDistributeFormStore } from '@/stores/distributeForm'
import { useJobStore } from '@/stores/job'
import { useAppStore } from '@/stores/app'
import { useConfigStore } from '@/stores/config'
import { useNetworkAuthStore } from '@/stores/networkAuth'
import { useDongleAuthStore } from '@/stores/dongleAuth'
import { validateJobPreflight } from '@/utils/validateJobPreflight'
@@ -219,9 +238,11 @@ import {
} from '@/api/cardsoon'
const router = useRouter()
const { t } = useI18n()
const formStore = useDistributeFormStore()
const jobStore = useJobStore()
const appStore = useAppStore()
const configStore = useConfigStore()
const netStore = useNetworkAuthStore()
const dongleStore = useDongleAuthStore()
@@ -256,13 +277,26 @@ const templateFlag = computed(() => formStore.templatePreview?.templateFlag ?? 0
const hasDoubleSide = computed(() => templateFlag.value === 1)
const isSingleSidePrinter = computed(() => configStore.printer.isSingleSide)
/** 模板已加载（无论有无可编辑字段），用于选面区显示 */
const templatePreviewLoaded = computed(() => !!formStore.templatePreview)
/** 单面打印机 + 双面模板时，必须显式选择正面或背面 */
const sidePicked = computed(
() => formStore.printFlag === 2 || formStore.printFlag === 3
)
const copyTypeItems = computed(() => copyTypeOptions(t))
const formatTypeItems = computed(() => formatTypeOptions(t))
const canPickFront = computed(() => templateFlag.value !== 3)
const canPickBack = computed(() => templateFlag.value !== 2)
const loadProgressText = computed(() => {
const loadedGb = formatBytesAsGb(totalLoadedBytes.value)
return `已加载: ${loadedGb} GB / ${CARD_CAPACITY_GB} GB (${loadPercent.value}%)`
return t('distributeConfig.loadProgress', { loaded: loadedGb, total: CARD_CAPACITY_GB, percent: loadPercent.value })
})
function isTextField(row: TemplateFieldRow): boolean {
@@ -280,7 +314,9 @@ function imageFieldLabel(value: string): string {
return parts[parts.length - 1] || v
}
function defaultPrintFlagForTemplate(flag: number): number {
function defaultPrintFlagForTemplate(flag: number, isSingleSide: boolean): number {
// 单面打印机 + 双面模板：不默认，强制用户选择打印面（0=未选择）
if (isSingleSide && flag === 1) return 0
if (flag === 1 || flag === 2 || flag === 3) return flag
return 2
}
@@ -308,7 +344,7 @@ async function pickFieldImage(idx: number): Promise<void> {
function onClear(): void {
formStore.reset()
notify.info('已清空，已恢复初始状态')
notify.info(t('distributeConfig.cleared'))
}
const dongleInputValue = computed(() =>
@@ -346,7 +382,7 @@ function onDongleAuthInput(): void {
async function addPath(): Promise<void> {
const r = await dialogOpenDirectory()
if (!r.ok) {
notify.error(r.message || '打开目录选择失败')
notify.error(r.message || t('notify.pathOpenFailed'))
return
}
if (!r.data?.paths.length) return
@@ -354,7 +390,7 @@ async function addPath(): Promise<void> {
const idx = formStore.pathList.length
formStore.pathList.push({
path: `${dir}\\*.*`,
meta: '计算中…',
meta: t('distributeConfig.calculating'),
sizeBytes: 0
})
await refreshPathSize(idx, dir)
@@ -428,13 +464,16 @@ async function pickTemplate(): Promise<void> {
}
formStore.templateFile = soonPath
formStore.templatePreview = parsed.data
formStore.printFlag = defaultPrintFlagForTemplate(parsed.data.templateFlag)
formStore.printFlag = defaultPrintFlagForTemplate(
parsed.data.templateFlag,
isSingleSidePrinter.value
)
const { fields, frontImageUrl, backImageUrl } = parsed.data
if (!fields.length && !frontImageUrl && !backImageUrl) {
notify.warning('模板已打开，但未解析到可预览内容')
notify.warning(t('distributeConfig.templateNoPreview'))
return
}
notify.success('已加载标签模板')
notify.success(t('distributeConfig.templateLoaded'))
}
async function onSubmit(): Promise<void> {
@@ -468,7 +507,7 @@ async function onSubmit(): Promise<void> {
await dllJobCancel(newJobId)
jobStore.clearActiveJob()
appStore.setMode('ready')
notify.error('无法进入运行页，已取消任务')
notify.error(t('notify.cannotEnterRunning'))
}
} finally {
jobStore.submitting = false
@@ -500,6 +539,11 @@ async function onSubmit(): Promise<void> {
cursor: pointer;
}
.m-print-side-hint {
color: #e6a23c;
font-weight: 500;
}
.c-card-small--slot {
display: flex;
align-items: center;
app/src/renderer/src/views/DistributeRunningView.vue
+28 -32
View File
@@ -2,29 +2,26 @@
<AppShell>
<AppHeader :mode="headerMode">
<div v-if="phase === 'failed'" class="c-nav-group">
<NavButton icon="arrow-left" label="返回" @click="onFailedBack" />
<NavButton icon="redo" label="重置" variant="primary" @click="onFailedReset" />
<NavButton icon="arrow-left" :label="t('common.back')" @click="onFailedBack" />
<NavButton icon="redo" :label="t('common.reset')" variant="primary" @click="onFailedReset" />
</div>
<NavButton
v-else-if="phase === 'completed'"
icon="home"
label="返回"
:label="t('common.back')"
@click="onReturn"
/>
<NavButton v-else icon="stop" label="停止" variant="stop" @click="onStop" />
<NavButton v-else icon="stop" :label="t('common.stop')" variant="stop" @click="onStop" />
</AppHeader>
<main class="app-shell__main l-main-full">
<section class="l-hero-container">
<div class="m-left-panel">
<div class="c-status-panel">
<template v-if="phase === 'failed'">
<h2 class="c-status-title is-error">任务失败</h2>
<h2 class="c-status-title is-error">{{ t('running.taskFailed') }}</h2>
<p class="c-status-sub">{{ failedSub }}</p>
<p class="c-status-counter">
任务已经完成<span class="ok">{{ successCount }}</span>次，其中失败次数是<span
class="err"
>{{ failCount }}</span
>。
{{ t('running.progressCounter', { success: successCount, fail: failCount }) }}
</p>
<p v-if="failureErrorText" class="m-error-detail">{{ failureErrorText }}</p>
</template>
@@ -34,10 +31,7 @@
</h2>
<p class="c-status-sub">{{ statusSub }}</p>
<p class="c-status-counter">
任务已经完成<span class="ok">{{ successCount }}</span>次，其中失败次数是<span
class="err"
>{{ failCount }}</span
>。
{{ t('running.progressCounter', { success: successCount, fail: failCount }) }}
</p>
</template>
</div>
@@ -81,6 +75,7 @@
<script setup lang="ts">
import { computed, onMounted, onUnmounted, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { useI18n } from 'vue-i18n'
import { notify } from '@/composables/useNotify'
import { refreshLiveStatus } from '@/composables/usePrinterStatus'
import AppShell from '@/layouts/AppShell.vue'
@@ -122,13 +117,14 @@ const CIRCLE_LEN = 283
const route = useRoute()
const router = useRouter()
const { t } = useI18n()
const jobStore = useJobStore()
const collectStore = useCollectStore()
const formStore = useDistributeFormStore()
const appStore = useAppStore()
const isCollect = computed(() => route.name === 'collect-running')
const headerMode = computed(() => (isCollect.value ? '数据收集模式' : '数据分发模式'))
const headerMode = computed(() => (isCollect.value ? t('header.modeCollect') : t('header.modeDistribute')))
const successCount = computed(() =>
isCollect.value ? collectStore.successCount : jobStore.successCount
)
@@ -156,30 +152,30 @@ const displayProgress = computed(() => Math.round(progress.value))
const failedSub = computed(() =>
isCollect.value
? '请检查读卡器与卡片，插入备卡位可自动重试'
: '请检查设备故障，插入备卡位可自动重试'
? t('running.failedSubCollect')
: t('running.failedSubDistribute')
)
const statusTitle = computed(() => {
if (phase.value === 'completed') {
return isCollect.value ? '收集已完成' : '任务已完成'
return isCollect.value ? t('running.collectCompleted') : t('running.taskCompleted')
}
if (isCollect.value) {
return collectHint.value || '数据收集中'
return collectHint.value || t('running.dataCollecting')
}
return waitCard.value ? '等待插卡' : '任务执行中'
return waitCard.value ? t('running.waitingCard') : t('running.taskRunning')
})
const statusSub = computed(() => {
if (phase.value === 'completed') {
return isCollect.value
? '请点击返回，或插入备卡位继续下一张'
: '请点击返回，或插入备卡位自动开始下一张'
? t('running.completedSubCollect')
: t('running.completedSubDistribute')
}
if (isCollect.value) {
return collectHint.value || '正在从卡片读取并写入导入目录'
return collectHint.value || t('running.collectingHint')
}
return waitCard.value ? '请插入数据卡，任务将自动执行' : '任务执行中，请稍候'
return waitCard.value ? t('running.waitCardHint') : t('running.runningHint')
})
function setProgress(value: number): void {
@@ -229,7 +225,7 @@ async function startCardPositionWatch(
)
const cardStarted = await pollCardPositionStart(sessionMode)
if (!cardStarted.ok) {
notify.warning(cardStarted.message || '无法监控卡位，请手动点击返回或重新提交')
notify.warning(cardStarted.message || t('notify.pollMonitorFailed'))
}
}
@@ -306,7 +302,7 @@ async function resubmitTask(): Promise<void> {
if (isCollect.value) {
const dest = collectStore.destPath.trim()
if (!dest) {
await backToWait('导入目录无效，无法继续')
await backToWait(t('notify.dirInvalid'))
return
}
phase.value = 'running'
@@ -317,7 +313,7 @@ async function resubmitTask(): Promise<void> {
usbQueryFailStreak = 0
const r = await dllUsbCopy(dest, collectStore.cardOutput, { resubmit: true })
if (!r.ok) {
await backToWait(r.message || '重新提交收集任务失败')
await backToWait(r.message || t('notify.resubmitCollectFailed'))
return
}
usbAwaitNewCycle = true
@@ -348,7 +344,7 @@ async function resubmitTask(): Promise<void> {
jobStore.setActiveJob(created.jobId)
const started = await pollJobStart(created.jobId)
if (!started.ok) {
await backToWait(started.message || '启动任务轮询失败')
await backToWait(started.message || t('notify.pollStartFailed'))
return
}
unsubJob = onJobPollTick((payload) => applyJobProgress(payload as JobPollPayload))
@@ -366,7 +362,7 @@ function applyJobProgress(p: JobPollPayload): void {
queryFailStreak += 1
if (queryFailStreak < 3) return
jobStore.failCount += 1
void enterFailedPhase(`查询任务失败: ${p.queryErrorCode}`)
void enterFailedPhase(t('notify.queryJobFailed', { code: p.queryErrorCode }))
return
}
queryFailStreak = 0
@@ -397,7 +393,7 @@ function applyUsbProgress(p: UsbPollPayload): void {
usbQueryFailStreak += 1
if (usbQueryFailStreak < 3) return
collectStore.failCount += 1
void enterFailedPhase(`查询 USB 任务失败: ${p.queryCode}`)
void enterFailedPhase(t('notify.queryUsbFailed', { code: p.queryCode }))
return
}
usbQueryFailStreak = 0
@@ -415,7 +411,7 @@ function applyUsbProgress(p: UsbPollPayload): void {
collectStore.successCount += 1
workflowStep.value = 3
collectHint.value = usbTaskStatusHint(p.taskStatus)
notify.success('USB 收集完成')
notify.success(t('notify.usbCollectComplete'))
void enterCompletedPhase()
return
}
@@ -438,7 +434,7 @@ async function finishDistribute(
if (id && !skipCancel) {
const r = await dllJobCancel(id)
if (!r.ok) {
notify.warning(r.message || '取消任务时出现问题')
notify.warning(r.message || t('notify.cancelIssue'))
}
}
jobStore.clearActiveJob()
@@ -476,7 +472,7 @@ onMounted(async () => {
setProgress(0)
const started = await pollJobStart(jobStore.jobId)
if (!started.ok) {
notify.error(started.message || '启动任务轮询失败')
notify.error(started.message || t('notify.pollStartFailed'))
await finishDistribute(false)
return
}
app/src/renderer/src/views/HomeView.vue
+52 -22
View File
@@ -1,35 +1,45 @@
<template>
<AppShell>
<AppHeader mode="卡树数据卡打印机软件" />
<AppHeader :mode="t('header.modeHome')" />
<main class="app-shell__main l-dashboard">
<section class="m-tool-section">
<h3 class="m-section-title">工具</h3>
<h3 class="m-section-title">{{ t('home.toolsTitle') }}</h3>
<div class="m-tool-grid">
<button type="button" class="m-tool-btn" @click="onReset">
<AppIcon name="redo" />
<span>重置打印机</span>
<span>{{ t('common.resetPrinter') }}</span>
</button>
<button type="button" class="m-tool-btn" @click="onReject">
<AppIcon name="trash" />
<span>废弃卡片</span>
<span>{{ t('common.discardCard') }}</span>
</button>
<div class="m-tool-row">
<button type="button" class="m-tool-btn m-tool-btn--half" @click="onReadCard">
<AppIcon name="id-card" />
<span>{{ t('home.readCard') }}</span>
</button>
<button type="button" class="m-tool-btn m-tool-btn--half" @click="onEjectCard">
<AppIcon name="eject" />
<span>{{ t('home.ejectCard') }}</span>
</button>
</div>
<button type="button" class="m-tool-btn" @click="onTemplate">
<AppIcon name="paint-brush" />
<span>模板设计</span>
<span>{{ t('common.templateDesign') }}</span>
</button>
</div>
</section>
<div class="m-divider" />
<section class="m-task-section">
<h3 class="m-section-title">任务</h3>
<h3 class="m-section-title">{{ t('home.tasksTitle') }}</h3>
<div class="m-task-grid">
<button type="button" class="m-task-card" @click="goDistribute">
<div class="m-task-icon">
<AppIcon name="share" />
</div>
<div class="m-task-info">
<h4>数据分发</h4>
<p>分发数据到打印卡片</p>
<h4>{{ t('home.dataDistribute') }}</h4>
<p>{{ t('home.dataDistributeDesc') }}</p>
</div>
</button>
<button type="button" class="m-task-card" @click="goCollect">
@@ -37,8 +47,8 @@
<AppIcon name="download" />
</div>
<div class="m-task-info">
<h4>数据收集</h4>
<p>从卡片收集导入数据</p>
<h4>{{ t('home.dataCollect') }}</h4>
<p>{{ t('home.dataCollectDesc') }}</p>
</div>
</button>
</div>
@@ -50,6 +60,7 @@
<script setup lang="ts">
import { computed } from 'vue'
import { useI18n } from 'vue-i18n'
import { useRouter } from 'vue-router'
import { notify, notifyRequireInit } from '@/composables/useNotify'
import { refreshLiveStatus } from '@/composables/usePrinterStatus'
@@ -59,8 +70,9 @@ import AppFooter from '@/components/AppFooter.vue'
import AppIcon from '@/components/AppIcon.vue'
import { useAppStore } from '@/stores/app'
import { useConfigStore } from '@/stores/config'
import { dllPrinterReject, dllPrinterReset, openDesignApp } from '@/api/cardsoon'
import { dllPrinterEjectCard, dllPrinterReadCard, dllPrinterReject, dllPrinterReset, openDesignApp } from '@/api/cardsoon'
const { t } = useI18n()
const router = useRouter()
const appStore = useAppStore()
const configStore = useConfigStore()
@@ -73,43 +85,61 @@ function guardInit(action?: string): boolean {
}
async function onReset(): Promise<void> {
if (!guardInit('重置打印机')) return
if (!guardInit(t('common.resetPrinter'))) return
const r = await dllPrinterReset()
if (r.ok) {
notify.success('已发送重置指令')
notify.success(t('notify.resetSent'))
await refreshLiveStatus()
} else notify.error(r.message || '重置失败')
} else notify.error(r.message || t('notify.resetFailed'))
}
async function onReject(): Promise<void> {
if (!guardInit('废弃卡片')) return
if (!guardInit(t('common.discardCard'))) return
if (!configStore.rejectApiAvailable) {
notify.warning('当前环境不支持废卡接口')
notify.warning(t('notify.rejectUnavailable'))
return
}
const r = await dllPrinterReject()
if (r.ok) {
notify.success('已废弃卡片')
notify.success(t('notify.cardRejected'))
await refreshLiveStatus()
} else notify.error(r.message || '操作失败')
} else notify.error(r.message || t('notify.operationFailed'))
}
async function onReadCard(): Promise<void> {
if (!guardInit(t('home.readCard'))) return
const r = await dllPrinterReadCard()
if (r.ok) {
notify.success(t('notify.readCardSent'))
await refreshLiveStatus()
} else notify.error(r.message || t('notify.readCardFailed'))
}
async function onEjectCard(): Promise<void> {
if (!guardInit(t('home.ejectCard'))) return
const r = await dllPrinterEjectCard()
if (r.ok) {
notify.success(t('notify.ejectCardSent'))
await refreshLiveStatus()
} else notify.error(r.message || t('notify.ejectCardFailed'))
}
async function onTemplate(): Promise<void> {
const r = await openDesignApp()
if (!r.ok) {
notify.error(r.message || '打开设计软件失败，请检查 cardsoon.config.json')
notify.warning(r.message || t('notify.designCancelled'))
return
}
notify.success('已启动设计软件')
notify.success(t('notify.designStarted'))
}
function guardBusy(): boolean {
if (appStore.mode === 'distributing') {
notify.warning('请先停止数据分发任务')
notify.warning(t('notify.stopDistribute'))
return false
}
if (appStore.mode === 'usbCopying') {
notify.warning('USB 收集进行中，请等待完成')
notify.warning(t('notify.usbCollecting'))
return false
}
return true
app/src/shared/printer-info.ts
+26 -3
View File
@@ -3,6 +3,19 @@ export interface PrinterStatusSnapshot {
ribbonAmount: string
statusText: string
serialNo: string
/** 打印机型号/名称（如 TH80），用于判断单/双面能力 */
printerName: string
/** 是否为单面打印机（如 TH80），单面打印机不能选"双面"打印 */
isSingleSide: boolean
}
/** 已知单面打印机型号关键字（命中即视为单面） */
const SINGLE_SIDE_PRINTER_PATTERNS = ['TH80']
function detectSingleSide(printerName: string): boolean {
const s = (printerName || '').trim().toUpperCase()
if (!s) return false
return SINGLE_SIDE_PRINTER_PATTERNS.some((p) => s.includes(p.toUpperCase()))
}
const PRINTER_STATUS_MAP: Record<string, string> = {
@@ -57,17 +70,27 @@ function snapshotFromRecord(row: Record<string, unknown>): PrinterStatusSnapshot
'SerialNo',
'serialNo',
'szPrinterSerial',
'PrinterSerial',
'PrinterName'
'PrinterSerial'
])
const printerName = pickFirst(row, [
'PrinterName',
'printer_name',
'PrinterModel',
'model',
'szPrinterName',
'szPrinterModel'
])
const ribbonType = pickFirst(row, ['ribbon_type', 'RibbonType'])
const ribbonAmount = pickFirst(row, ['RibbonAmount', 'ribbon_amount'])
const nameStr = String(printerName ?? '—')
return {
ribbonType: String(ribbonType ?? '—'),
ribbonAmount: String(ribbonAmount ?? '—'),
statusText: '—',
serialNo: String(serial ?? '—')
serialNo: String(serial ?? printerName ?? '—'),
printerName: nameStr,
isSingleSide: detectSingleSide(nameStr)
}
}