Add files via upload

Author: linyunjun

app.js

@@ -1717,10 +1717,17 @@ function parseCountedToken(raw) {
   return { value: token, count: 1 };
 }
 
+function normalizeImportedPatternText(text) {
+  return String(text || "")
+    .replace(/[，、]/g, ",")
+    .replace(/[（]/g, "(")
+    .replace(/[）]/g, ")");
+}
+
 function parseImportedItems(text) {
   const items = [];
   const unresolved = [];
-  splitPatternTokens(text).forEach((token) => {
+  splitPatternTokens(normalizeImportedPatternText(text)).forEach((token) => {
     const { value, count } = parseCountedToken(token);
     const groupMatch = value.match(/^[\(（](.+)[\)）]$/);
     if (groupMatch) {
@@ -1729,7 +1736,14 @@ function parseImportedItems(text) {
         const parsed = parseCountedToken(innerToken);
         const stitch = findStitch(parsed.value);
         if (!stitch) {
-          unresolved.push(innerToken);
+          const compactItems = splitCompactStitches(parsed.value);
+          if (compactItems.length) {
+            compactItems.forEach((item) => {
+              groupItems.push({ ...item, count: item.count * parsed.count });
+            });
+          } else {
+            unresolved.push(innerToken);
+          }
           return;
         }
         groupItems.push({ stitchId: stitch.id, count: parsed.count });
@@ -1739,7 +1753,12 @@ function parseImportedItems(text) {
     }
     const stitch = findStitch(value);
     if (!stitch) {
-      unresolved.push(token);
+      const compactItems = splitCompactStitches(value);
+      if (compactItems.length) {
+        items.push({ type: "group", groupName: value, count, items: compactItems });
+      } else {
+        unresolved.push(token);
+      }
       return;
     }
     items.push({ stitchId: stitch.id, count });
@@ -1770,8 +1789,12 @@ function parseTextPattern(text) {
     if (/^-{3,}$/.test(raw)) return;
     const match = raw.match(/^(?:R|第)?\s*(\d+)(?:\s*[-~～－]\s*(\d+))?(?:\s*[圈段])?(?::|：|\s+)\s*(.+)$/i);
     if (!match) {
-      if (/^[\u4e00-\u9fa5A-Za-z][\u4e00-\u9fa5A-Za-z0-9\s_-]*$/.test(raw)) {
-        currentPart = { id: crypto.randomUUID(), name: raw, notes: "", segments: [] };
+      const [partNameText, ...partNoteParts] = raw.split("//");
+      const partName = partNameText.trim();
+      const partNote = partNoteParts.join("//").trim();
+      const titleMatch = partName.match(/^[\u4e00-\u9fa5A-Za-z][\u4e00-\u9fa5A-Za-z0-9\s_*\-×xX]*$/);
+      if (titleMatch) {
+        currentPart = { id: crypto.randomUUID(), name: partName, notes: partNote, segments: [] };
         parts.push(currentPart);
       } else {
         unparsed.push(`第 ${index + 1} 行：${raw}`);
@@ -1780,15 +1803,17 @@ function parseTextPattern(text) {
     }
     const start = Number(match[1]);
     const end = Math.max(start, Number(match[2] || start));
-    const parsed = parseImportedItems(match[3]);
+    const [stitchText, ...noteParts] = match[3].split("//");
+    const note = noteParts.join("//").trim();
+    const parsed = parseImportedItems(stitchText);
     if (!parsed.items.length) {
       unparsed.push(`第 ${index + 1} 行：${raw}`);
       return;
     }
     parsed.unresolved.forEach((item) => unparsed.push(`第 ${index + 1} 行無法辨識：${item}`));
     const part = ensurePart();
     for (let round = start; round <= end; round += 1) {
-      part.segments.push({ id: crypto.randomUUID(), repeat: 1, note: "", items: structuredClone(parsed.items) });
+      part.segments.push({ id: crypto.randomUUID(), repeat: 1, note, items: structuredClone(parsed.items) });
     }
   });
   const validParts = parts.filter((part) => part.segments.length);
@@ -1801,6 +1826,24 @@ function findStitch(value) {
   return state.stitches.find((stitch) => [stitch.id, stitch.zh, stitch.letter].some((item) => String(item).toLowerCase() === normalized));
 }
 
+function splitCompactStitches(value) {
+  const text = String(value || "").trim();
+  if (!/^[A-Za-z]+$/.test(text)) return [];
+  const letters = state.stitches
+    .map((stitch) => ({ id: stitch.id, letter: String(stitch.letter || "").trim() }))
+    .filter((item) => item.letter && /^[A-Za-z]+$/.test(item.letter))
+    .sort((a, b) => b.letter.length - a.letter.length);
+  const result = [];
+  let index = 0;
+  while (index < text.length) {
+    const match = letters.find((item) => text.slice(index, index + item.letter.length).toLowerCase() === item.letter.toLowerCase());
+    if (!match) return [];
+    result.push({ stitchId: match.id, count: 1 });
+    index += match.letter.length;
+  }
+  return result.length > 1 ? result : [];
+}
+
 function expandedRows(pattern) {
   const rows = [];
   pattern.parts.forEach((part) => {
@@ -5804,6 +5847,24 @@ document.querySelectorAll(".modal").forEach((modal) => {
   });
 });
 
+function selectNumericInput(input) {
+  if (!(input instanceof HTMLInputElement)) return;
+  if (input.type !== "number" || input.disabled || input.readOnly) return;
+  requestAnimationFrame(() => {
+    try {
+      input.select();
+    } catch {}
+  });
+}
+
+document.addEventListener("focusin", (event) => {
+  selectNumericInput(event.target);
+});
+
+document.addEventListener("pointerup", (event) => {
+  if (event.target === document.activeElement) selectNumericInput(event.target);
+});
+
 registerServiceWorker();
 if ("scrollRestoration" in history) history.scrollRestoration = "manual";
 requestAnimationFrame(() => {

index.html

@@ -748,7 +748,8 @@ <h2>文字匯入織圖</h2>
           <details class="reference-box">
             <summary>參考針法與格式</summary>
             <p>每個中文標題會建立一個部分；部分下面可輸入 R1、R2 或 R3-9。</p>
-            <p>例：身體 / R1 6X,V,A / R2 3(2X,A,2X) / 手 / R1 12X。</p>
+            <p>例：身體 // 主體備註 / R1 6X,V,A // 膚色環起 / R2 3(2X,A,2X) / 手 / R1 12X。</p>
+            <p>使用 // 可加入備註；放在部分標題後是部分備註，放在 R1 後是段落備註。</p>
             <p>可用格式：6X、X x 6、3(2X,A,2X)、2(5X,W)，也可用逗號分隔針法。</p>
             <p id="textPatternReference"></p>
           </details>
@@ -758,7 +759,7 @@ <h2>文字匯入織圖</h2>
           </label>
           <label class="wide-field">
             貼上文字織圖
-            <textarea id="textPatternInput" rows="8" placeholder="身體&#10;R1 6X,V,A&#10;R2 3(2X,A,2X)&#10;R3-9 V,2(5X,W),5X,X&#10;手&#10;R1 12X&#10;R2 2X,A,10V"></textarea>
+            <textarea id="textPatternInput" rows="8" placeholder="身體 // 主體備註&#10;R1 6X,V,A // 膚色環起&#10;R2 3(2X,A,2X)&#10;R3-9 V,2(5X,W),5X,X // 不加不減&#10;手&#10;R1 12X&#10;R2 2X,A,10V"></textarea>
           </label>
           <button class="primary-button full-width" id="convertTextPatternBtn">匯入成織圖</button>
           <div class="unparsed-list hidden" id="textPatternUnparsed"></div>

service-worker.js

@@ -1,4 +1,4 @@
-const VERSION = "118";
+const VERSION = "123";
 const CACHE_NAME = `free-knit-workbench-v${VERSION}`;
 const ASSETS = [
   "./",