From f7f6be18517348b6ebf76846a6b75fbb37936354 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Fri, 14 Oct 2022 17:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A7=E4=BB=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmartClient.SCADAControl.csproj        |   8 +++
 .../CustomerControls/TheCheckBox.xaml.cs      |  12 ++++-
 .../CustomerControls/TheImage.xaml            |   2 +-
 .../CustomerControls/TheImage.xaml.cs         |   3 +-
 .../CustomerControls/TheRadioButton.cs        |  10 ++++
 .../CustomerControls/TheTabControl.xaml.cs    |   2 +-
 .../DLL/BPASmartClient.Compiler.dll           | Bin 55808 -> 56320 bytes
 .../Images/Image_32x32.png                    | Bin 0 -> 1828 bytes
 .../Images/暂无图片.png                   | Bin 0 -> 3667 bytes
 .../Themes/Generic.xaml                       |  51 ++++++------------
 BeDesignerSCADA/Controls/CanvasPanelNew.xaml  |   2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)
 create mode 100644 BPASmartClient.SCADAControl/Images/Image_32x32.png
 create mode 100644 BPASmartClient.SCADAControl/Images/暂无图片.png

diff --git a/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj b/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj
index fa35891c..90ffcd71 100644
--- a/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj
+++ b/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj
@@ -23,6 +23,7 @@
     <None Remove="Images\Cb_HalfChecked.png" />
     <None Remove="Images\databj.png" />
     <None Remove="Images\Exp.png" />
+    <None Remove="Images\Image_32x32.png" />
     <None Remove="Images\leftImage.png" />
     <None Remove="Images\mqtt.png" />
     <None Remove="Images\mqttrun.png" />
@@ -53,6 +54,7 @@
     <None Remove="Images\拉出.png" />
     <None Remove="Images\收缩.png" />
     <None Remove="Images\日期1.png" />
+    <None Remove="Images\暂无图片.png" />
     <None Remove="Images\矩形边框.png" />
     <None Remove="Images\矩形边框1.png" />
     <None Remove="Images\系统名称.png" />
@@ -124,6 +126,9 @@
     <Resource Include="Images\Exp.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Images\Image_32x32.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\leftImage.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
@@ -223,6 +228,9 @@
     <Resource Include="Images\日期1.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Images\暂无图片.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\矩形边框.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs
index ec3c34d7..9896f911 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs
@@ -31,10 +31,20 @@ namespace BPASmartClient.SCADAControl.CustomerControls
         public TheCheckBox()
         {
             InitializeComponent();
+            
             Content = "勾选框";
             VerticalContentAlignment = VerticalAlignment.Center;
+            this.Loaded += TheButton_Loaded;
+        }
+        private void TheButton_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (this.ActualWidth == 54 && this.Content.ToString()== "勾选框")
+            {
+                Content = "勾选框";
+                Width = 60;
+                Height = 30;
+            }
         }
-
         public string ControlType => "控件";
 
 
diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml b/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml
index 83869b10..363028a6 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml
@@ -5,5 +5,5 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:BPASmartClient.SCADAControl.CustomerControls"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800" Source="/BPASmartClient.SCADAControl;component/Images/State0.png">
+             d:DesignHeight="450" d:DesignWidth="800" Source="/BPASmartClient.SCADAControl;component/Images/暂无图片.png" Stretch="Fill">
 </Image>
diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml.cs
index 72140c14..c475d7b1 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml.cs
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml.cs
@@ -29,8 +29,7 @@ namespace BPASmartClient.SCADAControl.CustomerControls
         public TheImage()
         {
             InitializeComponent();
-            Stretch = Stretch.UniformToFill;
-            //SetCurrentValue(SourceProperty, new BitmapImage(new Uri("pack://application:,,,/Images/借出.png", UriKind.Absolute)));
+            Stretch = Stretch.Fill;
             Width = 80;
             Height = 80;
         }
diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheRadioButton.cs b/BPASmartClient.SCADAControl/CustomerControls/TheRadioButton.cs
index 9fb6131b..21ed5e25 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheRadioButton.cs
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheRadioButton.cs
@@ -27,6 +27,16 @@ namespace BPASmartClient.SCADAControl.CustomerControls
             languageResDic.Source = new Uri(@"/BPASmartClient.SCADAControl;component/Themes/Generic.xaml",UriKind.RelativeOrAbsolute);
             this.Resources.MergedDictionaries.Add(languageResDic);
             SetCurrentValue(ContentProperty, "单选按钮");
