From 42e52dd7a48775cd83be92cc46ea42aa124cb15c Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 14 六月 2024 13:06:19 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pIDS_efIDS_OnUserChanged.def |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pIDS_efIDS_OnUserChanged.def b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pIDS_efIDS_OnUserChanged.def
index 6330dfd..cfa61ff 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pIDS_efIDS_OnUserChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pIDS_efIDS_OnUserChanged.def
@@ -13,11 +13,16 @@
       
       flag := not this.Text().EndsWith( ".xlsx" );
       
-      if ( flag ) {
-        WebMessageBox::Warning( "鏂囦欢闇�瑕佷互.xlsx涓哄悗缂�" );
-        this.Text( dhOriginalFileNameIDS.Data() );
+      if ( not isnull( dhBinaryDataIDS.Data() ) ) {
+        if ( flag ) {
+          WebMessageBox::Warning( "鏂囦欢闇�瑕佷互.xlsx涓哄悗缂�" );
+          this.Text( dhOriginalFileNameIDS.Data() );
+        } else {
+          dhOriginalFileNameIDS.Data( this.Text() );
+        }
       } else {
-        dhOriginalFileNameIDS.Data( this.Text() );
+        WebMessageBox::Warning( "璇峰厛涓婁紶鏂囦欢鍦ㄥ懡鍚�" );
+        this.Text( "" );
       }
     *]
     GroupServerCalls: false

--
Gitblit v1.9.3