sc
/
formula_manage
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

master
忱 沈 2 years ago
parent
7e16bed67b a91f6213e0
commit
a90d2ff03e
3 changed files with 11 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      MainWindow.xaml
  2. 4
      View/Formula.xaml
  3. 4
      View/ViewProcess.xaml

8
MainWindow.xaml
View File

@ -76,10 +76,12 @@
<ComboBox HorizontalAlignment="Left" Height="30" Margin="270,110,0,0" Text="" VerticalAlignment="Top" Width="130" FontSize="20" Focusable ="False" IsEditable="True"/> <ComboBox HorizontalAlignment="Left" Height="30" Margin="270,110,0,0" Text="" VerticalAlignment="Top" Width="130" FontSize="20" Focusable ="False" IsEditable="True"/>
</Grid> </Grid>
<DataGrid x:Name="edit" AlternationCount="2" IsReadOnly="False" <DataGrid AlternationCount="2" IsReadOnly="False"
Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30" Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False" Background="White" SelectionMode="Single"> BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False"
CanUserAddRows="True" CanUserDeleteRows="True" CanUserSortColumns="False"
Background="White" SelectionMode="Single">
<DataGrid.RowStyle > <DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
<Style.Triggers> <Style.Triggers>
@ -109,7 +111,7 @@
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.Columns> <DataGrid.Columns>
<!--列信息绑定--> <!--列信息绑定-->
<DataGridTextColumn Header="顺序" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" CanUserReorder="False" /> <DataGridTextColumn Header="顺序" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" CanUserReorder="False"/>
<DataGridTextColumn Header="原料代码" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/> <DataGridTextColumn Header="原料代码" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
<DataGridTextColumn Header="目标饱和度(%)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/> <DataGridTextColumn Header="目标饱和度(%)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False"/>
<DataGridTextColumn Header="计算单位" Width="80" FontSize="15" MaxWidth="80" MinWidth="80" CanUserReorder="False"/> <DataGridTextColumn Header="计算单位" Width="80" FontSize="15" MaxWidth="80" MinWidth="80" CanUserReorder="False"/>

4
View/Formula.xaml
View File

@ -10,7 +10,9 @@
<DataGrid x:Name="edit" AlternationCount="2" IsReadOnly="False" <DataGrid x:Name="edit" AlternationCount="2" IsReadOnly="False"
Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30" Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False" Background="White" SelectionMode="Single"> BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False"
CanUserSortColumns="False"
Background="White" SelectionMode="Single">
<DataGrid.RowStyle > <DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
<Style.Triggers> <Style.Triggers>

4
View/ViewProcess.xaml
View File

@ -10,7 +10,9 @@
<DataGrid x:Name="edit" AlternationCount="2" IsReadOnly="False" <DataGrid x:Name="edit" AlternationCount="2" IsReadOnly="False"
Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30" Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False" Background="White" SelectionMode="Single"> BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False"
CanUserSortColumns="False"
Background="White" SelectionMode="Single">
<DataGrid.RowStyle > <DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
<Style.Triggers> <Style.Triggers>

Write Preview
Loading…
Cancel
Save