💄 fix #新建连接页面样式优化

JcongJason · Mar 27, 2023 · 9a04ed3 · 9a04ed3
1 parent ba1c854
commit 9a04ed3
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 44 deletions.
diff --git a/SmartSQL/SmartSQL.Framework/SqliteModel/GroupInfo.cs b/SmartSQL/SmartSQL.Framework/SqliteModel/GroupInfo.cs
@@ -34,11 +34,26 @@ public class GroupInfo
         /// <summary>
         /// 排序标记
         /// </summary>
-        public DateTime OrderFlag { get; set; }=DateTime.Now;
+        public DateTime OrderFlag { get; set; } = DateTime.Now;
         /// <summary>
         /// 对象数量
         /// </summary>
-        public int SubCount { get; set; }
+        private int _subCount;
+        public int SubCount
+        {
+            get
+            {
+                var sqLiteHelper = new SQLiteHelper();
+                var groupCount = sqLiteHelper.db
+                    .Table<GroupObjects>()
+                    .Count(x => x.GroupId == Id);
+                return groupCount;
+            }
+            set
+            {
+                _subCount = value;
+            }
+        }
         [Ignore]
         public bool IsSelected { get; set; }
     }

diff --git a/SmartSQL/SmartSQL/UserControl/Connect/ConnectMainUC.xaml b/SmartSQL/SmartSQL/UserControl/Connect/ConnectMainUC.xaml
@@ -13,13 +13,17 @@
     mc:Ignorable="d">
     <Grid>
         <Grid Height="40" VerticalAlignment="Top">
-            <Image Source="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
+            <Border BorderThickness="0" CornerRadius="8 8 0 0 ">
+                <Border.Background>
+                    <ImageBrush ImageSource="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
+                </Border.Background>
+            </Border>
             <StackPanel Margin="20,12,0,0" HorizontalAlignment="Left">
                 <TextBlock FontWeight="Bold" Foreground="#36425a">选择连接类型</TextBlock>
             </StackPanel>
         </Grid>
         <ListBox
-            Margin="15,40,15,0"
+            Margin="0,40,0,0"
             Padding="0,20,0,30"
             BorderThickness="0"
             Cursor="Arrow"

diff --git a/SmartSQL/SmartSQL/UserControl/Connect/DmUC .xaml b/SmartSQL/SmartSQL/UserControl/Connect/DmUC .xaml
@@ -13,11 +13,12 @@
     mc:Ignorable="d">
 
     <Grid>
-        <Grid
-            Height="50"
-            VerticalAlignment="Top"
-            Background="#e3e4e7">
-            <Image Source="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
+        <Grid Height="50" VerticalAlignment="Top">
+            <Border BorderThickness="0" CornerRadius="8 8 0 0 ">
+                <Border.Background>
+                    <ImageBrush ImageSource="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
+                </Border.Background>
+            </Border>
             <StackPanel>
                 <TextBlock
                     Margin="20,18"
@@ -36,7 +37,7 @@
                     Source="pack://application:,,,/Resources/svg/[email protected]" />
             </StackPanel>
         </Grid>
-        <Grid Margin="0,50,0,0">
+        <Grid Margin="0,50,0,0" Background="White">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="100" />
                 <ColumnDefinition Width="*" />

diff --git a/SmartSQL/SmartSQL/UserControl/Connect/MySqlUC.xaml b/SmartSQL/SmartSQL/UserControl/Connect/MySqlUC.xaml
@@ -14,7 +14,11 @@
 
     <Grid>
         <Grid Height="50" VerticalAlignment="Top">
-            <Image Source="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
+            <Border BorderThickness="0" CornerRadius="8 8 0 0 ">
+                <Border.Background>
+                    <ImageBrush ImageSource="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
+                </Border.Background>
+            </Border>
             <StackPanel>
                 <TextBlock
                     Margin="20,18"
@@ -33,7 +37,7 @@
                     Source="pack://application:,,,/Resources/svg/[email protected]" />
             </StackPanel>
         </Grid>
-        <Grid Margin="0,50,0,0">
+        <Grid Margin="0,50,0,0" Background="White">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="100" />
                 <ColumnDefinition Width="*" />

diff --git a/SmartSQL/SmartSQL/UserControl/Connect/OracleUC.xaml b/SmartSQL/SmartSQL/UserControl/Connect/OracleUC.xaml
@@ -13,11 +13,12 @@
     mc:Ignorable="d">
 
     <Grid>
-        <Grid
-            Height="50"
-            VerticalAlignment="Top"
-            Background="#e3e4e7">
-            <Image Source="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
+        <Grid Height="50" VerticalAlignment="Top">
+            <Border BorderThickness="0" CornerRadius="8 8 0 0 ">
+                <Border.Background>
+                    <ImageBrush ImageSource="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
+                </Border.Background>
+            </Border>
             <StackPanel>
                 <TextBlock
                     Margin="20,18"
@@ -36,7 +37,7 @@
                     Source="pack://application:,,,/Resources/svg/[email protected]" />
             </StackPanel>
         </Grid>
