diff --git a/app/.env b/app/.env index 0f656f3..e40b987 100644 --- a/app/.env +++ b/app/.env @@ -6,10 +6,12 @@ mysql_user=aiimage proxy_url=https://api.jikip.com/ip-get?num=1&minute=1&format=json&area=all&protocol=1&mode=2&key=t24g6gi44ubufd8 proxy_mode=2 +zn_company=rongchuang123 +zn_username=%E8%87%AA%E5%8A%A8%E5%8C%96_Robot + client_name=ShuFuAI -java_api_base=http://127.0.0.1:18080 -# java_api_base=http://8.136.19.173:18080 +java_api_base=http://8.136.19.173:18080 diff --git a/app/.env copy b/app/.env copy new file mode 100644 index 0000000..0ff00cd --- /dev/null +++ b/app/.env copy @@ -0,0 +1,15 @@ +base_url=http://8.136.19.173:15124 +workflow_id=7608812635877900322 +mysql_host=8.136.19.173 +mysql_user=aiimage + +proxy_url=https://api.jikip.com/ip-get?num=1&minute=1&format=json&area=all&protocol=1&mode=2&key=t24g6gi44ubufd8 +proxy_mode=2 + +client_name=ShuFuAI + + +java_api_base=http://127.0.0.1:18080 +# java_api_base=http://8.136.19.173:18080 + + diff --git a/app/__pycache__/config.cpython-312.pyc b/app/__pycache__/config.cpython-312.pyc index f5d4763..23bb38a 100644 Binary files a/app/__pycache__/config.cpython-312.pyc and b/app/__pycache__/config.cpython-312.pyc differ diff --git a/app/amazon/__pycache__/del_brand.cpython-312.pyc b/app/amazon/__pycache__/del_brand.cpython-312.pyc new file mode 100644 index 0000000..96fe63e Binary files /dev/null and b/app/amazon/__pycache__/del_brand.cpython-312.pyc differ diff --git a/app/amazon/__pycache__/main.cpython-312.pyc b/app/amazon/__pycache__/main.cpython-312.pyc new file mode 100644 index 0000000..702fd9b Binary files /dev/null and b/app/amazon/__pycache__/main.cpython-312.pyc differ diff --git a/app/assets/delete-brand.js b/app/assets/delete-brand.js index 6a3dad9..4c1fe87 100644 --- a/app/assets/delete-brand.js +++ b/app/assets/delete-brand.js @@ -1 +1 @@ -import{d as ye,o as ke,J as we,a as l,c as o,b as be,B as Ie,e as a,F as x,r as z,t as r,f as c,K as me,L as le,n as oe,g as _,h as A,M as Se,i as C,E as d,j as xe,N as Ce,O as $e,P as Ne,Q as Fe,_ as Pe,q as Ee,s as Te}from"./pywebview-Dee3nQjE.js";const Re={class:"page-shell module-page"},De={class:"main-content"},Ue={class:"left-panel"},qe={class:"upload-zone"},Be={class:"selected-files clean-placeholder split-selected-files"},Ae={key:0,class:"more-line"},Me={key:1},je={class:"run-row"},Le=["disabled"],Je={class:"loading-msg"},Ve={key:0,class:"queue-debug-card"},ze={key:0,class:"queue-debug-line"},Oe={key:1,class:"queue-debug-payload"},He={class:"right-panel"},Ke={class:"task-list-wrap"},Ge={class:"clean-result-summary"},Qe={class:"summary-card"},We={class:"summary-card"},Xe={class:"summary-card"},Ye={class:"result-list-wrap"},Ze={key:0,class:"empty-tasks"},es={key:0,class:"result-subsection"},ss={class:"task-list clean-result-list"},ts={class:"left split-result-main"},as=["title"],ns={class:"files"},ls={class:"files"},os={key:0,class:"files"},rs={key:1,class:"files"},is={key:2,class:"files"},us={key:3,class:"time"},cs={key:4,class:"delete-brand-progress-block"},ds={class:"delete-brand-progress-header"},fs={class:"delete-brand-progress-bar"},vs={class:"files delete-brand-progress"},hs={key:5,class:"files split-entry-list delete-brand-preview"},_s={key:6,class:"files"},ps={class:"task-right split-result-actions"},gs=["onClick"],ys=["onClick"],ks=["onClick"],ws={key:1,class:"result-subsection"},bs={class:"task-list clean-result-list"},Is={class:"left split-result-main"},ms=["title"],Ss={class:"files"},xs={class:"files"},Cs={key:0,class:"files"},$s={key:1,class:"files"},Ns={key:2,class:"time"},Fs={key:3,class:"delete-brand-progress-block"},Ps={class:"delete-brand-progress-header"},Es={class:"delete-brand-progress-bar"},Ts={class:"files delete-brand-progress"},Rs={key:4,class:"files split-entry-list delete-brand-preview"},Ds={key:5,class:"files"},Us={class:"task-right split-result-actions"},qs=["onClick"],Bs=["onClick"],As=ye({__name:"BrandDeleteBrandTab",setup(js){function $(){return`delete-brand:current-tasks:${typeof window<"u"&&window.localStorage.getItem("uid")||"0"}`}const w=_([]),N=_([]),I=_(!1),O=_([]),i=_([]),F=_([]),P=_({total:0,successCount:0,failedCount:0,items:[]}),k=_(""),y=_(""),p=_({}),g=_(null),M=_(!1),j=A(()=>w.value.slice(0,10)),m=A(()=>{const t=[];return i.value.forEach(s=>{t.push(...s.items)}),t});function re(){try{const t=typeof window<"u"?window.localStorage.getItem($()):null;if(t){if(i.value=JSON.parse(t),i.value.length>0){const s=i.value[i.value.length-1];k.value=s.queuePushResult||"",y.value=s.queuePayloadText||""}}else i.value=[]}catch{i.value=[]}}function H(t,s,e,n){const u=s.filter(f=>f.matched!==!1&&f.success!==!1);if(u.length===0)return;const v={taskId:t,items:u,createdAt:Date.now(),queuePushResult:e,queuePayloadText:n},h=i.value.findIndex(f=>f.taskId===t);h>=0?i.value[h]=v:i.value.push(v),typeof window<"u"&&window.localStorage.setItem($(),JSON.stringify(i.value))}function K(t){const s=i.value.length;i.value=i.value.filter(e=>e.taskId!==t),i.value.length!==s&&typeof window<"u"&&window.localStorage.setItem($(),JSON.stringify(i.value))}const E=A(()=>F.value.filter(t=>!m.value.some(s=>s.taskId===t.taskId||s.resultId&&s.resultId===t.resultId))),ie=A(()=>m.value.length>0||E.value.length>0);function ue(t){return t&&p.value[t]?.task?.status||""}function T(t){if(t.error)return t.error;const s=t.taskId;return s&&p.value[s]?.task?.errorMessage||""}function G(t){const s=D(t);return s==="已入队"||s==="处理中"}function Q(t){return t.map(s=>!s.success&&s.matched===!1?{...s,error:s.error||"未匹配到紫鸟店铺",openStoreUrl:void 0}:s)}function ce(){O.value=[...m.value,...E.value]}function b(){ce(),de(O.value)}function de(t){P.value={total:t.length,successCount:t.filter(s=>s.success).length,failedCount:t.filter(s=>!s.success).length,items:t}}function W(t){if(!t)return"";const s=p.value[t],e=s?.line_progress?.info;if(!s?.line_progress?.has_progress||!e){const u=s?.task?.status;return u?`任务状态：${u}`:""}const n=[];return e.phase&&n.push(`阶段：${e.phase}`),e.file_index&&e.file_total&&n.push(`文件：${e.file_index}/${e.file_total}`),e.file_name&&n.push(`当前文件：${e.file_name}`),e.current_line!=null&&e.total_lines!=null&&n.push(`进度：${e.current_line}/${e.total_lines}`),e.current_country&&n.push(`国家：${e.current_country}`),e.current_asin&&n.push(`ASIN：${e.current_asin}`),e.finished_files!=null&&n.push(`已完成文件：${e.finished_files}`),n.join("｜")}function R(t){if(!t)return 0;const s=p.value[t]?.line_progress?.info;return s?s.current_line!=null&&s.total_lines&&s.total_lines>0?Math.max(0,Math.min(100,Math.round(s.current_line/s.total_lines*100))):s.finished_files!=null&&s.file_total&&s.file_total>0?Math.max(0,Math.min(100,Math.round(s.finished_files/s.file_total*100))):p.value[t]?.task?.status==="SUCCESS"?100:0:0}function X(t){const s=p.value[t]?.task?.status;return s==="SUCCESS"||s==="FAILED"}function S(){const t=new Set;return i.value.forEach(s=>{s.items.some(e=>e._pushed)&&t.add(s.taskId)}),Array.from(t)}function D(t){const s=t.taskId;if(!s)return"";const e=i.value.find(f=>f.taskId===s);if(!e)return"";const n=ue(s);if(n==="SUCCESS"||n==="FAILED"||t.taskStatus==="SUCCESS"||t.taskStatus==="FAILED")return"已被全局判定为终态";const u=e.items.find(f=>f.resultId===t.resultId||f.sourceFilename===t.sourceFilename),v=p.value[s]?.line_progress;if(n==="RUNNING"&&v?.has_progress&&v?.info?.file_name===t.sourceFilename)return"处理中";const h=p.value[s];return h?.items&&h.items.find(B=>B.sourceFilename===t.sourceFilename)?"本文件解析完毕":u&&u._pushed?"已入队":"未入队"}function Y(t){if(t.downloadUrl||t.success)return!0;const s=t.taskId;return s?p.value[s]?.task?.status==="SUCCESS":!1}async function L(t){const s=t||S();if(s.length)try{const e=await Se(s);for(const n of e.items||[]){const u=n?.task?.id;typeof u=="number"&&u>0&&(p.value[u]=n)}}catch{}}function fe(){return document.visibilityState==="visible"?4500:1e4}function J(t=!1){if(g.value){if(!t)return;clearTimeout(g.value),g.value=null}const s=async()=>{if(g.value=null,M.value){J();return}const e=S();if(!e.length)return;M.value=!0;let n=!1;try{await L(e);for(const u of e)X(u)&&(K(u),n=!0)}finally{M.value=!1}n&&(q(),b()),S().length>0&&J()};t?s():g.value=window.setTimeout(s,fe())}function V(t=!1){g.value&&!t||J(t)}function U(t){const s=t.taskId?p.value[t.taskId]?.task?.status:null;return s==="SUCCESS"?{className:"success",text:"已完成"}:s==="FAILED"?{className:"failed",text:"失败"}:s==="RUNNING"?{className:"running",text:"执行中"}:t.taskStatus==="SUCCESS"?{className:"success",text:"已完成"}:t.taskStatus==="FAILED"?{className:"failed",text:"失败"}:t.taskStatus==="RUNNING"?{className:"running",text:"执行中"}:t.success?{className:"success",text:"已完成"}:{className:"failed",text:"失败"}}function Z(){g.value&&(window.clearTimeout(g.value),g.value=null)}async function ee(t){const s=C();if(!s?.upload_file_to_java)throw new Error("当前桌面端未提供文件上传桥接能力");const e=[];for(const n of t){const u=typeof n=="string"?n:n.absolutePath,v=typeof n=="string"?void 0:n.relativePath,h=await s.upload_file_to_java(u,v);if(!h?.success||!h.data)throw new Error(h?.error||h?.message||`上传失败：${u}`);e.push(h.data)}return e}async function ve(){const t=C();if(!t?.select_brand_xlsx_files){d.warning("当前环境不支持文件选择，请在本机客户端中打开");return}try{const s=await t.select_brand_xlsx_files();if(!s?.length)return;w.value=s,N.value=await ee(s),d.success(`已选择 ${s.length} 个删除品牌文件`)}catch(s){d.error(s instanceof Error?s.message:"选择失败")}}async function he(){const t=C();if(!t?.select_brand_folder){d.warning("当前环境不支持文件夹选择，请在本机客户端中打开");return}try{const s=await t.select_brand_folder();if(!s)return;const e=await xe(s);if(!e.success||!e.items?.length){d.warning(e.error||"该文件夹下没有 xlsx 文件");return}w.value=e.items.map(n=>n.relativePath||n.absolutePath),N.value=await ee(e.items),d.success(`已选择文件夹内 ${e.items.length} 个 xlsx 文件`)}catch(s){d.error(s instanceof Error?s.message:"选择失败")}}async function _e(){if(!N.value.length){d.warning("请先选择待处理文件");return}try{I.value=!0;const t=await Ce({files:N.value.map(n=>({fileKey:n.fileKey,originalFilename:n.originalFilename,relativePath:n.relativePath}))}),s=Q(t.items||[]),e=s.some(n=>!n.matched);k.value="解析完成，等待手动点击打开紫鸟进行单任务处理",y.value="",s.length&&s[0].taskId&&H(s[0].taskId,s,k.value,y.value),b(),e?d.error("存在未匹配到紫鸟店铺的文件，请检查报错内容。这些文件已自动归档至历史记录。"):d.success("删除品牌解析完成，请手动推送"),await q()}catch(t){d.error(t instanceof Error?t.message:"执行失败")}finally{I.value=!1}}async function se(t){const s=t.taskId;if(!s){d.warning("未找到任务ID");return}const e=C(),n=$e(s),u=t.outputFilename||t.sourceFilename||`delete-brand_${s}.xlsx`;if(e?.save_file_from_url){const v=await e.save_file_from_url(n,u);v.success?d.success(`已保存：${v.path||u}`):v.error&&v.error!=="用户取消"&&d.error(v.error);return}window.open(n,"_blank")}async function q(){try{const t=await Ne();F.value=Q(t.items||[]),b(),await L(),V(!0)}catch(t){console.error("loadHistory error:",t)}}function te(t){i.value.forEach(e=>{e.items=e.items.filter(n=>n.resultId!==t)});const s=i.value.length;i.value=i.value.filter(e=>e.items.length>0),i.value.length!==s&&typeof window<"u"&&window.localStorage.setItem($(),JSON.stringify(i.value)),F.value=F.value.filter(e=>e.resultId!==t),b(),S().length===0&&Z()}async function ae(t){try{await Fe(t),te(t),await q(),d.success("已删除")}catch(s){const e=s instanceof Error?s.message:"删除失败";if(typeof e=="string"&&e.includes("记录不存在")){te(t),d.success("已删除");return}d.error(e)}}function ne(t){const s=t.slice(0,5).map(n=>`${n.country}:${n.asin}${n.status?`（${n.status}）`:""}`);return t.length-s.length>0?`${s.join("、")} 等 ${t.length} 条`:s.join("、")}function pe(){for(const t of i.value)for(const s of t.items){const e=D(s);if(e==="已入队"||e==="处理中")return!0}return!1}async function ge(t){if(pe()){d.warning("当前存在正在处理的任务，请等待其完成后再推送下一条！");return}const s=C();if(t.openStoreUrl)if(s?.open_external_url){const f=await s.open_external_url(t.openStoreUrl);if(!f?.success){d.error(f?.error||"打开紫鸟失败");return}}else window.open(t.openStoreUrl,"_self");const e=t.taskId;if(!e)return;const n=i.value.find(f=>f.taskId===e);if(!n)return;if(!s?.enqueue_json){d.error("当前环境未启用 pywebview enqueue_json（浏览器环境不会推送）");return}const u={type:"delete-brand-run",ts:Date.now(),data:{taskId:e,items:[t]}};y.value=JSON.stringify(u,null,2);const v=await s.enqueue_json(u);let h="";if(v?.success){h=`已单独推送文件 ${t.sourceFilename}，当前队列长度：${v.queue_size??"-"}`;const f=n.items.find(B=>B.resultId===t.resultId||B.sourceFilename===t.sourceFilename);f&&(f._pushed=!0),H(e,n.items,h,y.value),V(!0)}else h=`推送到 Python 队列失败：${v?.error||"未知错误"}`;k.value=h}return ke(()=>{re();const t=S();t.length>0?L(t).then(()=>{let s=!1;for(const e of t)X(e)&&(K(e),s=!0);s&&b(),V(!0)}):b(),q().catch(()=>{})}),we(()=>{Z()}),(t,s)=>(l(),o("div",Re,[be(Ie,{active:"delete-brand"}),a("div",De,[a("aside",Ue,[s[2]||(s[2]=a("div",{class:"section-title"},"选择文件",-1)),a("div",qe,[s[0]||(s[0]=a("div",{class:"hint"},"上传删除品牌 Excel；无论是直接上传文件还是上传文件夹批量导入，都会按每个 Excel 文件名作为店铺名。",-1)),a("div",{class:"btns"},[a("button",{type:"button",class:"opt-btn",onClick:ve},"选择 Excel 文件"),a("button",{type:"button",class:"opt-btn",onClick:he},"选择文件夹")]),a("div",Be,[w.value.length?(l(),o(x,{key:0},[(l(!0),o(x,null,z(j.value,e=>(l(),o("span",{key:e},r(e),1))),128)),w.value.length>j.value.length?(l(),o("span",Ae," 还有 "+r(w.value.length-j.value.length)+" 个文件未展开显示 ",1)):c("",!0)],64)):(l(),o("span",Me,"暂未选择删除品牌文件"))])]),s[3]||(s[3]=me('
执行说明
',2)),a("div",je,[a("button",{type:"button",class:"btn-run",disabled:I.value,onClick:_e},r(I.value?"解析中...":"开始解析"),9,Le),a("span",Je,r(I.value?"正在读取删除品牌数据，请稍候…":"解析后会在右侧展示按国家分组的去重结果"),1)]),k.value||y.value?(l(),o("div",Ve,[s[1]||(s[1]=a("div",{class:"section-title queue-debug-title"},"Python 队列推送结果",-1)),k.value?(l(),o("div",ze,r(k.value),1)):c("",!0),y.value?(l(),o("pre",Oe,r(y.value),1)):c("",!0)])):c("",!0)]),a("section",He,[s[12]||(s[12]=a("div",{class:"panel-header"},"删除品牌结果",-1)),a("div",Ke,[a("div",Ge,[a("div",Qe,[s[4]||(s[4]=a("span",{class:"summary-label"},"已处理文件",-1)),a("strong",null,r(P.value.total),1)]),a("div",We,[s[5]||(s[5]=a("span",{class:"summary-label"},"成功结果",-1)),a("strong",null,r(P.value.successCount),1)]),a("div",Xe,[s[6]||(s[6]=a("span",{class:"summary-label"},"失败文件",-1)),a("strong",null,r(P.value.failedCount),1)])]),a("div",Ye,[s[11]||(s[11]=a("div",{class:"result-list-header"},[a("span",null,"删除品牌结果列表")],-1)),ie.value?(l(),o(x,{key:1},[m.value.length?(l(),o("div",es,[s[8]||(s[8]=a("div",{class:"result-subsection-title"},"当前任务",-1)),a("ul",ss,[(l(!0),o(x,null,z(m.value,e=>(l(),o("li",{key:`current-${e.taskId||e.resultId||e.sourceFilename}`,class:"task-item split-result-item"},[a("div",ts,[a("span",{class:"id",title:e.sourceFilename},r(e.sourceFilename||"-"),9,as),a("div",ns,"店铺名："+r(e.shopName||"-"),1),a("div",ls,"匹配结果："+r(e.matched?`已匹配 ${e.shopId||""}`:"未匹配到紫鸟店铺"),1),e.platform?(l(),o("div",os,"平台："+r(e.platform),1)):c("",!0),D(e)?(l(),o("div",rs,"队列状态："+r(D(e)),1)):c("",!0),e.countryCount!==void 0&&e.matched?(l(),o("div",is,"国家数："+r(e.countryCount),1)):c("",!0),e.totalRows!==void 0&&e.matched?(l(),o("div",us,"去重后 "+r(e.totalRows)+" 条 ",1)):c("",!0),G(e)?(l(),o("div",cs,[a("div",ds,[s[7]||(s[7]=a("span",null,"任务进度",-1)),a("span",null,r(R(e.taskId))+"%",1)]),a("div",fs,[a("div",{class:"delete-brand-progress-bar-fill",style:le({width:`${R(e.taskId)}%`})},null,4)]),a("div",vs,r(W(e.taskId)),1)])):c("",!0),e.previewRows?.length?(l(),o("div",hs,r(ne(e.previewRows)),1)):c("",!0),T(e)?(l(),o("div",_s,"错误信息："+r(T(e)),1)):c("",!0)]),a("div",ps,[a("span",{class:oe(["status",U(e).className])},r(U(e).text),3),e.openStoreUrl?(l(),o("button",{key:0,type:"button",class:"download",onClick:n=>ge(e)}," 打开紫鸟 ",8,gs)):c("",!0),Y(e)?(l(),o("button",{key:1,type:"button",class:"download",onClick:n=>se(e)}," 下载 ",8,ys)):c("",!0),e.resultId?(l(),o("button",{key:2,type:"button",class:"btn-delete",onClick:n=>ae(e.resultId)}," 删除 ",8,ks)):c("",!0)])]))),128))])])):c("",!0),E.value.length?(l(),o("div",ws,[s[10]||(s[10]=a("div",{class:"result-subsection-title"},"历史记录",-1)),a("ul",bs,[(l(!0),o(x,null,z(E.value,e=>(l(),o("li",{key:`history-${e.taskId||e.resultId||e.sourceFilename}`,class:"task-item split-result-item"},[a("div",Is,[a("span",{class:"id",title:e.sourceFilename},r(e.sourceFilename||"-"),9,ms),a("div",Ss,"店铺名："+r(e.shopName||"-"),1),a("div",xs,"匹配结果："+r(e.matched?`已匹配 ${e.shopId||""}`:"未匹配到紫鸟店铺"),1),e.platform?(l(),o("div",Cs,"平台："+r(e.platform),1)):c("",!0),e.countryCount!==void 0&&e.matched?(l(),o("div",$s,"国家数："+r(e.countryCount),1)):c("",!0),e.totalRows!==void 0&&e.matched?(l(),o("div",Ns,"去重后 "+r(e.totalRows)+" 条 ",1)):c("",!0),G(e)?(l(),o("div",Fs,[a("div",Ps,[s[9]||(s[9]=a("span",null,"任务进度",-1)),a("span",null,r(R(e.taskId))+"%",1)]),a("div",Es,[a("div",{class:"delete-brand-progress-bar-fill",style:le({width:`${R(e.taskId)}%`})},null,4)]),a("div",Ts,r(W(e.taskId)),1)])):c("",!0),e.previewRows?.length?(l(),o("div",Rs,r(ne(e.previewRows)),1)):c("",!0),T(e)?(l(),o("div",Ds,"错误信息："+r(T(e)),1)):c("",!0)]),a("div",Us,[a("span",{class:oe(["status",U(e).className])},r(U(e).text),3),Y(e)?(l(),o("button",{key:0,type:"button",class:"download",onClick:n=>se(e)}," 下载 ",8,qs)):c("",!0),e.resultId?(l(),o("button",{key:1,type:"button",class:"btn-delete",onClick:n=>ae(e.resultId)}," 删除 ",8,Bs)):c("",!0)])]))),128))])])):c("",!0)],64)):(l(),o("div",Ze," 暂无删除品牌结果，完成解析后会在这里展示按国家分组的去重结果 "))])])])])]))}}),Ms=Pe(As,[["__scopeId","data-v-401c4349"]]);Ee(Ms).use(Te).mount("#app"); +import{d as Ae,o as Me,J as Re,a as o,c as u,b as Be,B as qe,e as a,F as D,r as Z,t as c,f,K as Ue,L as ke,n as me,g as p,h as L,M as He,i as A,E as v,j as Je,N as Ke,O as Oe,P as Le,Q as je,_ as Ve,q as ze,s as Ge}from"./pywebview-Dee3nQjE.js";const Qe={class:"page-shell module-page"},Xe={class:"main-content"},We={class:"left-panel"},Ye={class:"upload-zone"},Ze={class:"selected-files clean-placeholder split-selected-files"},es={key:0,class:"more-line"},ss={key:1},ts={class:"run-row"},ns=["disabled"],as={class:"loading-msg"},ls={key:0,class:"queue-debug-card"},rs={key:0,class:"queue-debug-line"},os={key:1,class:"queue-debug-payload"},us={class:"right-panel"},is={class:"task-list-wrap"},cs={class:"clean-result-summary"},ds={class:"summary-card"},fs={class:"summary-card"},vs={class:"summary-card"},hs={class:"result-list-wrap"},ps={key:0,class:"empty-tasks"},_s={key:0,class:"result-subsection"},gs={class:"task-list clean-result-list"},ys={class:"left split-result-main"},ks=["title"],ms={class:"files"},Is={class:"files"},bs={key:0,class:"files"},ws={key:1,class:"files"},Ss={key:2,class:"files"},Cs={key:3,class:"time"},Ts={key:4,class:"delete-brand-progress-block"},xs={class:"delete-brand-progress-header"},Fs={class:"delete-brand-progress-bar"},Ns={class:"files delete-brand-progress"},$s={key:5,class:"files split-entry-list delete-brand-preview"},Es={key:6,class:"files"},Ps={class:"task-right split-result-actions"},Ds=["onClick"],As=["onClick"],Ms=["onClick"],Rs={key:1,class:"result-subsection"},Bs={class:"task-list clean-result-list"},qs={class:"left split-result-main"},Us=["title"],Hs={class:"files"},Js={class:"files"},Ks={key:0,class:"files"},Os={key:1,class:"files"},Ls={key:2,class:"time"},js={key:3,class:"delete-brand-progress-block"},Vs={class:"delete-brand-progress-header"},zs={class:"delete-brand-progress-bar"},Gs={class:"files delete-brand-progress"},Qs={key:4,class:"files split-entry-list delete-brand-preview"},Xs={key:5,class:"files"},Ws={class:"task-right split-result-actions"},Ys=["onClick"],Zs=["onClick"],et=Ae({__name:"BrandDeleteBrandTab",setup(tt){function F(){return`delete-brand:current-tasks:${typeof window<"u"&&window.localStorage.getItem("uid")||"0"}`}const S=p([]),M=p([]),N=p(!1),ee=p([]),d=p([]),R=p([]),B=p({total:0,successCount:0,failedCount:0,items:[]}),I=p(""),k=p(""),_=p({}),g=p(null),j=p(!1),C=p(!1),T=p(""),q=p(!1),V=L(()=>S.value.slice(0,10)),m=L(()=>{const e=[];return d.value.forEach(s=>{e.push(...s.items)}),e});function Ie(){try{const e=typeof window<"u"?window.localStorage.getItem(F()):null;if(e){if(d.value=JSON.parse(e),d.value.length>0){const s=d.value[d.value.length-1];I.value=s.queuePushResult||"",k.value=s.queuePayloadText||""}}else d.value=[]}catch{d.value=[]}}function se(e,s,t,n){const l=s.filter(h=>h.matchStatus==="MATCHED"&&h.success!==!1);if(l.length===0)return;const i={taskId:e,items:l,createdAt:Date.now(),queuePushResult:t,queuePayloadText:n},r=d.value.findIndex(h=>h.taskId===e);r>=0?d.value[r]=i:d.value.push(i),typeof window<"u"&&window.localStorage.setItem(F(),JSON.stringify(d.value))}function te(e){const s=d.value.length;d.value=d.value.filter(t=>t.taskId!==e),d.value.length!==s&&typeof window<"u"&&window.localStorage.setItem(F(),JSON.stringify(d.value))}const U=L(()=>R.value.filter(e=>!m.value.some(s=>s.taskId===e.taskId||s.resultId&&s.resultId===e.resultId))),be=L(()=>m.value.length>0||U.value.length>0);function ne(){typeof window<"u"&&window.localStorage.setItem(F(),JSON.stringify(d.value))}function $(e){return e?(d.value.find(t=>t.taskId===e)?.items.length||0)>1:!1}function z(e){return e&&d.value.find(s=>s.taskId===e)||null}function G(e,s){return!e||!s?!1:e.resultId!=null&&s.resultId!=null?e.resultId===s.resultId:e.fileKey&&s.fileKey?e.fileKey===s.fileKey:e.sourceFilename===s.sourceFilename}function x(e,s){const t=z(e);return t&&t.items.find(n=>G(n,s))||null}function ae(e){if(!e)return!1;const s=z(e);if(!s)return!1;let t=!1;const n=_.value[e]?.line_progress?.info;if($(e)&&n?.finished_files!=null&&n.finished_files>=0){const l=s.items.filter(r=>r._pushed),i=Math.max(0,Math.min(n.finished_files,l.length));for(let r=0;r0&&n.current_line>=n.total_lines){const l=m.value.find(r=>P(r)===T.value),i=l&&l.taskId===e?x(e,l):s.items.find(r=>r.sourceFilename===n.file_name);i&&!i._completed&&(i._completed=!0,t=!0)}return t&&ne(),t}function we(e){return e&&_.value[e]?.task?.status||""}function H(e){if(e.error)return e.error;if(e.matchStatus&&e.matchStatus!=="MATCHED")return e.matchMessage||"";const s=e.taskId;return s&&_.value[s]?.task?.errorMessage||""}function le(e){const s=e.taskId;if(!s)return!1;const t=_.value[s]?.line_progress,n=$(s),l=w(e);return l==="本文件解析完毕"||l==="已被全局判定为终态"?!1:n?x(s,e)?._pushed?t?.has_progress&&t?.info?.file_name?t.info.file_name===e.sourceFilename:!0:!1:t?.has_progress||t?.info?!0:l==="已入队"||l==="处理中"}function re(e){return e.map(s=>s.matchStatus==="MATCHED"?{...s,_pushed:!1,_completed:!1}:{...s,matched:!1,openStoreUrl:void 0,error:s.error||void 0,_pushed:!1,_completed:!1})}function oe(e){return e.matchStatus==="MATCHED"?`已匹配 ${e.shopId||""}`.trim():e.matchMessage?e.matchMessage:e.matchStatus==="CONFLICT"?"存在多个同名店铺，请人工确认":e.matchStatus==="PENDING"||e.matchStatus==="INDEX_STALE"?"店铺索引暂未就绪":e.matchStatus?e.matchStatus:e.matched?`已匹配 ${e.shopId||""}`.trim():"待匹配"}function Se(){ee.value=[...m.value,...U.value]}function b(){Se(),Ce(ee.value)}function Ce(e){B.value={total:e.length,successCount:e.filter(s=>s.success).length,failedCount:e.filter(s=>!s.success).length,items:e}}function ue(e){if(!e)return"";const s=_.value[e],t=s?.line_progress?.info;if(!s?.line_progress?.has_progress||!t){const l=s?.task?.status;return l?`任务状态：${l}`:""}const n=[];if(t.phase&&n.push(`阶段：${t.phase}`),t.file_index&&t.file_total&&n.push(`文件：${t.file_index}/${t.file_total}`),t.file_name&&n.push(`当前文件：${t.file_name}`),t.current_line!=null&&t.total_lines!=null&&n.push(`${$(e)?"当前文件进度":"进度"}：${t.current_line}/${t.total_lines}`),t.current_country&&n.push(`国家：${t.current_country}`),t.current_asin&&n.push(`ASIN：${t.current_asin}`),t.finished_files!=null){const l=t.file_total&&t.file_total>0?`/${t.file_total}`:"";n.push(`已完成文件：${t.finished_files}${l}`)}return n.join("｜")}function J(e){if(!e)return 0;const s=_.value[e]?.line_progress?.info;return s?s.current_line!=null&&s.total_lines&&s.total_lines>0?Math.max(0,Math.min(100,Math.round(s.current_line/s.total_lines*100))):s.finished_files!=null&&s.file_total&&s.file_total>0?Math.max(0,Math.min(100,Math.round(s.finished_files/s.file_total*100))):_.value[e]?.task?.status==="SUCCESS"?100:0:0}function ie(e){const s=_.value[e]?.task?.status;return s==="SUCCESS"||s==="FAILED"}function E(){const e=new Set;return d.value.forEach(s=>{s.items.some(t=>t._pushed)&&e.add(s.taskId)}),Array.from(e)}function w(e){const s=e.taskId;if(!s||!z(s))return"";const n=x(s,e),l=we(s),i=_.value[s]?.line_progress,r=$(s);if(!r&&(l==="SUCCESS"||l==="FAILED"||e.taskStatus==="SUCCESS"||e.taskStatus==="FAILED"))return"已被全局判定为终态";if(r&&!n?._pushed&&!n?._completed)return"未入队";if(n?._completed)return"本文件解析完毕";if(l==="RUNNING"&&i?.has_progress&&i?.info?.file_name===e.sourceFilename)return"处理中";if(r&&l==="SUCCESS")return"本文件解析完毕";if(!r){const h=_.value[s];if(h?.items&&h.items.find(Y=>G(Y,e))&&l==="SUCCESS")return"本文件解析完毕"}return n?._pushed?"已入队":"未入队"}function ce(e){if(e.downloadUrl)return!0;const s=e.taskId;return s?_.value[s]?.task?.status==="SUCCESS":!1}function Te(e){const s=e?.task?.id;if(!s||!e?.items?.length)return!1;const t=d.value.find(r=>r.taskId===s);if(!t)return!1;let n=!1;const i=t.items.map(r=>{const h=e.items?.find(Y=>G(Y,r));if(!h)return r;const y={...r,...h,success:r.success??h.success,_pushed:r._pushed,_completed:r._completed};return JSON.stringify(y)!==JSON.stringify(r)&&(n=!0),y}).filter(r=>r.matchStatus==="MATCHED"&&r.success!==!1);return JSON.stringify(i)!==JSON.stringify(t.items)&&(t.items=i,n=!0),n&&ne(),n}async function Q(e){const s=e||E();if(s.length)try{const t=await He(s);let n=!1;for(const l of t.items||[]){const i=l?.task?.id;typeof i=="number"&&i>0&&(_.value[i]=l,Te(l)&&(n=!0),ae(i)&&(n=!0))}n&&b()}catch{}}function xe(){return document.visibilityState==="visible"?4500:1e4}function X(e=!1){if(g.value){if(!e)return;clearTimeout(g.value),g.value=null}const s=async()=>{if(g.value=null,j.value){X();return}const t=E();if(!t.length)return;j.value=!0;let n=!1;try{await Q(t),await Pe();for(const l of t)ie(l)&&(te(l),n=!0)}finally{j.value=!1}n&&(O(),b()),E().length>0&&X()};e?s():g.value=window.setTimeout(s,xe())}function W(e=!1){g.value&&!e||X(e)}function K(e){const s=e.taskId?_.value[e.taskId]?.task?.status:null;return s==="SUCCESS"?{className:"success",text:"已完成"}:s==="FAILED"?{className:"failed",text:"失败"}:s==="RUNNING"?{className:"running",text:"执行中"}:e.taskStatus==="SUCCESS"?{className:"success",text:"已完成"}:e.taskStatus==="FAILED"?{className:"failed",text:"失败"}:e.taskStatus==="RUNNING"?{className:"running",text:"执行中"}:e.success?{className:"success",text:"已完成"}:{className:"failed",text:"失败"}}function de(){g.value&&(window.clearTimeout(g.value),g.value=null)}async function fe(e){const s=A();if(!s?.upload_file_to_java)throw new Error("当前桌面端未提供文件上传桥接能力");const t=[];for(const n of e){const l=typeof n=="string"?n:n.absolutePath,i=typeof n=="string"?void 0:n.relativePath,r=await s.upload_file_to_java(l,i);if(!r?.success||!r.data)throw new Error(r?.error||r?.message||`上传失败：${l}`);t.push(r.data)}return t}async function Fe(){const e=A();if(!e?.select_brand_xlsx_files){v.warning("当前环境不支持文件选择，请在本机客户端中打开");return}try{const s=await e.select_brand_xlsx_files();if(!s?.length)return;S.value=s,M.value=await fe(s),v.success(`已选择 ${s.length} 个删除品牌文件`)}catch(s){v.error(s instanceof Error?s.message:"选择失败")}}async function Ne(){const e=A();if(!e?.select_brand_folder){v.warning("当前环境不支持文件夹选择，请在本机客户端中打开");return}try{const s=await e.select_brand_folder();if(!s)return;const t=await Je(s);if(!t.success||!t.items?.length){v.warning(t.error||"该文件夹下没有 xlsx 文件");return}S.value=t.items.map(n=>n.relativePath||n.absolutePath),M.value=await fe(t.items),v.success(`已选择文件夹内 ${t.items.length} 个 xlsx 文件`)}catch(s){v.error(s instanceof Error?s.message:"选择失败")}}async function $e(){if(!M.value.length){v.warning("请先选择待处理文件");return}try{N.value=!0;const e=await Ke({files:M.value.map(l=>({fileKey:l.fileKey,originalFilename:l.originalFilename,relativePath:l.relativePath}))}),s=re(e.items||[]),t=s.some(l=>l.matchStatus==="MATCHED"),n=s.some(l=>l.matchStatus&&l.matchStatus!=="MATCHED");I.value="解析完成，等待手动点击打开紫鸟进行单任务处理",k.value="",s.length&&s[0].taskId&&se(s[0].taskId,s,I.value,k.value),b(),n?v.warning("部分文件尚未命中可用店铺索引，已保留状态信息，请等待后台刷新后重试。"):t?v.success("删除品牌解析完成，请手动推送"):v.warning("当前没有可推送的已匹配文件，请先等待店铺索引刷新。"),await O()}catch(e){v.error(e instanceof Error?e.message:"执行失败")}finally{N.value=!1}}async function ve(e){const s=e.taskId;if(!s){v.warning("未找到任务ID");return}const t=A(),n=Oe(s),l=e.outputFilename||e.sourceFilename||`delete-brand_${s}.xlsx`;if(t?.save_file_from_url){const i=await t.save_file_from_url(n,l);i.success?v.success(`已保存：${i.path||l}`):i.error&&i.error!=="用户取消"&&v.error(i.error);return}window.open(n,"_blank")}async function O(){try{const e=await Le();R.value=re(e.items||[]),b(),await Q(),W(!0)}catch(e){console.error("loadHistory error:",e)}}function he(e){d.value.forEach(t=>{t.items=t.items.filter(n=>n.resultId!==e)});const s=d.value.length;d.value=d.value.filter(t=>t.items.length>0),d.value.length!==s&&typeof window<"u"&&window.localStorage.setItem(F(),JSON.stringify(d.value)),R.value=R.value.filter(t=>t.resultId!==e),b(),E().length===0&&de()}async function pe(e){try{await je(e),he(e),await O(),v.success("已删除")}catch(s){const t=s instanceof Error?s.message:"删除失败";if(typeof t=="string"&&t.includes("记录不存在")){he(e),v.success("已删除");return}v.error(t)}}function _e(e){const s=e.slice(0,5).map(n=>`${n.country}:${n.asin}${n.status?`（${n.status}）`:""}`);return e.length-s.length>0?`${s.join("、")} 等 ${e.length} 条`:s.join("、")}function nt(e,s){}function ge(){for(const e of d.value)for(const s of e.items){const t=w(s);if(t==="已入队"||t==="处理中")return!0}return!1}function P(e){return e.resultId!=null?`result:${e.resultId}`:`task:${e.taskId||0}:${e.sourceFilename||""}`}function Ee(){return m.value.find(e=>!e.openStoreUrl||P(e)===T.value||x(e.taskId,e)?._completed?!1:w(e)==="未入队")}async function ye(e,s){if(s?.auto&&ge())return e.taskId,e.sourceFilename,!1;const t=A(),n=e.taskId;if(!n)return!1;const l=d.value.find(y=>y.taskId===n);if(!l)return!1;if(!t?.enqueue_json)return v.error("当前环境未启用 pywebview enqueue_json（浏览器环境不会推送）"),!1;const i={type:"delete-brand-run",ts:Date.now(),data:{taskId:n,items:[e]}};k.value=JSON.stringify(i,null,2);const r=await t.enqueue_json(i);let h="";if(r?.success){h=`已推送文件 ${e.sourceFilename}，当前队列长度：${r.queue_size??"-"}`;const y=x(n,e);y&&(y._pushed=!0,y._completed=!1),T.value=P(e),se(n,l.items,h,k.value),W(!0)}else h=`推送到 Python 队列失败：${r?.error||"未知错误"}`;return I.value=h,!!r?.success}async function Pe(){if(!C.value||q.value){C.value,q.value;return}if(ge())return;const e=T.value;if(e){const t=m.value.find(n=>P(n)===e);if(t){const n=t.taskId,l=$(n);l&&(ae(n),w(t),void 0);const i=w(t);if(i==="已入队"||i==="处理中"){t.sourceFilename;return}if(l){const r=x(n,t);if(r&&!r._completed){t.sourceFilename,r._pushed,r._completed;return}}}}const s=Ee();if(!s){T.value="",C.value=!1;return}q.value=!0;try{s.taskId,s.sourceFilename,P(s),await ye(s,{auto:!0})||(s.taskId,s.sourceFilename,C.value=!1)}finally{q.value=!1}}async function De(e){C.value=!0,await ye(e)||(C.value=!1,T.value="")}return Me(()=>{Ie();const e=E();e.length>0?Q(e).then(()=>{let s=!1;for(const t of e)ie(t)&&(te(t),s=!0);s&&b(),W(!0)}):b(),O().catch(()=>{})}),Re(()=>{de()}),(e,s)=>(o(),u("div",Qe,[Be(qe,{active:"delete-brand"}),a("div",Xe,[a("aside",We,[s[2]||(s[2]=a("div",{class:"section-title"},"选择文件",-1)),a("div",Ye,[s[0]||(s[0]=a("div",{class:"hint"},"上传删除品牌 Excel；无论是直接上传文件还是上传文件夹批量导入，都会按每个 Excel 文件名作为店铺名。",-1)),a("div",{class:"btns"},[a("button",{type:"button",class:"opt-btn",onClick:Fe},"选择 Excel 文件"),a("button",{type:"button",class:"opt-btn",onClick:Ne},"选择文件夹")]),a("div",Ze,[S.value.length?(o(),u(D,{key:0},[(o(!0),u(D,null,Z(V.value,t=>(o(),u("span",{key:t},c(t),1))),128)),S.value.length>V.value.length?(o(),u("span",es," 还有 "+c(S.value.length-V.value.length)+" 个文件未展开显示 ",1)):f("",!0)],64)):(o(),u("span",ss,"暂未选择删除品牌文件"))])]),s[3]||(s[3]=Ue('
执行说明
',2)),a("div",ts,[a("button",{type:"button",class:"btn-run",disabled:N.value,onClick:$e},c(N.value?"解析中...":"开始解析"),9,ns),a("span",as,c(N.value?"正在读取删除品牌数据，请稍候…":"解析后会在右侧展示按国家分组的去重结果"),1)]),I.value||k.value?(o(),u("div",ls,[s[1]||(s[1]=a("div",{class:"section-title queue-debug-title"},"Python 队列推送结果",-1)),I.value?(o(),u("div",rs,c(I.value),1)):f("",!0),k.value?(o(),u("pre",os,c(k.value),1)):f("",!0)])):f("",!0)]),a("section",us,[s[12]||(s[12]=a("div",{class:"panel-header"},"删除品牌结果",-1)),a("div",is,[a("div",cs,[a("div",ds,[s[4]||(s[4]=a("span",{class:"summary-label"},"已处理文件",-1)),a("strong",null,c(B.value.total),1)]),a("div",fs,[s[5]||(s[5]=a("span",{class:"summary-label"},"成功结果",-1)),a("strong",null,c(B.value.successCount),1)]),a("div",vs,[s[6]||(s[6]=a("span",{class:"summary-label"},"失败文件",-1)),a("strong",null,c(B.value.failedCount),1)])]),a("div",hs,[s[11]||(s[11]=a("div",{class:"result-list-header"},[a("span",null,"删除品牌结果列表")],-1)),be.value?(o(),u(D,{key:1},[m.value.length?(o(),u("div",_s,[s[8]||(s[8]=a("div",{class:"result-subsection-title"},"当前任务",-1)),a("ul",gs,[(o(!0),u(D,null,Z(m.value,t=>(o(),u("li",{key:`current-${t.taskId||t.resultId||t.sourceFilename}`,class:"task-item split-result-item"},[a("div",ys,[a("span",{class:"id",title:t.sourceFilename},c(t.sourceFilename||"-"),9,ks),a("div",ms,"店铺名："+c(t.shopName||"-"),1),a("div",Is,"匹配结果："+c(oe(t)),1),t.platform?(o(),u("div",bs,"平台："+c(t.platform),1)):f("",!0),w(t)?(o(),u("div",ws,"队列状态："+c(w(t)),1)):f("",!0),t.countryCount!==void 0&&t.matched?(o(),u("div",Ss,"国家数："+c(t.countryCount),1)):f("",!0),t.totalRows!==void 0&&t.matched?(o(),u("div",Cs,"去重后 "+c(t.totalRows)+" 条 ",1)):f("",!0),le(t)?(o(),u("div",Ts,[a("div",xs,[s[7]||(s[7]=a("span",null,"任务进度",-1)),a("span",null,c(J(t.taskId))+"%",1)]),a("div",Fs,[a("div",{class:"delete-brand-progress-bar-fill",style:ke({width:`${J(t.taskId)}%`})},null,4)]),a("div",Ns,c(ue(t.taskId)),1)])):f("",!0),t.previewRows?.length?(o(),u("div",$s,c(_e(t.previewRows)),1)):f("",!0),H(t)?(o(),u("div",Es,"错误信息："+c(H(t)),1)):f("",!0)]),a("div",Ps,[a("span",{class:me(["status",K(t).className])},c(K(t).text),3),t.openStoreUrl?(o(),u("button",{key:0,type:"button",class:"download",onClick:n=>De(t)}," 打开紫鸟 ",8,Ds)):f("",!0),ce(t)?(o(),u("button",{key:1,type:"button",class:"download",onClick:n=>ve(t)}," 下载 ",8,As)):f("",!0),t.resultId?(o(),u("button",{key:2,type:"button",class:"btn-delete",onClick:n=>pe(t.resultId)}," 删除 ",8,Ms)):f("",!0)])]))),128))])])):f("",!0),U.value.length?(o(),u("div",Rs,[s[10]||(s[10]=a("div",{class:"result-subsection-title"},"历史记录",-1)),a("ul",Bs,[(o(!0),u(D,null,Z(U.value,t=>(o(),u("li",{key:`history-${t.taskId||t.resultId||t.sourceFilename}`,class:"task-item split-result-item"},[a("div",qs,[a("span",{class:"id",title:t.sourceFilename},c(t.sourceFilename||"-"),9,Us),a("div",Hs,"店铺名："+c(t.shopName||"-"),1),a("div",Js,"匹配结果："+c(oe(t)),1),t.platform?(o(),u("div",Ks,"平台："+c(t.platform),1)):f("",!0),t.countryCount!==void 0&&t.matched?(o(),u("div",Os,"国家数："+c(t.countryCount),1)):f("",!0),t.totalRows!==void 0&&t.matched?(o(),u("div",Ls,"去重后 "+c(t.totalRows)+" 条 ",1)):f("",!0),le(t)?(o(),u("div",js,[a("div",Vs,[s[9]||(s[9]=a("span",null,"任务进度",-1)),a("span",null,c(J(t.taskId))+"%",1)]),a("div",zs,[a("div",{class:"delete-brand-progress-bar-fill",style:ke({width:`${J(t.taskId)}%`})},null,4)]),a("div",Gs,c(ue(t.taskId)),1)])):f("",!0),t.previewRows?.length?(o(),u("div",Qs,c(_e(t.previewRows)),1)):f("",!0),H(t)?(o(),u("div",Xs,"错误信息："+c(H(t)),1)):f("",!0)]),a("div",Ws,[a("span",{class:me(["status",K(t).className])},c(K(t).text),3),ce(t)?(o(),u("button",{key:0,type:"button",class:"download",onClick:n=>ve(t)}," 下载 ",8,Ys)):f("",!0),t.resultId?(o(),u("button",{key:1,type:"button",class:"btn-delete",onClick:n=>pe(t.resultId)}," 删除 ",8,Zs)):f("",!0)])]))),128))])])):f("",!0)],64)):(o(),u("div",ps," 暂无删除品牌结果，完成解析后会在这里展示按国家分组的去重结果 "))])])])])]))}}),st=Ve(et,[["__scopeId","data-v-7fbcf490"]]);ze(st).use(Ge).mount("#app"); diff --git a/app/blueprints/__pycache__/brand.cpython-312.pyc b/app/blueprints/__pycache__/brand.cpython-312.pyc index 777482c..2fef1f4 100644 Binary files a/app/blueprints/__pycache__/brand.cpython-312.pyc and b/app/blueprints/__pycache__/brand.cpython-312.pyc differ diff --git a/app/blueprints/__pycache__/communication.cpython-312.pyc b/app/blueprints/__pycache__/communication.cpython-312.pyc index 53d4f9d..4ac71e8 100644 Binary files a/app/blueprints/__pycache__/communication.cpython-312.pyc and b/app/blueprints/__pycache__/communication.cpython-312.pyc differ diff --git a/app/blueprints/__pycache__/main.cpython-312.pyc b/app/blueprints/__pycache__/main.cpython-312.pyc index f8c925b..eef60da 100644 Binary files a/app/blueprints/__pycache__/main.cpython-312.pyc and b/app/blueprints/__pycache__/main.cpython-312.pyc differ diff --git a/app/new_web_source/delete-brand.html b/app/new_web_source/delete-brand.html index 8135c9f..fc3da1f 100644 --- a/app/new_web_source/delete-brand.html +++ b/app/new_web_source/delete-brand.html @@ -7,7 +7,7 @@ - +
diff --git a/app/version.txt b/app/version.txt index cb1deba..52a718a 100644 --- a/app/version.txt +++ b/app/version.txt @@ -1 +1 @@ -{"version": "1.0.22"} \ No newline at end of file +{"version": "1.0.13"} \ No newline at end of file diff --git a/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue b/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue index 10a659d..631f37a 100644 --- a/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue @@ -417,7 +417,35 @@ function getDisplayError(item: DeleteBrandResultItem) { } function shouldShowProgress(item: DeleteBrandResultItem) { + const taskId = item.taskId + if (!taskId) return false + + const progress = taskDetails.value[taskId]?.line_progress + const multiFileTask = isMultiFileTask(taskId) const qs = getQueueStatus(item) + + // 已完成/终态后隐藏进度条。 + if (qs === '本文件解析完毕' || qs === '已被全局判定为终态') { + return false + } + + if (multiFileTask) { + const sessionItem = findSessionItem(taskId, item) + // 多文件任务：未入队的文件不展示同一个 task 的公共进度，避免“两个文件同时在跑”的错觉。 + if (!sessionItem?._pushed) { + return false + } + + if (progress?.has_progress && progress?.info?.file_name) { + return progress.info.file_name === item.sourceFilename + } + return true + } + + if (progress?.has_progress || progress?.info) { + return true + } + return qs === '已入队' || qs === '处理中' } @@ -550,14 +578,20 @@ function getQueueStatus(item: DeleteBrandResultItem) { return '已被全局判定为终态' } - if (status === 'RUNNING' && info?.has_progress && info?.info?.file_name === item.sourceFilename) { - return '处理中' + // 多文件：未推送的文件必须保持“未入队”，避免被同 task 的公共 RUNNING 状态误判成“处理中”。 + if (multiFileTask && !sessionItem?._pushed && !sessionItem?._completed) { + return '未入队' } + // 先看前端会话态：一旦该文件已判定完成，优先展示完成，避免被 RUNNING 覆盖导致链式推进卡住。 if (sessionItem?._completed) { return '本文件解析完毕' } + if (status === 'RUNNING' && info?.has_progress && info?.info?.file_name === item.sourceFilename) { + return '处理中' + } + if (multiFileTask && status === 'SUCCESS') { return '本文件解析完毕' } @@ -916,6 +950,11 @@ function formatPreview(rows: DeleteBrandPreviewRow[]) { return hiddenCount > 0 ? `${preview.join('、')} 等 ${rows.length} 条` : preview.join('、') } +function debugAutoAdvance(step: string, payload?: Record) { + if (!import.meta.env.DEV) return + console.log(`[DeleteBrandAutoAdvance] ${step}`, payload || {}) +} + function isPythonQueueBusy() { for (const task of sessionTasks.value) { for (const item of task.items) { @@ -945,6 +984,11 @@ function findNextAutoRunnableItem() { async function runItem(item: DeleteBrandResultItem, options?: { auto?: boolean }) { if (options?.auto && isPythonQueueBusy()) { + debugAutoAdvance('runItem blocked by busy queue', { + mode: 'auto', + taskId: item.taskId, + sourceFilename: item.sourceFilename, + }) return false } @@ -992,8 +1036,17 @@ async function runItem(item: DeleteBrandResultItem, options?: { auto?: boolean } } async function maybeAutoAdvance() { - if (!chainStarted.value || autoAdvancing.value) return - if (isPythonQueueBusy()) return + if (!chainStarted.value || autoAdvancing.value) { + debugAutoAdvance('skip: chain not started or auto advancing', { + chainStarted: chainStarted.value, + autoAdvancing: autoAdvancing.value, + }) + return + } + if (isPythonQueueBusy()) { + debugAutoAdvance('skip: queue busy') + return + } const currentKey = activeItemKey.value if (currentKey) { @@ -1002,15 +1055,33 @@ async function maybeAutoAdvance() { const taskId = currentItem.taskId const multiFileTask = isMultiFileTask(taskId) if (multiFileTask) { - updateCompletedItemsFromProgress(taskId) + const changed = updateCompletedItemsFromProgress(taskId) + debugAutoAdvance('sync completed from progress', { + taskId, + changed, + status: getQueueStatus(currentItem), + }) } const status = getQueueStatus(currentItem) if (status === '已入队' || status === '处理中') { + debugAutoAdvance('skip: current item still running', { + currentKey, + status, + taskId, + sourceFilename: currentItem.sourceFilename, + }) return } if (multiFileTask) { const sessionItem = findSessionItem(taskId, currentItem) if (sessionItem && !sessionItem._completed) { + debugAutoAdvance('skip: multi-file current not completed yet', { + currentKey, + taskId, + sourceFilename: currentItem.sourceFilename, + pushed: sessionItem._pushed, + completed: sessionItem._completed, + }) return } } @@ -1019,6 +1090,9 @@ async function maybeAutoAdvance() { const nextItem = findNextAutoRunnableItem() if (!nextItem) { + debugAutoAdvance('stop chain: no next runnable item', { + currentKey, + }) activeItemKey.value = '' chainStarted.value = false return @@ -1026,8 +1100,17 @@ async function maybeAutoAdvance() { autoAdvancing.value = true try { + debugAutoAdvance('try start next item', { + taskId: nextItem.taskId, + sourceFilename: nextItem.sourceFilename, + nextKey: getItemKey(nextItem), + }) const started = await runItem(nextItem, { auto: true }) if (!started) { + debugAutoAdvance('stop chain: runItem returned false', { + taskId: nextItem.taskId, + sourceFilename: nextItem.sourceFilename, + }) chainStarted.value = false } } finally {