Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

lazhen

2024-06-14 42e52dd7a48775cd83be92cc46ea42aa124cb15c

 _Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pCurve_efCurve_OnUserChanged.def

@@ -13,11 +13,16 @@
      
      flag := not this.Text().EndsWith( ".xlsx" );
      
      if ( flag ) {
        WebMessageBox::Warning( "文件需要以.xlsx为后缀" );
        this.Text( dhOriginalFileNameCurve.Data() );
      if ( not isnull( dhBinaryDataCurve.Data() ) ) {
        if ( flag ) {
          WebMessageBox::Warning( "文件需要以.xlsx为后缀" );
          this.Text( dhOriginalFileNameCurve.Data() );
        } else {
          dhOriginalFileNameCurve.Data( this.Text() );
        }
      } else {
        dhOriginalFileNameCurve.Data( this.Text() );
        WebMessageBox::Warning( "请先上传文件在命名" );
        this.Text( "" );
      }
    *]
    GroupServerCalls: false