翻译bug修复
This commit is contained in:
@@ -133,7 +133,7 @@ function currentEditEl(): HTMLInputElement | null {
|
||||
return Array.isArray(raw) ? (raw[0] ?? null) : raw;
|
||||
}
|
||||
const priorityStyle = ref<'{}' | '()' | '[]' | '<>' | 'suffix'>('{}');
|
||||
const priorityStep = ref(1);
|
||||
const priorityStep = ref(0.1);
|
||||
function splitTokensLocal(txt: string): string[] {
|
||||
return splitTokens(txt);
|
||||
}
|
||||
@@ -176,9 +176,12 @@ function adjustWeight(core: string, delta: number): string {
|
||||
const decimals = stepStr.includes('.') ? stepStr.split('.')[1]!.length : 0;
|
||||
const cur = w == null ? 1.0 : w;
|
||||
let nw = cur + delta;
|
||||
if (delta < 0 && nw <= 1.0) return base;
|
||||
nw = Math.min(2.0, Math.max(0.1, nw));
|
||||
|
||||
nw = roundToDecimals(nw, decimals);
|
||||
|
||||
// If weight is 1, return base without suffix
|
||||
if (nw === 1) return base;
|
||||
|
||||
return base + ':' + nw;
|
||||
}
|
||||
const text = ref('');
|
||||
@@ -773,9 +776,15 @@ function applyEditSuggestion(s: string) {
|
||||
}
|
||||
|
||||
const unmappedTokens = computed(() => {
|
||||
return tokens.value.filter(k => displayTrans(k) === k);
|
||||
return tokens.value.filter(k => isUnmapped(k));
|
||||
});
|
||||
|
||||
function isUnmapped(key: string): boolean {
|
||||
const { core } = parseDetailedToken(key);
|
||||
const tag = store.getTagByKey(core);
|
||||
return !tag || !tag.translation?.[selectedLang.value];
|
||||
}
|
||||
|
||||
function handleApplyTranslation(results: { key: string; trans: string }[]) {
|
||||
results.forEach(({ key, trans }) => {
|
||||
store.addMapping(key, selectedLang.value, trans);
|
||||
@@ -792,9 +801,11 @@ async function autoTranslateSingle() {
|
||||
let target = selectedLang.value as string;
|
||||
if (target === 'zh_CN') target = 'zh';
|
||||
|
||||
// 移除包裹层和下划线
|
||||
const { core } = store.parseTokenWrappers(key);
|
||||
const cleanText = core.replace(/_/g, ' ');
|
||||
// 移除包裹层和下划线,提取核心词
|
||||
const { core } = parseDetailedToken(key);
|
||||
// 再次清理可能残留的括号(针对复杂嵌套或未闭合情况)
|
||||
const cleanCore = core.replace(/^[\(\[\{<]+/, '').replace(/[\)\]\}>]+$/, '');
|
||||
const cleanText = cleanCore.replace(/_/g, ' ');
|
||||
|
||||
const url = `https://sywb.top/api/translate2?text=${encodeURIComponent(cleanText)}&sourceLang=auto&targetLang=${target}`;
|
||||
|
||||
@@ -812,23 +823,11 @@ async function autoTranslateSingle() {
|
||||
}
|
||||
|
||||
function displayTrans(key: string): string {
|
||||
const { core, weight, wrappers } = parseDetailedToken(key);
|
||||
const { core, weight, wrappers, prefix, suffix } = parseDetailedToken(key);
|
||||
const tag = store.getTagByKey(core);
|
||||
const translatedCore = tag?.translation?.[selectedLang.value] ?? tag?.key ?? core;
|
||||
|
||||
let result = translatedCore;
|
||||
let currentWrappers = [...wrappers];
|
||||
|
||||
if (weight !== undefined && weight !== 1) {
|
||||
const lastWrapper = currentWrappers[currentWrappers.length - 1];
|
||||
if (lastWrapper === '()') {
|
||||
currentWrappers.pop();
|
||||
}
|
||||
const wStr = Number.isInteger(weight) ? weight.toString() : weight.toFixed(2).replace(/\.?0+$/, '');
|
||||
result = `(${result}:${wStr})`;
|
||||
}
|
||||
|
||||
return store.wrapToken(result, currentWrappers);
|
||||
return constructToken(translatedCore, weight, wrappers, prefix, suffix);
|
||||
}
|
||||
|
||||
function isRemoveDisabled(token: string): boolean {
|
||||
@@ -1066,7 +1065,7 @@ function isRemoveDisabled(token: string): boolean {
|
||||
<div v-else class="pe-token-content">
|
||||
<span class="pe-key-compact">{{ k }}</span>
|
||||
<span class="pe-arrow-compact">→</span>
|
||||
<span class="pe-trans-compact" :class="{ unmapped: displayTrans(k) === k }">
|
||||
<span class="pe-trans-compact" :class="{ unmapped: isUnmapped(k) }">
|
||||
{{ displayTrans(k) }}
|
||||
</span>
|
||||
</div>
|
||||
@@ -1118,10 +1117,10 @@ function isRemoveDisabled(token: string): boolean {
|
||||
<div class="pe-token-main" @dblclick="beginEdit(i)">
|
||||
<span class="pe-key-detail">{{ k }}</span>
|
||||
<span class="pe-arrow-detail">→</span>
|
||||
<span class="pe-trans-detail" :class="{ unmapped: displayTrans(k) === k }">{{ displayTrans(k) }}</span>
|
||||
<span class="pe-trans-detail" :class="{ unmapped: isUnmapped(k) }">{{ displayTrans(k) }}</span>
|
||||
</div>
|
||||
<div class="pe-token-controls">
|
||||
<button v-if="displayTrans(k) === k" class="pe-add-map-btn" @click="showAddMap(i)" title="添加映射">
|
||||
<button v-if="isUnmapped(k)" class="pe-add-map-btn" @click="showAddMap(i)" title="添加映射">
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<line x1="12" y1="5" x2="12" y2="19" stroke="currentColor" stroke-width="2"/>
|
||||
<line x1="5" y1="12" x2="19" y2="12" stroke="currentColor" stroke-width="2"/>
|
||||
|
||||
@@ -41,9 +41,9 @@
|
||||
@change="toggleSelect(token)"
|
||||
/>
|
||||
</label>
|
||||
<div class="tp-item-key" :title="token">{{ token }}</div>
|
||||
<div class="tp-item-key" :title="token">{{ parseDetailedToken(token).core }}</div>
|
||||
<div class="tp-item-trans">
|
||||
<div v-if="results[token]" class="tp-trans-result">
|
||||
<div v-if="results[token] !== undefined" class="tp-trans-result">
|
||||
<input
|
||||
v-model="results[token]"
|
||||
class="tp-trans-input"
|
||||
@@ -71,6 +71,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, watch, reactive } from 'vue';
|
||||
import { parseDetailedToken } from '../stores/promptStore';
|
||||
|
||||
const props = defineProps<{
|
||||
visible: boolean;
|
||||
@@ -151,8 +152,13 @@ async function startTranslation() {
|
||||
let target = props.targetLang;
|
||||
if (target === 'zh_CN') target = 'zh';
|
||||
|
||||
// 预处理:移除下划线
|
||||
const cleanTokens = batch.map(t => t.replace(/_/g, ' '));
|
||||
// 预处理:移除包裹层和下划线,提取核心词
|
||||
const cleanTokens = batch.map(t => {
|
||||
const { core } = parseDetailedToken(t);
|
||||
// 再次清理可能残留的括号(针对复杂嵌套或未闭合情况)
|
||||
const cleanCore = core.replace(/^[\(\[\{<]+/, '').replace(/[\)\]\}>]+$/, '');
|
||||
return cleanCore.replace(/_/g, ' ');
|
||||
});
|
||||
const text = cleanTokens.join(SEPARATOR);
|
||||
|
||||
const url = `https://sywb.top/api/translate2?text=${encodeURIComponent(text)}&sourceLang=auto&targetLang=${target}`;
|
||||
@@ -165,6 +171,10 @@ async function startTranslation() {
|
||||
batch.forEach((token, idx) => {
|
||||
const trans = translations[idx] ? translations[idx].trim() : '';
|
||||
if (trans) {
|
||||
// 保存时,如果 token 是纯词(无包裹/权重),直接保存翻译结果
|
||||
// 如果 token 有包裹/权重,我们应该只保存核心词的映射,而不是将整个 token 作为 key
|
||||
// 但是这里的 results 是按 token 索引的显示结果。
|
||||
// 用户希望在这里看到的是核心词的翻译结果,而不是带符号的。
|
||||
results[token] = trans;
|
||||
cache[token] = trans;
|
||||
}
|
||||
@@ -184,7 +194,8 @@ function apply() {
|
||||
const list: { key: string; trans: string }[] = [];
|
||||
for (const key of selected) {
|
||||
if (results[key]) {
|
||||
list.push({ key, trans: results[key] });
|
||||
const { core } = parseDetailedToken(key);
|
||||
list.push({ key: core, trans: results[key] });
|
||||
}
|
||||
}
|
||||
emit('apply', list);
|
||||
|
||||
Reference in New Issue
Block a user