用户确认导入导出策略:1) 配置冲突按 ConfigName + CANLINInfo 判重,CAN/LIN/CANFD 可同名;2) 增量导入对同名配置自动重命名(_import_时间戳);3) JSON 字段尽量与数据库模型一致,可不加注释;4) LogicRule 也需随配置导入导出,规则同名冲突采用覆盖更新;5) 导入后需同步刷新 CAN/CANFD/LIN 以及 ZLG 对应界面;6) 入口按现有系统菜单弹窗(ComDialogEvent + DialogService)接入。

This commit is contained in:
2026-03-30 14:33:10 +08:00
parent aa6d930374
commit ea58e0335e
14 changed files with 1610 additions and 4 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -70,6 +70,9 @@ namespace CapMachine.Wpf.Services
}
ShowLogicRule(msg.Par);
break;
case "CAN/CANFD/LIN配置导入导出":
ShowCanLinConfigImExport(msg.Par);
break;
default:
break;
}
@@ -136,6 +139,20 @@ namespace CapMachine.Wpf.Services
});
}
/// <summary>
/// CAN/CANFD/LIN 配置导入导出弹窗。
/// </summary>
/// <param name="par">透传参数。</param>
private void ShowCanLinConfigImExport(object par)
{
DialogService.ShowDialog("DialogCanLinConfigImExportView", new DialogParameters() { { "Name", par } }, (dialogResult) =>
{
if (dialogResult.Result == ButtonResult.OK)
{
}
});
}

View File

@@ -44,10 +44,10 @@ namespace CapMachine.Wpf.Services
{
new NavigationItem("Rule","规则转换","DialogLogicRuleView"),
}),
//new NavigationItem("", "PID设置","",new ObservableCollection<NavigationItem>()
//{
// new NavigationItem("Circle","转速PID",""),
//}),
new NavigationItem("", "配置导出","",new ObservableCollection<NavigationItem>()
{
new NavigationItem("","CAN/CANFD/LIN配置导入导出","DialogCanLinConfigImExport"),
}),
//new NavigationItem("", "通信配置","",new ObservableCollection<NavigationItem>()
//{
// new NavigationItem("Circle","CAN配置","CANConfigView"),