dsh-config-manager 0.1.2 → 0.1.4
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 +146 -187
- package/README.zh-CN.md +145 -188
- package/lib/client.js +80 -84
- package/lib/client.js.map +1 -1
- package/package.json +1 -1
- package/src/client/import/ConflictList.tsx +5 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dsh-config-manager",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.4",
|
|
4
4
|
"description": "DSH Config Manager — backup / export / import / migrate DSH configuration (dual-face Cordis plugin: host engine + web UI). Manifest shape mirrors @linxin666/dsh-ssh@0.1.12.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"repository": {
|
|
@@ -2,8 +2,11 @@
|
|
|
2
2
|
* 冲突决策列表（规范 §11，绑 src/ui/conflict-view.ts 的 ConflictCollector）。
|
|
3
3
|
*
|
|
4
4
|
* 渲染 plan 中 kind === 'Conflict' 的项，用户逐项选择
|
|
5
|
-
* Keep Current / Use Imported
|
|
5
|
+
* Keep Current / Use Imported；决策实时写入 collector，
|
|
6
6
|
* 完成时父组件调用 collector.toResolutions() → wizard.setResolutions()。
|
|
7
|
+
*
|
|
8
|
+
* 注意：不提供 "Review（稍后决定）" 选项——Review 会被收集器计为
|
|
9
|
+
* unresolved，导致「下一步」永远禁用（死路）。要么决策，要么不进入本步。
|
|
7
10
|
*/
|
|
8
11
|
import { useState } from 'react'
|
|
9
12
|
import { ConflictCollector } from '../../ui/conflict-view.ts'
|
|
@@ -22,7 +25,6 @@ export interface ConflictListProps {
|
|
|
22
25
|
const RESOLUTION_OPTIONS: { value: ItemResolution; key: string }[] = [
|
|
23
26
|
{ value: 'keepCurrent', key: 'import.conflicts.keepCurrent' },
|
|
24
27
|
{ value: 'useImported', key: 'import.conflicts.useImported' },
|
|
25
|
-
{ value: 'review', key: 'import.conflicts.review' },
|
|
26
28
|
]
|
|
27
29
|
|
|
28
30
|
/** 冲突项决策列表 */
|
|
@@ -58,7 +60,7 @@ export function ConflictList({ collector, t, onChanged }: ConflictListProps) {
|
|
|
58
60
|
onChanged()
|
|
59
61
|
}}
|
|
60
62
|
/>
|
|
61
|
-
{t(opt.key as 'import.conflicts.keepCurrent' | 'import.conflicts.useImported'
|
|
63
|
+
{t(opt.key as 'import.conflicts.keepCurrent' | 'import.conflicts.useImported')}
|
|
62
64
|
</label>
|
|
63
65
|
))}
|
|
64
66
|
</div>
|