fix: 维护模式重复进入失败与按钮灰死 + Broker 并发验证用例

wenxiangchao

3 天以前 b544d5cccd76735e034c8055918a50927b437474

 HMI.ParameterManage/ParameterSetting.xaml

@@ -10,12 +10,23 @@
             xmlns:pu="https://opensource.panuon.com/wpf-ui"
             xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
             xmlns:cc="clr-namespace:HMI.Core;assembly=HMI.Core"
             mc:Ignorable="d" 
             Padding="10"
             mc:Ignorable="d"
             Loaded="UserControl_Loaded"
             Background="{StaticResource WorkspaceBackground}"
             Background="{DynamicResource WorkspaceBackground}"
             d:DesignHeight="450" d:DesignWidth="800">
    <UserControl.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
                <!--<pu:StyleDictionary Includes="Expander" />-->
            </ResourceDictionary.MergedDictionaries>

            <CollectionViewSource x:Key="GroupFilter" Source="{Binding Datasource}">
                <CollectionViewSource.GroupDescriptions>
                    <PropertyGroupDescription PropertyName="ShowGroup" />
                </CollectionViewSource.GroupDescriptions>
            </CollectionViewSource>
        </ResourceDictionary>
    </UserControl.Resources>
    <Border Style="{StaticResource CardBoarder}">
        <Grid dp:GridHelper.Space="10" Cursor="">
            <Grid.RowDefinitions>
@@ -24,10 +35,7 @@
                <RowDefinition/>
            </Grid.RowDefinitions>

            <TextBlock FontSize="{StaticResource TitleFontSize}" 
                       VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource Pm.Setting.Title}"/>

            <DockPanel Grid.Row="1" Cursor="">
            <DockPanel Grid.Row="1">
                <StackPanel DockPanel.Dock="Right" Style="{StaticResource ButtonGroup}">
                    <Button Style="{StaticResource AddBtn}"
                            x:Name="addBtn" Click="Button_Click"/>
@@ -40,22 +48,49 @@
                    <Button x:Name="importBtn" 
                            Style="{StaticResource ImportBtn}" Click="Button_Click"/>
                </StackPanel>
                <TextBlock FontSize="{StaticResource TitleFontSize}" 
           VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource Pm.Setting.Title}"/>

                <StackPanel Style="{StaticResource ButtonGroup}" HorizontalAlignment="Left">
                <!--<StackPanel Style="{StaticResource ButtonGroup}" HorizontalAlignment="Left">

                    <TextBlock Style="{StaticResource TitleBox}" FontSize="14" Text="{DynamicResource HMI.Line}"/>
                    <ComboBox Style="{StaticResource FormComboxStyle}" Width="160" x:Name="CbLine"/>

                    <TextBlock Style="{StaticResource TitleBox}" FontSize="14" Text="{DynamicResource HMI.Station}"/>
                    <ComboBox Style="{StaticResource FormComboxStyle}" Width="160" x:Name="CbStation"/>
                </StackPanel>
                </StackPanel>-->
            </DockPanel>


            <DataGrid Grid.Row="2" x:Name="table" Style="{StaticResource DefaultDataGrid}"
                      ItemsSource="{Binding Datasource}">
                      ItemsSource="{Binding Source={StaticResource GroupFilter}}">
                <DataGrid.GroupStyle>
                    <GroupStyle>
                        <GroupStyle.ContainerStyle>
                            <Style TargetType="{x:Type GroupItem}">
                                <Setter Property="Template">
                                    <Setter.Value>
                                        <ControlTemplate TargetType="{x:Type GroupItem}">
                                            <Expander BorderThickness="0" Background="DarkCyan"
                                                      IsExpanded="True">
                                                <Expander.Header>
                                                    <TextBlock Text="{Binding Name}" FontSize="15"
                                                               Margin="8"
                                                               Foreground="#FFF"/>
                                                </Expander.Header>
                                                <Border Background="#FFF">
                                                    <ItemsPresenter />
                                                </Border>
                                            </Expander>
                                        </ControlTemplate>
                                    </Setter.Value>
                                </Setter>
                            </Style>
                        </GroupStyle.ContainerStyle>
                    </GroupStyle>
                </DataGrid.GroupStyle>

                <DataGrid.Columns>
                    <DataGridTemplateColumn Header="" Width="Auto" CanUserResize="False">
                    <DataGridTemplateColumn Width="20" CanUserResize="False">
                        <DataGridTemplateColumn.CellTemplate>
                            <DataTemplate>
                                <CheckBox VerticalAlignment="Center" 
@@ -63,7 +98,7 @@
                            </DataTemplate>
                        </DataGridTemplateColumn.CellTemplate>
                    </DataGridTemplateColumn>
                    <DataGridTemplateColumn Header="#" CanUserResize="False">
                    <DataGridTemplateColumn Header="#" Width="30" CanUserResize="False">
                        <DataGridTemplateColumn.CellTemplate>
                            <DataTemplate>
                                <TextBlock Text="{Binding Converter={StaticResource rowNumber},