From 83f13e9a6ed7274edb9718862e849d47621e3a0c Mon Sep 17 00:00:00 2001
From: Zhou Weidong <502333560@qq.com>
Date: Mon, 19 Oct 2026 18:47:18 +0800
Subject: [PATCH] =?UTF-8?q?docs(plans):=20=E8=AE=B0=E5=BD=95=20Web=20relea?=
 =?UTF-8?q?se=20=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5=20develop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/plans/PROGRESS.md | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/docs/plans/PROGRESS.md b/docs/plans/PROGRESS.md
index e5acd6f..5cc6375 100644
--- a/docs/plans/PROGRESS.md
+++ b/docs/plans/PROGRESS.md
@@ -5886,7 +5886,27 @@ Git：
 ```text
 d75b696 chore(config): 恢复开发默认服务器地址
 190e4f9 merge: 恢复开发默认服务器地址
-```
-
 提交与合并 author/committer 均为 `Zhou Weidong <502333560@qq.com>`；
 `develop` 与 `chore/flutter-api-host-3` 已推送。真机验证由用户执行。
+```
+
+## 2026-10-19 ReelShortWeb：release/v1.0.0 分片上传修复同步到 develop
+
+- `release/v1.0.0` 本地落后 1 个提交，执行 `git pull --ff-only origin release/v1.0.0` 快进到
+  `8e9435e fix(web): 修复分片上传 chunkSize 字符串拼接导致大文件超限`（仅 `src/utils/uploader.ts`）。
+- `develop`（`83e535d`）以 `--no-ff` 合并 release，合并提交
+  `f78960f chore(web): 合并 release 分片上传修复`，已推送。
+
+门禁原始输出：
+
+```text
+$ pnpm lint:eslint
+> eslint --fix --ext .js,.ts,.vue ./src
+（无错误输出）
+
+$ pnpm build:pro
+[warn] Circular chunk: element-plus -> vue-chunks -> element-plus. Please adjust the manual chunk logic for these chunks.
+Build successful. Please see dist-pro directory
+```
+
+`release/v1.0.0` 保持 `8e9435e` 不变；`develop` 已包含该修复。
\ No newline at end of file