完成新需求

This commit is contained in:
super
2026-03-20 14:26:34 +08:00
parent 43d508f527
commit 92d3fc965b
71 changed files with 3265 additions and 540 deletions

View File

@@ -79,7 +79,7 @@
{{ cleanRunning ? '清洗中...' : '开始清洗' }}
</button>
<span class="loading-msg">
{{ cleanRunning ? '正在处理文件,请稍候…' : '选择文件、列和 ID 规则后即可执行本地清洗' }}
{{ cleanRunning ? '正在处理文件并上传结果,请稍候…' : '选择文件、列和 ID 规则后即可执行清洗,结果会显示在右侧供下载' }}
</span>
</div>
</aside>
@@ -106,9 +106,6 @@
<div class="result-list-wrap">
<div class="result-list-header">
<span>处理后的 Excel 列表</span>
<button type="button" class="download-all" :disabled="!cleanOutputDir" @click="openCleanOutputDir">
打开输出目录
</button>
</div>
<div v-if="cleanResultItems.length === 0" class="empty-tasks">
@@ -118,8 +115,8 @@
<ul v-else class="task-list clean-result-list">
<li v-for="item in cleanResultItems" :key="`${item.source_path}-${item.output_path || item.error || 'result'}`" class="task-item">
<div class="left">
<span class="id" :title="item.source_path">{{ shorten(item.source_path, 42) }}</span>
<div v-if="item.output_path" class="files">输出文件{{ item.output_path }}</div>
<span class="id" :title="item.source_path">{{ item.source_path || '-' }}</span>
<div v-if="item.output_path" class="files">结果下载地址已生成</div>
<div v-else-if="item.error" class="files">错误信息{{ item.error }}</div>
</div>
@@ -131,9 +128,17 @@
v-if="item.success && item.output_path"
type="button"
class="download"
@click="openCleanResult(item)"
@click="downloadCleanResult(item)"
>
打开文件
下载文件
</button>
<button
v-if="item.result_id"
type="button"
class="btn-delete"
@click="deleteCleanHistory(item.result_id)"
>
删除
</button>
</div>
</li>
@@ -145,7 +150,7 @@
</template>
<script setup lang="ts">
import { computed, ref } from 'vue'
import { computed, onMounted, ref } from 'vue'
import { ElMessage } from 'element-plus'
import { expandBrandFolder } from '@/shared/api/brand'
import { type CleanExcelResultItem, getPywebviewApi, hasPywebview } from '@/shared/bridges/pywebview'
@@ -181,7 +186,6 @@ async function loadCleanHeaders(filePath: string) {
return
}
cleanResultItems.value = []
cleanSummary.value = { total: 0, success_count: 0, failed_count: 0 }
cleanOutputDir.value = ''
@@ -248,7 +252,7 @@ async function selectCleanFolder() {
async function submitCleanRun() {
const api = getPywebviewApi()
if (!api?.clean_excel_files || !api?.select_folder) {
if (!api?.clean_excel_files) {
ElMessage.warning('当前环境不支持数据去重,请在桌面端打开')
return
}
@@ -266,16 +270,12 @@ async function submitCleanRun() {
}
try {
const outputDir = await api.select_folder()
if (!outputDir) return
cleanRunning.value = true
const result = await api.clean_excel_files({
paths: cleanSelectedPaths.value,
selected_columns: cleanSelectedColumns.value,
keep_integer_ids: cleanKeepIntegerIds.value,
keep_underscore_ids: cleanKeepUnderscoreIds.value,
output_dir: outputDir,
})
if (!result.success) {
@@ -283,13 +283,13 @@ async function submitCleanRun() {
return
}
cleanOutputDir.value = result.summary?.output_dir || outputDir
cleanOutputDir.value = ''
cleanSummary.value = {
total: result.summary?.total || 0,
success_count: result.summary?.success_count || 0,
failed_count: result.summary?.failed_count || 0,
}
cleanResultItems.value = result.items || []
await loadCleanHistory()
ElMessage.success('数据去重完成')
} catch (error) {
ElMessage.error(error instanceof Error ? error.message : '去重失败')
@@ -298,30 +298,69 @@ async function submitCleanRun() {
}
}
async function openCleanOutputDir() {
onMounted(() => {
loadCleanHistory().catch(() => undefined)
})
async function loadCleanHistory() {
const api = getPywebviewApi()
if (!api?.open_path || !cleanOutputDir.value) {
ElMessage.warning('当前环境不支持打开输出目录')
if (!api?.get_dedupe_history) {
return
}
const result = await api.open_path(cleanOutputDir.value)
if (!result.success) {
ElMessage.error(result.error || '打开目录失败')
try {
const response = await api.get_dedupe_history()
if (!response.success || !response.items) return
cleanResultItems.value = response.items
cleanSummary.value = {
total: response.items.length,
success_count: response.items.filter((item) => item.success).length,
failed_count: response.items.filter((item) => !item.success).length,
}
} catch {
// ignore history load errors
}
}
async function openCleanResult(item: CleanExcelResultItem) {
async function deleteCleanHistory(resultId: number) {
const api = getPywebviewApi()
if (!api?.open_path || !item.output_path) {
ElMessage.warning('当前环境不支持打开结果文件')
if (!api?.delete_history_item) {
ElMessage.warning('当前环境不支持删除历史')
return
}
const result = await api.open_path(item.output_path)
const result = await api.delete_history_item('dedupe', resultId)
if (!result.success) {
ElMessage.error(result.error || '打开文件失败')
ElMessage.error(result.error || '删除失败')
return
}
await loadCleanHistory()
ElMessage.success('已删除')
}
async function downloadCleanResult(item: CleanExcelResultItem) {
const api = getPywebviewApi()
if (!item.output_path) {
ElMessage.warning('当前结果没有下载地址')
return
}
const today = new Date()
const yyyy = String(today.getFullYear())
const mm = String(today.getMonth() + 1).padStart(2, '0')
const dd = String(today.getDate()).padStart(2, '0')
const filename = `${yyyy}${mm}${dd}_cleaned.xlsx`
if (api?.save_file_from_url) {
const result = await api.save_file_from_url(item.output_path, filename)
if (result.success) {
ElMessage.success(`已保存:${result.path || filename}`)
} else if (result.error && result.error !== '用户取消') {
ElMessage.error(result.error)
}
return
}
window.open(item.output_path, '_blank')
}
</script>