From c0c90ab9b08f9afb18e3c5ac63dab7fc81b630c6 Mon Sep 17 00:00:00 2001
From: zfluok <zfluok@isoftstone.com>
Date: Wed, 13 Jul 2022 15:05:40 +0800
Subject: [PATCH 1/2] 111

---
 SmartSQL/SmartSQL/UserControl/MainColumns.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SmartSQL/SmartSQL/UserControl/MainColumns.xaml.cs b/SmartSQL/SmartSQL/UserControl/MainColumns.xaml.cs
index 97bd21e..95bf4fd 100644
--- a/SmartSQL/SmartSQL/UserControl/MainColumns.xaml.cs
+++ b/SmartSQL/SmartSQL/UserControl/MainColumns.xaml.cs
@@ -332,6 +332,7 @@ namespace SmartSQL.UserControl
                 if (selectedData is TextBlock selectedText)
                 {
                     //Clipboard.SetDataObject(selectedText.Text);
+                    //
                 }
             }
         }
-- 
Gitee


From 14591f0bcd31f2efb644fc892e88a0434d811e8c Mon Sep 17 00:00:00 2001
From: zfluok <zfluok@isoftstone.com>
Date: Wed, 13 Jul 2022 17:38:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feature=20#=E5=88=86=E7=BB=84=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E8=8F=9C=E5=8D=95=E5=B1=95=E5=BC=80=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SqliteModel/ObjectGroup.cs                |  6 ++++-
 SmartSQL/SmartSQL/MainWindow.xaml             |  4 +--
 SmartSQL/SmartSQL/Views/GroupManage.xaml      | 26 ++++++++++++++++++-
 SmartSQL/SmartSQL/Views/GroupManage.xaml.cs   | 14 +++++++++-
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/SmartSQL/SmartSQL.Framework/SqliteModel/ObjectGroup.cs b/SmartSQL/SmartSQL.Framework/SqliteModel/ObjectGroup.cs
index 1fdf0b4..90603db 100644
--- a/SmartSQL/SmartSQL.Framework/SqliteModel/ObjectGroup.cs
+++ b/SmartSQL/SmartSQL.Framework/SqliteModel/ObjectGroup.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -24,6 +24,10 @@ namespace SmartSQL.Framework.SqliteModel
         /// </summary>
         public string GroupName { get; set; }
         /// <summary>
+        /// 展开层级：1.展开当前项，2.展开子项
+        /// </summary>
+        public int? OpenLevel { get; set; }
+        /// <summary>
         /// 排序标记
         /// </summary>
         public DateTime OrderFlag { get; set; }=DateTime.Now;
diff --git a/SmartSQL/SmartSQL/MainWindow.xaml b/SmartSQL/SmartSQL/MainWindow.xaml
index 41d022c..d099a09 100644
--- a/SmartSQL/SmartSQL/MainWindow.xaml
+++ b/SmartSQL/SmartSQL/MainWindow.xaml
@@ -18,9 +18,9 @@
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <!--  按键/命令监听绑定  -->
-    <Window.InputBindings>
+    <!--<Window.InputBindings>
         <KeyBinding Command="Copy" Gesture="Control + C" />
-    </Window.InputBindings>
+    </Window.InputBindings>-->
     <Window.CommandBindings>
         <CommandBinding Command="Copy" Executed="MenuSelectedItem_OnClick" />
     </Window.CommandBindings>
diff --git a/SmartSQL/SmartSQL/Views/GroupManage.xaml b/SmartSQL/SmartSQL/Views/GroupManage.xaml
index f5c2389..9cb3dbf 100644
--- a/SmartSQL/SmartSQL/Views/GroupManage.xaml
+++ b/SmartSQL/SmartSQL/Views/GroupManage.xaml
@@ -1,4 +1,4 @@
-<hc:Window
+<hc:Window
     x:Class="SmartSQL.Views.GroupManage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -133,6 +133,30 @@
                 PreviewKeyUp="TextGourpName_OnPreviewKeyUp"
                 Style="{StaticResource TextBoxExtend}"
                 TextChanged="TextGourpName_OnTextChanged" />
