chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增强应用程序异常处理机制，新增未处理异常日志记录功能，确保在启动和运行期间捕获并记录异常信息。同时，重构配置文件加载逻辑，支持用户目录覆盖默认配置，优化 SQLite 数据库连接字符串处理，确保在不同环境下的兼容性和稳定性。

Browse Source
This commit is contained in:
geht
2026-05-15 17:30:30 +08:00
parent cea4781397
commit 1b280af9e2
23 changed files with 584 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yy-admin-master/YY.Admin/Views/Dialogs/ServerSettingsDialogView.xaml
View File

@@ -2,13 +2,13 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ctls="clr-namespace:YY.Admin.Core.Controls;assembly=YY.Admin.Core"
Width="520" Height="420"
Loaded="UserControl_Loaded">
MinWidth="520">
<Border Background="White" BorderBrush="#f0f0f0" BorderThickness="1" CornerRadius="4">
<Grid Margin="0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
<!-- Auto：按表单实际高度排列，避免固定窗体高度时中间行被压扁裁切 -->
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>

18
yy-admin-master/YY.Admin/Views/Dialogs/ServerSettingsDialogView.xaml.cs
View File

@@ -1,5 +1,4 @@
using System.Windows.Controls;
using System.Windows;
namespace YY.Admin.Views.Dialogs
{
@@ -12,22 +11,5 @@ namespace YY.Admin.Views.Dialogs
{
InitializeComponent();
}
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
var win = Window.GetWindow(this);
if (win == null) return;
// 必须先关闭 AllowsTransparency，再改 WindowStyle（否则会抛出：
// 「当 AllowsTransparency 为 true 时，WindowStyle.None 是唯一有效值」）
win.AllowsTransparency = false;
win.WindowStyle = WindowStyle.SingleBorderWindow;
win.ResizeMode = ResizeMode.CanResizeWithGrip;
win.SizeToContent = SizeToContent.Manual;
win.MinWidth = 520;
win.MinHeight = 420;
if (win.Width < 520) win.Width = 520;
if (win.Height < 420) win.Height = 420;
}
}
}

3
yy-admin-master/YY.Admin/Views/Print/PrintPreviewWindow.xaml.cs
View File

@@ -6,6 +6,7 @@ using System.Text.RegularExpressions;
using System.Windows;
using YY.Admin.Core.Entity;
using YY.Admin.Core.Services;
using YY.Admin.Helper;
using YY.Admin.Services.Service.Print;
namespace YY.Admin.Views.Print;
@@ -32,6 +33,8 @@ public partial class PrintPreviewWindow : HandyControl.Controls.Window
_printDotService = printDotService;
_initialPrinterName = selectedPrinterName;
WebView.CreationProperties = WebView2UserDataFolder.CreateCreationProperties("PrintPreview");
TbTemplateName.Text = template.TemplateName ?? "（未命名）";
TbTemplateCode.Text = $"编码：{template.TemplateCode} " +
$"尺寸：{template.PaperWidthMm ?? 210}×{template.PaperHeightMm ?? 297} mm " +

2
yy-admin-master/YY.Admin/Views/RawMaterialEntry/RawMaterialCardGenerateConfirmWindow.xaml.cs
View File

@@ -10,6 +10,7 @@ using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls.Primitives;
using YY.Admin.Core.Services;
using YY.Admin.Helper;
using YY.Admin.ViewModels.RawMaterialEntry;
namespace YY.Admin.Views.RawMaterialEntry;
@@ -101,6 +102,7 @@ public partial class RawMaterialCardGenerateConfirmWindow : HandyControl.Control
Func<RawMaterialCardGeneratePlanRow, string> previewHtmlBuilder)
{
InitializeComponent();
PreviewWebView.CreationProperties = WebView2UserDataFolder.CreateCreationProperties("RawMaterialCardConfirm");
_printDotService = printDotService;
_previewHtmlBuilder = previewHtmlBuilder;
HeaderText = $"共 {planItems.Count} 张，左侧展示即将生成的原材料卡片，右侧展示业务关联打印模板预览。";

2
yy-admin-master/YY.Admin/Views/RawMaterialEntry/RawMaterialEntryOperationView.xaml.cs
View File

@@ -2,6 +2,7 @@ using System.ComponentModel;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using YY.Admin.Helper;
using YY.Admin.ViewModels.RawMaterialEntry;
namespace YY.Admin.Views.RawMaterialEntry;
@@ -14,6 +15,7 @@ public partial class RawMaterialEntryOperationView : UserControl
public RawMaterialEntryOperationView()
{
InitializeComponent();
PrintPreviewWebView.CreationProperties = WebView2UserDataFolder.CreateCreationProperties("RawMaterialEntryPreview");
Loaded += OnLoaded;
DataContextChanged += OnDataContextChanged;
Unloaded += (_, _) => DetachVm();