xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了样式

Browse Source
This commit is contained in:
David P.G
2025-07-04 23:53:15 +08:00
parent 2e9586bfdf
commit bf1e5f27eb
2 changed files with 119 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
Views/Dialogs/MqttDialog.xaml
View File

@@ -17,27 +17,39 @@
d:DataContext="{d:DesignInstance vmd:MqttDialogViewModel}" d:DataContext="{d:DesignInstance vmd:MqttDialogViewModel}"
mc:Ignorable="d"> mc:Ignorable="d">
<ui:ContentDialog.Resources> <ui:ContentDialog.Resources>
<ex:EnumBindingSource x:Key="mqttPlatform" EnumType="{x:Type en:MqttPlatform}" /> <ex:EnumBindingSource x:Key="mqttPlatform"
EnumType="{x:Type en:MqttPlatform}" />
<vc:EnumDescriptionConverter x:Key="EnumDescriptionConverter" /> <vc:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
</ui:ContentDialog.Resources> </ui:ContentDialog.Resources>
<Grid Width="480" Margin="10"> <Grid Width="480"
Margin="10">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" /> <ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" /> <ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- 左边列 --> <!-- 左边列 -->
<ikw:SimpleStackPanel Grid.Column="0" Margin="10 10 20 10 " Spacing="12"> <ikw:SimpleStackPanel Grid.Column="0"
Margin="10 10 20 10 "
Spacing="12">
<!-- MQTT名称 --> <!-- MQTT名称 -->
<TextBlock Text="MQTT名称" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" /> <TextBlock Text="MQTT名称"
HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Mqtt.Name, UpdateSourceTrigger=PropertyChanged}" /> <TextBox Text="{Binding Mqtt.Name, UpdateSourceTrigger=PropertyChanged}" />
<!-- MQTT IP地址 --> <!-- MQTT IP地址 -->
<TextBlock Text="MQTT IP地址" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" /> <TextBlock Text="MQTT IP地址"
<TextBox AcceptsReturn="True" Text="{Binding Mqtt.Host, UpdateSourceTrigger=PropertyChanged}" /> HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox AcceptsReturn="True"
Text="{Binding Mqtt.Host, UpdateSourceTrigger=PropertyChanged}" />
<!-- Mqtt平台 --> <!-- Mqtt平台 -->
<TextBlock Text="Mqtt平台" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" /> <TextBlock Text="Mqtt平台"
<ComboBox SelectedItem="{Binding Mqtt.Platform}" ItemsSource="{Binding Source={StaticResource mqttPlatform} }"> HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" />
<ComboBox SelectedItem="{Binding Mqtt.Platform}"
ItemsSource="{Binding Source={StaticResource mqttPlatform} }">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" /> <TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" />
@@ -45,28 +57,63 @@
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<CheckBox FontSize="16" Content="是否设为默认" Margin="0 30 0 0" IsChecked="{Binding Mqtt.IsDefault}" />
<!-- PublishTopic -->
<TextBlock Text="发布主题"
HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Mqtt.PublishTopic, UpdateSourceTrigger=PropertyChanged}" />
<!-- SubTopics -->
<TextBlock Text="订阅主题"
HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Mqtt.SubTopics, UpdateSourceTrigger=PropertyChanged}" />
<CheckBox FontSize="16"
Content="是否设为默认"
Margin="0 30 0 0"
IsChecked="{Binding Mqtt.IsDefault}" />
</ikw:SimpleStackPanel> </ikw:SimpleStackPanel>
<!-- 右边列 --> <!-- 右边列 -->
<ikw:SimpleStackPanel Margin="10" Grid.Column="1" Spacing="12"> <ikw:SimpleStackPanel Margin="10"
Grid.Column="1"
Spacing="12">
<!-- MQTT备注 --> <!-- MQTT备注 -->
<TextBlock Text="MQTT备注" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" /> <TextBlock Text="MQTT备注"
HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Mqtt.Remark, UpdateSourceTrigger=PropertyChanged}" /> <TextBox Text="{Binding Mqtt.Remark, UpdateSourceTrigger=PropertyChanged}" />
<!-- MQTT端口 --> <!-- MQTT端口 -->
<TextBlock Text="MQTT端口" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" /> <TextBlock Text="MQTT端口"
<TextBox AcceptsReturn="True" Text="{Binding Mqtt.Port, UpdateSourceTrigger=PropertyChanged}" /> HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox AcceptsReturn="True"
Text="{Binding Mqtt.Port, UpdateSourceTrigger=PropertyChanged}" />
<!-- 用户名 --> <!-- 用户名 -->
<TextBlock Text="用户名" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" /> <TextBlock Text="用户名"
HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Mqtt.UserName, UpdateSourceTrigger=PropertyChanged}" /> <TextBox Text="{Binding Mqtt.UserName, UpdateSourceTrigger=PropertyChanged}" />
<!-- 密码 --> <!-- 密码 -->
<TextBlock Text="密码" HorizontalAlignment="Left" Style="{StaticResource TextBlockSubTitle}" /> <TextBlock Text="密码"
HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Mqtt.PassWord, UpdateSourceTrigger=PropertyChanged}" /> <TextBox Text="{Binding Mqtt.PassWord, UpdateSourceTrigger=PropertyChanged}" />
<CheckBox FontSize="16" Content="是否启用" Margin="0 30 0 0" IsChecked="{Binding Mqtt.IsActive}" /> <!-- ClientID -->
<TextBlock Text="ClientID"
HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Mqtt.ClientID, UpdateSourceTrigger=PropertyChanged}" />
<CheckBox FontSize="16"
Content="是否启用"
Margin="0 30 0 0"
IsChecked="{Binding Mqtt.IsActive}" />
</ikw:SimpleStackPanel> </ikw:SimpleStackPanel>
</Grid> </Grid>

56
Views/MqttsView.xaml
View File

@@ -79,6 +79,62 @@
<Run Text="{Binding Platform, FallbackValue='EMQX'}" /> <Run Text="{Binding Platform, FallbackValue='EMQX'}" />
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,2">
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Contact}"
VerticalAlignment="Center"
Margin="0,0,8,0"
FontSize="14" />
<TextBlock Text="{Binding ClientID}" />
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,2">
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.OtherUser}"
VerticalAlignment="Center"
Margin="0,0,8,0"
FontSize="14" />
<TextBlock Text="{Binding UserName}" />
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,2">
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Lock}"
VerticalAlignment="Center"
Margin="0,0,8,0"
FontSize="14" />
<TextBlock Text="{Binding PassWord}" />
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,2">
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Send}"
VerticalAlignment="Center"
Margin="0,0,8,0"
FontSize="14" />
<TextBlock Text="{Binding PublishTopic}" />
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,2">
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.SubscriptionAdd}"
VerticalAlignment="Center"
Margin="0,0,8,0"
FontSize="14" />
<TextBlock Text="{Binding SubTopics}" />
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,2">
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Calendar}"
VerticalAlignment="Center"
Margin="0,0,8,0"
FontSize="14" />
<TextBlock Text="{Binding ConnTime}" />
</StackPanel>
<StackPanel Orientation="Horizontal"
Margin="0,2">
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.FavoriteStar}"
VerticalAlignment="Center"
Margin="0,0,8,0"
FontSize="14" />
<TextBlock Text="{Binding IsDefault}" />
</StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>