Skip to content

V
VIZ.Package
Commit 3f2a4b6a by liulongfei
Options

bug修复

parent c91ddc15
Showing with 23 additions and 15 deletions
VIZ.Package.Module/Page/Group/View/PageGroupView.xaml
...@@ -106,8 +106,8 @@ ...@@ -106,8 +106,8 @@
</dxg:GridColumn.EditSettings> </dxg:GridColumn.EditSettings>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn Header="引擎类型" FieldName="EngineType" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"></dxg:GridColumn> <dxg:GridColumn Header="引擎类型" FieldName="EngineType" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"></dxg:GridColumn>
<dxg:GridColumn Header="模板类型" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" <dxg:GridColumn Header="模板类型" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" AllowEditing="False"
Binding="{Binding Path=TemplateType,Converter={StaticResource Enum2EnumDescriptionConverter}}"> Binding="{Binding Path=PageType,Converter={StaticResource Enum2EnumDescriptionConverter}}">
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn Header="插件" FieldName="PluginName" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"></dxg:GridColumn> <dxg:GridColumn Header="插件" FieldName="PluginName" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"></dxg:GridColumn>
</dxg:GridControl.Columns> </dxg:GridControl.Columns>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<dxg:TableView IsColumnMenuEnabled="False" <dxg:TableView IsColumnMenuEnabled="False"
AllowEditing="True" ShowIndicator="False" AllowEditing="True" ShowIndicator="False"
NavigationStyle="Cell" ShowVerticalLines="False" NavigationStyle="Cell" ShowVerticalLines="False"
ShowGroupPanel="False" EditorShowMode="MouseUp" ShowGroupPanel="False" EditorShowMode="MouseDown"
AllowDragDrop="True" AllowDragDrop="True"
ShowBandsPanel="False" ShowBandsPanel="False"
ShowTotalSummary="False" ShowTotalSummary="False"
......
VIZ.Package.Module/Page/Templage/View/PageTemplateView.xaml
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<dxg:TableView IsColumnMenuEnabled="False" <dxg:TableView IsColumnMenuEnabled="False"
AllowEditing="True" ShowIndicator="False" AllowEditing="True" ShowIndicator="False"
NavigationStyle="Cell" ShowVerticalLines="False" NavigationStyle="Cell" ShowVerticalLines="False"
ShowGroupPanel="False" EditorShowMode="MouseUp" ShowGroupPanel="False" EditorShowMode="MouseDown"
AllowDragDrop="True" AllowDragDrop="True"
ShowBandsPanel="False" ShowBandsPanel="False"
ShowTotalSummary="False" ShowTotalSummary="False"
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<dxg:TableView IsColumnMenuEnabled="False" <dxg:TableView IsColumnMenuEnabled="False"
AllowEditing="True" ShowIndicator="False" AllowEditing="True" ShowIndicator="False"
NavigationStyle="Cell" ShowVerticalLines="False" NavigationStyle="Cell" ShowVerticalLines="False"
ShowGroupPanel="False" EditorShowMode="MouseUp" ShowGroupPanel="False" EditorShowMode="MouseDown"
AllowDragDrop="False" AllowDragDrop="False"
ShowBandsPanel="False" ShowBandsPanel="False"
ShowTotalSummary="False" ShowTotalSummary="False"
......
VIZ.Package.Module/Setting/PluginMapping/View/PluginMappingSettingView.xaml
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn Header="插件" FieldName="PluginID" AllowSorting="False" AllowColumnFiltering="False" Width="120" AllowResizing="False"> <dxg:GridColumn Header="插件" FieldName="PluginID" AllowSorting="False" AllowColumnFiltering="False" Width="120" AllowResizing="False">
<dxg:GridColumn.EditSettings> <dxg:GridColumn.EditSettings>
<dxe:ComboBoxEditSettings ItemsSource="{Binding Path=PluginInfos}" <dxe:ComboBoxEditSettings ItemsSource="{Binding Path=PluginInfos}" IsTextEditable="False"
DisplayMember="Name" ValueMember="ID"></dxe:ComboBoxEditSettings> DisplayMember="Name" ValueMember="ID"></dxe:ComboBoxEditSettings>
</dxg:GridColumn.EditSettings> </dxg:GridColumn.EditSettings>
</dxg:GridColumn> </dxg:GridColumn>
</dxg:GridControl.Columns> </dxg:GridControl.Columns>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<dxg:TableView IsColumnMenuEnabled="False" <dxg:TableView IsColumnMenuEnabled="False"
AllowEditing="True" ShowIndicator="False" AllowEditing="True" ShowIndicator="False"
NavigationStyle="Cell" ShowVerticalLines="False" NavigationStyle="Cell" ShowVerticalLines="False"
ShowGroupPanel="False" EditorShowMode="MouseUp" ShowGroupPanel="False" EditorShowMode="MouseDown"
AllowDragDrop="False" AllowDragDrop="False"
ShowBandsPanel="False" ShowBandsPanel="False"
ShowTotalSummary="False" ShowTotalSummary="False"
......
VIZ.Package.Module/Task/PackageTask/View/PackageTaskView.xaml
...@@ -35,10 +35,16 @@ ...@@ -35,10 +35,16 @@
<Grid> <Grid>
<dxg:GridControl ItemsSource="{Binding Path=ItemsSource}" ShowBorder="False"> <dxg:GridControl ItemsSource="{Binding Path=ItemsSource}" ShowBorder="False">
<dxg:GridControl.Columns> <dxg:GridControl.Columns>
<dxg:GridColumn Header="编号" FieldName="ID" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" <dxg:GridColumn Header="编号" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"
AllowResizing="False" Width="80"></dxg:GridColumn> AllowResizing="False" Width="40" AllowEditing="False">
<dxg:GridColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Row.ID}" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
</DataTemplate>
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn>
<dxg:GridColumn Header="状态" FieldName="Status" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" <dxg:GridColumn Header="状态" FieldName="Status" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"
AllowResizing="False" Width="80"> AllowResizing="False" Width="80" AllowEditing="False">
<dxg:GridColumn.CellTemplate> <dxg:GridColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<Image Width="20" Height="20" Margin="0,3,0,3" HorizontalAlignment="Center" VerticalAlignment="Center" <Image Width="20" Height="20" Margin="0,3,0,3" HorizontalAlignment="Center" VerticalAlignment="Center"
...@@ -83,7 +89,7 @@ ...@@ -83,7 +89,7 @@
</dxg:GridColumn.EditSettings> </dxg:GridColumn.EditSettings>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn Header="任务信息" FieldName="Status" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" <dxg:GridColumn Header="任务信息" FieldName="Status" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"
AllowResizing="False" Width="80"> AllowResizing="False" Width="80" AllowEditing="False">
<dxg:GridColumn.CellTemplate> <dxg:GridColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<Image Width="20" Height="20" Margin="0,3,0,3" HorizontalAlignment="Center" VerticalAlignment="Center" <Image Width="20" Height="20" Margin="0,3,0,3" HorizontalAlignment="Center" VerticalAlignment="Center"
...@@ -94,7 +100,7 @@ ...@@ -94,7 +100,7 @@
</dxg:GridColumn.CellTemplate> </dxg:GridColumn.CellTemplate>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn AllowSorting="False" AllowColumnFiltering="False" <dxg:GridColumn AllowSorting="False" AllowColumnFiltering="False"
AllowResizing="False" Width="100"> AllowResizing="False" Width="100" AllowEditing="False">
<dxg:GridColumn.CellTemplate> <dxg:GridColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
...@@ -102,12 +108,14 @@ ...@@ -102,12 +108,14 @@
Icon="/VIZ.Package.Module.Resource;component/Icons/icon_play_32x32.png" Icon="/VIZ.Package.Module.Resource;component/Icons/icon_play_32x32.png"
IsEnabled="{Binding Path=Row.IsRunning,Converter={StaticResource Bool2BoolConverter}}" IsEnabled="{Binding Path=Row.IsRunning,Converter={StaticResource Bool2BoolConverter}}"
Command="{Binding ElementName=uc,Path=DataContext.StartCommand}" Command="{Binding ElementName=uc,Path=DataContext.StartCommand}"
CommandParameter="{Binding Row}"></fcommon:IconButton> CommandParameter="{Binding Row}"
ToolTip="开始"></fcommon:IconButton>
<fcommon:IconButton Style="{StaticResource IconButton_Menu_Mask}" Margin="10,0,0,0" <fcommon:IconButton Style="{StaticResource IconButton_Menu_Mask}" Margin="10,0,0,0"
Icon="/VIZ.Package.Module.Resource;component/Icons/icon_pause_32x32.png" Icon="/VIZ.Package.Module.Resource;component/Icons/icon_pause_32x32.png"
IsEnabled="{Binding Path=Row.IsRunning}" IsEnabled="{Binding Path=Row.IsRunning}"
Command="{Binding ElementName=uc,Path=DataContext.StopCommand}" Command="{Binding ElementName=uc,Path=DataContext.StopCommand}"
CommandParameter="{Binding Row}"></fcommon:IconButton> CommandParameter="{Binding Row}"
ToolTip="停止"></fcommon:IconButton>
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</dxg:GridColumn.CellTemplate> </dxg:GridColumn.CellTemplate>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment