diff --git a/src/linker.app/App.xaml.cs b/src/linker.app/App.xaml.cs index 1986fe9f..59d3d27c 100644 --- a/src/linker.app/App.xaml.cs +++ b/src/linker.app/App.xaml.cs @@ -1,6 +1,4 @@ -using linker.libs.extends; - -namespace linker.app +namespace linker.app { public partial class App : Application { @@ -23,18 +21,11 @@ namespace linker.app private void TaskScheduler_UnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e) { - HandleException(e.Exception); e.SetObserved(); } private void HandleException(Exception ex) { - //System.Diagnostics.Debug.WriteLine($"全局异常: {ex}"); - /* - MainThread.BeginInvokeOnMainThread(async () => - { - await Application.Current.MainPage.DisplayAlert("错误", $"{ex}", "确定"); - }); - */ + System.Diagnostics.Debug.WriteLine($"全局异常: {ex}"); } } } diff --git a/src/linker.app/MainPage.xaml b/src/linker.app/MainPage.xaml index 0e55df65..624561f0 100644 --- a/src/linker.app/MainPage.xaml +++ b/src/linker.app/MainPage.xaml @@ -2,7 +2,14 @@ + x:Class="linker.app.MainPage" BackgroundColor="#f4f4f4"> + + + + + + + - diff --git a/src/linker.app/MainPage.xaml.cs b/src/linker.app/MainPage.xaml.cs index 50939d5d..a0d2e95c 100644 --- a/src/linker.app/MainPage.xaml.cs +++ b/src/linker.app/MainPage.xaml.cs @@ -1,6 +1,5 @@  using linker.app.Services; -using Microsoft.Maui.Controls.PlatformConfiguration; namespace linker.app { @@ -10,9 +9,17 @@ namespace linker.app { InitializeComponent(); + LoadingOverlay.IsVisible = true; + webview.IsVisible = false; IPlatformApplication.Current.Services.GetService().OnInitialized += () => { - webview.Source = new Uri($"http://127.0.0.1:1804?t={DateTime.Now.Ticks}"); + MainThread.BeginInvokeOnMainThread(() => + { + LoadingOverlay.IsVisible = false; + webview.IsVisible = true; + webview.Source = new Uri($"http://127.0.0.1:1804?t={DateTime.Now.Ticks}"); + }); + }; } } diff --git a/src/linker.web/src/views/full/status/Export.vue b/src/linker.web/src/views/full/status/Export.vue index 87bbfc98..e7a768e3 100644 --- a/src/linker.web/src/views/full/status/Export.vue +++ b/src/linker.web/src/views/full/status/Export.vue @@ -169,12 +169,15 @@ export default { state.loading = true; saveConfig(json).then((res)=>{ state.loading = false; - state.show = false; - ElMessage.success(t('common.oper')); - - state.saveContent = res; - state.showSave = true; + if(res){ + state.show = false; + ElMessage.success(t('common.oper')); + state.saveContent = res; + state.showSave = true; + }else{ + ElMessage.error(t('common.operFail')); + } }).catch(()=>{ ElMessage.error(t('common.operFail')); state.loading = false; diff --git a/version.txt b/version.txt index bbd606c6..c742604c 100644 --- a/version.txt +++ b/version.txt @@ -1,5 +1,5 @@ v1.7.4 -2025-04-25 10:39:50 +2025-04-25 16:08:46 1. 一些优化 2. 内置应用层SNAT,用于无法使用系统NetNat的windows系统 3. 如果你设备很多,请尝试升级其中一个成功重启后再升级其它 \ No newline at end of file