@angelyeye/dsh-cost-tracker 1.9.1 → 1.9.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +119 -0
- package/README.en.md +60 -8
- package/README.md +65 -18
- package/client.js +202 -47
- package/config.js +10 -3
- package/index.js +42 -15
- package/package.json +2 -2
- package/pricing.js +181 -53
- package/sync.js +1 -1
- package/vendor-catalog.js +1 -1
package/client.js
CHANGED
|
@@ -180,6 +180,8 @@ window.__ModuleLoader__.load({
|
|
|
180
180
|
.cost-ps.peak .cost-ps-chip { color: #ff9800; }
|
|
181
181
|
.cost-ps.off .cost-ps-chip { color: var(--dsw-alias-state-business-primary, #4176e6); }
|
|
182
182
|
.cost-ps.weekend .cost-ps-chip { color: #34a853; }
|
|
183
|
+
/* 法定节假日:与周末同为「全天谷价」,同一绿色系 */
|
|
184
|
+
.cost-ps.holiday .cost-ps-chip { color: #34a853; }
|
|
183
185
|
.cost-ps-foot { font-size: 11px; color: var(--dsw-alias-label-tertiary, #9ca3af); white-space: nowrap; }
|
|
184
186
|
/* 环形表盘(classic 改造):24h 中空圆环,蓝=平价、橙=高峰、绿=周末 */
|
|
185
187
|
.cost-ps-ring { flex-direction: column; align-items: center; justify-content: center; gap: 4px; }
|
|
@@ -191,6 +193,7 @@ window.__ModuleLoader__.load({
|
|
|
191
193
|
.cost-ps-rail.peak .cost-ps-word { color: #ff9800; }
|
|
192
194
|
.cost-ps-rail.off .cost-ps-word { color: var(--dsw-alias-state-business-primary, #4176e6); }
|
|
193
195
|
.cost-ps-rail.weekend .cost-ps-word { color: #34a853; }
|
|
196
|
+
.cost-ps-rail.holiday .cost-ps-word { color: #34a853; }
|
|
194
197
|
/* 侧边栏底部(sidebar.footer.action)多插件 UI 兼容:
|
|
195
198
|
DSH 渲染器把该槽锚点设为 display:contents(见 dsh-client-ui-renderer ANCHOR_STYLE),
|
|
196
199
|
多个插件内容会被并进同一行(如与 linxin666/dsh-web-ui-all 冲突);改为纵向堆叠即可共存。
|
|
@@ -241,6 +244,19 @@ window.__ModuleLoader__.load({
|
|
|
241
244
|
.cost-pcard-chevron { color: var(--dsw-alias-label-tertiary, #8b93a1); flex: none; transition: transform .16s; }
|
|
242
245
|
.cost-pcard-chevron.is-open { transform: rotate(180deg); }
|
|
243
246
|
.cost-pcard-body { border-top: .5px solid var(--dsw-alias-border-l2, #e5e7eb); margin: 0 16px; padding: 12px 0 10px; }
|
|
247
|
+
/* ---------- 设置入口 v1.9.3:页头齿轮 + 分区内配置页(宿主 0.1.7 起插件配置插槽下线) ---------- */
|
|
248
|
+
/* 页头右侧的操作位:把齿轮推到行尾,不影响既有的标题与图标 */
|
|
249
|
+
.cost-h1-actions { margin-left: auto; display: inline-flex; align-items: center; gap: 8px; }
|
|
250
|
+
.cost-gear { appearance: none; display: inline-flex; align-items: center; justify-content: center; width: 28px; height: 28px; padding: 0; border: .5px solid var(--dsw-alias-border-l2, #d1d5db); border-radius: 8px; background: var(--dsw-alias-bg-layer-1, #fff); color: var(--dsw-alias-label-secondary, #5b6472); cursor: pointer; transition: background .16s, border-color .16s, color .16s; }
|
|
251
|
+
.cost-gear:hover { background: var(--dsw-alias-bg-layer-2, #f3f4f6); color: var(--dsw-alias-label-primary, #171a1f); }
|
|
252
|
+
.cost-gear:focus-visible { outline: 2px solid var(--dsw-alias-brand-primary, #2563eb); outline-offset: 2px; }
|
|
253
|
+
.cost-gear-icon { display: block; }
|
|
254
|
+
.cost-cfg-page { padding-top: 2px; }
|
|
255
|
+
.cost-cfg-page-head { display: flex; align-items: center; gap: 10px; margin: 2px 0 10px; }
|
|
256
|
+
.cost-back { appearance: none; display: inline-flex; align-items: center; gap: 4px; padding: 4px 10px; font: inherit; font-size: 12px; border-radius: 6px; border: .5px solid var(--dsw-alias-border-l2, #d1d5db); background: var(--dsw-alias-bg-layer-1, #fff); color: var(--dsw-alias-label-primary, #171a1f); cursor: pointer; }
|
|
257
|
+
.cost-back:hover { background: var(--dsw-alias-bg-layer-2, #f3f4f6); }
|
|
258
|
+
.cost-back:focus-visible { outline: 2px solid var(--dsw-alias-brand-primary, #2563eb); outline-offset: 2px; }
|
|
259
|
+
.cost-cfg-page-title { display: inline-flex; align-items: center; gap: 8px; font-size: 16px; font-weight: 600; }
|
|
244
260
|
/* ---------- 插件配置卡片 v1.9.0:顶部状态条 + 折叠分组 ---------- */
|
|
245
261
|
.cost-cfg-top { display: flex; flex-wrap: wrap; gap: 6px; align-items: center; margin: 2px 0 10px; }
|
|
246
262
|
.cost-cfg-chip { display: inline-flex; align-items: center; gap: 5px; font-size: 12px; line-height: 1.6; padding: 2px 9px; border-radius: 999px; border: .5px solid var(--dsw-alias-border-l2, #e5e7eb); background: var(--dsw-alias-bg-layer-3, transparent); color: var(--dsw-alias-label-secondary, #5b6472); white-space: nowrap; }
|
|
@@ -289,6 +305,42 @@ window.__ModuleLoader__.load({
|
|
|
289
305
|
e("path", { d: "M10.9 9.5 L13.7 9.5" })));
|
|
290
306
|
}
|
|
291
307
|
|
|
308
|
+
/**
|
|
309
|
+
* 设置齿轮(v1.9.3):自绘 —— 外环 + 内孔 + 8 根径向齿。
|
|
310
|
+
* 不用第三方图标字体/路径,避免额外许可负担;齿由极坐标循环生成,
|
|
311
|
+
* 15px 下仍能看清是「齿轮」而不是圆点。
|
|
312
|
+
*/
|
|
313
|
+
function gearIcon(size) {
|
|
314
|
+
const s = size || 15;
|
|
315
|
+
const teeth = [];
|
|
316
|
+
for (let i = 0; i < 8; i++) {
|
|
317
|
+
const a = (Math.PI / 4) * i;
|
|
318
|
+
teeth.push(e("line", {
|
|
319
|
+
key: "gt" + i,
|
|
320
|
+
x1: (8 + 4.6 * Math.cos(a)).toFixed(2), y1: (8 + 4.6 * Math.sin(a)).toFixed(2),
|
|
321
|
+
x2: (8 + 6.4 * Math.cos(a)).toFixed(2), y2: (8 + 6.4 * Math.sin(a)).toFixed(2),
|
|
322
|
+
stroke: "currentColor", strokeWidth: 1.3, strokeLinecap: "round",
|
|
323
|
+
}));
|
|
324
|
+
}
|
|
325
|
+
return e("svg", {
|
|
326
|
+
className: "cost-gear-icon", width: s, height: s, viewBox: "0 0 16 16",
|
|
327
|
+
fill: "none", xmlns: "http://www.w3.org/2000/svg", "aria-hidden": "true",
|
|
328
|
+
},
|
|
329
|
+
e("circle", { cx: 8, cy: 8, r: 4.6, stroke: "currentColor", strokeWidth: 1.3 }),
|
|
330
|
+
e("circle", { cx: 8, cy: 8, r: 1.7, stroke: "currentColor", strokeWidth: 1.3 }),
|
|
331
|
+
e("g", null, teeth));
|
|
332
|
+
}
|
|
333
|
+
|
|
334
|
+
/** 返回箭头(配置页左上角),与本插件其它内联 SVG 同款线宽与端点 */
|
|
335
|
+
function backIcon(size) {
|
|
336
|
+
const s = size || 13;
|
|
337
|
+
return e("svg", {
|
|
338
|
+
className: "cost-back-icon", width: s, height: s, viewBox: "0 0 14 14",
|
|
339
|
+
fill: "none", xmlns: "http://www.w3.org/2000/svg", "aria-hidden": "true",
|
|
340
|
+
},
|
|
341
|
+
e("path", { d: "M8.75 3.5 5.25 7l3.5 3.5", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round" }));
|
|
342
|
+
}
|
|
343
|
+
|
|
292
344
|
function fmtInt(n) { return String(Math.round(Number(n) || 0)).replace(/\B(?=(\d{3})+(?!\d))/g, ","); }
|
|
293
345
|
function fmtMoney(n) {
|
|
294
346
|
const x = Number(n) || 0;
|
|
@@ -1270,15 +1322,24 @@ window.__ModuleLoader__.load({
|
|
|
1270
1322
|
}
|
|
1271
1323
|
|
|
1272
1324
|
// ---------- 峰谷计价提示 ----------
|
|
1273
|
-
// 相位助记(与 dsh-cost-meter 一致):
|
|
1325
|
+
// 相位助记(与 dsh-cost-meter 一致):allDayOff → 「周末/节假日全谷」;inPeak → 「峰时」;否则「平价」。
|
|
1326
|
+
// allDayOff 由后端给出(weekend ∪ 法定节假日);对老后端缺该字段时回落到 weekend。
|
|
1327
|
+
function offAllDay(p) {
|
|
1328
|
+
return !!(p && (p.allDayOff === true || (p.allDayOff === undefined && p.weekend === true)));
|
|
1329
|
+
}
|
|
1274
1330
|
function peakWord(p) {
|
|
1275
1331
|
if (!p) return "";
|
|
1276
|
-
if (p
|
|
1332
|
+
if (offAllDay(p)) return p.holiday ? "节假日全谷" : "周末全谷";
|
|
1277
1333
|
return p.inPeak ? "峰时" : "平价";
|
|
1278
1334
|
}
|
|
1279
1335
|
function peakWordClass(p) {
|
|
1280
1336
|
if (!p) return "";
|
|
1281
|
-
|
|
1337
|
+
if (offAllDay(p)) return p.holiday ? " holiday" : " weekend";
|
|
1338
|
+
return p.inPeak ? " peak" : " off";
|
|
1339
|
+
}
|
|
1340
|
+
/** 全天谷价日的档位文案(周末 / 法定节假日分开说,避免把节假日误称「周末」) */
|
|
1341
|
+
function offPhaseLabel(p) {
|
|
1342
|
+
return p && p.holiday ? "法定节假日全谷价" : "周末全谷价";
|
|
1282
1343
|
}
|
|
1283
1344
|
// 倒计时文本:向上取整到分钟。与 dsh-cost-meter 一致:{time}后进入高峰/平价。
|
|
1284
1345
|
function peakCountdown(p, now) {
|
|
@@ -1297,7 +1358,7 @@ window.__ModuleLoader__.load({
|
|
|
1297
1358
|
// 当前相位在轨道上的标记位置:峰=25%、平价=75%;周末中点=50%。
|
|
1298
1359
|
function peakMarkerLeft(p) {
|
|
1299
1360
|
if (!p) return "50%";
|
|
1300
|
-
if (p
|
|
1361
|
+
if (offAllDay(p)) return "50%";
|
|
1301
1362
|
return p.inPeak ? "25%" : "75%";
|
|
1302
1363
|
}
|
|
1303
1364
|
// 24h 环形表盘(classic 改造):中空圆环。底环蓝=平价铺满 24h,高峰窗口叠加橙色弧段,
|
|
@@ -1322,8 +1383,8 @@ window.__ModuleLoader__.load({
|
|
|
1322
1383
|
// 平价底环(蓝)
|
|
1323
1384
|
e("circle", { cx: CX, cy: CY, r: R, fill: "none", stroke: offC, "stroke-width": SW }),
|
|
1324
1385
|
];
|
|
1325
|
-
//
|
|
1326
|
-
if (!p
|
|
1386
|
+
// 高峰弧(橙);周末 / 法定节假日则不画任何峰时弧段
|
|
1387
|
+
if (!offAllDay(p)) {
|
|
1327
1388
|
for (const w of windows) {
|
|
1328
1389
|
const a = deg(w.start), b = deg(w.end);
|
|
1329
1390
|
const s = polar(a, R), e2 = polar(b, R);
|
|
@@ -1338,9 +1399,9 @@ window.__ModuleLoader__.load({
|
|
|
1338
1399
|
children.push(e("text", { x: pt[0], y: pt[1], "text-anchor": "middle", "dominant-baseline": "middle", "font-size": "8.5", fill: dim }, (h < 10 ? "0" : "") + h + ":00"));
|
|
1339
1400
|
}
|
|
1340
1401
|
}
|
|
1341
|
-
// 当前相位颜色(峰橙 / 平蓝 /
|
|
1342
|
-
const color = p
|
|
1343
|
-
const word = p.
|
|
1402
|
+
// 当前相位颜色(峰橙 / 平蓝 / 周末·节假日绿)—— 同时用于标记点与圆心文案
|
|
1403
|
+
const color = offAllDay(p) ? weekC : p.inPeak ? peakC : offC;
|
|
1404
|
+
const word = offAllDay(p) ? (p.holiday ? "节假日全谷" : "周末全谷") : p.inPeak ? "高峰时段" : "平价时段";
|
|
1344
1405
|
// 当前时刻标记:相位色点(环上,随相位变色 + 白色描边)
|
|
1345
1406
|
const m = peakBeijingMinute(now);
|
|
1346
1407
|
const tip = polar(m / 1440 * 360, R);
|
|
@@ -1379,7 +1440,7 @@ window.__ModuleLoader__.load({
|
|
|
1379
1440
|
e("div", { className: "cost-ps-seg cost-ps-offseg", style: { left: "0%", width: "100%" } }),
|
|
1380
1441
|
];
|
|
1381
1442
|
// 高峰段(橙)按窗口在 24h 中的比例定位
|
|
1382
|
-
if (!p
|
|
1443
|
+
if (!offAllDay(p)) {
|
|
1383
1444
|
for (const w of win) {
|
|
1384
1445
|
segs.push(e("div", { className: "cost-ps-seg cost-ps-peakseg", style: { left: (w.start / 24 * 100) + "%", width: ((w.end - w.start) / 24 * 100) + "%" } }));
|
|
1385
1446
|
}
|
|
@@ -1507,7 +1568,8 @@ window.__ModuleLoader__.load({
|
|
|
1507
1568
|
// 设置面板:峰谷计价与提示
|
|
1508
1569
|
/**
|
|
1509
1570
|
* 「峰谷计价与提示」看板面板(v1.9.0 起**只读**)。
|
|
1510
|
-
* 设置入口统一到「设置 →
|
|
1571
|
+
* 设置入口统一到「设置 → 花费统计 → 右上角齿轮 → 峰谷计价与提示」
|
|
1572
|
+
* (旧宿主也可在「设置 → 插件 → 插件配置 → 花费统计」卡片里改,同一份配置),
|
|
1511
1573
|
* 这里只回显当前档位与生效配置,避免两处都能改造成口径不一致。
|
|
1512
1574
|
* 预览按钮保留:它只是本地弹窗预览,不改任何持久化状态。
|
|
1513
1575
|
*/
|
|
@@ -1532,7 +1594,7 @@ window.__ModuleLoader__.load({
|
|
|
1532
1594
|
["时段条样式", cfg.peakStyle === "classic" ? "环形表盘(24h)" : "简洁(单行紧凑)"],
|
|
1533
1595
|
["切换提醒", cfg.peakAlertEnabled !== false ? ("提前 " + (cfg.peakAlertAhead == null ? 2 : cfg.peakAlertAhead) + " 分钟 · " + (cfg.peakAlertTarget === "peak" ? "进入峰时" : cfg.peakAlertTarget === "offpeak" ? "进入谷时" : "峰和谷")) : "已关闭"],
|
|
1534
1596
|
["系统通知", cfg.peakAlertWebNotify === true ? "已开启" : "未开启"],
|
|
1535
|
-
["当前档位", snap && snap.phase ? (snap.phase
|
|
1597
|
+
["当前档位", snap && snap.phase ? (offAllDay(snap.phase) ? offPhaseLabel(snap.phase) : snap.phase.inPeak ? "高峰时段" : "平价时段") : "…"],
|
|
1536
1598
|
];
|
|
1537
1599
|
return e("div", { className: "cost-panel" },
|
|
1538
1600
|
e("div", { className: "cost-row" },
|
|
@@ -1546,8 +1608,8 @@ window.__ModuleLoader__.load({
|
|
|
1546
1608
|
e("span", { className: "k", style: { minWidth: "90px" } }, r[0]),
|
|
1547
1609
|
e("span", { className: "v" }, r[1])))),
|
|
1548
1610
|
e("div", { className: "cost-hint", style: { marginTop: "6px" } },
|
|
1549
|
-
"峰时段(北京时间):" + (snap ? snap.peakWindows : "周一至周五 9:00-12:00 · 14:00-18:00
|
|
1550
|
-
"。当前:" + (snap && snap.phase ? (snap.phase
|
|
1611
|
+
"峰时段(北京时间):" + (snap ? snap.peakWindows : "周一至周五 9:00-12:00 · 14:00-18:00(周末与法定节假日全天闲时)") +
|
|
1612
|
+
"。当前:" + (snap && snap.phase ? (offAllDay(snap.phase) ? offPhaseLabel(snap.phase) : snap.phase.inPeak ? "高峰时段" : "平价时段") : "…")),
|
|
1551
1613
|
noticeOn ? e("div", { style: { marginTop: "8px" } }, e(PeakStrip, { snap, style: cfg.peakStyle || "compact", wide: true, now, ringSize: 150 }))
|
|
1552
1614
|
: e("p", { className: "cost-hint", style: { marginTop: "8px" } }, "提示已隐藏:需启用峰谷计价并开启「峰时高价时段显著提示」。"),
|
|
1553
1615
|
e(SyncReadonlyCard, { sync: props.sync }));
|
|
@@ -1555,8 +1617,8 @@ window.__ModuleLoader__.load({
|
|
|
1555
1617
|
|
|
1556
1618
|
// ============================================================
|
|
1557
1619
|
// 云端同步(只读回显)—— 花费统计设置页
|
|
1558
|
-
// 编辑入口在「设置 →
|
|
1559
|
-
//
|
|
1620
|
+
// 编辑入口在「设置 → 花费统计 → 右上角齿轮」(旧宿主:插件配置卡片里的同一份设置),
|
|
1621
|
+
// 这里只回显当前状态,避免两处都能改造成口径不一致。
|
|
1560
1622
|
// ============================================================
|
|
1561
1623
|
function SyncReadonlyCard(props) {
|
|
1562
1624
|
const [st, setSt] = useState(props && props.sync ? props.sync : null);
|
|
@@ -1585,15 +1647,25 @@ window.__ModuleLoader__.load({
|
|
|
1585
1647
|
line("上报项目", st.includePurpose ? "含 purpose" : "不含 purpose")),
|
|
1586
1648
|
st.lastError ? e("div", { className: "cost-err", style: { marginTop: "6px" } }, "最近错误:" + st.lastError) : null,
|
|
1587
1649
|
e("div", { className: "cost-hint", style: { marginTop: "8px" } },
|
|
1588
|
-
"编辑入口:设置 →
|
|
1650
|
+
"编辑入口:设置 → 花费统计 → 右上角齿轮(设置)" + (st.dataDir ? "(身份文件:" + st.identityFile + ")" : "")));
|
|
1589
1651
|
}
|
|
1590
1652
|
|
|
1591
1653
|
// ============================================================
|
|
1592
|
-
//
|
|
1593
|
-
//
|
|
1654
|
+
// 配置面板(一份实现,两种外壳)
|
|
1655
|
+
// · mode 'card'(默认):宿主「插件配置」列表里的可点开卡片
|
|
1656
|
+
// (settings.plugin.item,key = cost-tracker)。**兼容保留** ——
|
|
1657
|
+
// DSH 0.1.7-alpha.2 起宿主已不再声明该插槽,回调不触发即自动失效,
|
|
1658
|
+
// 零成本;仍声明该插槽的旧宿主照旧有卡片。
|
|
1659
|
+
// · mode 'page':本插件「设置 → 花费统计」分区内的配置页,由页头齿轮进入、
|
|
1660
|
+
// 左上角返回键退出(宿主设置外壳没有分区间跳转能力,见 apply 处注释)。
|
|
1661
|
+
// 两种外壳共用同一段正文(顶部状态条 + 七个折叠分组),因此不可能出现
|
|
1662
|
+
// 「两处字段/口径不一致」——只有外壳不同。
|
|
1663
|
+
// 表单走本插件自己的 host API(/api/cost-tracker/*),
|
|
1594
1664
|
// 不硬依赖 settings UI 包的内部实现,避免版本耦合。
|
|
1595
1665
|
// ============================================================
|
|
1596
|
-
function
|
|
1666
|
+
function ConfigPanel(props) {
|
|
1667
|
+
const mode = props && props.mode === "page" ? "page" : "card";
|
|
1668
|
+
const onBack = props && props.onBack;
|
|
1597
1669
|
const [st, setSt] = useState(null);
|
|
1598
1670
|
const [prices, setPrices] = useState(null);
|
|
1599
1671
|
const [imp, setImp] = useState(null);
|
|
@@ -1728,6 +1800,7 @@ window.__ModuleLoader__.load({
|
|
|
1728
1800
|
alert: { enabled: v.peakAlertEnabled, ahead: v.peakAlertAhead, target: v.peakAlertTarget, position: v.peakAlertPosition, webNotify: v.peakAlertWebNotify },
|
|
1729
1801
|
}));
|
|
1730
1802
|
say("peak", "已保存");
|
|
1803
|
+
loadPeak();
|
|
1731
1804
|
} else say("peak", "保存失败");
|
|
1732
1805
|
}).catch(err => { setBusy(""); say("peak", "保存失败:" + String(err && err.message ? err.message : err)); });
|
|
1733
1806
|
}
|
|
@@ -1911,11 +1984,18 @@ window.__ModuleLoader__.load({
|
|
|
1911
1984
|
|
|
1912
1985
|
// ---------- ② 峰谷计价与提示 ----------
|
|
1913
1986
|
const pd = peakDraft || {};
|
|
1987
|
+
// 法定节假日(官方把节假日全天计入闲时):回显当前生效来源与条数
|
|
1988
|
+
const hol = (peakSnap && peakSnap.holidays) || null;
|
|
1989
|
+
const holHint = !hol ? "法定节假日:…"
|
|
1990
|
+
: hol.disabled ? "法定节假日:已停用(只按周末判定高峰)"
|
|
1991
|
+
: "法定节假日:" + hol.count + " 天" + (hol.builtin ? "(内置表)" : "(自定义)")
|
|
1992
|
+
+ (hol.count ? " · 例:" + hol.dates.slice(0, 3).join(" ") + (hol.count > 3 ? " …" : "") : "")
|
|
1993
|
+
+ (hol.invalid && hol.invalid.length ? " · 已忽略无法识别:" + hol.invalid.join(" ") : "");
|
|
1914
1994
|
// 预览用快照:把草稿覆盖到服务端快照上,从而「改完即可预览、点保存才落盘」
|
|
1915
1995
|
const peakPreviewSnap = peakSnap ? Object.assign({}, peakSnap, { config: pd }) : null;
|
|
1916
1996
|
const noticeOn = peakSnap && peakSnap.notice !== false && pd.peakNotice !== false;
|
|
1917
1997
|
const peakBody = e("div", null,
|
|
1918
|
-
e("div", { className: "cost-hint" }, "官方只有两档:高峰(工作日 9:00-12:00 / 14:00-18:00
|
|
1998
|
+
e("div", { className: "cost-hint" }, "官方只有两档:高峰(工作日 9:00-12:00 / 14:00-18:00,不含法定节假日)与闲时(高峰 × 0.5,含周末与法定节假日全天)。此处只影响界面提示与档位判定:改价请用「计价与价格目录 → 官方价格同步」。"),
|
|
1919
1999
|
e("div", { style: { marginTop: "8px", display: "grid", gap: "6px" } },
|
|
1920
2000
|
e("label", { className: "cost-row", style: { gap: "8px" } },
|
|
1921
2001
|
e("input", { type: "checkbox", checked: pd.peakEnabled !== false, onChange: ev => setPeak("peakEnabled", ev.target.checked) }),
|
|
@@ -1923,6 +2003,19 @@ window.__ModuleLoader__.load({
|
|
|
1923
2003
|
e("label", { className: "cost-row", style: { gap: "8px" } },
|
|
1924
2004
|
e("input", { type: "checkbox", checked: pd.peakNotice !== false, onChange: ev => setPeak("peakNotice", ev.target.checked) }),
|
|
1925
2005
|
e("span", null, "峰时高价时段显著提示(时段条显示)")),
|
|
2006
|
+
e("div", { className: "cost-row", style: { gap: "8px", flexWrap: "wrap" } },
|
|
2007
|
+
e("span", null, "法定节假日(全天闲时)"),
|
|
2008
|
+
e("input", {
|
|
2009
|
+
className: "cost-input",
|
|
2010
|
+
style: { flex: "1 1 280px", minWidth: "220px" },
|
|
2011
|
+
type: "text",
|
|
2012
|
+
placeholder: "留空 = 内置表;填 none = 停用;或写 2027-01-01 2027-02-05 …",
|
|
2013
|
+
value: pd.peakHolidays == null ? "" : String(pd.peakHolidays),
|
|
2014
|
+
onChange: ev => setPeak("peakHolidays", ev.target.value),
|
|
2015
|
+
}),
|
|
2016
|
+
e("button", { className: "cost-btn", onClick: () => setPeak("peakHolidays", "") }, "恢复内置"),
|
|
2017
|
+
e("button", { className: "cost-btn", onClick: () => setPeak("peakHolidays", "none") }, "停用")),
|
|
2018
|
+
e("div", { className: "cost-hint" }, holHint + "(官方口径:周一至周五不含法定节假日才算高峰;调休补班的周末不计高峰)"),
|
|
1926
2019
|
e("div", { className: "cost-row", style: { gap: "8px" } },
|
|
1927
2020
|
e("span", null, "时段条样式"),
|
|
1928
2021
|
e("select", { className: "cost-select", value: pd.peakStyle === "classic" ? "classic" : "compact", onChange: ev => setPeak("peakStyle", ev.target.value) },
|
|
@@ -1966,8 +2059,8 @@ window.__ModuleLoader__.load({
|
|
|
1966
2059
|
e("button", { className: "cost-btn cost-btn-primary", onClick: savePeak, disabled: busy === "peak" }, "保存"),
|
|
1967
2060
|
msg.peak ? e("span", { className: "cost-hint" }, msg.peak) : null),
|
|
1968
2061
|
e("div", { className: "cost-hint", style: { marginTop: "6px" } },
|
|
1969
|
-
"峰时段(北京时间):" + (peakSnap ? peakSnap.peakWindows : "周一至周五 9:00-12:00 · 14:00-18:00
|
|
1970
|
-
"。当前:" + (peakPreviewSnap && peakPreviewSnap.phase ? (peakPreviewSnap.phase
|
|
2062
|
+
"峰时段(北京时间):" + (peakSnap ? peakSnap.peakWindows : "周一至周五 9:00-12:00 · 14:00-18:00(周末与法定节假日全天闲时)") +
|
|
2063
|
+
"。当前:" + (peakPreviewSnap && peakPreviewSnap.phase ? (offAllDay(peakPreviewSnap.phase) ? offPhaseLabel(peakPreviewSnap.phase) : peakPreviewSnap.phase.inPeak ? "高峰时段" : "平价时段") : "…")),
|
|
1971
2064
|
noticeOn ? e("div", { style: { marginTop: "8px" } }, e(PeakStrip, { snap: peakPreviewSnap, style: pd.peakStyle || "compact", wide: true, now, ringSize: 150 }))
|
|
1972
2065
|
: e("p", { className: "cost-hint", style: { marginTop: "8px" } }, "提示已隐藏:需启用峰谷计价并开启「峰时高价时段显著提示」。")));
|
|
1973
2066
|
|
|
@@ -2153,23 +2246,42 @@ window.__ModuleLoader__.load({
|
|
|
2153
2246
|
e("div", { className: "cost-hint", style: { marginTop: "6px" } },
|
|
2154
2247
|
"提示:AccessKeyID 属非敏感标识(控制台可见),会随看板回显以便预填;SecretAccessKey 与令牌在任何响应里都只有布尔标记。"));
|
|
2155
2248
|
|
|
2156
|
-
//
|
|
2157
|
-
const head = e("button", { type: "button", className: "cost-pcard-head", "aria-expanded": open, onClick: () => setOpen(v => !v) },
|
|
2158
|
-
e("span", { className: "cost-pcard-headtext" },
|
|
2159
|
-
e("span", { className: "cost-pcard-name" }, "花费统计" + (st && st.enabled ? " · 云端同步已开启" : "")),
|
|
2160
|
-
e("span", { className: "cost-pcard-desc" }, "全部设置集中于此:云端同步(多机汇总)、峰谷计价与提示、订阅套餐与配额、计价与价格目录、历史导入、数据与界面、安全与凭据。")),
|
|
2161
|
-
e("svg", { className: "cost-pcard-chevron" + (open ? " is-open" : ""), width: 14, height: 14, viewBox: "0 0 14 14", fill: "none", "aria-hidden": "true" },
|
|
2162
|
-
e("path", { d: "M3.5 5.25 7 8.75l3.5-3.5", stroke: "currentColor", strokeWidth: 1.4, strokeLinecap: "round", strokeLinejoin: "round" })));
|
|
2249
|
+
// 正文(两种外壳共用):顶部状态条 + 七个折叠分组。外壳只决定包在外面的 chrome。
|
|
2163
2250
|
const body = e("div", null,
|
|
2164
2251
|
topStrip,
|
|
2165
2252
|
!st ? e("div", { className: "cost-hint", style: { margin: "4px 0 8px" } }, "加载状态…") : null,
|
|
2166
2253
|
cfgSection(Object.assign({ key: "s1" }, secProps("cloud", "多机汇总(云端同步)", st && st.enabled ? ("已开启 · " + (st.deviceName || "未命名设备")) : "未开启")), cloudBody),
|
|
2167
|
-
cfgSection(Object.assign({ key: "s2" }, secProps("peak", "峰谷计价与提示", (pd.peakEnabled !== false ? "已启用" : "已停用") + " · " + (pd.peakStyle === "classic" ? "环形表盘" : "简洁样式"))), peakBody),
|
|
2254
|
+
cfgSection(Object.assign({ key: "s2" }, secProps("peak", "峰谷计价与提示", (pd.peakEnabled !== false ? "已启用" : "已停用") + " · " + (pd.peakStyle === "classic" ? "环形表盘" : "简洁样式") + (hol ? (hol.disabled ? " · 节假日停用" : " · 节假日 " + hol.count + " 天") : ""))), peakBody),
|
|
2168
2255
|
cfgSection(Object.assign({ key: "s3" }, secProps("sub", "订阅套餐与配额", (volcHasSecret ? "火山凭据已配" : "火山凭据未配") + " · 归类覆盖 " + bill.planRows.length + " 条")), subBody),
|
|
2169
2256
|
cfgSection(Object.assign({ key: "s4" }, secProps("bill", "计价与价格目录", (bill.showTotalWithPlan ? "含 Plan 总额" : "仅按量") + " · 覆盖价 " + bill.priceRows.length + " 条 · " + (cat ? (cat.providers || []).length + " 家目录" : "无目录"))), billBody),
|
|
2170
2257
|
cfgSection(Object.assign({ key: "s5" }, secProps("imp", "历史导入", (impDraft.autoImport !== false ? "开机自动" : "手动") + " · 已导入 " + fmtInt((imp && imp.totalImported) || 0) + " 条")), impBody),
|
|
2171
2258
|
cfgSection(Object.assign({ key: "s6" }, secProps("data", "数据与界面", "保留 180 天明细 · 界面落点 " + UI_SURFACES.filter(s => uiDraft[s.key] !== false).length + "/3")), dataBody),
|
|
2172
2259
|
cfgSection(Object.assign({ key: "s7" }, secProps("sec", "安全与凭据", "密钥零落盘 · 出站白名单")), secBody));
|
|
2260
|
+
|
|
2261
|
+
// ---------- 外壳①:分区内配置页(齿轮进入 / 返回键退出) ----------
|
|
2262
|
+
// 页头自己画,因为宿主设置外壳只负责导航与内容列(见 apply 处注释)。
|
|
2263
|
+
if (mode === "page") {
|
|
2264
|
+
return e("div", { className: "cost-wrap cost-cfg-page" },
|
|
2265
|
+
e("div", { className: "cost-cfg-page-head" },
|
|
2266
|
+
e("button", {
|
|
2267
|
+
type: "button", className: "cost-back", onClick: onBack,
|
|
2268
|
+
"aria-label": "返回花费统计看板", title: "返回花费统计看板",
|
|
2269
|
+
}, backIcon(13), e("span", null, "返回")),
|
|
2270
|
+
e("span", { className: "cost-cfg-page-title" }, pluginIcon(18), "花费统计 · 设置")),
|
|
2271
|
+
e("div", { className: "cost-hint", style: { margin: "0 0 8px" } },
|
|
2272
|
+
"全部设置集中于此页:云端同步(多机汇总)、峰谷计价与提示、订阅套餐与配额、计价与价格目录、历史导入、数据与界面、安全与凭据。"
|
|
2273
|
+
+ "旧版宿主(设置里仍显示「插件 → 插件配置」卡片)在那张卡片里打开的是同一份设置,就近改一处即可。"),
|
|
2274
|
+
body);
|
|
2275
|
+
}
|
|
2276
|
+
|
|
2277
|
+
// ---------- 外壳②:宿主「插件配置」列表里的卡片(兼容旧宿主) ----------
|
|
2278
|
+
// 卡片外壳对齐宿主 PluginCard:li.cost-pcard > button.cost-pcard-head(标题+副标题+箭头)> body
|
|
2279
|
+
const head = e("button", { type: "button", className: "cost-pcard-head", "aria-expanded": open, onClick: () => setOpen(v => !v) },
|
|
2280
|
+
e("span", { className: "cost-pcard-headtext" },
|
|
2281
|
+
e("span", { className: "cost-pcard-name" }, "花费统计" + (st && st.enabled ? " · 云端同步已开启" : "")),
|
|
2282
|
+
e("span", { className: "cost-pcard-desc" }, "全部设置集中于此:云端同步(多机汇总)、峰谷计价与提示、订阅套餐与配额、计价与价格目录、历史导入、数据与界面、安全与凭据。")),
|
|
2283
|
+
e("svg", { className: "cost-pcard-chevron" + (open ? " is-open" : ""), width: 14, height: 14, viewBox: "0 0 14 14", fill: "none", "aria-hidden": "true" },
|
|
2284
|
+
e("path", { d: "M3.5 5.25 7 8.75l3.5-3.5", stroke: "currentColor", strokeWidth: 1.4, strokeLinecap: "round", strokeLinejoin: "round" })));
|
|
2173
2285
|
return e("li", { className: "cost-pcard" + (open ? " is-open" : "") },
|
|
2174
2286
|
head,
|
|
2175
2287
|
open ? e("div", { className: "cost-pcard-body" }, body) : null);
|
|
@@ -2297,12 +2409,21 @@ window.__ModuleLoader__.load({
|
|
|
2297
2409
|
}
|
|
2298
2410
|
|
|
2299
2411
|
/**
|
|
2300
|
-
*
|
|
2301
|
-
*
|
|
2302
|
-
*
|
|
2303
|
-
*
|
|
2412
|
+
* 「花费统计」设置分区的路由壳(v1.9.3)。
|
|
2413
|
+
*
|
|
2414
|
+
* 宿主 0.1.7-alpha.2 起,「内置插件」分区改成只读清单、`settings.plugin.item`
|
|
2415
|
+
* 插槽被删除(0.1.6 及更早的宿主仍声明它,插件侧保留注册做兼容),
|
|
2416
|
+
* 所以配置入口随页面内迁:看板页头右上角齿轮 → 本分区内的配置页 → 左上角返回键。
|
|
2417
|
+
* 之所以做成「分区内子视图」而不是第二个左侧导航项:宿主设置外壳渲染分区时
|
|
2418
|
+
* 只传入 close(见 dsh-client-ui-settings-general 的
|
|
2419
|
+
* renderSlot('settings.section', { close }, { only: active })),
|
|
2420
|
+
* 分区没有任何程序化切换导航的能力。
|
|
2421
|
+
*
|
|
2422
|
+
* ui 快照(peak 轮询 + UI_EVENT 广播)放在这一层:看板与配置页共用同一个快照,
|
|
2423
|
+
* 因此配置页里改完「界面显示」开关后,返回看板立刻生效。
|
|
2304
2424
|
*/
|
|
2305
|
-
function
|
|
2425
|
+
function CostSection() {
|
|
2426
|
+
const [view, setView] = useState("dashboard");
|
|
2306
2427
|
const [ui, setUi] = useState(null);
|
|
2307
2428
|
useEffect(() => {
|
|
2308
2429
|
let alive = true;
|
|
@@ -2314,17 +2435,44 @@ window.__ModuleLoader__.load({
|
|
|
2314
2435
|
window.addEventListener(UI_EVENT, load);
|
|
2315
2436
|
return () => { alive = false; clearInterval(id); window.removeEventListener(UI_EVENT, load); };
|
|
2316
2437
|
}, []);
|
|
2438
|
+
if (view === "config") {
|
|
2439
|
+
return e(ConfigPanel, { mode: "page", onBack: () => setView("dashboard") });
|
|
2440
|
+
}
|
|
2441
|
+
return e(DashboardGate, { ui, onOpenConfig: () => setView("config") });
|
|
2442
|
+
}
|
|
2443
|
+
|
|
2444
|
+
/**
|
|
2445
|
+
* 看板门卫 + 看板关闭态。
|
|
2446
|
+
* 关掉界面显示时**不能注册成空渲染**(会留下一个点不开的空白导航项),
|
|
2447
|
+
* 也不能把齿轮一起藏起来(否则关掉后再没有入口能打开):
|
|
2448
|
+
* 所以这里保留页头 + 齿轮,只把统计内容换成一句说明。
|
|
2449
|
+
* 宿主不重启插件、插槽注册也无法撤销,因此显隐必须在渲染期判定。
|
|
2450
|
+
*/
|
|
2451
|
+
function DashboardGate(props) {
|
|
2452
|
+
const ui = props ? props.ui : null;
|
|
2453
|
+
const openConfig = props && props.onOpenConfig;
|
|
2317
2454
|
if (!uiOn(ui, "uiDashboardEnabled")) {
|
|
2318
2455
|
return e("div", { className: "cost-wrap" },
|
|
2319
|
-
e("div", { className: "cost-h1" }, pluginIcon(18), "花费统计"
|
|
2456
|
+
e("div", { className: "cost-h1" }, pluginIcon(18), "花费统计",
|
|
2457
|
+
e("span", { className: "cost-h1-actions" }, e(GearButton, { onClick: openConfig }))),
|
|
2320
2458
|
e("div", { className: "cost-hint", style: { marginTop: "8px" } },
|
|
2321
2459
|
"花费统计看板已在设置里关闭显示。记账与云端同步不受影响;要重新打开:" +
|
|
2322
|
-
"
|
|
2460
|
+
"点右上角齿轮 → 「数据与界面」→ 打开「设置页花费统计看板」。"));
|
|
2323
2461
|
}
|
|
2324
|
-
return e(Dashboard, {});
|
|
2462
|
+
return e(Dashboard, { onOpenConfig: openConfig });
|
|
2463
|
+
}
|
|
2464
|
+
|
|
2465
|
+
/** 看板页头右上角的设置齿轮:进入本分区的配置页 */
|
|
2466
|
+
function GearButton(props) {
|
|
2467
|
+
return e("button", {
|
|
2468
|
+
type: "button", className: "cost-gear",
|
|
2469
|
+
"aria-label": "花费统计设置", title: "花费统计设置",
|
|
2470
|
+
onClick: props && props.onClick,
|
|
2471
|
+
}, gearIcon(15));
|
|
2325
2472
|
}
|
|
2326
2473
|
|
|
2327
|
-
function Dashboard() {
|
|
2474
|
+
function Dashboard(props) {
|
|
2475
|
+
const onOpenConfig = props && props.onOpenConfig;
|
|
2328
2476
|
const [days, setDays] = useState(7);
|
|
2329
2477
|
const [dash, setDash] = useState(null);
|
|
2330
2478
|
const [dashErr, setDashErr] = useState("");
|
|
@@ -2575,11 +2723,12 @@ window.__ModuleLoader__.load({
|
|
|
2575
2723
|
}
|
|
2576
2724
|
|
|
2577
2725
|
return e("div", { className: "cost-wrap" },
|
|
2578
|
-
e("div", { className: "cost-h1" }, pluginIcon(18), "花费统计"
|
|
2579
|
-
|
|
2726
|
+
e("div", { className: "cost-h1" }, pluginIcon(18), "花费统计",
|
|
2727
|
+
e("span", { className: "cost-h1-actions" }, e(GearButton, { onClick: onOpenConfig }))),
|
|
2728
|
+
filterRow(days, setDays, onExport, onRefresh, msg, busy, dash ? dash.peakWindows : "周一至周五 9:00-12:00 · 14:00-18:00(周末与法定节假日全天闲时)", viewCtl, openVolc, planTotal, setPlanTotal),
|
|
2580
2729
|
!cloudAvailable
|
|
2581
2730
|
? e("div", { className: "cost-hint", style: { marginTop: "4px" } },
|
|
2582
|
-
"仅显示本机数据。在多台电脑/多个 Agent
|
|
2731
|
+
"仅显示本机数据。在多台电脑/多个 Agent 之间汇总:点右上角齿轮 → 「多机汇总(云端同步)」填写云端服务地址与令牌。")
|
|
2583
2732
|
: null,
|
|
2584
2733
|
sync && sync.enabled && sync.pending > 0 && view !== "local"
|
|
2585
2734
|
? e("div", { className: "cost-cloudnote" },
|
|
@@ -2590,7 +2739,7 @@ window.__ModuleLoader__.load({
|
|
|
2590
2739
|
? e("div", { className: "cost-err", style: { marginTop: "6px" } }, "云端数据不可用(已显示本机数据):" + cloudErr)
|
|
2591
2740
|
: null,
|
|
2592
2741
|
sync && sync.needAuth
|
|
2593
|
-
? e("div", { className: "cost-err", style: { marginTop: "6px" } }, "云端令牌无效:请在「设置 →
|
|
2742
|
+
? e("div", { className: "cost-err", style: { marginTop: "6px" } }, "云端令牌无效:请在「设置 → 花费统计 → 右上角齿轮 → 多机汇总」更新令牌。")
|
|
2594
2743
|
: null,
|
|
2595
2744
|
dashErr ? e("div", { className: "cost-err", style: { marginTop: "8px" } }, dashErr) : null,
|
|
2596
2745
|
(!viewDash && !dashErr) ? e("div", { className: "cost-hint", style: { marginTop: "12px" } }, "加载中…") : null,
|
|
@@ -2753,20 +2902,26 @@ window.__ModuleLoader__.load({
|
|
|
2753
2902
|
applyStyles(ctx);
|
|
2754
2903
|
const slots = ctx.get("slots");
|
|
2755
2904
|
if (slots === undefined) return;
|
|
2905
|
+
// 「花费统计」设置分区:看板 + 页头齿轮进入的配置页(见 CostSection 注释)
|
|
2756
2906
|
slots.inject("settings.section", () => slots.register(
|
|
2757
2907
|
{ name: "settings.section", id: "cost-dashboard", order: 30, label: "花费统计" },
|
|
2758
|
-
() => e(
|
|
2908
|
+
() => e(CostSection, {}),
|
|
2759
2909
|
));
|
|
2760
|
-
// 插件配置卡片(设置 → 插件 → 插件配置):以 settings
|
|
2910
|
+
// 插件配置卡片(设置 → 插件 → 插件配置):以 settings 命名空间为键,**兼容入口**。
|
|
2761
2911
|
// 这里必须**无条件** inject,不能拿 slots.entries(key).length 当"插槽是否存在"的探测:
|
|
2762
2912
|
// entries 数的是"已经注册进该槽的条目",而条目正是由各插件在插槽声明后才注册的,
|
|
2763
2913
|
// 所以在插件 apply 阶段它恒为空 —— 用探测就会把卡片永远挡在门外(1.8.0 的缺陷)。
|
|
2764
2914
|
// 宿主的官方卡片(dsh-client-ui-settings-plugins)与 dsh-context 都是无条件 inject:
|
|
2765
2915
|
// 插槽未声明时回调不触发、声明时自动触发,既不会误判也不需要重试。
|
|
2916
|
+
//
|
|
2917
|
+
// v1.9.3:DSH 0.1.7-alpha.2 起宿主已删除该插槽(「内置插件」分区改为只读清单),
|
|
2918
|
+
// 回调自然不触发 ⇒ 保留注册在 0.1.7+ 上是零成本的空操作;
|
|
2919
|
+
// 仍声明该插槽的旧宿主照旧显示这张卡片,且它与分区内配置页共用 ConfigPanel,
|
|
2920
|
+
// 字段、校验、写接口完全一致(只是外壳不同)。
|
|
2766
2921
|
const pluginItemKey = "settings.plugin.item";
|
|
2767
2922
|
slots.inject(pluginItemKey, () => slots.register(
|
|
2768
2923
|
{ name: pluginItemKey, key: "cost-tracker" },
|
|
2769
|
-
() => e(
|
|
2924
|
+
() => e(ConfigPanel, { mode: "card" }),
|
|
2770
2925
|
));
|
|
2771
2926
|
slots.inject("conversation.composer.dock", () => slots.register(
|
|
2772
2927
|
{ name: "conversation.composer.dock", id: "cost", order: 1 },
|
package/config.js
CHANGED
|
@@ -18,6 +18,9 @@
|
|
|
18
18
|
// peakAlertTarget 提醒类型:both(峰和谷)/ peak(进入峰时)/ offpeak(进入谷时)
|
|
19
19
|
// peakAlertPosition 弹窗位置:corner(右下角)/ center(屏幕中心)
|
|
20
20
|
// peakAlertWebNotify 同步发送浏览器系统通知
|
|
21
|
+
// peakHolidays 中国法定节假日列表(官方把节假日全天计入空闲时段)。
|
|
22
|
+
// 空串 = 用内置表;'none'/'off' = 停用(只按周末判定);
|
|
23
|
+
// 也可写 "2027-01-01 2027-02-05" 这类自定列表(逗号/空白分隔)。
|
|
21
24
|
// peakEffectiveAt 峰谷计价生效时间(ISO 字符串,展示用)
|
|
22
25
|
//
|
|
23
26
|
// 字段(云端同步,v1.8.0):
|
|
@@ -44,8 +47,8 @@
|
|
|
44
47
|
// uiDashboardEnabled 设置页左侧的「花费统计」看板入口(settings.section)
|
|
45
48
|
//
|
|
46
49
|
// 三者**互相独立**,且都只影响前端渲染,不影响记账、云端同步与 Agent 工具。
|
|
47
|
-
//
|
|
48
|
-
//
|
|
50
|
+
// 承载这些开关的配置面板本身不受开关控制 —— 它必须始终可达(页头齿轮,
|
|
51
|
+
// 以及旧宿主「设置 → 插件 → 插件配置」里的卡片),否则关掉之后用户就没有入口再打开了。
|
|
49
52
|
//
|
|
50
53
|
// 真值语义与 peakEnabled 相反:null/undefined → true(显隐是从 v1.8.12 才有的新
|
|
51
54
|
// 能力,老配置文件里没有这几个键,必须保持默认全部可见),只有显式 false 才隐藏。
|
|
@@ -94,6 +97,7 @@ export function defaultPeakConfig() {
|
|
|
94
97
|
peakAlertTarget: 'both',
|
|
95
98
|
peakAlertPosition: 'corner',
|
|
96
99
|
peakAlertWebNotify: false,
|
|
100
|
+
peakHolidays: '',
|
|
97
101
|
peakEffectiveAt: DEFAULT_PEAK_EFFECTIVE_AT,
|
|
98
102
|
}
|
|
99
103
|
}
|
|
@@ -124,7 +128,7 @@ export function defaultCloudConfig() {
|
|
|
124
128
|
export const BOARD_VIEWS = ['local', 'local+cloud', 'cloud']
|
|
125
129
|
|
|
126
130
|
/**
|
|
127
|
-
* 前端显隐开关(设置 →
|
|
131
|
+
* 前端显隐开关(设置 → 花费统计 → 右上角齿轮 → 数据与界面 → 界面显示)。
|
|
128
132
|
* 每项声明:配置键、文案、说明,以及它在 DSH 里对应的插槽(便于对照宿主与测试)。
|
|
129
133
|
* 新增可控落点时只改这张表:服务端 normalize 与前端卡片都从它派生。
|
|
130
134
|
*/
|
|
@@ -191,6 +195,9 @@ export function normalizePeakConfig(raw) {
|
|
|
191
195
|
peakAlertTarget: (raw.peakAlertTarget === 'peak' || raw.peakAlertTarget === 'offpeak') ? raw.peakAlertTarget : def.peakAlertTarget,
|
|
192
196
|
peakAlertPosition: raw.peakAlertPosition === 'center' ? 'center' : 'corner',
|
|
193
197
|
peakAlertWebNotify: bool(raw.peakAlertWebNotify, def.peakAlertWebNotify),
|
|
198
|
+
// 节假日列表按**原文**保存(由 pricing.setPeakHolidays 解释空串/哨兵/列表),
|
|
199
|
+
// 配置卡回显即所见即所得,不做静默改写。
|
|
200
|
+
peakHolidays: typeof raw.peakHolidays === 'string' ? raw.peakHolidays.trim() : def.peakHolidays,
|
|
194
201
|
peakEffectiveAt: typeof raw.peakEffectiveAt === 'string' && raw.peakEffectiveAt.length > 0 ? raw.peakEffectiveAt : def.peakEffectiveAt,
|
|
195
202
|
}
|
|
196
203
|
return out
|