diff --git a/SmartSQL/SmartSQL.Framework/SqliteModel/ObjectGroup.cs b/SmartSQL/SmartSQL.Framework/SqliteModel/ObjectGroup.cs
index 1fdf0b490cda64af7da15a30c052a0e6a5bc0d89..90603db7a76b6d7464bef5782d33e475da366378 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
///
public string GroupName { get; set; }
///
+ /// 展开层级:1.展开当前项,2.展开子项
+ ///
+ public int? OpenLevel { get; set; }
+ ///
/// 排序标记
///
public DateTime OrderFlag { get; set; }=DateTime.Now;
diff --git a/SmartSQL/SmartSQL/MainWindow.xaml b/SmartSQL/SmartSQL/MainWindow.xaml
index 41d022c5233316f465e39cc59e8cfc7aa068d5ec..d099a09d42019e4c5c40d2528e73397e1be6a4cf 100644
--- a/SmartSQL/SmartSQL/MainWindow.xaml
+++ b/SmartSQL/SmartSQL/MainWindow.xaml
@@ -18,9 +18,9 @@
WindowStartupLocation="CenterScreen"
mc:Ignorable="d">
-
+
diff --git a/SmartSQL/SmartSQL/UserControl/MainColumns.xaml.cs b/SmartSQL/SmartSQL/UserControl/MainColumns.xaml.cs
index 97bd21e8616e4b148ed506e7d9194603e2d59b8c..95bf4fd8c1a6c3d9f79ca234fe4d320182b6a555 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);
+ //
}
}
}
diff --git a/SmartSQL/SmartSQL/Views/GroupManage.xaml b/SmartSQL/SmartSQL/Views/GroupManage.xaml
index f5c2389632bff38e7ab8c16bacd3ea159d0bc394..9cb3dbf7efe74da29be022b8367142df07df3128 100644
--- a/SmartSQL/SmartSQL/Views/GroupManage.xaml
+++ b/SmartSQL/SmartSQL/Views/GroupManage.xaml
@@ -1,4 +1,4 @@
-
+ 默认展开
+
+
+
+
+
+
@@ -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;
}