From d2ec6798fa2cc711abd8c4e0bad8e4dbe431ddcc Mon Sep 17 00:00:00 2001 From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com> Date: 星期三, 01 十一月 2023 09:49:13 +0800 Subject: [PATCH] Merge branch 'dev' into dev_lrs --- _Main/UI/MacroPlannerWebApp/Component_Form633/Response_PanelPRDataButton_ButtonExportPR_OnClick.def | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form633/Response_PanelPRDataButton_ButtonExportPR_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form633/Response_PanelPRDataButton_ButtonExportPR_OnClick.def index db7b6a3..d189e36 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_Form633/Response_PanelPRDataButton_ButtonExportPR_OnClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_Form633/Response_PanelPRDataButton_ButtonExportPR_OnClick.def @@ -7,14 +7,13 @@ DefinitionID: 'Responsedef_WebButton_OnClick' Precondition: [* - return not isnull( GlobalOTDTable ); + return not isnull( GlobalOTDTable ) and not isnull( MacroPlan ); *] QuillAction { Body: [* - tableBinaryData := PRData::ExportTheFileStream( MacroPlan ).AsBinaryData(); - Application.Download( "PRData.xlsx", tableBinaryData ); + Application.Download( "PRData.xlsx", PRData::ExportTheFileStream( DataHolderChecked.Data() ).AsBinaryData() ); *] GroupServerCalls: false } -- Gitblit v1.9.3