Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage
This commit is contained in:
commit
bcf132dd6c
4 files changed
+16
-21
No files matched your search
+12
-15
@@ -1,18 +1,16 @@
|
||||
<Page x:Class="formula_manage.View.ViewProcess"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:formula_manage.View"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="150" d:DesignWidth="405"
|
||||
Title="ViewProcess">
|
||||
|
||||
<UserControl x:Class="formula_manage.View.ViewProcess"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:formula_manage.View"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="150" d:DesignWidth="405">
|
||||
<Grid>
|
||||
<DataGrid x:Name="edit" AlternationCount="2" IsReadOnly="False"
|
||||
Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30"
|
||||
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">
|
||||
Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30"
|
||||
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">
|
||||
<DataGrid.RowStyle >
|
||||
<Style TargetType="{x:Type DataGridRow}">
|
||||
<Style.Triggers>
|
||||
@@ -52,6 +50,5 @@
|
||||
<DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" CanUserReorder="False"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
|
||||
</Grid>
|
||||
</Page>
|
||||
</UserControl>
|
||||
@@ -18,7 +18,7 @@ namespace formula_manage.View
|
||||
/// <summary>
|
||||
/// ViewProcess.xaml 的交互逻辑
|
||||
/// </summary>
|
||||
public partial class ViewProcess : Page
|
||||
public partial class ViewProcess : UserControl
|
||||
{
|
||||
public ViewProcess()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user