i18-fe-automator-beta 2.1.7 → 2.1.8

package/dist/commonjs/index.js

@@ -2877,6 +2877,8 @@ async function selectPlan(plans, keyword) {
       message: "请选择计划",
       name: "plan",
       type: "rawlist",
+      // 到列表边界停止, 不循环回第一条
+      loop: false,
       choices: plans.map((p) => ({
         name: `#${p.id} ${p.title} [${p.begin} ~ ${p.end}] (${
           p.stories ?? 0
@@ -2971,9 +2973,64 @@ async function showPlanDetail(zentaosid, selected) {
   return stories;
 }
 
-// 导出动作(plan收尾交互使用): 按范围过滤需求, 拉详情并产出 .zentao-<计划名>/ + 工作区
+// 按导出范围过滤需求: front=有前端工时 | back=有后端工时 | all=全部
+function filterStoriesByScope(stories, scope) {
+  return stories.filter((s) => {
+    if (scope === "front") return Number(s.webestimate) > 0;
+    if (scope === "back") return Number(s.estimate) > 0;
+    return true;
+  });
+}
+
+// 导出前下一步: 列出范围内需求供勾选(「全选」与子项父子联动, 复用 CheckboxAllPrompt)
+// 返回勾选的需求数组; 未勾选任何项返回[](调用方据此跳过导出)
+async function selectExportStories(stories, scope) {
+  const scoped = filterStoriesByScope(stories, scope);
+  // 工时展示跟随导出范围: front只展示前端工时 / back只展示后端工时 / all全展示
+  const hoursOf = (s) => {
+    const w = Number(s.webestimate) > 0 ? `${s.webestimate}h` : "-";
+    const e = Number(s.estimate) > 0 ? `${s.estimate}h` : "-";
+    if (scope === "front") return `(前端${w})`;
+    if (scope === "back") return `(后端${e})`;
+    return `(前端${w}/后端${e})`;
+  };
+  // prompt 注册幂等, 与 upload.js 各自使用前注册
+  inquirer.registerPrompt("checkbox-all", CheckboxAllPrompt);
+  // 需求选项拼接序号, 与数字键选择对应(按2选第一个需求...); 「全选」不占序号, 固定首项无前缀
+  const choices = [
+    {
+      name: `全选(共${scoped.length}条)`,
+      value: SELECT_ALL,
+      short: "全选",
+      // 默认全选(与全部子项联动一致)
+      checked: true,
+    },
+    ...scoped.map((s, index) => ({
+      name: `${index + 1}. #${s.id} ${s.title} ${hoursOf(s)}`,
+      value: String(s.id),
+      short: `#${s.id}`,
+      checked: true,
+    })),
+  ];
+  const { picked } = await inquirer.prompt([
+    {
+      message: `请勾选要导出的需求(空格选择, 回车确认; 「全选」与单个需求联动)`,
+      name: "picked",
+      type: "checkbox-all",
+      // 到列表边界停止, 不循环回第一条
+      loop: false,
+      choices,
+    },
+  ]);
+  // 全选勾上时返回值含哨兵值, 一并忽略后按ID过滤
+  const ids = new Set(picked.filter((v) => v !== SELECT_ALL));
+  return scoped.filter((s) => ids.has(String(s.id)));
+}
+
+// 导出动作(plan收尾交互使用): 按范围过滤需求(交互勾选时再按pickedIds收窄), 拉详情并产出 .zentao-<计划名>/ + 工作区
 // scope: front=有前端工时的需求 | back=有后端工时的需求 | all=全部
