diff --git a/src/components/PromptEditor.vue b/src/components/PromptEditor.vue index ab9745c..4e96d0f 100644 --- a/src/components/PromptEditor.vue +++ b/src/components/PromptEditor.vue @@ -7,6 +7,8 @@ import NotificationToast from './NotificationToast.vue'; const store = usePromptStore(); const draggingIndex = ref(null); const overIndex = ref(null); +const dragPreview = ref(null); +const isDragging = ref(false); const editingIndex = ref(null); const editingValue = ref(''); const addingMapIndex = ref(null); @@ -120,27 +122,129 @@ async function copyLeft() { function replaceCnComma() { store.replaceChineseComma(); text.value = store.promptText; } function formatPrompt() { store.formatPrompt(); text.value = store.promptText; } +// 新增功能方法 +function toggleUnderscoreSpace() { + store.toggleUnderscoreSpace(); + text.value = store.promptText; + showNotification('已切换下划线/空格格式', 'success'); +} + +function addWrapperToToken(index: number) { + store.addWrapperToToken(index, '{}'); + text.value = store.promptText; + showNotification('已添加包裹层 {}', 'success'); +} + +function removeWrapperFromToken(index: number) { + store.removeWrapperFromToken(index); + text.value = store.promptText; + showNotification('已移除外层包裹', 'success'); +} + +function getTokenWrapperInfo(token: string) { + return store.getTokenWrapperInfo(token); +} + function onDragStart(index: number, e: DragEvent) { - draggingIndex.value = index; + draggingIndex.value = index; + isDragging.value = true; + if (e.dataTransfer) { e.dataTransfer.effectAllowed = 'move'; e.dataTransfer.setData('text/plain', tokens.value[index] || ''); + + // 创建自定义拖拽预览 + const dragElement = e.target as HTMLElement; + const token = tokens.value[index] || ''; + const translation = displayTrans(token); + + // 创建预览元素 + const preview = document.createElement('div'); + preview.className = 'drag-preview'; + preview.innerHTML = ` +
+ ${token} + → + ${translation} +
+ `; + + // 设置预览样式（减少布局与重绘） + preview.style.position = 'fixed'; + preview.style.top = '0'; + preview.style.left = '0'; + preview.style.zIndex = '1000'; + preview.style.pointerEvents = 'none'; + preview.style.visibility = 'hidden'; + // 降低绘制成本 + ;(preview.style as any).contain = 'layout style paint'; + preview.style.willChange = 'transform, opacity'; + + document.body.appendChild(preview); + dragPreview.value = preview; + + // 设置拖拽图像 + e.dataTransfer.setDragImage(preview, 0, 0); + + // 预览节点在 dragend 中统一清理，避免频繁移除导致卡顿 } } + function onDragOver(index: number, e: DragEvent) { e.preventDefault(); + if (draggingIndex.value === null) return; + e.dataTransfer!.dropEffect = 'move'; - overIndex.value = index; + + // 只有当拖拽到不同位置时才更新 + if (overIndex.value !== index) { + overIndex.value = index; + } } -function onDragLeave() { - overIndex.value = null; + +function onDragEnter(index: number, e: DragEvent) { + e.preventDefault(); + if (draggingIndex.value !== null && draggingIndex.value !== index) { + overIndex.value = index; + } } + +function onDragLeave(e: DragEvent) { + // 只有当离开整个拖拽区域时才清除 + const rect = (e.currentTarget as HTMLElement).getBoundingClientRect(); + const x = e.clientX; + const y = e.clientY; + + if (x < rect.left || x > rect.right || y < rect.top || y > rect.bottom) { + overIndex.value = null; + } +} + function onDrop(index: number, e: DragEvent) { e.preventDefault(); if (draggingIndex.value == null) return; + + // 执行重排序 store.reorderTokens(draggingIndex.value, index); + + // 重置状态 draggingIndex.value = null; overIndex.value = null; + isDragging.value = false; + + showNotification('已重新排序', 'success'); +} + +function onDragEnd() { + // 清理拖拽状态 + draggingIndex.value = null; + overIndex.value = null; + isDragging.value = false; + + if (dragPreview.value) { + document.body.removeChild(dragPreview.value); + dragPreview.value = null; + } } function beginEdit(i: number) { @@ -321,6 +425,14 @@ function displayTrans(key: string): string { 格式化提示词 +
  • {{ s }}
    • @@ -334,6 +446,8 @@ function displayTrans(key: string): string { + +
    @@ -359,14 +476,34 @@ function displayTrans(key: string): string { {{ displayTrans(k) }}
    - -
    -
    +
    + + + +
    + +
    ⋮⋮ @@ -398,6 +538,24 @@ function displayTrans(key: string): string { + +
    + @@ -966,6 +1125,50 @@ function displayTrans(key: string): string { transform: scale(1.05); } +/* 精简视图的包裹层控制按钮 */ +.pe-token-controls-compact { + display: flex; + gap: 0.125rem; + opacity: 0.7; + transition: opacity 0.2s ease; +} + +.pe-token-compact:hover .pe-token-controls-compact { + opacity: 1; +} + +.pe-add-wrapper-btn, .pe-remove-wrapper-btn { + display: flex; + align-items: center; + justify-content: center; + width: 1.25rem; + height: 1.25rem; + border: 1px solid var(--color-border); + background-color: var(--color-bg-primary); + color: var(--color-text-secondary); + border-radius: var(--radius-sm); + cursor: pointer; + transition: all 0.2s ease; + flex-shrink: 0; +} + +.pe-add-wrapper-btn:hover { + background-color: var(--color-accent); + color: white; + border-color: var(--color-accent); +} + +.pe-remove-wrapper-btn:hover:not(:disabled) { + background-color: var(--color-warning); + color: white; + border-color: var(--color-warning); +} + +.pe-remove-wrapper-btn:disabled { + opacity: 0.3; + cursor: not-allowed; +} + /* 详细列表视图 */ .pe-tokens-detail { display: flex; @@ -1089,7 +1292,8 @@ function displayTrans(key: string): string { opacity: 1; } -.pe-add-map-btn, .pe-add-after-btn, .pe-remove-detail-btn { +.pe-add-map-btn, .pe-add-after-btn, .pe-remove-detail-btn, +.pe-add-wrapper-detail-btn, .pe-remove-wrapper-detail-btn { display: flex; align-items: center; justify-content: center; @@ -1115,6 +1319,23 @@ function displayTrans(key: string): string { border-color: var(--color-success); } +.pe-add-wrapper-detail-btn:hover { + background-color: var(--color-accent); + color: white; + border-color: var(--color-accent); +} + +.pe-remove-wrapper-detail-btn:hover:not(:disabled) { + background-color: var(--color-warning); + color: white; + border-color: var(--color-warning); +} + +.pe-remove-wrapper-detail-btn:disabled { + opacity: 0.3; + cursor: not-allowed; +} + .pe-remove-detail-btn:hover { background-color: var(--color-error); color: white; @@ -1264,6 +1485,10 @@ function displayTrans(key: string): string { opacity: 1; } + .pe-token-controls-compact { + opacity: 1; + } + .pe-edit-actions, .pe-add-actions { flex-direction: column; } @@ -1301,6 +1526,123 @@ function displayTrans(key: string): string { color: var(--color-accent); } +/* 拖拽预览样式 */ +.drag-preview { + background-color: var(--color-bg-primary); + border: 2px solid var(--color-accent); + border-radius: var(--radius-md); + padding: 0.5rem 0.75rem; + box-shadow: var(--shadow-md); + opacity: 0.9; +} + +.drag-preview-content { + display: flex; + align-items: center; + gap: 0.5rem; + white-space: nowrap; +} + +.drag-preview-key { + font-family: ui-monospace, SFMono-Regular, 'SF Mono', Menlo, Monaco, Consolas, monospace; + font-size: 0.875rem; + font-weight: 600; + color: var(--color-text-primary); + background-color: var(--color-bg-tertiary); + padding: 0.25rem 0.5rem; + border-radius: var(--radius-sm); +} + +.drag-preview-arrow { + color: var(--color-text-tertiary); + font-weight: 500; +} + +.drag-preview-trans { + color: var(--color-text-primary); + font-weight: 500; +} + +/* 拖拽占位符样式 */ +.pe-token-compact.drag-placeholder, +.pe-token-detail.drag-placeholder { + position: relative; +} + +.pe-token-compact.drag-placeholder::before, +.pe-token-detail.drag-placeholder::before { + content: ''; + position: absolute; + top: -2px; + left: -2px; + right: -2px; + bottom: -2px; + border: 2px dashed var(--color-accent); + border-radius: var(--radius-md); + background-color: var(--color-accent-light); + opacity: 0.3; + animation: pulse 1s ease-in-out infinite alternate; +} + +@keyframes pulse { + from { + opacity: 0.2; + } + to { + opacity: 0.5; + } +} + +/* 改进拖拽中的样式 */ +.pe-token-compact.dragging, +.pe-token-detail.dragging { + opacity: 0.3; + transform: scale(0.95) rotate(2deg); + cursor: grabbing; + z-index: 1000; + box-shadow: var(--shadow-lg); +} + +.pe-token-compact.drag-over, +.pe-token-detail.drag-over { + border-color: var(--color-accent); + background-color: var(--color-accent-light); + transform: scale(1.02); + transition: all 0.2s ease; +} + +/* 拖拽容器样式 */ +.pe-drag-container { + position: relative; + min-height: 200px; + transition: all 0.1s ease; +} + +.pe-drag-container.is-dragging { + background-color: var(--color-bg-secondary); + border: 2px dashed var(--color-accent); + border-radius: var(--radius-lg); + padding: 0.5rem; +} + +.pe-drag-container.is-dragging::after { + content: '拖拽到此处重新排序'; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + color: var(--color-text-tertiary); + font-size: 0.875rem; + pointer-events: none; + opacity: 0.5; +} + +/* 预先启用复合层以提升拖拽流畅度 */ +.pe-token-compact, +.pe-token-detail { + will-change: transform; +} + /* 加载和过渡动画 */ .pe-token-compact, .pe-token-detail { animation: slideIn 0.3s ease-out; diff --git a/src/components/PromptManager.vue b/src/components/PromptManager.vue index 653899b..e134a51 100644 --- a/src/components/PromptManager.vue +++ b/src/components/PromptManager.vue @@ -203,6 +203,7 @@ function resetDefault() { .pm-empty { color: #6b7280; padding: 20px; } .pm-tags { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 6px; } .pm-tags li { display: grid; grid-template-columns: 24px 1fr 1fr auto auto; align-items: center; gap: 6px; padding: 6px; border: 1px solid #e5e7eb; border-radius: 6px; } +.pm-tags li { will-change: transform; } .pm-tags li.hidden { opacity: 0.5; } .pm-handle { cursor: grab; user-select: none; color: #6b7280; text-align: center; } .pm-key, .pm-trans { padding: 6px 8px; border: 1px solid #d1d5db; border-radius: 6px; } diff --git a/src/stores/promptStore.ts b/src/stores/promptStore.ts index f4e6740..b1f8b1c 100644 --- a/src/stores/promptStore.ts +++ b/src/stores/promptStore.ts @@ -32,12 +32,19 @@ export const usePromptStore = defineStore('promptStore', { const grp = this.currentGroup; if (!grp) return [] as PromptTag[]; const q = this.searchQuery.trim().toLowerCase(); + const qNorm = q.replace(/_/g, ' '); if (!q) return grp.tags; return grp.tags.filter((t) => { const trans = t.translation?.[this.selectedLang] ?? ''; + const keyLower = t.key.toLowerCase(); + const keyNorm = keyLower.replace(/_/g, ' '); + const transLower = trans.toLowerCase(); + const transNorm = transLower.replace(/_/g, ' '); return ( - t.key.toLowerCase().includes(q) || - trans.toLowerCase().includes(q) + keyLower.includes(q) || + keyNorm.includes(qNorm) || + transLower.includes(q) || + transNorm.includes(qNorm) ); }); }, @@ -202,6 +209,113 @@ export const usePromptStore = defineStore('promptStore', { formatPrompt() { this.promptText = normalizePrompt(this.promptText); }, + // 切换下划线和空格 + toggleUnderscoreSpace() { + const tokens = splitTokens(this.promptText); + const newTokens = tokens.map(token => { + // 解析包裹层数和核心内容 + const { core, wrappers } = this.parseTokenWrappers(token); + + // 切换下划线和空格 + let newCore; + if (core.includes('_')) { + newCore = core.replace(/_/g, ' '); + } else if (core.includes(' ')) { + newCore = core.replace(/ /g, '_'); + } else { + newCore = core; + } + + // 重新包装 + return this.wrapToken(newCore, wrappers); + }); + this.promptText = newTokens.join(', '); + }, + // 为单个token添加包裹层 + addWrapperToToken(index: number, wrapperType: string = '{}') { + const tokens = splitTokens(this.promptText); + if (index < 0 || index >= tokens.length) return; + + const token = tokens[index]; + if (!token) return; + const { core, wrappers } = this.parseTokenWrappers(token); + const newWrappers = [...wrappers, wrapperType]; + tokens[index] = this.wrapToken(core, newWrappers); + + this.promptText = tokens.join(', '); + }, + // 为单个token移除包裹层 + removeWrapperFromToken(index: number) { + const tokens = splitTokens(this.promptText); + if (index < 0 || index >= tokens.length) return; + + const token = tokens[index]; + if (!token) return; + const { core, wrappers } = this.parseTokenWrappers(token); + if (wrappers.length > 0) { + const newWrappers = wrappers.slice(0, -1); + tokens[index] = this.wrapToken(core, newWrappers); + this.promptText = tokens.join(', '); + } + }, + // 获取token的包裹信息（用于显示） + getTokenWrapperInfo(token: string): { core: string; wrappers: string[]; wrapperCount: number } { + const { core, wrappers } = this.parseTokenWrappers(token); + return { core, wrappers, wrapperCount: wrappers.length }; + }, + // 解析token的包裹层和核心内容 + parseTokenWrappers(token: string): { core: string; wrappers: string[] } { + const wrapperPairs = [ + ['{}', '{', '}'], + ['()', '(', ')'], + ['[]', '[', ']'], + ['<>', '<', '>'] + ]; + + let current = token.trim(); + const wrappers: string[] = []; + + // 从外到内解析包裹层 + while (current.length >= 2) { + let found = false; + for (const [type, start, end] of wrapperPairs) { + if (start && end && current.startsWith(start) && current.endsWith(end)) { + if (type) wrappers.push(type); + current = current.slice(start.length, -end.length); + found = true; + break; + } + } + if (!found) break; + } + + return { core: current, wrappers }; + }, + // 用包裹层包装token + wrapToken(core: string, wrappers: string[]): string { + let result = core; + + // 从内到外添加包裹层 + for (let i = wrappers.length - 1; i >= 0; i--) { + const wrapper = wrappers[i]; + switch (wrapper) { + case '{}': + result = `{${result}}`; + break; + case '()': + result = `(${result})`; + break; + case '[]': + result = `[${result}]`; + break; + case '<>': + result = `<${result}>`; + break; + } + } + + return result; + }, updateToken(index: number, newToken: string) { const tokens = splitTokens(this.promptText); if (index < 0 || index >= tokens.length) return; @@ -227,10 +341,13 @@ export const usePromptStore = defineStore('promptStore', { this.promptText = tokens.join(', '); }, getTagByKey(key: string): PromptTag | null { + const target = normalizeKeyForMatch(key); for (const cat of this.dataset?.categories || []) { for (const g of cat.groups) { - const t = g.tags.find((x) => x.key === key); - if (t) return t; + for (const t of g.tags) { + if (t.key === key) return t; // 精确匹配优先 + if (normalizeKeyForMatch(t.key) === target) return t; // 下划线/空格归一化匹配 + } } } return null; @@ -244,13 +361,16 @@ export const usePromptStore = defineStore('promptStore', { const list: string[] = []; const seen = new Set(); const p = prefix.trim().toLowerCase(); + const pNorm = p.replace(/_/g, ' '); if (!p) return []; for (const cat of this.dataset?.categories || []) { for (const g of cat.groups) { for (const t of g.tags) { const k = t.key; if (seen.has(k)) continue; - if (k.toLowerCase().includes(p)) { + const kLower = k.toLowerCase(); + const kNorm = kLower.replace(/_/g, ' '); + if (kLower.includes(p) || kNorm.includes(pNorm)) { list.push(k); seen.add(k); if (list.length >= limit) return list; @@ -489,4 +609,9 @@ function normalizeToken(t: string): string { } function normalizePrompt(text: string): string { return splitTokens(text).join(', '); +} + +// 归一化用于匹配的 key：统一大小写与下划线/空格 +function normalizeKeyForMatch(s: string): string { + return s.trim().toLowerCase().replace(/_/g, ' '); } \ No newline at end of file