1

BeDesignerSCADA/Controls/MainCanvasPanel.xaml

@@ -405,8 +405,10 @@
                                                     <ColumnDefinition Width="40"/>
                                                 </Grid.ColumnDefinitions>
                                                 <TextBox Grid.Row="2" x:Name="wenben"  Padding="5" Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap"></TextBox>
-                                                <ToggleButton Grid.Column="1" Height="20"  Content="清除"  Width="30" Margin="5,0,5,0" HorizontalAlignment="Left" Click="ClearBingToggleButton_Click"></ToggleButton>
-                                                <ToggleButton Grid.Column="1" Height="20"  Content="绑定"  Width="30" Margin="5,0,5,0" HorizontalAlignment="Left" Click="BingToggleButton_Click"></ToggleButton>
+                                                <StackPanel Grid.Column="1">
+                                                    <ToggleButton Grid.Column="1" Height="20"  Content="绑定"  Width="30" Margin="5,0,5,0" HorizontalAlignment="Left" Click="BingToggleButton_Click"></ToggleButton>
+                                                    <ToggleButton  Height="20"  Content="解绑"  Width="30" Margin="5,2,5,0" HorizontalAlignment="Right" Click="ClearBingToggleButton_Click"></ToggleButton>
+                                                </StackPanel>
                                             </Grid>
                                         </Grid>
                                     </DataTemplate>

BeDesignerSCADA/View/PropertyBindingWindow.xaml

@@ -20,22 +20,18 @@
         </Grid.RowDefinitions>
         <TextBlock  FontSize="20" Margin="10,10,0,0">属性绑定器</TextBlock>
         <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="3*"/>
-            </Grid.ColumnDefinitions>
-            <Grid>
-                <TextBlock x:Name="ProperpName" FontSize="16" TextWrapping="Wrap" HorizontalAlignment="Center" VerticalAlignment="Center">
-                    属性名称
-                </TextBlock>
-            </Grid>
-            <Grid Grid.Column="1">
-                <ComboBox x:Name="BindingName" Grid.Column="1" IsEditable="True" ></ComboBox>
-            </Grid>
+            <StackPanel>
+                <StackPanel Margin="10,0,0,10" Orientation="Horizontal">
+                    <TextBlock Foreground="Green" FontSize="16" Text="当前设置属性名称为：" TextWrapping="Wrap" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    <TextBlock x:Name="ProperpName" Foreground="Red" FontSize="14" Text="属性名称" TextWrapping="Wrap" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </StackPanel>
+                <ComboBox x:Name="BindingName" Margin="10,0,10,0" Height="24" Grid.Column="1" IsEditable="True" ></ComboBox>
+
+            </StackPanel>
         </Grid>
 
-        <StackPanel Grid.Row="2"  Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Width="80" Height="30" Content="清除绑定" x:Name="ClearBtn" Click="ClearBtn_Click" Margin="0,0,10,0"/>
+        <StackPanel Grid.Row="2" Margin="0,0,16,10" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Width="120" Height="30" Content="解除所有绑定" x:Name="ClearBtn" Click="ClearBtn_Click" Margin="0,0,10,0"/>
             <Button Width="80" Height="30" Content="取消" x:Name="CancelBtn" Click="CancelBtn_Click" IsCancel="True"/>
             <Button Width="80" Height="30" Content="确认" x:Name="ConfirmBtn" Margin="8 0 4 0" Click="ConfirmBtn_Click"/>
         </StackPanel>