-async function exportPlanStories(zentaosid, selected, scope) {
+// pickedIds: 交互勾选的需求ID集合(Set); 未传(--export直通一键场景)为范围内全量
+async function exportPlanStories(zentaosid, selected, scope, pickedIds) {
   const scopeLabel =
     scope === "front" ? "前端" : scope === "back" ? "后端" : "全部";
   Loading$1.start("拉取计划详情中...");
@@ -2981,12 +3038,10 @@ async function exportPlanStories(zentaosid, selected, scope) {
     zentaosid,
     selected.id
   );
-  // 按导出范围过滤需求
-  const stories = allStories.filter((s) => {
-    if (scope === "front") return Number(s.webestimate) > 0;
-    if (scope === "back") return Number(s.estimate) > 0;
-    return true;
-  });
+  // 按导出范围过滤需求, 再按勾选ID收窄(pickedIds未传=范围内全量)
+  const stories = filterStoriesByScope(allStories, scope).filter(
+    (s) => !pickedIds || pickedIds.has(String(s.id))
+  );
   Loading$1.succeed(
     `拉取计划详情成功(${scopeLabel}${stories.length}/${allStories.length}条)`
   );
@@ -4015,7 +4070,7 @@ async function storyMain(action, cliOpts) {
     });
     return;
   }
-  // plan: 产品选择 -> 计划选取 -> 展示 -> 导出(--export直通一键场景, 不传则收尾交互)
+  // plan: 产品选择 -> 计划选取 -> 展示 -> 导出询问(交互场景勾选需求, --export直通一键场景)
   const session = await ensureZentaoSession(cliOpts);
   await session.request(async (zentaosid) => {
     // 位置参数纯数字 = 产品计划ID(productplan-browse-<ID>.html 中的ID), 等同 --product 直通
@@ -4059,7 +4114,17 @@ async function storyMain(action, cliOpts) {
       ]));
     }
     if (exportChoice !== "none") {
-      await exportPlanStories(zentaosid, selected, exportChoice);
+      // 下一步(仅交互场景): 列出范围内需求勾选要导出的(「全选」与单个需求互斥); --export直通为范围内全量
+      let pickedIds = null;
+      if (cliOpts.export === undefined) {
+        const pickedStories = await selectExportStories(stories, exportChoice);
+        if (!pickedStories.length) {
+          console.log(chalk.yellow("未勾选需求, 跳过导出"));
+          return;
+        }
+        pickedIds = new Set(pickedStories.map((s) => String(s.id)));
+      }
+      await exportPlanStories(zentaosid, selected, exportChoice, pickedIds);
     }
   });
 }

package/dist/esm/index.mjs

@@ -2855,6 +2855,8 @@ async function selectPlan(plans, keyword) {
       message: "请选择计划",
       name: "plan",
       type: "rawlist",
+      // 到列表边界停止, 不循环回第一条
+      loop: false,
       choices: plans.map((p) => ({
         name: `#${p.id} ${p.title} [${p.begin} ~ ${p.end}] (${
           p.stories ?? 0
@@ -2949,9 +2951,64 @@ async function showPlanDetail(zentaosid, selected) {
   return stories;
 }
 
-// 导出动作(plan收尾交互使用): 按范围过滤需求, 拉详情并产出 .zentao-<计划名>/ + 工作区
+// 按导出范围过滤需求: front=有前端工时 | back=有后端工时 | all=全部
+function filterStoriesByScope(stories, scope) {
+  return stories.filter((s) => {
+    if (scope === "front") return Number(s.webestimate) > 0;
+    if (scope === "back") return Number(s.estimate) > 0;
+    return true;
+  });
+}
+
+// 导出前下一步: 列出范围内需求供勾选(「全选」与子项父子联动, 复用 CheckboxAllPrompt)
+// 返回勾选的需求数组; 未勾选任何项返回[](调用方据此跳过导出)
+async function selectExportStories(stories, scope) {
+  const scoped = filterStoriesByScope(stories, scope);
+  // 工时展示跟随导出范围: front只展示前端工时 / back只展示后端工时 / all全展示
+  const hoursOf = (s) => {
+    const w = Number(s.webestimate) > 0 ? `${s.webestimate}h` : "-";
+    const e = Number(s.estimate) > 0 ? `${s.estimate}h` : "-";
+    if (scope === "front") return `(前端${w})`;
+    if (scope === "back") return `(后端${e})`;
+    return `(前端${w}/后端${e})`;
+  };
+  // prompt 注册幂等, 与 upload.js 各自使用前注册
+  inquirer.registerPrompt("checkbox-all", CheckboxAllPrompt);
+  // 需求选项拼接序号, 与数字键选择对应(按2选第一个需求...); 「全选」不占序号, 固定首项无前缀
+  const choices = [
+    {
+      name: `全选(共${scoped.length}条)`,
+      value: SELECT_ALL,
+      short: "全选",
+      // 默认全选(与全部子项联动一致)
+      checked: true,
+    },
+    ...scoped.map((s, index) => ({
+      name: `${index + 1}. #${s.id} ${s.title} ${hoursOf(s)}`,
+      value: String(s.id),
+      short: `#${s.id}`,
+      checked: true,
+    })),
+  ];
+  const { picked } = await inquirer.prompt([
+    {
+      message: `请勾选要导出的需求(空格选择, 回车确认; 「全选」与单个需求联动)`,
+      name: "picked",
+      type: "checkbox-all",
+      // 到列表边界停止, 不循环回第一条
+      loop: false,
+      choices,
+    },
+  ]);
+  // 全选勾上时返回值含哨兵值, 一并忽略后按ID过滤
+  const ids = new Set(picked.filter((v) => v !== SELECT_ALL));
+  return scoped.filter((s) => ids.has(String(s.id)));
+}
+
+// 导出动作(plan收尾交互使用): 按范围过滤需求(交互勾选时再按pickedIds收窄), 拉详情并产出 .zentao-<计划名>/ + 工作区
 // scope: front=有前端工时的需求 | back=有后端工时的需求 | all=全部