+            this.Loaded += TheButton_Loaded;
+        }
+        private void TheButton_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (this.ActualWidth <= 70 && this.Content.ToString() == "单选按钮")
+            {
+                Content = "单选按钮";
+                Width = 78;
+                Height = 24;
+            }
         }
         static TheRadioButton()
         {
diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheTabControl.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheTabControl.xaml.cs
index 4af03091..48f7a29f 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheTabControl.xaml.cs
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheTabControl.xaml.cs
@@ -42,7 +42,7 @@ namespace BPASmartClient.SCADAControl.CustomerControls
         {
             try
             {
-                object _header = (this.SelectedItem as TabItem).Header;
+                object _header = (this.SelectedItem as TabItem)?.Header;
                 TabItems?.ToList().ForEach(par =>
                 {
                     if (_header!=null && par.Header == (string)_header)
diff --git a/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll b/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll
index c77b1d4f276535ff435161f578c5df3ff460a01d..d7bb62ee2d56c84e101ae9e1d2f192176df12ea0 100644
GIT binary patch
delta 24288
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
X`@S8%cmAWu#l3du?|&&Z_OSn7gDE9~

delta 23923
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

diff --git a/BPASmartClient.SCADAControl/Images/Image_32x32.png b/BPASmartClient.SCADAControl/Images/Image_32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..c272ba4a0c0e6159736bdd710aea40940975b7ab
GIT binary patch
literal 1828
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
SmsQ>X0000<MNUMnLSTYFokdgt

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Images/暂无图片.png b/BPASmartClient.SCADAControl/Images/暂无图片.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4db00b0c8f54db443963d27d3c5fe2058b879d6
GIT binary patch
literal 3667
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Themes/Generic.xaml b/BPASmartClient.SCADAControl/Themes/Generic.xaml
index 1eb6d38d..305b450b 100644
--- a/BPASmartClient.SCADAControl/Themes/Generic.xaml
+++ b/BPASmartClient.SCADAControl/Themes/Generic.xaml
@@ -395,7 +395,7 @@
             <Setter Property="BorderBrush" Value="Transparent" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="../Images/button2.png" />
+                    <ImageBrush ImageSource="../Images/button1.png" />
                 </Setter.Value>
             </Setter>
             <Setter Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
@@ -427,20 +427,12 @@
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="true">
-                                <Setter TargetName="BD" Property="Background">
-                                    <Setter.Value>
-                                        <ImageBrush ImageSource="../Images/button2.png" />
-                                    </Setter.Value>
-                                </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource MeunSelectForeground}" />
+                                <Setter TargetName="BD" Property="Opacity" Value="1"/>
+                                <Setter TargetName="textBlock" Property="Opacity" Value="1" />
                             </Trigger>
                             <Trigger Property="IsChecked" Value="False">
-                                <Setter TargetName="BD" Property="Background">
-                                    <Setter.Value>
-                                        <ImageBrush ImageSource="../Images/button1.png" />
-                                    </Setter.Value>
-                                </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
+                                <Setter TargetName="BD" Property="Opacity" Value="0.5"/>
+                                <Setter TargetName="textBlock" Property="Opacity" Value="0.5" />
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonUnSelectForeground}" />
@@ -500,7 +492,7 @@
     </Style>
 
     <Style TargetType="{x:Type ctrl:NumberBox}">
-        <Setter Property="BorderBrush" Value="{x:Static Themes1:ClassicBorderDecorator.ClassicBorderBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource borderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="Foreground" Value="{DynamicResource foreground}" />
@@ -519,9 +511,10 @@
                 <ControlTemplate TargetType="{x:Type TextBox}">
                     <Themes1:ClassicBorderDecorator
                         x:Name="Bd"
-                        BorderBrush="{DynamicResource borderBrush}"
                         BorderStyle="None"
-                        BorderThickness="1">
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}">
                         <ScrollViewer x:Name="PART_ContentHost" />
                     </Themes1:ClassicBorderDecorator>
                     <ControlTemplate.Triggers>
@@ -758,14 +751,10 @@
                         SnapsToDevicePixels="True">
                         <Grid>
                             <Image
-                                Width="12"
-                                Height="14"
-                                Source="../Images/Cb_HalfChecked.png" />
+                                Source="../Images/Cb_HalfChecked.png" Margin="0,8,2,8" VerticalAlignment="Center" />
                             <Image
                                 x:Name="image1"
-                                Width="12"
-                                Height="14"
-                                Source="../Images/Cb_HalfChecked.png" />
+                                Source="../Images/Cb_HalfChecked.png" Margin="0,8,2,8" VerticalAlignment="Center" />
                         </Grid>
                         <ContentPresenter
                             Margin="{TemplateBinding Padding}"
@@ -1505,23 +1494,13 @@
                 <ControlTemplate TargetType="{x:Type RadioButton}">
                     <BulletDecorator VerticalAlignment="Center" Background="Transparent">
                         <BulletDecorator.Bullet>
-                            <Grid>
-                                <Ellipse
-                                    x:Name="Border"
-                                    Width="10"
-                                    Height="10"
-                                    Fill="{TemplateBinding Background}" />
-                                <Ellipse
-                                    x:Name="Dot"
-                                    Width="5"
-                                    Height="5"
-                                    Fill="#ff8a03"
-                                    Visibility="Hidden" />
+                            <Grid Height="{TemplateBinding Height}" Width="{TemplateBinding Height}">
+                                <Ellipse  x:Name="Border" Margin="0,5,10,5"  Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}"/>
+                                <Ellipse  x:Name="Dot" Width="{Binding Width,ElementName=Border}" Height="{Binding Height,ElementName=Border}" Margin="0,5,10,5"  Fill="{TemplateBinding Foreground}"  />
                             </Grid>
-
                         </BulletDecorator.Bullet>
                         <ContentPresenter
-                            Margin="{TemplateBinding Padding}"
+                            Margin="-5,0,0,0"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             RecognizesAccessKey="True" />
diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
index fddbac28..1b28f4a1 100644
--- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
+++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
@@ -472,7 +472,7 @@
 
 
                             <!--代码绑定模块-->
-                            <mypro:EditorTemplateDefinition TargetProperties="ClickExec,ValueChangedExecute,TikcExecute,CheckedExec,UnCheckedExec,ChuLiaoExecute,StopChuLiaoExecute" >
+                            <mypro:EditorTemplateDefinition TargetProperties="ClickStr,ClickExec,ValueChangedExecute,TikcExecute,CheckedExec,UnCheckedExec,ChuLiaoExecute,StopChuLiaoExecute" >
                                 <mypro:EditorTemplateDefinition.EditingTemplate>
                                     <DataTemplate>
                                         <Grid>