From 1afe548ac40cc7f975917ef9bf2e156595cf81f3 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 16 四月 2026 08:58:04 +0800
Subject: [PATCH] 优化；
---
HMI.MenuManage/Modal/MenuModal.xaml.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/HMI.MenuManage/Modal/MenuModal.xaml.cs b/HMI.MenuManage/Modal/MenuModal.xaml.cs
index 3936180..35d2ffb 100644
--- a/HMI.MenuManage/Modal/MenuModal.xaml.cs
+++ b/HMI.MenuManage/Modal/MenuModal.xaml.cs
@@ -39,7 +39,6 @@
set { Set(ref parentSource, value); }
}
-
protected override void OnClosing(CancelEventArgs e)
{
//Press Continue Button
@@ -65,7 +64,8 @@
}
catch (Exception ex)
{
- ToastHelper.Error(this, "Error锛�");
+ MenuManage.PluginLog.Error("Modal Commit Error.", ex);
+ ToastHelper.Error(this, ex.Message);
e.Cancel = true;
return;
}
@@ -85,7 +85,7 @@
string sql = $"SELECT 1 FROM menu WHERE code='{TbCode.Text}'{segment};";
if (sqliteHelper.HasData(sql))
{
- err = $"{LangUtil.Get("HMI.Menu.Code")}{LangUtil.Get("HMI.Menu.CodeMustBeUnique")}";
+ err = this.lang("App.MustBeUnique", LangUtil.Get("HMI.Menu.Code")); ;
return false;
}
return true;
@@ -118,6 +118,7 @@
Data.ParentCode = TbParentCode.SelectedValue?.ToString();
Data.DllPath = TbDllPath.Text;
Data.ClassName = TbClassName.Text;
+ Data.Sort = NiSort.Value;
}
return flag;
}
@@ -154,6 +155,7 @@
TbParentCode.SelectedValue = Data.ParentCode;
TbDllPath.Text = Data.DllPath;
TbClassName.Text = Data.ClassName;
+ NiSort.Value = Data.Sort;
return this.ShowDialog();
}
@@ -171,10 +173,10 @@
public void InsertMenu(MenuData data)
{
- string sql = $@"INSERT INTO menu (code,name,icon,level,type,parentCode,dllPath,className)
+ string sql = $@"INSERT INTO menu (code,name,icon,level,type,parentCode,dllPath,className,sort)
VALUES
('{data.Code}','{data.Name}','{data.Icon}','{data.Level}','{data.Type}','{data.ParentCode}',
- '{data.DllPath}','{data.ClassName}');";
+ '{data.DllPath}','{data.ClassName}',{data.Sort});";
sqliteHelper.ExecuteSql(sql);
}
@@ -182,7 +184,7 @@
{
string sql = $@"UPDATE menu SET code='{data.Code}',name='{data.Name}',
icon='{data.Icon}',level='{data.Level}',type='{data.Type}',parentCode='{data.ParentCode}',
-dllPath='{data.DllPath}',className='{data.ClassName}' WHERE id='{data.Id}';";
+dllPath='{data.DllPath}',className='{data.ClassName}',sort={data.Sort} WHERE id='{data.Id}';";
sqliteHelper.ExecuteSql(sql);
}
@@ -202,7 +204,7 @@
// string FileName = openFileDialog.FileName;
// if (!FileName.StartsWith(BasePath))
// {
- // Panuon.WPF.UI.Toast.Show(this, "璇峰皢鍥炬爣绉诲姩鑷崇▼搴廔con鐩綍涓嬶紒", ToastPosition.Top);
+ // (this, "璇峰皢鍥炬爣绉诲姩鑷崇▼搴廔con鐩綍涓嬶紒", ToastPosition.Top);
// }
// else
// {
--
Gitblit v1.9.1