信号管理外部加载dll报错bug
This commit is contained in:
parent
6be078b01e
commit
a9fb4be5d1
Binary file not shown.
Binary file not shown.
@ -30,13 +30,13 @@
|
|||||||
<ResourceDictionary.MergedDictionaries>
|
<ResourceDictionary.MergedDictionaries>
|
||||||
<ResourceDictionary Source="pack://application:,,,/SWS.WPF;component/Style/CustomStyles.xaml" />
|
<ResourceDictionary Source="pack://application:,,,/SWS.WPF;component/Style/CustomStyles.xaml" />
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
<!-- 转换器 -->
|
<!--转换器-->
|
||||||
<cvt:RadGridViewRowToBoolConverter x:Key="RowToBoolCvt" />
|
<cvt:RadGridViewRowToBoolConverter x:Key="RowToBoolCvt" />
|
||||||
<cvt:TimeSpanValueConverter x:Key="TimeSpanValueCvt" />
|
<cvt:TimeSpanValueConverter x:Key="TimeSpanValueCvt" />
|
||||||
<cvt:TimeSpanToColourValueConverter x:Key="TimeSpanToColourCvt" />
|
<cvt:TimeSpanToColourValueConverter x:Key="TimeSpanToColourCvt" />
|
||||||
<CustomControl:CollectionToStringConverter x:Key="CollectionToStringConverter" />
|
<CustomControl:CollectionToStringConverter x:Key="CollectionToStringConverter" />
|
||||||
|
|
||||||
<!-- 模版样式 -->
|
<!--模版样式-->
|
||||||
<DataTemplate x:Key="CellTemplate1">
|
<DataTemplate x:Key="CellTemplate1">
|
||||||
<TextBlock Text="{Binding WHCPUs, Converter={StaticResource CollectionToStringConverter}}" />
|
<TextBlock Text="{Binding WHCPUs, Converter={StaticResource CollectionToStringConverter}}" />
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
@ -49,7 +49,7 @@
|
|||||||
Delimiter="|"
|
Delimiter="|"
|
||||||
DisplayMemberPath="DataItemName"
|
DisplayMemberPath="DataItemName"
|
||||||
IsSelectAllActive="True"
|
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}"
|
SelectedItems="{Binding WHCPUs}"
|
||||||
SelectedValuePath="DataItemCode" />
|
SelectedValuePath="DataItemCode" />
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
@ -66,7 +66,7 @@
|
|||||||
Delimiter="|"
|
Delimiter="|"
|
||||||
DisplayMemberPath="DataItemName"
|
DisplayMemberPath="DataItemName"
|
||||||
IsSelectAllActive="True"
|
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}"
|
SelectedItems="{Binding ECRCPUs}"
|
||||||
SelectedValuePath="DataItemCode" />
|
SelectedValuePath="DataItemCode" />
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
@ -84,7 +84,7 @@
|
|||||||
Delimiter="|"
|
Delimiter="|"
|
||||||
DisplayMemberPath="DataItemName"
|
DisplayMemberPath="DataItemName"
|
||||||
IsSelectAllActive="True"
|
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}"
|
SelectedItems="{Binding ShipOfficeCPUs}"
|
||||||
SelectedValuePath="DataItemCode" />
|
SelectedValuePath="DataItemCode" />
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
@ -97,7 +97,7 @@
|
|||||||
</Style.Triggers>
|
</Style.Triggers>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<!-- 定义展开按钮样式 -->
|
<!--定义展开按钮样式-->
|
||||||
<Style x:Key="ExpandButtonStyle" TargetType="telerik:GridViewToggleButton">
|
<Style x:Key="ExpandButtonStyle" TargetType="telerik:GridViewToggleButton">
|
||||||
<Setter Property="telerik:StyleManager.Theme" Value="Office_Blue"/>
|
<Setter Property="telerik:StyleManager.Theme" Value="Office_Blue"/>
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
@ -106,7 +106,7 @@
|
|||||||
<Border Background="Red">
|
<Border Background="Red">
|
||||||
<Border Background="Red">
|
<Border Background="Red">
|
||||||
<Grid>
|
<Grid>
|
||||||
<!-- 自定义箭头图标 -->
|
<!--自定义箭头图标-->
|
||||||
<Path
|
<Path
|
||||||
x:Name="ExpandPath"
|
x:Name="ExpandPath"
|
||||||
Data="M 0 2 L 4 6 L 0 10 Z"
|
Data="M 0 2 L 4 6 L 0 10 Z"
|
||||||
@ -120,7 +120,7 @@
|
|||||||
</Border>
|
</Border>
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<Trigger Property="IsChecked" Value="True">
|
<Trigger Property="IsChecked" Value="True">
|
||||||
<!-- 展开时旋转箭头(可选) -->
|
<!--展开时旋转箭头(可选)-->
|
||||||
<Setter TargetName="ExpandPath" Property="LayoutTransform">
|
<Setter TargetName="ExpandPath" Property="LayoutTransform">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<RotateTransform Angle="90" />
|
<RotateTransform Angle="90" />
|
||||||
@ -163,7 +163,7 @@
|
|||||||
|
|
||||||
</Style>
|
</Style>
|
||||||
<cvt:StatusToColourConverter x:Key="converter" />
|
<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:ConditionalStyleSelector.Rules>
|
||||||
<CustomControl:ConditionalStyleRule Style="{StaticResource ToDeleteStatusStyle}">
|
<CustomControl:ConditionalStyleRule Style="{StaticResource ToDeleteStatusStyle}">
|
||||||
<CustomControl:ConditionalStyleRule.Value>
|
<CustomControl:ConditionalStyleRule.Value>
|
||||||
@ -198,183 +198,6 @@
|
|||||||
</CustomControl:ConditionalStyleSelector.Rules>
|
</CustomControl:ConditionalStyleSelector.Rules>
|
||||||
</CustomControl:ConditionalStyleSelector>
|
</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>
|
</ResourceDictionary>
|
||||||
|
|
||||||
|
|
||||||
@ -399,7 +222,7 @@
|
|||||||
Foreground="White"
|
Foreground="White"
|
||||||
Style="{StaticResource sysLabel}"
|
Style="{StaticResource sysLabel}"
|
||||||
Text="{Binding pojectName}" />
|
Text="{Binding pojectName}" />
|
||||||
<!-- 送审时间倒计时 -->
|
<!--送审时间倒计时-->
|
||||||
<Border Background="{Binding ReviewCountdown.TimeRemaining,Converter={StaticResource TimeSpanToColourCvt}}" CornerRadius="6"
|
<Border Background="{Binding ReviewCountdown.TimeRemaining,Converter={StaticResource TimeSpanToColourCvt}}" CornerRadius="6"
|
||||||
Margin="50,1,0,1" Padding="1">
|
Margin="50,1,0,1" Padding="1">
|
||||||
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" >
|
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" >
|
||||||
@ -417,7 +240,7 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<!-- 施工时间倒计时 -->
|
<!--施工时间倒计时-->
|
||||||
<Border Background="{Binding ConstructionCountdown.TimeRemaining,Converter={StaticResource TimeSpanToColourCvt}}" CornerRadius="6"
|
<Border Background="{Binding ConstructionCountdown.TimeRemaining,Converter={StaticResource TimeSpanToColourCvt}}" CornerRadius="6"
|
||||||
Margin="25,1,0,1" Padding="1">
|
Margin="25,1,0,1" Padding="1">
|
||||||
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
|
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
|
||||||
@ -489,9 +312,9 @@
|
|||||||
IconData="M12,3 L12,9 M12,21 L12,15 M15,18 L21,12 L15,6 M9,6 L3,12 L9,18"
|
IconData="M12,3 L12,9 M12,21 L12,15 M15,18 L21,12 L15,6 M9,6 L3,12 L9,18"
|
||||||
IconPlacement="Left"
|
IconPlacement="Left"
|
||||||
IconSize="16" />
|
IconSize="16" />
|
||||||
<!-- 浮框 -->
|
<!--浮框-->
|
||||||
<Popup x:Name="CustomPopup"
|
<Popup x:Name="CustomPopup"
|
||||||
IsOpen="{Binding PopupButton_IsOpen,Mode=TwoWay}"
|
IsOpen="{Binding PopupButton_IsOpen}"
|
||||||
PlacementTarget="{Binding ElementName=PopupButton}"
|
PlacementTarget="{Binding ElementName=PopupButton}"
|
||||||
Placement="Bottom"
|
Placement="Bottom"
|
||||||
StaysOpen="False">
|
StaysOpen="False">
|
||||||
@ -508,27 +331,25 @@
|
|||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Style="{StaticResource sysLabel}"
|
Style="{StaticResource sysLabel}"
|
||||||
Text="开始时间:" />
|
Text="开始时间:" />
|
||||||
<telerik:RadDatePicker
|
<DatePicker
|
||||||
Width="140"
|
Width="140"
|
||||||
DateTimeWatermarkContent="开始时间"
|
ToolTip="开始时间"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
telerik:StyleManager.Theme="Office_Blue"
|
SelectedDate="{Binding statDate}" />
|
||||||
SelectedValue="{Binding statDate}" />
|
|
||||||
<TextBlock Margin="0 5 0 2"
|
<TextBlock Margin="0 5 0 2"
|
||||||
Foreground="White"
|
Foreground="White"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Style="{StaticResource sysLabel}"
|
Style="{StaticResource sysLabel}"
|
||||||
Text="结束时间:" />
|
Text="结束时间:" />
|
||||||
<telerik:RadDatePicker
|
<DatePicker
|
||||||
Width="140"
|
Width="140"
|
||||||
DateTimeWatermarkContent="结束时间"
|
ToolTip="结束时间"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
telerik:StyleManager.Theme="Office_Blue"
|
SelectedDate="{Binding endDate}">
|
||||||
SelectedValue="{Binding endDate,StringFormat=yyyy-MM-dd}">
|
</DatePicker>
|
||||||
</telerik:RadDatePicker>
|
|
||||||
<telerik:RadButton
|
<telerik:RadButton
|
||||||
Width="100"
|
Width="100"
|
||||||
Margin="0,10,0,5"
|
Margin="0,10,0,5"
|
||||||
@ -619,15 +440,12 @@
|
|||||||
<telerik:GridViewColumnGroup Name="ECR" Header="ECR" />
|
<telerik:GridViewColumnGroup Name="ECR" Header="ECR" />
|
||||||
<telerik:GridViewColumnGroup Name="SHIP OFFICE" Header="SHIP OFFICE" />
|
<telerik:GridViewColumnGroup Name="SHIP OFFICE" Header="SHIP OFFICE" />
|
||||||
</telerik:RadTreeListView.ColumnGroups>
|
</telerik:RadTreeListView.ColumnGroups>
|
||||||
<!-- 层级结构定义 -->
|
<!--层级结构定义-->
|
||||||
<telerik:RadTreeListView.ChildTableDefinitions >
|
<telerik:RadTreeListView.ChildTableDefinitions >
|
||||||
<telerik:TreeListViewTableDefinition ItemsSource="{Binding ChildSignals}" />
|
<telerik:TreeListViewTableDefinition ItemsSource="{Binding ChildSignals}" />
|
||||||
</telerik:RadTreeListView.ChildTableDefinitions>
|
</telerik:RadTreeListView.ChildTableDefinitions>
|
||||||
|
|
||||||
<telerik:RadTreeListView.Columns>
|
<telerik:RadTreeListView.Columns>
|
||||||
<!-- 展开行详情列“+”
|
|
||||||
<telerik:GridViewToggleRowDetailsColumn Header=""/>
|
|
||||||
-->
|
|
||||||
<telerik:GridViewDataColumn
|
<telerik:GridViewDataColumn
|
||||||
DataMemberBinding="{Binding serialNumber}"
|
DataMemberBinding="{Binding serialNumber}"
|
||||||
Header="序号"
|
Header="序号"
|
||||||
@ -698,42 +516,25 @@
|
|||||||
<telerik:GridViewComboBoxColumn.CellTemplate>
|
<telerik:GridViewComboBoxColumn.CellTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<TextBlock Text="{Binding GroupOther}"/>
|
<TextBlock Text="{Binding GroupOther}"/>
|
||||||
<!-- 显示原始值 -->
|
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</telerik:GridViewComboBoxColumn.CellTemplate>
|
</telerik:GridViewComboBoxColumn.CellTemplate>
|
||||||
<telerik:GridViewComboBoxColumn.CellEditTemplate>
|
<telerik:GridViewComboBoxColumn.CellEditTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<telerik:RadComboBox
|
<ComboBox
|
||||||
ItemsSource="{Binding DataContext.GroupOthers,
|
ItemsSource="{Binding DataContext.GroupOthers,
|
||||||
RelativeSource={RelativeSource AncestorType={x:Type telerik:RadTreeListView}}}"
|
RelativeSource={RelativeSource AncestorType={x:Type telerik:RadTreeListView}}}"
|
||||||
SelectedValue="{Binding tempGroupOther, Mode=TwoWay}"
|
SelectedValue="{Binding tempGroupOther, Mode=TwoWay}"
|
||||||
>
|
>
|
||||||
<telerik:RadComboBox.ItemTemplate>
|
<ComboBox.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<TextBlock x:Name="TextBlock_DataItemName" Text="{Binding DataItemName}"/>
|
<TextBlock x:Name="TextBlock_DataItemName" Text="{Binding DataItemName}"/>
|
||||||
<TextBlock >
|
<TextBlock Text="|" />
|
||||||
<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="{Binding DataItemCode}"/>
|
<TextBlock Text="{Binding DataItemCode}"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</telerik:RadComboBox.ItemTemplate>
|
</ComboBox.ItemTemplate>
|
||||||
</telerik:RadComboBox>
|
</ComboBox>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</telerik:GridViewComboBoxColumn.CellEditTemplate>
|
</telerik:GridViewComboBoxColumn.CellEditTemplate>
|
||||||
</telerik:GridViewComboBoxColumn>
|
</telerik:GridViewComboBoxColumn>
|
||||||
@ -988,11 +789,11 @@
|
|||||||
CommandParameter="信号转虚拟点">
|
CommandParameter="信号转虚拟点">
|
||||||
<telerik:RadButton.Style>
|
<telerik:RadButton.Style>
|
||||||
<Style TargetType="telerik:RadButton" BasedOn="{StaticResource sysBtn}">
|
<Style TargetType="telerik:RadButton" BasedOn="{StaticResource sysBtn}">
|
||||||
<!-- 默认文本 -->
|
<!--默认文本-->
|
||||||
<Setter Property="Content" Value="虚拟转信号" />
|
<Setter Property="Content" Value="虚拟转信号" />
|
||||||
<Setter Property="IsEnabled" Value="False" />
|
<Setter Property="IsEnabled" Value="False" />
|
||||||
|
|
||||||
<!-- 当选中项的Content为信号时 -->
|
<!--当选中项的Content为信号时-->
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding SelectedItem.type, ElementName=RadGridView1}" Value="信号">
|
<DataTrigger Binding="{Binding SelectedItem.type, ElementName=RadGridView1}" Value="信号">
|
||||||
<Setter Property="Content" Value="信号转虚拟点" />
|
<Setter Property="Content" Value="信号转虚拟点" />
|
||||||
@ -1019,6 +820,7 @@
|
|||||||
</telerik:RadButton.Style>
|
</telerik:RadButton.Style>
|
||||||
|
|
||||||
</telerik:RadButton>
|
</telerik:RadButton>
|
||||||
|
|
||||||
<telerik:RadButton
|
<telerik:RadButton
|
||||||
Width="100"
|
Width="100"
|
||||||
Margin="0,0,0,5"
|
Margin="0,0,0,5"
|
||||||
@ -1131,6 +933,7 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</telerik:RadButton.Style>
|
</telerik:RadButton.Style>
|
||||||
</telerik:RadButton>
|
</telerik:RadButton>
|
||||||
|
|
||||||
<telerik:RadButton
|
<telerik:RadButton
|
||||||
Width="100"
|
Width="100"
|
||||||
Margin="0,0,0,5"
|
Margin="0,0,0,5"
|
||||||
@ -1145,7 +948,7 @@
|
|||||||
<DataTrigger Binding="{Binding SelectedItem.LinkedID, ElementName=RadGridView1}" Value="{x:Null}">
|
<DataTrigger Binding="{Binding SelectedItem.LinkedID, ElementName=RadGridView1}" Value="{x:Null}">
|
||||||
<Setter Property="IsEnabled" Value="False" />
|
<Setter Property="IsEnabled" Value="False" />
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<!-- 检查空字符串 -->
|
<!--检查空字符串-->
|
||||||
<DataTrigger Binding="{Binding SelectedItem.LinkedID, ElementName=RadGridView1}" Value="">
|
<DataTrigger Binding="{Binding SelectedItem.LinkedID, ElementName=RadGridView1}" Value="">
|
||||||
<Setter Property="IsEnabled" Value="False" />
|
<Setter Property="IsEnabled" Value="False" />
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
@ -1174,6 +977,7 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</telerik:RadButton.Style>
|
</telerik:RadButton.Style>
|
||||||
</telerik:RadButton>
|
</telerik:RadButton>
|
||||||
|
|
||||||
<GroupBox
|
<GroupBox
|
||||||
Margin="5,90,5,5"
|
Margin="5,90,5,5"
|
||||||
VerticalAlignment="Bottom"
|
VerticalAlignment="Bottom"
|
||||||
@ -1235,18 +1039,6 @@
|
|||||||
Foreground="#232323" />
|
Foreground="#232323" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</GroupBox>
|
</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>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
Binary file not shown.
@ -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>
|
// <auto-generated>
|
||||||
// 此代码由工具生成。
|
// 此代码由工具生成。
|
||||||
@ -78,7 +78,7 @@ namespace SWS.WPF.Views {
|
|||||||
public partial class DialogSignalManagement : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
|
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")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal SWS.CustomControl.customWindowTitleBar titleBar;
|
internal SWS.CustomControl.customWindowTitleBar titleBar;
|
||||||
|
|
||||||
@ -86,7 +86,7 @@ namespace SWS.WPF.Views {
|
|||||||
#line hidden
|
#line hidden
|
||||||
|
|
||||||
|
|
||||||
#line 409 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
#line 232 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal System.Windows.Controls.TextBlock txtReviewCountdown;
|
internal System.Windows.Controls.TextBlock txtReviewCountdown;
|
||||||
|
|
||||||
@ -94,7 +94,7 @@ namespace SWS.WPF.Views {
|
|||||||
#line hidden
|
#line hidden
|
||||||
|
|
||||||
|
|
||||||
#line 427 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
#line 250 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal System.Windows.Controls.TextBlock txtConstructionCountdown;
|
internal System.Windows.Controls.TextBlock txtConstructionCountdown;
|
||||||
|
|
||||||
@ -102,7 +102,7 @@ namespace SWS.WPF.Views {
|
|||||||
#line hidden
|
#line hidden
|
||||||
|
|
||||||
|
|
||||||
#line 483 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
#line 306 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal SWS.CustomControl.IconButton PopupButton;
|
internal SWS.CustomControl.IconButton PopupButton;
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ namespace SWS.WPF.Views {
|
|||||||
#line hidden
|
#line hidden
|
||||||
|
|
||||||
|
|
||||||
#line 493 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
#line 316 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal System.Windows.Controls.Primitives.Popup CustomPopup;
|
internal System.Windows.Controls.Primitives.Popup CustomPopup;
|
||||||
|
|
||||||
@ -118,7 +118,7 @@ namespace SWS.WPF.Views {
|
|||||||
#line hidden
|
#line hidden
|
||||||
|
|
||||||
|
|
||||||
#line 544 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
#line 365 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal SWS.CustomControl.IconButton myButton;
|
internal SWS.CustomControl.IconButton myButton;
|
||||||
|
|
||||||
@ -126,7 +126,7 @@ namespace SWS.WPF.Views {
|
|||||||
#line hidden
|
#line hidden
|
||||||
|
|
||||||
|
|
||||||
#line 577 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
#line 398 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal Telerik.Windows.Controls.RadTreeListView RadGridView1;
|
internal Telerik.Windows.Controls.RadTreeListView RadGridView1;
|
||||||
|
|
||||||
|
@ -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>
|
// <auto-generated>
|
||||||
// 此代码由工具生成。
|
// 此代码由工具生成。
|
||||||
@ -78,7 +78,7 @@ namespace SWS.WPF.Views {
|
|||||||
public partial class DialogSignalManagement : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
|
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")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal SWS.CustomControl.customWindowTitleBar titleBar;
|
internal SWS.CustomControl.customWindowTitleBar titleBar;
|
||||||
|
|
||||||
@ -86,7 +86,7 @@ namespace SWS.WPF.Views {
|
|||||||
#line hidden
|
#line hidden
|
||||||
|
|
||||||
|
|
||||||
#line 409 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
#line 232 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal System.Windows.Controls.TextBlock txtReviewCountdown;
|
internal System.Windows.Controls.TextBlock txtReviewCountdown;
|
||||||
|
|
||||||
@ -94,7 +94,7 @@ namespace SWS.WPF.Views {
|
|||||||
#line hidden
|
#line hidden
|
||||||
|
|
||||||
|
|
||||||
#line 427 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
#line 250 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal System.Windows.Controls.TextBlock txtConstructionCountdown;
|
internal System.Windows.Controls.TextBlock txtConstructionCountdown;
|
||||||
|
|
||||||
@ -102,7 +102,7 @@ namespace SWS.WPF.Views {
|
|||||||
#line hidden
|
#line hidden
|
||||||
|
|
||||||
|
|
||||||
#line 483 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
#line 306 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal SWS.CustomControl.IconButton PopupButton;
|
internal SWS.CustomControl.IconButton PopupButton;
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ namespace SWS.WPF.Views {
|
|||||||
#line hidden
|
#line hidden
|
||||||
|
|
||||||
|
|
||||||
#line 493 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
#line 316 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal System.Windows.Controls.Primitives.Popup CustomPopup;
|
internal System.Windows.Controls.Primitives.Popup CustomPopup;
|
||||||
|
|
||||||
@ -118,7 +118,7 @@ namespace SWS.WPF.Views {
|
|||||||
#line hidden
|
#line hidden
|
||||||
|
|
||||||
|
|
||||||
#line 544 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
#line 365 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal SWS.CustomControl.IconButton myButton;
|
internal SWS.CustomControl.IconButton myButton;
|
||||||
|
|
||||||
@ -126,7 +126,7 @@ namespace SWS.WPF.Views {
|
|||||||
#line hidden
|
#line hidden
|
||||||
|
|
||||||
|
|
||||||
#line 577 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
#line 398 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
|
||||||
internal Telerik.Windows.Controls.RadTreeListView RadGridView1;
|
internal Telerik.Windows.Controls.RadTreeListView RadGridView1;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user