From 8eb6a6c8fe153acdf6452faef6aad1f083b16bc5 Mon Sep 17 00:00:00 2001 From: chaiyunying <chaiyunying> Date: 星期一, 30 十月 2023 14:50:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev' --- _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