dsh-config-manager 0.1.2 → 0.1.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/README.md +220 -180
- package/README.zh-CN.md +219 -181
- package/lib/client.js +82 -86
- package/lib/client.js.map +1 -1
- package/package.json +1 -1
- package/src/client/import/ConflictList.tsx +5 -3
package/lib/client.js
CHANGED
|
@@ -559,93 +559,93 @@ if (typeof document !== "undefined" && document.querySelector("style[data-tag=\"
|
|
|
559
559
|
document.head.appendChild(tag);
|
|
560
560
|
}
|
|
561
561
|
var config_manager_module_css_default = {
|
|
562
|
-
"
|
|
563
|
-
"
|
|
562
|
+
"iconButton": "_367UGW_iconButton",
|
|
563
|
+
"progressBar": "_367UGW_progressBar",
|
|
564
|
+
"viewBody": "_367UGW_viewBody",
|
|
564
565
|
"badgeInfo": "_367UGW_badgeInfo",
|
|
565
|
-
"
|
|
566
|
-
"
|
|
567
|
-
"
|
|
566
|
+
"rollbackBox": "_367UGW_rollbackBox",
|
|
567
|
+
"errorFooter": "_367UGW_errorFooter",
|
|
568
|
+
"conflictId": "_367UGW_conflictId",
|
|
569
|
+
"pathIssueKind": "_367UGW_pathIssueKind",
|
|
570
|
+
"errorAction": "_367UGW_errorAction",
|
|
571
|
+
"modeTabs": "_367UGW_modeTabs",
|
|
568
572
|
"radioLabel": "_367UGW_radioLabel",
|
|
569
|
-
"modeTab": "_367UGW_modeTab",
|
|
570
|
-
"groupLabel": "_367UGW_groupLabel",
|
|
571
|
-
"actionRow": "_367UGW_actionRow",
|
|
572
|
-
"spinnerWrap": "_367UGW_spinnerWrap",
|
|
573
|
-
"groupNote": "_367UGW_groupNote",
|
|
574
|
-
"dshCmSpin": "_367UGW_dshCmSpin",
|
|
575
|
-
"progressMeta": "_367UGW_progressMeta",
|
|
576
|
-
"groupItems": "_367UGW_groupItems",
|
|
577
573
|
"categoryName": "_367UGW_categoryName",
|
|
578
|
-
"
|
|
574
|
+
"primaryButton": "_367UGW_primaryButton",
|
|
575
|
+
"pathNew": "_367UGW_pathNew",
|
|
576
|
+
"conflictList": "_367UGW_conflictList",
|
|
577
|
+
"reportText": "_367UGW_reportText",
|
|
578
|
+
"progressBarDone": "_367UGW_progressBarDone",
|
|
579
|
+
"errorActionLabel": "_367UGW_errorActionLabel",
|
|
580
|
+
"empty": "_367UGW_empty",
|
|
581
|
+
"errorLine": "_367UGW_errorLine",
|
|
582
|
+
"dangerButton": "_367UGW_dangerButton",
|
|
583
|
+
"reportFooter": "_367UGW_reportFooter",
|
|
579
584
|
"badgeOk": "_367UGW_badgeOk",
|
|
585
|
+
"progressBlock": "_367UGW_progressBlock",
|
|
586
|
+
"input": "_367UGW_input",
|
|
587
|
+
"secretsList": "_367UGW_secretsList",
|
|
588
|
+
"reportView": "_367UGW_reportView",
|
|
589
|
+
"progressMeta": "_367UGW_progressMeta",
|
|
590
|
+
"progressTrack": "_367UGW_progressTrack",
|
|
580
591
|
"errorList": "_367UGW_errorList",
|
|
581
|
-
"
|
|
582
|
-
"
|
|
583
|
-
"
|
|
592
|
+
"errorReason": "_367UGW_errorReason",
|
|
593
|
+
"pathOld": "_367UGW_pathOld",
|
|
594
|
+
"badgeWarn": "_367UGW_badgeWarn",
|
|
595
|
+
"progressIndeterminate": "_367UGW_progressIndeterminate",
|
|
584
596
|
"sectionTitle": "_367UGW_sectionTitle",
|
|
597
|
+
"categoryItem": "_367UGW_categoryItem",
|
|
585
598
|
"sectionBody": "_367UGW_sectionBody",
|
|
586
|
-
"
|
|
587
|
-
"
|
|
599
|
+
"badgeError": "_367UGW_badgeError",
|
|
600
|
+
"groupLabel": "_367UGW_groupLabel",
|
|
601
|
+
"errorItem": "_367UGW_errorItem",
|
|
602
|
+
"errorTitle": "_367UGW_errorTitle",
|
|
603
|
+
"pathMappingList": "_367UGW_pathMappingList",
|
|
604
|
+
"banner": "_367UGW_banner",
|
|
605
|
+
"pathRow": "_367UGW_pathRow",
|
|
606
|
+
"sectionHeader": "_367UGW_sectionHeader",
|
|
607
|
+
"spinnerWrap": "_367UGW_spinnerWrap",
|
|
608
|
+
"badge": "_367UGW_badge",
|
|
609
|
+
"groupCard": "_367UGW_groupCard",
|
|
610
|
+
"section": "_367UGW_section",
|
|
611
|
+
"progressPercent": "_367UGW_progressPercent",
|
|
612
|
+
"dshCmSpin": "_367UGW_dshCmSpin",
|
|
613
|
+
"optionsCard": "_367UGW_optionsCard",
|
|
614
|
+
"spinner": "_367UGW_spinner",
|
|
615
|
+
"viewTab": "_367UGW_viewTab",
|
|
588
616
|
"hiddenFile": "_367UGW_hiddenFile",
|
|
589
|
-
"
|
|
617
|
+
"progressLabel": "_367UGW_progressLabel",
|
|
618
|
+
"severityError": "_367UGW_severityError",
|
|
619
|
+
"conflictOptions": "_367UGW_conflictOptions",
|
|
590
620
|
"progressDetail": "_367UGW_progressDetail",
|
|
621
|
+
"ghostButton": "_367UGW_ghostButton",
|
|
622
|
+
"groupNote": "_367UGW_groupNote",
|
|
623
|
+
"statRow": "_367UGW_statRow",
|
|
624
|
+
"conflictDetail": "_367UGW_conflictDetail",
|
|
625
|
+
"modeHint": "_367UGW_modeHint",
|
|
626
|
+
"actionRow": "_367UGW_actionRow",
|
|
627
|
+
"viewTabs": "_367UGW_viewTabs",
|
|
628
|
+
"field": "_367UGW_field",
|
|
629
|
+
"secretFields": "_367UGW_secretFields",
|
|
591
630
|
"conflictHead": "_367UGW_conflictHead",
|
|
592
|
-
"
|
|
593
|
-
"optionsCard": "_367UGW_optionsCard",
|
|
594
|
-
"groupCard": "_367UGW_groupCard",
|
|
631
|
+
"groupItems": "_367UGW_groupItems",
|
|
595
632
|
"card": "_367UGW_card",
|
|
633
|
+
"pathValue": "_367UGW_pathValue",
|
|
634
|
+
"fieldLabel": "_367UGW_fieldLabel",
|
|
635
|
+
"groupList": "_367UGW_groupList",
|
|
596
636
|
"warnList": "_367UGW_warnList",
|
|
637
|
+
"modeTab": "_367UGW_modeTab",
|
|
597
638
|
"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
|
|
598
|
-
"reportFooter": "_367UGW_reportFooter",
|
|
599
|
-
"errorFooter": "_367UGW_errorFooter",
|
|
600
639
|
"errorBanner": "_367UGW_errorBanner",
|
|
601
|
-
"
|
|
602
|
-
"categoryItem": "_367UGW_categoryItem",
|
|
603
|
-
"errorAction": "_367UGW_errorAction",
|
|
604
|
-
"categoryDesc": "_367UGW_categoryDesc",
|
|
605
|
-
"secretsList": "_367UGW_secretsList",
|
|
606
|
-
"viewTab": "_367UGW_viewTab",
|
|
607
|
-
"progressPercent": "_367UGW_progressPercent",
|
|
608
|
-
"reportView": "_367UGW_reportView",
|
|
609
|
-
"conflictDetail": "_367UGW_conflictDetail",
|
|
610
|
-
"ghostButton": "_367UGW_ghostButton",
|
|
640
|
+
"spinnerLabel": "_367UGW_spinnerLabel",
|
|
611
641
|
"checkboxRow": "_367UGW_checkboxRow",
|
|
612
|
-
"
|
|
613
|
-
"primaryButton": "_367UGW_primaryButton",
|
|
614
|
-
"errorTitle": "_367UGW_errorTitle",
|
|
615
|
-
"conflictOptions": "_367UGW_conflictOptions",
|
|
616
|
-
"sectionHeader": "_367UGW_sectionHeader",
|
|
617
|
-
"progressTrack": "_367UGW_progressTrack",
|
|
618
|
-
"progressIndeterminate": "_367UGW_progressIndeterminate",
|
|
619
|
-
"formError": "_367UGW_formError",
|
|
620
|
-
"empty": "_367UGW_empty",
|
|
621
|
-
"spinner": "_367UGW_spinner",
|
|
622
|
-
"pathRow": "_367UGW_pathRow",
|
|
623
|
-
"pathIssueKind": "_367UGW_pathIssueKind",
|
|
642
|
+
"conflictItem": "_367UGW_conflictItem",
|
|
624
643
|
"sectionSubtitle": "_367UGW_sectionSubtitle",
|
|
625
|
-
"
|
|
626
|
-
"
|
|
627
|
-
"
|
|
628
|
-
"
|
|
629
|
-
"
|
|
630
|
-
"field": "_367UGW_field",
|
|
631
|
-
"statRow": "_367UGW_statRow",
|
|
632
|
-
"banner": "_367UGW_banner",
|
|
633
|
-
"fieldLabel": "_367UGW_fieldLabel",
|
|
634
|
-
"modeTabs": "_367UGW_modeTabs",
|
|
635
|
-
"progressBar": "_367UGW_progressBar",
|
|
636
|
-
"errorActionLabel": "_367UGW_errorActionLabel",
|
|
637
|
-
"pathNew": "_367UGW_pathNew",
|
|
638
|
-
"spinnerLabel": "_367UGW_spinnerLabel",
|
|
639
|
-
"rollbackBox": "_367UGW_rollbackBox",
|
|
640
|
-
"reportText": "_367UGW_reportText",
|
|
641
|
-
"viewBody": "_367UGW_viewBody",
|
|
642
|
-
"severityError": "_367UGW_severityError",
|
|
643
|
-
"conflictList": "_367UGW_conflictList",
|
|
644
|
-
"badgeWarn": "_367UGW_badgeWarn",
|
|
645
|
-
"progressLabel": "_367UGW_progressLabel",
|
|
646
|
-
"secretFields": "_367UGW_secretFields",
|
|
647
|
-
"pathValue": "_367UGW_pathValue",
|
|
648
|
-
"badge": "_367UGW_badge"
|
|
644
|
+
"hint": "_367UGW_hint",
|
|
645
|
+
"categoryDesc": "_367UGW_categoryDesc",
|
|
646
|
+
"sectionTitleBlock": "_367UGW_sectionTitleBlock",
|
|
647
|
+
"groupHeader": "_367UGW_groupHeader",
|
|
648
|
+
"formError": "_367UGW_formError"
|
|
649
649
|
};
|
|
650
650
|
//#endregion
|
|
651
651
|
//#region src/client/common/ui.tsx
|
|
@@ -1651,23 +1651,19 @@ function nextFlowPhase(list, from) {
|
|
|
1651
1651
|
* 冲突决策列表(规范 §11,绑 src/ui/conflict-view.ts 的 ConflictCollector)。
|
|
1652
1652
|
*
|
|
1653
1653
|
* 渲染 plan 中 kind === 'Conflict' 的项,用户逐项选择
|
|
1654
|
-
* Keep Current / Use Imported
|
|
1654
|
+
* Keep Current / Use Imported;决策实时写入 collector,
|
|
1655
1655
|
* 完成时父组件调用 collector.toResolutions() → wizard.setResolutions()。
|
|
1656
|
+
*
|
|
1657
|
+
* 注意:不提供 "Review(稍后决定)" 选项——Review 会被收集器计为
|
|
1658
|
+
* unresolved,导致「下一步」永远禁用(死路)。要么决策,要么不进入本步。
|
|
1656
1659
|
*/
|
|
1657
|
-
const RESOLUTION_OPTIONS = [
|
|
1658
|
-
|
|
1659
|
-
|
|
1660
|
-
|
|
1661
|
-
|
|
1662
|
-
|
|
1663
|
-
|
|
1664
|
-
key: "import.conflicts.useImported"
|
|
1665
|
-
},
|
|
1666
|
-
{
|
|
1667
|
-
value: "review",
|
|
1668
|
-
key: "import.conflicts.review"
|
|
1669
|
-
}
|
|
1670
|
-
];
|
|
1660
|
+
const RESOLUTION_OPTIONS = [{
|
|
1661
|
+
value: "keepCurrent",
|
|
1662
|
+
key: "import.conflicts.keepCurrent"
|
|
1663
|
+
}, {
|
|
1664
|
+
value: "useImported",
|
|
1665
|
+
key: "import.conflicts.useImported"
|
|
1666
|
+
}];
|
|
1671
1667
|
/** 冲突项决策列表 */
|
|
1672
1668
|
function ConflictList({ collector, t, onChanged }) {
|
|
1673
1669
|
const [tick, setTick] = (0, react.useState)(0);
|