From ccfadb626ee9918181f935cd9ef7668a5357dacf Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 02 一月 2025 20:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_OnOK.def | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_OnOK.def
index 5d5f39e..68ce532 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_OnOK.def
@@ -6,7 +6,14 @@
Body:
[*
// On ok
- Form.ApplyChanges();
+
+ if ( isnull( DataHolderDialogData.Data() ) ) {
+ ShiftDayTime::CreateData( MacroPlan, dtsStart.DateTime(),
+ dtsEnd.DateTime(), ddslName.Text() );
+ } else {
+ ShiftDayTime::EditData( MacroPlan, DataHolderDialogData.Data(), dtsStart.DateTime(),
+ dtsEnd.DateTime(), ddslName.Text() );
+ }
Form.Close();
*]
--
Gitblit v1.9.3