merge: resolve frontend asset conflicts, keep build with URL param cleanup

This commit is contained in:
Kelin
2026-03-25 12:43:59 +08:00
3 changed files with 11 additions and 1 deletions
File diff suppressed because one or more lines are too long
@@ -1 +1,5 @@
<<<<<<<< HEAD:ui/static/assets/versionUpgrade-DZ8KZRQB.js
import{p as e,h as i,m as d}from"./index-DZODVG__.js";function c(a,s){const r=e(s),m=i(a.workflow_data,a.schema_params),o=d(m,r.schemaParams);return{workflowData:r.workflowData,schemaParams:o.schemaParams,workflowId:a.workflow_id,description:a.description||"",editingWorkflowId:a.workflow_id,hasUnsavedChanges:!0,upgradeSummary:o.summary}}export{c as buildVersionUpgradeState};
========
import{p as e,h as i,m as d}from"./index-Dur4B611.js";function c(a,s){const r=e(s),m=i(a.workflow_data,a.schema_params),o=d(m,r.schemaParams);return{workflowData:r.workflowData,schemaParams:o.schemaParams,workflowId:a.workflow_id,description:a.description||"",editingWorkflowId:a.workflow_id,hasUnsavedChanges:!0,upgradeSummary:o.summary}}export{c as buildVersionUpgradeState};
>>>>>>>> origin/main:ui/static/assets/versionUpgrade-DWt7nwJP.js
+1 -1
View File
@@ -1 +1 @@
{"commit":"bdcb8fcf7a938df52554d4dcdccd3d4591d626a4","date":"2026-03-24T16:07:46Z"}
{"commit":"b85d1ba5447463eb3f0dfdff78561e49a1c1c756","date":"2026-03-25T03:49:44Z"}