信号管理外部加载dll报错bug

This commit is contained in:
CHEN-ZW\acer 2025-09-05 12:03:25 +08:00
parent 6be078b01e
commit a9fb4be5d1
6 changed files with 48 additions and 256 deletions

View File

@ -49,7 +49,7 @@
Delimiter="|"
DisplayMemberPath="DataItemName"
IsSelectAllActive="True"
ItemsSource="{Binding DataContext.WHCPUs, RelativeSource={RelativeSource AncestorType=telerik:RadTreeListView}}"
ItemsSource="{Binding DataContext.WHCPUs, RelativeSource={RelativeSource AncestorType={x:Type telerik:RadTreeListView}}}"
SelectedItems="{Binding WHCPUs}"
SelectedValuePath="DataItemCode" />
</DataTemplate>
@ -66,7 +66,7 @@
Delimiter="|"
DisplayMemberPath="DataItemName"
IsSelectAllActive="True"
ItemsSource="{Binding DataContext.ECRCPUs, RelativeSource={RelativeSource AncestorType=telerik:RadTreeListView}}"
ItemsSource="{Binding DataContext.ECRCPUs, RelativeSource={RelativeSource AncestorType={x:Type telerik:RadTreeListView}}}"
SelectedItems="{Binding ECRCPUs}"
SelectedValuePath="DataItemCode" />
</DataTemplate>
@ -84,7 +84,7 @@
Delimiter="|"
DisplayMemberPath="DataItemName"
IsSelectAllActive="True"
ItemsSource="{Binding DataContext.ShipOfficeCPUs, RelativeSource={RelativeSource AncestorType=telerik:RadTreeListView}}"
ItemsSource="{Binding DataContext.ShipOfficeCPUs, RelativeSource={RelativeSource AncestorType={x:Type telerik:RadTreeListView}}}"
SelectedItems="{Binding ShipOfficeCPUs}"
SelectedValuePath="DataItemCode" />
</DataTemplate>
@ -163,7 +163,7 @@
</Style>
<cvt:StatusToColourConverter x:Key="converter" />
<CustomControl:ConditionalStyleSelector x:Key="selector" ConditionConverter="{StaticResource converter}">
<CustomControl:ConditionalStyleSelector x:Key="selector1" ConditionConverter="{StaticResource converter}">
<CustomControl:ConditionalStyleSelector.Rules>
<CustomControl:ConditionalStyleRule Style="{StaticResource ToDeleteStatusStyle}">
<CustomControl:ConditionalStyleRule.Value>
@ -198,183 +198,6 @@
</CustomControl:ConditionalStyleSelector.Rules>
</CustomControl:ConditionalStyleSelector>
<Style x:Key="CityNumStyle" TargetType="DataGridColumnHeader">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<Grid x:Name="Root">
<!--<Rectangle x:Name="BackgroundGradient" Fill="#eee" Stretch="Fill" Grid.ColumnSpan="2" />-->
<ContentPresenter
Grid.Row="2"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="区号" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="CityNameStyle" TargetType="DataGridColumnHeader">
<Setter Property="Foreground" Value="#222" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="IsTabStop" Value="False" />
<Setter Property="SeparatorBrush" Value="#CCC" />
<Setter Property="Padding" Value="8" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<Grid x:Name="Root">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<!--<Rectangle x:Name="BackgroundRectangle" Fill="#eee" Stretch="Fill" Grid.ColumnSpan="2" />-->
<Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<Grid.RowDefinitions>
<RowDefinition Height="20" />
<RowDefinition Height="1" />
<RowDefinition Height="20" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100" />
<ColumnDefinition Width="1" />
<ColumnDefinition Width="100" />
</Grid.ColumnDefinitions>
<!-- 设置标题名称 -->
<ContentPresenter
Grid.ColumnSpan="3"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="省份城市" />
<!-- 设置间隔线 -->
<Rectangle
Grid.Row="1"
Grid.ColumnSpan="3"
Height="1"
VerticalAlignment="Stretch"
Fill="#ccc"
Visibility="Visible" />
<ContentPresenter
Grid.Row="2"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="省名" />
<Rectangle
Grid.Row="2"
Grid.Column="1"
Width="1"
VerticalAlignment="Stretch"
Fill="#ccc"
Visibility="Visible" />
<ContentPresenter
Grid.Row="2"
Grid.Column="2"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="城市" />
</Grid>
<Rectangle
x:Name="VerticalSeparator"
Grid.Row="1"
Grid.Column="1"
Width="1"
VerticalAlignment="Stretch"
Fill="#ccc"
Visibility="Visible" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="CityStyle" TargetType="DataGridColumnHeader">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<Grid x:Name="Root">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid
Grid.Column="0"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<Grid.RowDefinitions>
<RowDefinition Height="30" />
<RowDefinition Height="Auto" />
<RowDefinition Height="30" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="100" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="100" />
</Grid.ColumnDefinitions>
<ContentPresenter
Grid.Row="0"
Grid.Column="0"
Grid.ColumnSpan="5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="户籍信息" />
<Rectangle
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="5"
Height="1"
VerticalAlignment="Stretch"
Fill="Black"
Visibility="Visible" />
<ContentPresenter
Grid.Row="2"
Grid.Column="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="省" />
<Rectangle
Grid.Row="2"
Grid.Column="1"
Width="1"
VerticalAlignment="Stretch"
Fill="#ccc"
Visibility="Visible" />
<ContentPresenter
Grid.Row="2"
Grid.Column="2"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="市" />
<Rectangle
Grid.Row="2"
Grid.Column="3"
Width="1"
VerticalAlignment="Stretch"
Fill="#ccc"
Visibility="Visible" />
<ContentPresenter
Grid.Row="2"
Grid.Column="4"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="县" />
</Grid>
<Rectangle
Grid.Column="1"
Width="1"
VerticalAlignment="Stretch"
Fill="#ccc"
Visibility="Visible" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
@ -491,7 +314,7 @@
IconSize="16" />
<!--浮框-->
<Popup x:Name="CustomPopup"
IsOpen="{Binding PopupButton_IsOpen,Mode=TwoWay}"
IsOpen="{Binding PopupButton_IsOpen}"
PlacementTarget="{Binding ElementName=PopupButton}"
Placement="Bottom"
StaysOpen="False">
@ -508,27 +331,25 @@
VerticalAlignment="Center"
Style="{StaticResource sysLabel}"
Text="开始时间:" />
<telerik:RadDatePicker
<DatePicker
Width="140"
DateTimeWatermarkContent="开始时间"
ToolTip="开始时间"
HorizontalAlignment="Center"
VerticalAlignment="Center"
telerik:StyleManager.Theme="Office_Blue"
SelectedValue="{Binding statDate}" />
SelectedDate="{Binding statDate}" />
<TextBlock Margin="0 5 0 2"
Foreground="White"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Style="{StaticResource sysLabel}"
Text="结束时间:" />
<telerik:RadDatePicker
<DatePicker
Width="140"
DateTimeWatermarkContent="结束时间"
ToolTip="结束时间"
HorizontalAlignment="Center"
VerticalAlignment="Center"
telerik:StyleManager.Theme="Office_Blue"
SelectedValue="{Binding endDate,StringFormat=yyyy-MM-dd}">
</telerik:RadDatePicker>
SelectedDate="{Binding endDate}">
</DatePicker>
<telerik:RadButton
Width="100"
Margin="0,10,0,5"
@ -625,9 +446,6 @@
</telerik:RadTreeListView.ChildTableDefinitions>
<telerik:RadTreeListView.Columns>
<!-- 展开行详情列“+”
<telerik:GridViewToggleRowDetailsColumn Header=""/>
-->
<telerik:GridViewDataColumn
DataMemberBinding="{Binding serialNumber}"
Header="序号"
@ -698,42 +516,25 @@
<telerik:GridViewComboBoxColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding GroupOther}"/>
<!-- 显示原始值 -->
</DataTemplate>
</telerik:GridViewComboBoxColumn.CellTemplate>
<telerik:GridViewComboBoxColumn.CellEditTemplate>
<DataTemplate>
<telerik:RadComboBox
<ComboBox
ItemsSource="{Binding DataContext.GroupOthers,
RelativeSource={RelativeSource AncestorType={x:Type telerik:RadTreeListView}}}"
SelectedValue="{Binding tempGroupOther, Mode=TwoWay}"
>
<telerik:RadComboBox.ItemTemplate>
<ComboBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<TextBlock x:Name="TextBlock_DataItemName" Text="{Binding DataItemName}"/>
<TextBlock >
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="Text" Value="|"/>
<Style.Triggers>
<!-- 检查空字符串 -->
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding Text,ElementName=TextBlock_DataItemName}" Value="{x:Null}" />
<Condition Binding="{Binding Text,ElementName=TextBlock_DataItemName}" Value="" />
</MultiDataTrigger.Conditions>
<Setter Property="Text" Value="" />
</MultiDataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
<TextBlock Text="|" />
<TextBlock Text="{Binding DataItemCode}"/>
</StackPanel>
</DataTemplate>
</telerik:RadComboBox.ItemTemplate>
</telerik:RadComboBox>
</ComboBox.ItemTemplate>
</ComboBox>
</DataTemplate>
</telerik:GridViewComboBoxColumn.CellEditTemplate>
</telerik:GridViewComboBoxColumn>
@ -1019,6 +820,7 @@
</telerik:RadButton.Style>
</telerik:RadButton>
<telerik:RadButton
Width="100"
Margin="0,0,0,5"
@ -1131,6 +933,7 @@
</Style>
</telerik:RadButton.Style>
</telerik:RadButton>
<telerik:RadButton
Width="100"
Margin="0,0,0,5"
@ -1174,6 +977,7 @@
</Style>
</telerik:RadButton.Style>
</telerik:RadButton>
<GroupBox
Margin="5,90,5,5"
VerticalAlignment="Bottom"
@ -1235,18 +1039,6 @@
Foreground="#232323" />
</StackPanel>
</GroupBox>
<!--
<CustomControl:MultiSelectSearchComboBox
Width="auto"
Height="auto"
Delimiter="|"
DisplayMemberPath="DataItemName"
IsSelectAllActive="True"
ItemsSource="{Binding ItemsSource,ElementName=MultiSelectSearchComboBox1}"
SelectedItems="{Binding WHCPUs, RelativeSource={RelativeSource AncestorType=telerik:RadTreeListView}}"
SelectedValuePath="DataItemCode" >
</CustomControl:MultiSelectSearchComboBox>
-->
</StackPanel>
</Grid>
</Grid>

