完成MQTT服务器的别名设置
This commit is contained in:
@@ -47,6 +47,7 @@ namespace DMS.WPF.ViewModels.Dialogs
|
||||
MqttServerId = SelectedMqttServer.Id,
|
||||
MqttServerName = SelectedMqttServer.ServerName,
|
||||
MqttServer = SelectedMqttServer,
|
||||
Variable = variable,
|
||||
Alias = existingAlias?.Alias ?? GenerateDefaultAlias(variable)
|
||||
};
|
||||
|
||||
@@ -60,7 +61,7 @@ namespace DMS.WPF.ViewModels.Dialogs
|
||||
private string GenerateDefaultAlias(VariableItemViewModel variable)
|
||||
{
|
||||
// 可以根据需要自定义默认别名生成逻辑
|
||||
return $"{variable.Name}_{Guid.NewGuid().ToString("N")[..8]}";
|
||||
return $"{variable.Name}";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -93,7 +94,7 @@ namespace DMS.WPF.ViewModels.Dialogs
|
||||
|
||||
foreach (var alias in VariableMqttAliases)
|
||||
{
|
||||
alias.Alias = $"{prefix}_{alias.VariableId}";
|
||||
alias.Alias = $"{prefix}_{alias.Variable.Name}";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,4 +21,7 @@ public partial class VariableMqttAliasItemViewModel : ObservableObject
|
||||
|
||||
[ObservableProperty]
|
||||
private MqttServerItemViewModel _mqttServer;
|
||||
|
||||
[ObservableProperty]
|
||||
private VariableItemViewModel _variable;
|
||||
}
|
||||
|
||||
@@ -626,7 +626,8 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
|
||||
VariableId = originalVariable.Id,
|
||||
MqttServerId = selectedMqtt.Id,
|
||||
Alias = editedVariableMqtt.Alias,
|
||||
MqttServer = selectedMqtt
|
||||
MqttServer = selectedMqtt,
|
||||
Variable = originalVariable
|
||||
};
|
||||
// originalVariable.MqttAliases.Add(variableMqtt);
|
||||
}
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
<TextBlock Text="MQTT服务器:" VerticalAlignment="Center" />
|
||||
<TextBlock Text="{Binding SelectedMqttServer.ServerName}"
|
||||
FontWeight="Bold"
|
||||
FontSize="16"
|
||||
Margin="5,0,0,0"
|
||||
VerticalAlignment="Center" />
|
||||
</StackPanel>
|
||||
@@ -47,7 +48,7 @@
|
||||
MaxHeight="500">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="变量名称"
|
||||
Binding="{Binding VariableId}"
|
||||
Binding="{Binding Variable.Name}"
|
||||
IsReadOnly="True"
|
||||
Width="*" />
|
||||
<DataGridTextColumn Header="别名"
|
||||
|
||||
Reference in New Issue
Block a user