-        <Grid Margin="0,50,0,0">
+        <Grid Margin="0,50,0,0" Background="White">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="100" />
                 <ColumnDefinition Width="*" />

diff --git a/SmartSQL/SmartSQL/UserControl/Connect/PostgreSqlUC.xaml b/SmartSQL/SmartSQL/UserControl/Connect/PostgreSqlUC.xaml
@@ -13,7 +13,11 @@
     mc:Ignorable="d">
     <Grid>
         <Grid Height="50" VerticalAlignment="Top">
-            <Image Source="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
+            <Border BorderThickness="0" CornerRadius="8 8 0 0 ">
+                <Border.Background>
+                    <ImageBrush ImageSource="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
+                </Border.Background>
+            </Border>
             <StackPanel>
                 <TextBlock
                     Margin="20,18"
@@ -32,7 +36,7 @@
                     Source="pack://application:,,,/Resources/svg/[email protected]" />
             </StackPanel>
         </Grid>
-        <Grid Margin="0,50,0,0">
+        <Grid Margin="0,50,0,0" Background="White">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="100" />
                 <ColumnDefinition Width="*" />

diff --git a/SmartSQL/SmartSQL/UserControl/Connect/SqlServerUC.xaml b/SmartSQL/SmartSQL/UserControl/Connect/SqlServerUC.xaml
@@ -12,27 +12,35 @@
     Loaded="SqlServerUC_OnLoaded"
     mc:Ignorable="d">
     <Grid>
-        <Grid Height="50" VerticalAlignment="Top">
-            <Image Source="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
-            <StackPanel>
-                <TextBlock
-                    Margin="20,18"
-                    HorizontalAlignment="Left"
-                    FontWeight="Bold"
-                    Foreground="#697b8c"
-                    Text="SQLServer 连接设置" />
-            </StackPanel>
-            <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center">
-                <svgc:SvgViewbox
-                    Width="50"
-                    Height="45"
-                    Margin="5"
-                    HorizontalAlignment="Left"
-                    IsHitTestVisible="False"
-                    Source="pack://application:,,,/Resources/svg/[email protected]" />
-            </StackPanel>
+        <Grid
+            Height="50"
+            VerticalAlignment="Top">
+            <Grid>
+                <Border BorderThickness="0" CornerRadius="8 8 0 0 ">
+                    <Border.Background>
+                        <ImageBrush ImageSource="pack://application:,,,/Resources/Img/connect_bg.png" />
+                    </Border.Background>
+                </Border>
+                <StackPanel>
+                    <TextBlock
+                        Margin="20,18"
+                        HorizontalAlignment="Left"
+                        FontWeight="Bold"
+                        Foreground="#697b8c"
+                        Text="SQLServer 连接设置" />
+                </StackPanel>
+                <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center">
+                    <svgc:SvgViewbox
+                        Width="50"
+                        Height="45"
+                        Margin="5"
+                        HorizontalAlignment="Left"
+                        IsHitTestVisible="False"
+                        Source="pack://application:,,,/Resources/svg/[email protected]" />
+                </StackPanel>
+            </Grid>
         </Grid>
-        <Grid Margin="0,50,0,0">
+        <Grid Margin="0,50,0,0" Background="White">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="100" />
                 <ColumnDefinition Width="*" />

diff --git a/SmartSQL/SmartSQL/UserControl/Connect/SqliteUC.xaml b/SmartSQL/SmartSQL/UserControl/Connect/SqliteUC.xaml
@@ -13,7 +13,11 @@
     mc:Ignorable="d">
     <Grid>
         <Grid Height="50" VerticalAlignment="Top">
-            <Image Source="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
+            <Border BorderThickness="0" CornerRadius="8 8 0 0 ">
+                <Border.Background>
+                    <ImageBrush ImageSource="pack://application:,,,/Resources/Img/connect_bg.png" Stretch="Fill" />
+                </Border.Background>
+            </Border>
             <StackPanel>
                 <TextBlock
                     Margin="20,18"
@@ -32,7 +36,7 @@
                     Source="pack://application:,,,/Resources/svg/[email protected]" />
             </StackPanel>
         </Grid>
-        <Grid Margin="0,50,0,0">
+        <Grid Margin="0,50,0,0" Background="White">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="100" />
                 <ColumnDefinition Width="*" />

diff --git a/SmartSQL/SmartSQL/Views/Category/GroupsView.xaml b/SmartSQL/SmartSQL/Views/Category/GroupsView.xaml
@@ -124,7 +124,6 @@
                                         <TextBlock
                                             Margin="5,1,5,1"
                                             VerticalAlignment="Center"
-                                            FontWeight="Bold"
                                             Foreground="{StaticResource ThirdlyTextBrush}"
                                             Text="{Binding SubCount}" />
                                     </Border>

diff --git a/SmartSQL/SmartSQL/Views/ConnectManage.xaml b/SmartSQL/SmartSQL/Views/ConnectManage.xaml
@@ -165,7 +165,7 @@
         <Grid
             Grid.Column="1"
             Margin="0,5,5,5"
-            Background="White">
+            Background="Transparent">
             <Grid>
                 <UserControl Name="UcMainContent" Content="{Binding MainContent}" />
             </Grid>