Skip to content

V
VIZ.Package
Commit df9b169d by liulongfei
Options

样式调整

parent d86c8faf
Showing with 51 additions and 23 deletions
VIZ.Package.Domain/Model/Page/PageGroupModel.cs
......@@ -74,6 +74,20 @@ namespace VIZ.Package.Domain
// 扩展属性
// ===========================================================
#region SelectedPage -- 当前选中的页
private PageModel selectedPage;
/// <summary>
/// 当前选中的页
/// </summary>
public PageModel SelectedPage
{
get { return selectedPage; }
set { selectedPage = value; this.RaisePropertyChanged(nameof(SelectedPage)); }
}
#endregion
#region SelectedPages -- 当前选中的页集合
private ObservableCollection<PageModel> selectedPages = new ObservableCollection<PageModel>();
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/DupletListCellEdit.xaml
......@@ -20,7 +20,7 @@
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="30"></ColumnDefinition>
</Grid.ColumnDefinitions>
<dxe:TextEdit x:Name="PART_Text" IsReadOnly="True" EditValueChanged="EditValueChanged"></dxe:TextEdit>
<dxe:TextEdit x:Name="PART_Text" IsReadOnly="True" EditValueChanged="EditValueChanged" Margin="1"></dxe:TextEdit>
<Button x:Name="PART_Show" Content=".." Grid.Column="1" Click="EditClick"></Button>
</Grid>
</local:ListCellEditBase>
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/FloatListCellEdit.xaml
......@@ -16,7 +16,7 @@
mc:Ignorable="d"
d:DesignHeight="30" d:DesignWidth="200">
<Grid>
<dxe:TextEdit x:Name="PART_Text"
<dxe:TextEdit x:Name="PART_Text" Margin="1"
MaskType="Numeric" EditValueChanged="EditValueChanged"></dxe:TextEdit>
</Grid>
</local:ListCellEditBase>
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/FontListCellEdit.xaml
......@@ -22,7 +22,7 @@
<ColumnDefinition Width="30"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Image Width="16" Height="16" Source="/VIZ.Package.Module.Resource;component/Icons/image_20x20.png"></Image>
<dxe:TextEdit x:Name="PART_Text" Grid.Column="1" IsReadOnly="True" EditValueChanged="EditValueChanged"></dxe:TextEdit>
<dxe:TextEdit x:Name="PART_Text" Grid.Column="1" IsReadOnly="True" EditValueChanged="EditValueChanged" Margin="1"></dxe:TextEdit>
<Button x:Name="PART_Show" Content=".." Grid.Column="2" Click="EditClick"></Button>
</Grid>
</local:ListCellEditBase>
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/ImageListCellEdit.xaml
......@@ -22,7 +22,7 @@
<ColumnDefinition Width="30"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Image Width="16" Height="16" Source="/VIZ.Package.Module.Resource;component/Icons/image_20x20.png"></Image>
<dxe:TextEdit x:Name="PART_Text" Grid.Column="1" IsReadOnly="True" EditValueChanged="EditValueChanged"></dxe:TextEdit>
<dxe:TextEdit x:Name="PART_Text" Grid.Column="1" IsReadOnly="True" EditValueChanged="EditValueChanged" Margin="1"></dxe:TextEdit>
<Button x:Name="PART_Show" Content=".." Grid.Column="2" Click="EditClick"></Button>
</Grid>
</local:ListCellEditBase>
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/IntegerListCellEdit.xaml
......@@ -16,7 +16,7 @@
mc:Ignorable="d"
d:DesignHeight="30" d:DesignWidth="200">
<Grid>
<dxe:TextEdit x:Name="PART_Text"
<dxe:TextEdit x:Name="PART_Text" Margin="1"
MaskType="Numeric" Mask="d" EditValueChanged="EditValueChanged"></dxe:TextEdit>
</Grid>
</local:ListCellEditBase>
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/RichTextListCellEdit.xaml
......@@ -20,7 +20,7 @@
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="30"></ColumnDefinition>
</Grid.ColumnDefinitions>
<dxe:TextEdit x:Name="PART_Text" EditValueChanged="EditValueChanged"></dxe:TextEdit>
<dxe:TextEdit x:Name="PART_Text" EditValueChanged="EditValueChanged" Margin="1"></dxe:TextEdit>
<Button x:Name="PART_Show" Content=".." Grid.Column="1" Click="EditClick"></Button>
</Grid>
</local:ListCellEditBase>
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/TextListCellEdit.xaml
......@@ -20,7 +20,7 @@
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="30"></ColumnDefinition>
</Grid.ColumnDefinitions>
<dxe:TextEdit x:Name="PART_Text" EditValueChanged="EditValueChanged"></dxe:TextEdit>
<dxe:TextEdit x:Name="PART_Text" EditValueChanged="EditValueChanged" Margin="1"></dxe:TextEdit>
<Button x:Name="PART_Show" Content=".." Grid.Column="1" Click="EditClick"></Button>
</Grid>
</local:ListCellEditBase>
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/TripletListCellEdit.xaml
......@@ -20,7 +20,7 @@
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="30"></ColumnDefinition>
</Grid.ColumnDefinitions>
<dxe:TextEdit x:Name="PART_Text" IsReadOnly="True" EditValueChanged="EditValueChanged"></dxe:TextEdit>
<dxe:TextEdit x:Name="PART_Text" IsReadOnly="True" EditValueChanged="EditValueChanged" Margin="1"></dxe:TextEdit>
<Button x:Name="PART_Show" Content=".." Grid.Column="1" Click="EditClick"></Button>
</Grid>
</local:ListCellEditBase>
VIZ.Package.Module/Page/Group/View/PageGroupView.xaml
......@@ -67,11 +67,11 @@
<Separator></Separator>
<MenuItem Header="显示列" Command="{Binding Path=PlacementTarget.DataContext.ColumnChoiceCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<Separator></Separator>
<MenuItem Header="更新页" Command="{Binding Path=PlacementTarget.DataContext.UpdateCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<MenuItem Header="初始化页" Command="{Binding Path=PlacementTarget.DataContext.TakeInitCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<MenuItem Header="更新选中页" Command="{Binding Path=PlacementTarget.DataContext.UpdateCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<MenuItem Header="初始化选中页" Command="{Binding Path=PlacementTarget.DataContext.TakeInitCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<Separator></Separator>
<MenuItem Header="删除分组" Command="{Binding Path=PlacementTarget.DataContext.DeleteGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<MenuItem Header="删除节目单项" Command="{Binding Path=PlacementTarget.DataContext.DeleteItemCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
<MenuItem Header="删除选中节目单" Command="{Binding Path=PlacementTarget.DataContext.DeleteItemCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
</ContextMenu>
</dx:DXTabControl.ContextMenu>
<dx:DXTabControl.View>
......@@ -94,6 +94,7 @@
<Setter.Value>
<DataTemplate>
<dxg:GridControl ItemsSource="{Binding Path=Pages}" ShowBorder="False" IsFilterEnabled="False" SelectionMode="Row"
SelectedItem="{Binding Path=SelectedPage,Mode=TwoWay}"
SelectedItems="{Binding Path=SelectedPages}">
<dxg:GridControl.Columns>
<dxg:GridColumn Header="编号" AllowSorting="False" AllowColumnFiltering="False" AllowResizing="True"
......
VIZ.Package.Module/Page/Group/ViewModel/PageGroupViewModel.cs
......@@ -316,11 +316,10 @@ namespace VIZ.Package.Module
if (this.SelectedPageGroupModel == null)
return;
if (this.SelectedPageGroupModel.SelectedPages == null || this.SelectedPageGroupModel.SelectedPages.Count == 0)
if (this.SelectedPageGroupModel.SelectedPage == null)
return;
PageModel page = this.SelectedPageGroupModel.SelectedPages.First();
this.OpenPage(page);
this.OpenPage(this.SelectedPageGroupModel.SelectedPage);
}
#endregion
......
VIZ.Package.Module/Page/Templage/View/PageTemplateView.xaml
......@@ -28,6 +28,7 @@
<Grid IsEnabled="{Binding Path=IsEnabled}" Margin="0,10,0,10">
<dxg:GridControl ItemsSource="{Binding Path=SceneTemplateModels}" ShowBorder="False" SelectionMode="Row"
SelectedItem="{Binding Path=SelectedSceneTemplateModel}"
SelectedItems="{Binding Path=SelectedSceneTemplateModels}">
<dxg:GridControl.ContextMenu>
<ContextMenu>
......
VIZ.Package.Module/Page/Templage/ViewModel/PageTemplateViewModel.cs
......@@ -144,6 +144,20 @@ namespace VIZ.Package.Module
#endregion
#region SelectedSceneTemplateModel -- 当前选中的场景模板
private PageTemplateModel selectedSceneTemplateModel;
/// <summary>
/// 当前选中的场景模板
/// </summary>
public PageTemplateModel SelectedSceneTemplateModel
{
get { return selectedSceneTemplateModel; }
set { selectedSceneTemplateModel = value; this.RaisePropertyChanged(nameof(SelectedSceneTemplateModel)); }
}
#endregion
#region SelectedSceneTemplateModels -- 当前选中的场景模板集合
private ObservableCollection<PageTemplateModel> selectedSceneTemplateModels = new ObservableCollection<PageTemplateModel>();
......@@ -200,11 +214,10 @@ namespace VIZ.Package.Module
/// </summary>
private void OpenScenePage()
{
if (this.SelectedSceneTemplateModels == null || this.SelectedSceneTemplateModels.Count == 0)
if (this.SelectedSceneTemplateModel == null)
return;
PageTemplateModel template = this.SelectedSceneTemplateModels.First();
this.OpenScenePage(template);
this.OpenScenePage(this.SelectedSceneTemplateModel);
}
/// <summary>
......
VIZ.Package.Module/Setting/Conn/View/ConnSettingView.xaml
......@@ -37,7 +37,7 @@
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<GroupBox Header="分组" Margin="5" Padding="5">
<GroupBox Header="分组" Margin="10,10,5,10" Padding="10">
<dxg:GridControl ItemsSource="{Binding Path=Groups}" ShowBorder="False"
SelectedItem="{Binding Path=SelectedGroup,Mode=TwoWay}">
<dxg:GridControl.ContextMenu>
......@@ -80,8 +80,8 @@
ReadOnly="True"></dxg:GridColumn>
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView AllowEditing="True" ShowIndicator="True"
IsColumnMenuEnabled="False"
<dxg:TableView AllowEditing="True" ShowIndicator="False"
IsColumnMenuEnabled="False"
ShowGroupPanelsForUngroupedDetails="False"
NavigationStyle="Cell" ShowVerticalLines="False"
ShowGroupPanel="False"
......@@ -99,7 +99,7 @@
<GridSplitter HorizontalAlignment="Right" VerticalAlignment="Stretch" Width="5"
Style="{StaticResource GridSplitter_None}"></GridSplitter>
<GroupBox Header="项" Margin="5" Padding="5" Grid.Column="1">
<GroupBox Header="项" Margin="0,10,10,10" Padding="10" Grid.Column="1">
<dxg:GridControl ItemsSource="{Binding Path=SelectedGroup.Items}" ShowBorder="False" Grid.Column="1"
SelectedItem="{Binding Path=SelectedItem,Mode=TwoWay}">
<dxg:GridControl.ContextMenu>
......@@ -141,7 +141,7 @@
</dxg:GridColumn>
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView AllowEditing="True" ShowIndicator="True"
<dxg:TableView AllowEditing="True" ShowIndicator="False"
IsColumnMenuEnabled="False"
NavigationStyle="Cell" ShowVerticalLines="False"
ShowGroupPanel="False"
......
VIZ.Package.Module/Setting/Core/View/SettingWindow.xaml
......@@ -28,7 +28,7 @@
<RowDefinition Height="60"></RowDefinition>
</Grid.RowDefinitions>
<!-- 设置项 -->
<GroupBox Header="设置" Margin="5" Padding="5">
<GroupBox Header="设置" Margin="10" Padding="5">
<ListBox ItemsSource="{Binding Path=ItemsSource}" Margin="0,0,6,0" Background="Transparent"
SelectedValue="{Binding Path=SelectedValue,Mode=TwoWay}" BorderThickness="0">
<ListBox.ItemTemplate>
......
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