From 9d3b8fcd20489107c4900dbcff07eb435d4762ea Mon Sep 17 00:00:00 2001
From: Gmaker689 <1711322114@qq.com>
Date: Mon, 25 May 2026 19:46:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8F=8C=E9=87=8D=E6=A0=87=E7=AD=BE=E5=92=8C?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87=E7=AD=BE=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 CreateProjectModal/ProjectConfigPanel 中外层重复的"工程类型"标签
- CustomTagsEditor 标签 pill 改为 button，点击整个 pill 即可移除标签
---
 frontend/src/components/CreateProjectModal.tsx |  3 ---
 frontend/src/components/CustomTagsEditor.tsx   | 18 ++++++++----------
 frontend/src/components/ProjectConfigPanel.tsx |  3 ---
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/CreateProjectModal.tsx b/frontend/src/components/CreateProjectModal.tsx
index 3edd8ec..12c9e9a 100644
--- a/frontend/src/components/CreateProjectModal.tsx
+++ b/frontend/src/components/CreateProjectModal.tsx
@@ -91,9 +91,6 @@ export default function CreateProjectModal({
         </label>
 
         <div style={{ marginBottom: 16 }}>
-          <span style={{ display: 'block', fontSize: 13, fontWeight: 600, marginBottom: 8, color: 'var(--text-secondary)' }}>
-            工程类型
-          </span>
           <StyleSelector
             value={style}
             onChange={handleStyleChange}
diff --git a/frontend/src/components/CustomTagsEditor.tsx b/frontend/src/components/CustomTagsEditor.tsx
index 6407e0b..13ce815 100644
--- a/frontend/src/components/CustomTagsEditor.tsx
+++ b/frontend/src/components/CustomTagsEditor.tsx
@@ -32,8 +32,10 @@ export default function CustomTagsEditor({ style, onChange }: CustomTagsEditorPr
       </div>
       <div style={{ display: 'flex', flexWrap: 'wrap', gap: 6, marginBottom: 8 }}>
         {tags.map(tag => (
-          <span
+          <button
             key={tag}
+            type="button"
+            onClick={() => onChange(removeCustomTag(style, tag))}
             style={{
               display: 'inline-flex',
               alignItems: 'center',
@@ -43,25 +45,21 @@ export default function CustomTagsEditor({ style, onChange }: CustomTagsEditorPr
               borderRadius: 999,
               background: 'var(--bg-input)',
               border: '1px solid var(--border)',
+              color: 'var(--text-primary)',
+              cursor: 'pointer',
             }}
           >
             {tag}
-            <button
-              type="button"
+            <span
               style={{
-                background: 'transparent',
-                border: 'none',
                 color: 'var(--text-muted)',
                 fontSize: 14,
-                padding: 0,
                 lineHeight: 1,
-                cursor: 'pointer',
               }}
-              onClick={() => onChange(removeCustomTag(style, tag))}
             >
               x
-            </button>
-          </span>
+            </span>
+          </button>
         ))}
       </div>
       <div style={{ display: 'flex', gap: 8 }}>
diff --git a/frontend/src/components/ProjectConfigPanel.tsx b/frontend/src/components/ProjectConfigPanel.tsx
index f504f6c..b0158a3 100644
--- a/frontend/src/components/ProjectConfigPanel.tsx
+++ b/frontend/src/components/ProjectConfigPanel.tsx
@@ -73,9 +73,6 @@ export default function ProjectConfigPanel() {
       </div>
 
       <div style={{ flex: 1, overflow: 'auto', padding: '12px 16px' }}>
-        <div style={{ fontSize: 13, fontWeight: 600, marginBottom: 8, color: 'var(--text-secondary)' }}>
-          工程类型
-        </div>
         <StyleSelector
           value={draftStyle}
           onChange={updateDraft}

From f44fd56e22065f6f9672c6260cb525de7d79f32f Mon Sep 17 00:00:00 2001
From: Gmaker689 <1711322114@qq.com>
Date: Mon, 25 May 2026 19:55:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E8=9E=8D=E5=85=A5=E5=8E=9F=E7=94=9F=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=A0=8F=EF=BC=8C=E7=82=B9=E5=87=BB=E5=88=87=E6=8D=A2=E8=80=8C?=
 =?UTF-8?q?=E9=9D=9E=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- StyleSelector 新增 customTags 属性，自定义标签作为「自定义标签」行展示在原生标签栏中
- 自定义标签点击切换 true/false，不再移除 key，解决点击消失问题
- CustomTagsEditor 简化为仅输入框+添加按钮
- extractTags 仅提取激活态自定义标签（value=true）
- 导出 CUSTOM_PREFIX 供组件使用
---
 frontend/src/api/prompt.ts                    |  9 ++--
 .../src/components/CreateProjectModal.tsx     |  3 +-
 frontend/src/components/CustomTagsEditor.tsx  | 41 ++-----------------
 frontend/src/components/GenerateForm.tsx      |  4 +-
 .../src/components/ProjectConfigPanel.tsx     |  3 +-
 frontend/src/components/PromptEditor.tsx      |  6 ++-
 frontend/src/components/StyleSelector.tsx     | 31 +++++++++++++-
 frontend/src/utils/style.ts                   |  2 +-
 8 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/frontend/src/api/prompt.ts b/frontend/src/api/prompt.ts
index f023b57..bda3d46 100755
--- a/frontend/src/api/prompt.ts
+++ b/frontend/src/api/prompt.ts
@@ -1,5 +1,5 @@
 import { post } from './client'
-import { STYLE_CATEGORIES, PROJECT_TYPES, PROJECT_TYPE_KEY, getCustomTags } from '../utils/style'
+import { STYLE_CATEGORIES, PROJECT_TYPES, PROJECT_TYPE_KEY, CUSTOM_PREFIX, getCustomTags } from '../utils/style'
 
 interface OptimizePromptParams {
   tags: string[]
@@ -34,8 +34,11 @@ export function extractTags(style: Record<string, string>): string[] {
     if (option) tags.push(option.label)
   }
 
-  // 自定义标签
-  tags.push(...getCustomTags(style))
+  // 自定义标签（仅包含激活的）
+  const customTags = getCustomTags(style).filter(
+    tag => style[`${CUSTOM_PREFIX}${tag}`] === 'true'
+  )
+  tags.push(...customTags)
   return tags
 }
 
diff --git a/frontend/src/components/CreateProjectModal.tsx b/frontend/src/components/CreateProjectModal.tsx
index 12c9e9a..a819adf 100644
--- a/frontend/src/components/CreateProjectModal.tsx
+++ b/frontend/src/components/CreateProjectModal.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { PROJECT_TYPES, PROJECT_TYPE_KEY } from '../utils/style'
+import { PROJECT_TYPES, PROJECT_TYPE_KEY, getCustomTags } from '../utils/style'
 import StyleSelector from './StyleSelector'
 import CustomTagsEditor from './CustomTagsEditor'
 
@@ -100,6 +100,7 @@ export default function CreateProjectModal({
               label: '工程类型',
               options: PROJECT_TYPES.map(p => ({ value: p.value, label: p.label })),
             }]}
+            customTags={getCustomTags(style)}
           />
           <CustomTagsEditor style={style} onChange={setStyle} />
         </div>
diff --git a/frontend/src/components/CustomTagsEditor.tsx b/frontend/src/components/CustomTagsEditor.tsx
index 13ce815..3331c57 100644
--- a/frontend/src/components/CustomTagsEditor.tsx
+++ b/frontend/src/components/CustomTagsEditor.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { getCustomTags, addCustomTag, removeCustomTag } from '../utils/style'
+import { getCustomTags, addCustomTag } from '../utils/style'
 
 interface CustomTagsEditorProps {
   style: Record<string, string>
@@ -26,49 +26,14 @@ export default function CustomTagsEditor({ style, onChange }: CustomTagsEditorPr
   }
 
   return (
-    <div style={{ marginTop: 12 }}>
-      <div style={{ fontSize: 13, fontWeight: 600, marginBottom: 8, color: 'var(--text-secondary)' }}>
-        自定义标签
-      </div>
-      <div style={{ display: 'flex', flexWrap: 'wrap', gap: 6, marginBottom: 8 }}>
-        {tags.map(tag => (
-          <button
-            key={tag}
-            type="button"
-            onClick={() => onChange(removeCustomTag(style, tag))}
-            style={{
-              display: 'inline-flex',
-              alignItems: 'center',
-              gap: 4,
-              fontSize: 12,
-              padding: '3px 10px',
-              borderRadius: 999,
-              background: 'var(--bg-input)',
-              border: '1px solid var(--border)',
-              color: 'var(--text-primary)',
-              cursor: 'pointer',
-            }}
-          >
-            {tag}
-            <span
-              style={{
-                color: 'var(--text-muted)',
-                fontSize: 14,
-                lineHeight: 1,
-              }}
-            >
-              x
-            </span>
-          </button>
-        ))}
-      </div>
+    <div style={{ marginTop: 8 }}>
       <div style={{ display: 'flex', gap: 8 }}>
         <input
           type="text"
           value={input}
           onChange={e => setInput(e.target.value)}
           onKeyDown={handleKeyDown}
-          placeholder="输入标签后按 Enter 添加"
+          placeholder="输入自定义标签后按 Enter 添加"
           style={{ flex: 1, padding: '6px 10px', fontSize: 13 }}
         />
         <button
diff --git a/frontend/src/components/GenerateForm.tsx b/frontend/src/components/GenerateForm.tsx
index 02c29ce..e12d1f6 100755
--- a/frontend/src/components/GenerateForm.tsx
+++ b/frontend/src/components/GenerateForm.tsx
@@ -1,7 +1,7 @@
 import type { AssetType } from '../api/types'
 import { useProjectStore } from '../stores/project'
 import { useTaskStore } from '../stores/task'
-import { mergeStyles } from '../utils/style'
+import { mergeStyles, getCustomTags } from '../utils/style'
 import StyleSelector from './StyleSelector'
 import CustomTagsEditor from './CustomTagsEditor'
 import PromptEditor from './PromptEditor'
@@ -122,7 +122,7 @@ export default function GenerateForm({ onSubmit, submitting }: GenerateFormProps
         <h3 style={{ marginBottom: 12, fontSize: 14, color: 'var(--text-secondary)' }}>
           素材风格
         </h3>
-        <StyleSelector value={taskStyle} onChange={toggleTaskStyle} compact />
+        <StyleSelector value={taskStyle} onChange={toggleTaskStyle} compact customTags={getCustomTags(taskStyle)} />
         <CustomTagsEditor style={taskStyle} onChange={setTaskStyle} />
       </div>
 
diff --git a/frontend/src/components/ProjectConfigPanel.tsx b/frontend/src/components/ProjectConfigPanel.tsx
index b0158a3..a5384b1 100644
--- a/frontend/src/components/ProjectConfigPanel.tsx
+++ b/frontend/src/components/ProjectConfigPanel.tsx
@@ -2,7 +2,7 @@ import { useEffect } from 'react'
 import { useParams } from 'react-router-dom'
 import { useProjectStore } from '../stores/project'
 import { useToastStore } from '../stores/toast'
-import { PROJECT_TYPES, PROJECT_TYPE_KEY } from '../utils/style'
+import { PROJECT_TYPES, PROJECT_TYPE_KEY, getCustomTags } from '../utils/style'
 import StyleSelector from './StyleSelector'
 import CustomTagsEditor from './CustomTagsEditor'
 import Skeleton from './Skeleton'
@@ -82,6 +82,7 @@ export default function ProjectConfigPanel() {
             label: '工程类型',
             options: PROJECT_TYPES.map(p => ({ value: p.value, label: p.label })),
           }]}
+          customTags={getCustomTags(draftStyle)}
         />
         <CustomTagsEditor style={draftStyle} onChange={setDraftStyle} />
       </div>
diff --git a/frontend/src/components/PromptEditor.tsx b/frontend/src/components/PromptEditor.tsx
index fbd43fc..27ecaef 100755
--- a/frontend/src/components/PromptEditor.tsx
+++ b/frontend/src/components/PromptEditor.tsx
@@ -1,4 +1,4 @@
-import { STYLE_CATEGORIES, PROJECT_TYPES, PROJECT_TYPE_KEY, getCustomTags } from '../utils/style'
+import { STYLE_CATEGORIES, PROJECT_TYPES, PROJECT_TYPE_KEY, CUSTOM_PREFIX, getCustomTags } from '../utils/style'
 import styles from './GenerateForm.module.css'
 
 interface PromptEditorProps {
@@ -32,7 +32,9 @@ function styleToDescription(kvPairs: Record<string, string>): string {
     if (option) parts.push(`${cat.label}: ${option.label}`)
   }
 
-  const customTags = getCustomTags(kvPairs)
+  const customTags = getCustomTags(kvPairs).filter(
+    tag => kvPairs[`${CUSTOM_PREFIX}${tag}`] === 'true'
+  )
   if (customTags.length > 0) parts.push(`标签: ${customTags.join(', ')}`)
 
   return parts.join(', ')
diff --git a/frontend/src/components/StyleSelector.tsx b/frontend/src/components/StyleSelector.tsx
index 06a7578..d995d26 100755
--- a/frontend/src/components/StyleSelector.tsx
+++ b/frontend/src/components/StyleSelector.tsx
@@ -1,5 +1,5 @@
 import type { StyleCategory } from '../utils/style'
-import { STYLE_CATEGORIES } from '../utils/style'
+import { STYLE_CATEGORIES, CUSTOM_PREFIX } from '../utils/style'
 import styles from './StyleSelector.module.css'
 
 interface StyleSelectorProps {
@@ -7,6 +7,13 @@ interface StyleSelectorProps {
   onChange: (key: string, value: string) => void
   compact?: boolean
   categories?: StyleCategory[]
+  customTags?: string[]
+}
+
+const CUSTOM_TAG_CATEGORY: StyleCategory = {
+  key: '', // unused, pills use custom: prefix directly
+  label: '自定义标签',
+  options: [],
 }
 
 export default function StyleSelector({
@@ -14,6 +21,7 @@ export default function StyleSelector({
   onChange,
   compact,
   categories,
+  customTags,
 }: StyleSelectorProps) {
   const cats = categories ?? STYLE_CATEGORIES
   return (
@@ -37,6 +45,27 @@ export default function StyleSelector({
           </div>
         </div>
       ))}
+      {customTags && customTags.length > 0 && (
+        <div key="_custom" className={styles.category}>
+          <span className={styles.label}>{CUSTOM_TAG_CATEGORY.label}</span>
+          <div className={styles.options}>
+            {customTags.map(tag => {
+              const key = `${CUSTOM_PREFIX}${tag}`
+              const isActive = value[key] === 'true'
+              return (
+                <button
+                  key={tag}
+                  type="button"
+                  className={`${styles.pill} ${isActive ? styles.pillActive : ''}`}
+                  onClick={() => onChange(key, isActive ? 'false' : 'true')}
+                >
+                  {tag}
+                </button>
+              )
+            })}
+          </div>
+        </div>
+      )}
     </div>
   )
 }
diff --git a/frontend/src/utils/style.ts b/frontend/src/utils/style.ts
index 55d979b..222ffc3 100755
--- a/frontend/src/utils/style.ts
+++ b/frontend/src/utils/style.ts
@@ -8,7 +8,7 @@ export function mergeStyles(
   return { ...projectStyle, ...taskOverrides }
 }
 
-const CUSTOM_PREFIX = 'custom:'
+export const CUSTOM_PREFIX = 'custom:'
 
 export function isCustomKey(key: string): boolean {
   return key.startsWith(CUSTOM_PREFIX)