-async function exportPlanStories(zentaosid, selected, scope) {
+// pickedIds: 交互勾选的需求ID集合(Set); 未传(--export直通一键场景)为范围内全量
+async function exportPlanStories(zentaosid, selected, scope, pickedIds) {
   const scopeLabel =
     scope === "front" ? "前端" : scope === "back" ? "后端" : "全部";
   Loading.start("拉取计划详情中...");
@@ -2959,12 +3016,10 @@ async function exportPlanStories(zentaosid, selected, scope) {
     zentaosid,
     selected.id
   );
-  // 按导出范围过滤需求
-  const stories = allStories.filter((s) => {
-    if (scope === "front") return Number(s.webestimate) > 0;
-    if (scope === "back") return Number(s.estimate) > 0;
-    return true;
-  });
+  // 按导出范围过滤需求, 再按勾选ID收窄(pickedIds未传=范围内全量)
+  const stories = filterStoriesByScope(allStories, scope).filter(
+    (s) => !pickedIds || pickedIds.has(String(s.id))
+  );
   Loading.succeed(
     `拉取计划详情成功(${scopeLabel}${stories.length}/${allStories.length}条)`
   );
@@ -3993,7 +4048,7 @@ async function storyMain(action, cliOpts) {
     });
     return;
   }
-  // plan: 产品选择 -> 计划选取 -> 展示 -> 导出(--export直通一键场景, 不传则收尾交互)
+  // plan: 产品选择 -> 计划选取 -> 展示 -> 导出询问(交互场景勾选需求, --export直通一键场景)
   const session = await ensureZentaoSession(cliOpts);
   await session.request(async (zentaosid) => {
     // 位置参数纯数字 = 产品计划ID(productplan-browse-<ID>.html 中的ID), 等同 --product 直通
@@ -4037,7 +4092,17 @@ async function storyMain(action, cliOpts) {
       ]));
     }
     if (exportChoice !== "none") {
-      await exportPlanStories(zentaosid, selected, exportChoice);
+      // 下一步(仅交互场景): 列出范围内需求勾选要导出的(「全选」与单个需求互斥); --export直通为范围内全量
+      let pickedIds = null;
+      if (cliOpts.export === undefined) {
+        const pickedStories = await selectExportStories(stories, exportChoice);
+        if (!pickedStories.length) {
+          console.log(chalk.yellow("未勾选需求, 跳过导出"));
+          return;
+        }
+        pickedIds = new Set(pickedStories.map((s) => String(s.id)));
+      }
+      await exportPlanStories(zentaosid, selected, exportChoice, pickedIds);
     }
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18-fe-automator-beta",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "i18-fe-automator-beta内测版本,只用于key: ''替换、检测中文规则等",
   "type": "module",
   "bin": {