Skip to content

V
VIZ.Package
Commit e80b8a39 by liulongfei
Options

样式调整

parent 5881ea47
Showing with 31 additions and 13 deletions
VIZ.Package.Module/ControlObject/FieldEdit/Edit/DupletEdit/DupletEditPanel.xaml
...@@ -35,14 +35,16 @@ ...@@ -35,14 +35,16 @@
<TextBlock Text="X:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0" Grid.Row="0"></TextBlock> <TextBlock Text="X:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0" Grid.Row="0"></TextBlock>
<common:LeftRightTextEdit Grid.Row="0" Grid.Column="1" Height="30" <common:LeftRightTextEdit Grid.Row="0" Grid.Column="1" Height="30"
dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull" dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull"
dxe:NumericMaskOptions.HideInsignificantZeros="True"
dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False" dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
MaskType="Numeric" Mask="##########.###" MaskType="Numeric"
EditValue="{Binding Path=X,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></common:LeftRightTextEdit> EditValue="{Binding Path=X,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></common:LeftRightTextEdit>
<TextBlock Text="Y:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0" Grid.Row="1"></TextBlock> <TextBlock Text="Y:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0" Grid.Row="1"></TextBlock>
<common:LeftRightTextEdit Grid.Row="1" Grid.Column="1" Height="30" <common:LeftRightTextEdit Grid.Row="1" Grid.Column="1" Height="30"
dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull" dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull"
dxe:NumericMaskOptions.HideInsignificantZeros="True"
dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False" dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
MaskType="Numeric" Mask="##########.###" MaskType="Numeric"
EditValue="{Binding Path=Y,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></common:LeftRightTextEdit> EditValue="{Binding Path=Y,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></common:LeftRightTextEdit>
<!-- 编辑模式 --> <!-- 编辑模式 -->
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/FloatEdit/FloatEditPanel.xaml
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
Width="200" Grid.Column="1" Width="200" Grid.Column="1"
Margin="20,0,0,0" Margin="20,0,0,0"
dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull" dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull"
dxe:NumericMaskOptions.HideInsignificantZeros="True"
dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False" dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
MaskType="Numeric" Mask="##########.###" MaskType="Numeric"
EditValue="{Binding Path=EditValue,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></dxe:TextEdit> EditValue="{Binding Path=EditValue,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></dxe:TextEdit>
</Grid> </Grid>
</UserControl> </UserControl>
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/FloatListCellEdit.xaml
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
d:DesignHeight="30" d:DesignWidth="200"> d:DesignHeight="30" d:DesignWidth="200">
<Grid> <Grid>
<dxe:TextEdit x:Name="PART_Text" Margin="1" Background="Transparent" ShowBorder="False" <dxe:TextEdit x:Name="PART_Text" Margin="1" Background="Transparent" ShowBorder="False"
dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull"
dxe:NumericMaskOptions.HideInsignificantZeros="True"
dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
MaskType="Numeric" EditValueChanged="EditValueChanged"></dxe:TextEdit> MaskType="Numeric" EditValueChanged="EditValueChanged"></dxe:TextEdit>
</Grid> </Grid>
</local:ListCellEditBase> </local:ListCellEditBase>
VIZ.Package.Module/ControlObject/FieldEdit/Edit/TripletEdit/TripletEditPanel.xaml
...@@ -36,20 +36,23 @@ ...@@ -36,20 +36,23 @@
<TextBlock Text="X:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0" Grid.Row="0"></TextBlock> <TextBlock Text="X:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0" Grid.Row="0"></TextBlock>
<common:LeftRightTextEdit Grid.Row="0" Grid.Column="1" Height="30" <common:LeftRightTextEdit Grid.Row="0" Grid.Column="1" Height="30"
dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull" dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull"
dxe:NumericMaskOptions.HideInsignificantZeros="True"
dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False" dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
MaskType="Numeric" Mask="##########.###" MaskType="Numeric"
EditValue="{Binding Path=X,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></common:LeftRightTextEdit> EditValue="{Binding Path=X,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></common:LeftRightTextEdit>
<TextBlock Text="Y:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0" Grid.Row="1"></TextBlock> <TextBlock Text="Y:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0" Grid.Row="1"></TextBlock>
<common:LeftRightTextEdit Grid.Row="1" Grid.Column="1" Height="30" <common:LeftRightTextEdit Grid.Row="1" Grid.Column="1" Height="30"
dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull" dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull"
dxe:NumericMaskOptions.HideInsignificantZeros="True"
dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False" dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
MaskType="Numeric" Mask="##########.###" MaskType="Numeric"
EditValue="{Binding Path=Y,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></common:LeftRightTextEdit> EditValue="{Binding Path=Y,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></common:LeftRightTextEdit>
<TextBlock Text="Z:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0" Grid.Row="2"></TextBlock> <TextBlock Text="Z:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,0" Grid.Row="2"></TextBlock>
<common:LeftRightTextEdit Grid.Row="2" Grid.Column="1" Height="30" <common:LeftRightTextEdit Grid.Row="2" Grid.Column="1" Height="30"
dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull" dxe:NumericMaskOptions.ValueAfterDelete="ZeroThenNull"
dxe:NumericMaskOptions.HideInsignificantZeros="True"
dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False" dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
MaskType="Numeric" Mask="##########.###" MaskType="Numeric"
EditValue="{Binding Path=Z,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></common:LeftRightTextEdit> EditValue="{Binding Path=Z,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></common:LeftRightTextEdit>
<!-- 编辑模式 --> <!-- 编辑模式 -->
......
VIZ.Package.Module/Page/Group/View/PageGroupView.xaml
...@@ -127,9 +127,8 @@ ...@@ -127,9 +127,8 @@
<dxg:GridColumn Header="序号" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="40" AllowResizing="False"> <dxg:GridColumn Header="序号" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="40" AllowResizing="False">
<dxg:GridColumn.CellTemplate> <dxg:GridColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<Grid Background="{Binding Path=Row.IsOpen,Converter={StaticResource RowHandleBgConverter}}"> <Grid>
<Rectangle Fill="{Binding Path=Row.IsTake,Converter={StaticResource RowHandleTakeConverter}}" <Rectangle Fill="{Binding Path=Row.IsTake,Converter={StaticResource RowHandleTakeConverter}}"></Rectangle>
Width="10" HorizontalAlignment="Left"></Rectangle>
<TextBlock Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding RowData.RowHandle,Converter={StaticResource RowHandleConverter}}"></TextBlock> <TextBlock Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding RowData.RowHandle,Converter={StaticResource RowHandleConverter}}"></TextBlock>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
...@@ -403,6 +402,17 @@ ...@@ -403,6 +402,17 @@
SelectedItems="{Binding Path=SelectedPages}" SelectedItems="{Binding Path=SelectedPages}"
ColumnsSource="{Binding ElementName=uc, Path=DataContext.Columns}" ColumnsSource="{Binding ElementName=uc, Path=DataContext.Columns}"
ColumnGeneratorTemplateSelector="{StaticResource ResourceKey=ColumnDefintionGeneratorTemplateSelector}"> ColumnGeneratorTemplateSelector="{StaticResource ResourceKey=ColumnDefintionGeneratorTemplateSelector}">
<dxg:GridControl.Resources>
<Style TargetType="{x:Type dxg:RowControl}">
<Style.Triggers>
<DataTrigger Binding="{Binding Row.IsOpen}" Value="True">
<Setter Property="Background" Value="#FF0078D7"></Setter>
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridControl.Resources>
<dxg:GridControl.ContextMenu> <dxg:GridControl.ContextMenu>
<common:ContextMenuEx BindingTargetType="{x:Type dx:DXTabControl}"> <common:ContextMenuEx BindingTargetType="{x:Type dx:DXTabControl}">
<MenuItem Header="添加命令页" Command="{Binding Path=DataContext.CreateCmdPageCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type common:ContextMenuEx}}}"/> <MenuItem Header="添加命令页" Command="{Binding Path=DataContext.CreateCmdPageCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type common:ContextMenuEx}}}"/>
......
VIZ.Package.Module/Page/Templage/View/PageTemplateView.xaml
...@@ -147,9 +147,8 @@ ...@@ -147,9 +147,8 @@
<dxg:GridColumn Header="序号" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="40" AllowResizing="False"> <dxg:GridColumn Header="序号" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="40" AllowResizing="False">
<dxg:GridColumn.CellTemplate> <dxg:GridColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<Grid Background="{Binding Path=Row.IsOpen,Converter={StaticResource RowHandleBgConverter}}"> <Grid>
<Rectangle Fill="{Binding Path=Row.IsTake,Converter={StaticResource RowHandleTakeConverter}}" <Rectangle Fill="{Binding Path=Row.IsTake,Converter={StaticResource RowHandleTakeConverter}}"></Rectangle>
Width="10" HorizontalAlignment="Left"></Rectangle>
<TextBlock Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding RowData.RowHandle,Converter={StaticResource RowHandleConverter}}"></TextBlock> <TextBlock Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding RowData.RowHandle,Converter={StaticResource RowHandleConverter}}"></TextBlock>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
......
VIZ.Package.Module/Setting/PluginMapping/View/PluginMappingSettingView.xaml
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<GroupBox Header="插件映射" Padding="10" Margin="10"> <GroupBox Header="数据模板映射" Padding="10" Margin="10">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"></RowDefinition> <RowDefinition Height="40"></RowDefinition>
......
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