From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pCurve_bCurve_OnClick.def | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pCurve_bCurve_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pCurve_bCurve_OnClick.def
index d597890..c88046e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pCurve_bCurve_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pCurve_bCurve_OnClick.def
@@ -7,7 +7,7 @@
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
[*
- return cCurveEnable.Checked();
+ //return cCurveEnable.Checked();
*]
QuillAction
{
@@ -15,7 +15,9 @@
[*
try {
uploadJsonString := Application.GetFile();
- if ( uploadJsonString <> "" ) {
+ if ( uploadJsonString <> "" and not uploadJsonString.Regex( "Curve" ) ) {
+ WebMessageBox::Error( "鏂囦欢鍚嶄笉鍖归厤" );
+ } else if ( uploadJsonString <> "" ) {
uploadJson := JSON::Parse( uploadJsonString );
Archive::VerifyTheFileName( uploadJson );
@@ -27,6 +29,8 @@
efCurve.Text( fileName );
dhBinaryDataCurve.Data( &webFileBinaryData );
dhOriginalFileNameCurve.Data( fileName );
+
+ cCurveEnable.Checked( true );
}
} onerror {
WebMessageBox::Error( e.GeneralInformation() );
--
Gitblit v1.9.3