From b09560a4e54ebf76b0114a2051037d278ba399ee Mon Sep 17 00:00:00 2001 From: hyper Date: Tue, 7 Apr 2026 19:33:08 +0800 Subject: [PATCH] refactor: allow chinese layer names --- src/components/md-deck/hooks/deckStore.ts | 6 +++--- src/components/md-deck/hooks/layer-parser.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/md-deck/hooks/deckStore.ts b/src/components/md-deck/hooks/deckStore.ts index c9b6b5d..055bfa1 100644 --- a/src/components/md-deck/hooks/deckStore.ts +++ b/src/components/md-deck/hooks/deckStore.ts @@ -1,4 +1,4 @@ -import { createStore } from 'solid-js/store'; +import { createStore } from 'solid-js/store'; import { calculateDimensions } from './dimensions'; import { loadCSV, CSV } from '../../utils/csv-loader'; import { initLayerConfigs, formatLayers, initLayerConfigsForSide } from './layer-parser'; @@ -321,7 +321,7 @@ export function createDeckStore( if (data.length === 0) { setState({ - error: 'CSV 文件为空或格式不正确', + error: `CSV ${path} 文件为空或格式不正确`, isLoading: false }); return; @@ -337,7 +337,7 @@ export function createDeckStore( updateDimensions(); } catch (err) { setState({ - error: `加载 CSV 失败:${err instanceof Error ? err.message : '未知错误'}`, + error: `加载 CSV ${path} 失败:${err instanceof Error ? err.message : '未知错误'}`, isLoading: false }); } diff --git a/src/components/md-deck/hooks/layer-parser.ts b/src/components/md-deck/hooks/layer-parser.ts index e723e0b..4404914 100644 --- a/src/components/md-deck/hooks/layer-parser.ts +++ b/src/components/md-deck/hooks/layer-parser.ts @@ -11,7 +11,7 @@ export function parseLayers(layersStr: string): Layer[] { const layers: Layer[] = []; // 匹配:prop:x1,y1-x2,y2[ffontSize][direction][align] - const regex = /(\w+):(\d+),(\d+)-(\d+),(\d+)(?:f([\d.]+))?([nsew])?([lcr])?/g; + const regex = /([^: ]+):(\d+),(\d+)-(\d+),(\d+)(?:f([\d.]+))?([nsew])?([lcr])?/g; let match; while ((match = regex.exec(layersStr)) !== null) {