+            <TextBlock Margin="20,90,0,0" VerticalAlignment="Top">默认展开</TextBlock>
+            <Grid
+                Margin="0,90,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Cursor="Hand">
+                <RadioButton
+                    Name="CheckCurrent"
+                    Margin="100,0,0,0"
+                    HorizontalAlignment="Left"
+                    Content="当前项" />
+                <RadioButton
+                    Name="CheckChild"
+                    Margin="200,0,0,0"
+                    HorizontalAlignment="Left"
+                    Content="子菜单" />
+                <RadioButton
+                    Name="CheckNone"
+                    Margin="300,0,0,0"
+                    HorizontalAlignment="Left"
+                    Content="不展开"
+                    IsChecked="True" />
+            </Grid>
+
             <hc:SimpleStackPanel
                 Margin="5"
                 HorizontalAlignment="Right"
diff --git a/SmartSQL/SmartSQL/Views/GroupManage.xaml.cs b/SmartSQL/SmartSQL/Views/GroupManage.xaml.cs
index 7395e22..b2e1601 100644
--- a/SmartSQL/SmartSQL/Views/GroupManage.xaml.cs
+++ b/SmartSQL/SmartSQL/Views/GroupManage.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Configuration;
@@ -114,6 +114,9 @@ namespace SmartSQL.Views
 
                 HidId.Text = group.Id.ToString();
                 TextGourpName.Text = group.GroupName;
+                CheckCurrent.IsChecked = group.OpenLevel == 1;
+                CheckChild.IsChecked = group.OpenLevel == 2;
+                CheckNone.IsChecked = group.OpenLevel == null || group.OpenLevel == 0;
             }
         }
 
@@ -141,8 +144,11 @@ namespace SmartSQL.Views
                     Growl.Warning(new GrowlInfo { Message = $"已存在相同名称的分组名", WaitTime = 1, ShowDateTime = false });
                     return;
                 }
+                //分组菜单左侧默认展开层级
+                var openLevel = CheckCurrent.IsChecked == true ? 1 : (CheckChild.IsChecked == true ? 2 : 0);
                 var selectedGroup = (ObjectGroup)ListGroup.SelectedItems[0];
                 selectedGroup.GroupName = groupName;
+                selectedGroup.OpenLevel = openLevel;
                 sqLiteHelper.db.Update(selectedGroup);
             }
             else
@@ -153,16 +159,20 @@ namespace SmartSQL.Views
                     Growl.Warning(new GrowlInfo { Message = $"已存在相同名称的分组名", WaitTime = 1, ShowDateTime = false });
                     return;
                 }
+                //分组菜单左侧默认展开层级
+                var openLevel = CheckCurrent.IsChecked == true ? 1 : (CheckChild.IsChecked == true ? 2 : 0);
                 sqLiteHelper.db.Insert(new ObjectGroup()
                 {
                     ConnectId = Connection.ID,
                     DataBaseName = selectedDatabase.DbName,
                     GroupName = groupName,
+                    OpenLevel = openLevel,
                     OrderFlag = DateTime.Now
                 });
             }
             HidId.Text = "0";
             TextGourpName.Text = "";
+            CheckNone.IsChecked = true;
             BtnSave.IsEnabled = false;
             var connKey = Connection.ID;
             Task.Run(() =>
@@ -227,6 +237,7 @@ namespace SmartSQL.Views
                 {
                     HidId.Text = "0";
                     TextGourpName.Text = "";
+                    CheckNone.IsChecked = true;
                     BtnSave.IsEnabled = false;
                     DataList = datalist;
                     if (ChangeRefreshEvent != null)
@@ -249,6 +260,7 @@ namespace SmartSQL.Views
         {
             HidId.Text = "0";
             TextGourpName.Text = "";
+            CheckNone.IsChecked = true;
             BtnSave.IsEnabled = false;
         }
 
-- 
Gitee