From 58cf2a0b67de9c9550b0d5960c8967dab9c66521 Mon Sep 17 00:00:00 2001 From: feng <279202647@qq.com> Date: Thu, 13 Apr 2023 14:54:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Windows/CompetingWindow.xaml.cs | 26 +++++++++++--- .../client/src/views/competing/Index.vue | 10 +++--- .../client/src/views/competing/List.vue | 36 +++++++++++-------- .../齐越慧眼/vuepage/dist/js/app.js | 2 +- .../齐越慧眼/vuepage/dist/js/app.js.map | 2 +- 5 files changed, 51 insertions(+), 25 deletions(-) diff --git a/客户端/齐越慧眼/齐越慧眼/Windows/CompetingWindow.xaml.cs b/客户端/齐越慧眼/齐越慧眼/Windows/CompetingWindow.xaml.cs index c494c79..2982951 100644 --- a/客户端/齐越慧眼/齐越慧眼/Windows/CompetingWindow.xaml.cs +++ b/客户端/齐越慧眼/齐越慧眼/Windows/CompetingWindow.xaml.cs @@ -600,16 +600,32 @@ namespace 齐越慧眼.Windows topPanel.Visibility = Visibility.Visible; } - private void btn_save_Click(object sender, RoutedEventArgs e) + private async void btn_save_Click(object sender, RoutedEventArgs e) { - if (ApiHelper.UpdateItemCompeting(CompetingWindowViewModel.Instance.ItemList.ToList(), CompetingWindowViewModel.Instance.Item.Id)) + try { - this.DialogResult = true; + var result = await web.EvaluateScriptAsPromiseAsync("return window.checkCanSave()"); + + if (result.Success) + { + if ((bool)result.Result) + { + if (ApiHelper.UpdateItemCompeting(CompetingWindowViewModel.Instance.ItemList.ToList(), CompetingWindowViewModel.Instance.Item.Id)) + { + this.DialogResult = true; + } + else + { + WpfNoticeMsg.NoticeMessage.Show(this, "保存失败!"); + } + } + } } - else + catch { - WpfNoticeMsg.NoticeMessage.Show(this,"保存失败!"); + WpfNoticeMsg.NoticeMessage.Show(this, "保存失败!"); } + } } diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/competing/Index.vue b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/competing/Index.vue index a552091..7b0a31a 100644 --- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/competing/Index.vue +++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/competing/Index.vue @@ -114,12 +114,12 @@ 最强武将战力:{{getTop1Comment(item.CompetingItems)}} -