oltc-selector 1.2.0 → 1.2.5

package/bin/oltc.js

@@ -1543,11 +1543,12 @@ function selectOltc(input) {
         const reasonsZh = [];
         const warningsEn = [];
         const warningsZh = [];
+        const dutyA = input.throughCurrentA >= 100 ? String(Math.round(input.throughCurrentA)) : String(Math.round(input.throughCurrentA * 10) / 10);
         reasonsEn.push(
-          `Minimum-adequate path: ${s.nameEn}, Ium ${current} A \u2265 ${input.throughCurrentA} A, Um ${att.um} kV.`
+          `Minimum-adequate path: ${s.nameEn}, Ium ${current} A \u2265 ${dutyA} A, Um ${att.um} kV.`
         );
         reasonsZh.push(
-          `\u6700\u4F4E\u6EE1\u8DB3\u8DEF\u5F84\uFF1A${s.nameZh}\uFF0CIum ${current} A \u2265 \u9700\u6C42 ${input.throughCurrentA} A\uFF0CUm ${att.um} kV\u3002`
+          `\u6700\u4F4E\u6EE1\u8DB3\u8DEF\u5F84\uFF1A${s.nameZh}\uFF0CIum ${current} A \u2265 \u9700\u6C42 ${dutyA} A\uFF0CUm ${att.um} kV\u3002`
         );
         if (s.structure === "compound" && !octc) {
           reasonsEn.push(
@@ -1971,7 +1972,7 @@ Flags:
   --um kV            Equipment Um (OLTC). With --mva/--kv, derived if omitted.
   --ust V            Step voltage. With --mva/--kv/--step-pct, derived if omitted.
   --step-pct %       Step as percent (1.25 means 1.25%). Capacity path only.
-  --k n              Safety factor on capacity path only (default 1.2).
+  --k n              Safety factor on capacity path only (default 1.0, same as the web app).
   --conn Y|D         Switch connection (star / delta). Default Y.
   --reg W|G|0        Reversing / coarse-fine / linear. Default W.
   --pm N             \xB1 steps. Default 8.
@@ -2007,7 +2008,7 @@ function cliToSelectInput(args) {
     const pct = args.stepPct != null && args.stepPct > 0 ? args.stepPct / 100 : 0.0125;
     const minus = args.pm != null && args.pm > 0 ? args.pm : 8;
     const iMax = maxThroughCurrent(rated, minus, pct);
-    const k = args.k != null && args.k > 0 ? args.k : 1.2;
+    const k = args.k != null && args.k > 0 ? args.k : 1;
     iu = iMax * k;
     if (um == null || !(um > 0)) {
       um = oltcUmFromRatedKv(args.kv, args.conn);
@@ -2042,7 +2043,7 @@ function cliToSelectInput(args) {
     input.octcSeries = args.series ?? "auto";
     if (args.contact) input.octcContact = args.contact;
     if (args.positions != null) input.positions = args.positions;
-    else if (args.pm != null && args.pm > 0) {
+    else if (args.given.has("pm") && args.pm != null && args.pm > 0) {
       input.positions = Math.round(2 * args.pm + 1);
     }
   } else if (args.reg === "linear") {
@@ -2059,21 +2060,37 @@ function cliToSelectInput(args) {
 var MOUNT_ZH = {
   in_tank: "\u7BB1\u5185",
   on_tank: "\u7BB1\u9876",
-  dry_type: "\u5E72\u5F0F"
+  dry_type: "\u5E72\u5F0F",
+  // CLI 不会接收这两种，列上只为 Record 完整性
+  external_compartment: "\u5916\u7F6E\u9694\u5BA4",
+  reactor: "\u7535\u6297\u5668"
 };
 function assumptionsFromArgs(args) {
   const mark = (key) => args.given.has(key) ? "" : "\uFF08\u9ED8\u8BA4\uFF09";
   const items = [
     `conn=${args.conn} ${args.conn === "Y" ? "\u661F\u70B9" : "\u7EBF\u7AEF"}${mark("conn")}`
   ];
+  if (args.mva != null) {
+    items.push(args.given.has("k") ? `k=${args.k}` : "k=1.0\uFF08\u9ED8\u8BA4\uFF09");
+    items.push(
+      args.given.has("stepPct") ? `step=${args.stepPct}%` : "step=1.25%\uFF08\u9ED8\u8BA4\uFF09"
+    );
+  }
+  const phases = `\u76F8\u6570=${args.phases}${mark("phases")}`;
   if (args.octc) {
-    const pos = args.positions ?? (args.pm != null && args.pm > 0 ? Math.round(2 * args.pm + 1) : null);
-    items.push(pos != null ? `${pos} \u6863${mark("positions")}` : "\u6863\u6570\u672A\u6307\u5B9A");
+    if (args.positions != null) {
+      items.push(`${args.positions} \u6863`);
+    } else if (args.given.has("pm") && args.pm != null && args.pm > 0) {
+      items.push(`${Math.round(2 * args.pm + 1)} \u6863\uFF08\u7531 \xB1${args.pm} \u63A8\uFF09`);
+    } else if (!args.given.has("contact")) {
+      items.push("\u6863\u6570\u672A\u6307\u5B9A");
+    }
     const s = args.series ?? "auto";
     items.push(
       s === "auto" ? `\u63A5\u7EBF=\u81EA\u52A8\uFF08${args.conn === "Y" ? "IV" : "II"}\uFF09${mark("series")}` : `\u63A5\u7EBF=${s}${mark("series")}`
     );
     items.push(`${MOUNT_ZH[args.mount]}${mark("mount")}`);
+    items.push(phases);
     return items;
   }
   items.push(
@@ -2088,6 +2105,7 @@ function assumptionsFromArgs(args) {
   }
   items.push(`${args.oil || !args.vacuum ? "\u6CB9\u6D78" : "\u771F\u7A7A"}${mark("medium")}`);
   items.push(`${MOUNT_ZH[args.mount]}${mark("mount")}`);
+  items.push(phases);
   return items;
 }
 function assumptionsLine(args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oltc-selector",
-  "version": "1.2.0",
+  "version": "1.2.5",
   "description": "Huaming OLTC/OCTC type selection CLI. No prices. Same engine as the web app.",
   "bin": {
     "oltc": "bin/oltc.js"