View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7FC1349645A243539D743597373104AD804F32213988FBF5ECA2A7D538B5FA48"
#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7BBBAAC2D30DDCBE426FDE8827BDBF7527EEDC8C0F823DBAF3EBE2D35FF1D1F8"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -78,7 +78,7 @@ namespace SWS.WPF.Views {
public partial class DialogSignalManagement : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 390 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 213 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.customWindowTitleBar titleBar;
@ -86,7 +86,7 @@ namespace SWS.WPF.Views {
#line hidden
#line 409 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 232 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock txtReviewCountdown;
@ -94,7 +94,7 @@ namespace SWS.WPF.Views {
#line hidden
#line 427 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 250 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock txtConstructionCountdown;
@ -102,7 +102,7 @@ namespace SWS.WPF.Views {
#line hidden
#line 483 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 306 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.IconButton PopupButton;
@ -110,7 +110,7 @@ namespace SWS.WPF.Views {
#line hidden
#line 493 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 316 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.Popup CustomPopup;
@ -118,7 +118,7 @@ namespace SWS.WPF.Views {
#line hidden
#line 544 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 365 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.IconButton myButton;
@ -126,7 +126,7 @@ namespace SWS.WPF.Views {
#line hidden
#line 577 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 398 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Telerik.Windows.Controls.RadTreeListView RadGridView1;

View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7FC1349645A243539D743597373104AD804F32213988FBF5ECA2A7D538B5FA48"
#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7BBBAAC2D30DDCBE426FDE8827BDBF7527EEDC8C0F823DBAF3EBE2D35FF1D1F8"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -78,7 +78,7 @@ namespace SWS.WPF.Views {
public partial class DialogSignalManagement : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 390 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 213 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.customWindowTitleBar titleBar;
@ -86,7 +86,7 @@ namespace SWS.WPF.Views {
#line hidden
#line 409 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 232 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock txtReviewCountdown;
@ -94,7 +94,7 @@ namespace SWS.WPF.Views {
#line hidden
#line 427 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 250 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock txtConstructionCountdown;
@ -102,7 +102,7 @@ namespace SWS.WPF.Views {
#line hidden
#line 483 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 306 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.IconButton PopupButton;
@ -110,7 +110,7 @@ namespace SWS.WPF.Views {
#line hidden
#line 493 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 316 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.Popup CustomPopup;
@ -118,7 +118,7 @@ namespace SWS.WPF.Views {
#line hidden
#line 544 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 365 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.IconButton myButton;
@ -126,7 +126,7 @@ namespace SWS.WPF.Views {
#line hidden
#line 577 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
#line 398 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Telerik.Windows.Controls.RadTreeListView RadGridView1;