From f55840994436da0a2ced1632612ff27f1a738eae Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 14 十一月 2024 12:25:46 +0800
Subject: [PATCH] 修复一些bug
---
_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_pExport.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pExport_dhXMLDataListener_OnDataChanged#141.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_94_dhXMLDataListener_OnDataChanged.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bImportOutput_OnClick.def | 4 ++--
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport#94.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bExportTemplate_OnClick.def | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\04394.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\04394.def"
index cad0150..015a766 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\04394.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\04394.def"
@@ -29,7 +29,7 @@
Properties:
[
DataType: 'RecycleBin'
- FixedFilter: 'object.Name() = MP_Cell_AnnualPlanReport::GetTableName()'
+ FixedFilter: 'object.Name() = ArchiveCell_AnnualPlanReport::GetTableName()'
Source: 'RecycleBin'
Taborder: 0
Transformation: 'ExportXMLManager'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_94_dhXMLDataListener_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_94_dhXMLDataListener_OnDataChanged.def
index 0fc59da..5123d2a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_94_dhXMLDataListener_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_94_dhXMLDataListener_OnDataChanged.def
@@ -11,7 +11,7 @@
[*
if( not isnull( this.Data() )){
binaryValue := dhXMLDataListener.Data( ).Export();
- Application.Download( MP_Cell_AnnualPlanReport::GetTableName() + "_" + DateTime::Now().Format( "YM2D2H2mmss" ) + ".xlsx", binaryValue.AsBinaryData() );
+ Application.Download( ArchiveCell_AnnualPlanReport::GetTableName() + "_" + DateTime::Now().Format( "YM2D2H2mmss" ) + ".xlsx", binaryValue.AsBinaryData() );
dhXMLDataListener.Data( ).Delete();
}
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_pExport.def b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_pExport.def
index 3d3f8b4..ab29ac8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_pExport.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_pExport.def
@@ -29,7 +29,7 @@
Properties:
[
DataType: 'RecycleBin'
- FixedFilter: 'object.Name() = MP_Cell_ScheduleSummary::GetTableName()'
+ FixedFilter: 'object.Name() = ArchiveCell_ScheduleSummary::GetTableName()'
Source: 'RecycleBin'
Taborder: 0
Transformation: 'ExportXMLManager'
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pExport_dhXMLDataListener_OnDataChanged\043141.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pExport_dhXMLDataListener_OnDataChanged\043141.def"
index 3bf8450..c91451f 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pExport_dhXMLDataListener_OnDataChanged\043141.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pExport_dhXMLDataListener_OnDataChanged\043141.def"
@@ -11,7 +11,7 @@
[*
if( not isnull( this.Data() )){
binaryValue := dhXMLDataListener.Data( ).Export();
- Application.Download( MP_Cell_ScheduleSummary::GetTableName() + "_" + DateTime::Now().Format( "YM2D2H2mmss" ) + ".xlsx", binaryValue.AsBinaryData() );
+ Application.Download( ArchiveCell_ScheduleSummary::GetTableName() + "_" + DateTime::Now().Format( "YM2D2H2mmss" ) + ".xlsx", binaryValue.AsBinaryData() );
dhXMLDataListener.Data( ).Delete();
}
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bExportTemplate_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bExportTemplate_OnClick.def
index 3ccd7f9..7ac8992 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bExportTemplate_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bExportTemplate_OnClick.def
@@ -9,7 +9,7 @@
{
Body:
[*
- data := MP_Cell_ScheduleSummary::ExportOutputTemplate( Date::ActualDate().Year() );
+ data := ArchiveCell_ScheduleSummary::ExportOutputTemplate( Date::ActualDate().Year() );
Application.Download( "浜у嚭瀵煎叆妯℃澘.xlsx",data.AsBinaryData() );
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bImportOutput_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bImportOutput_OnClick.def
index 6aa27cf..324cfd2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bImportOutput_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bImportOutput_OnClick.def
@@ -27,7 +27,7 @@
generalExcelImportAndExportDataSource := GeneralExcelImportAndExportDataSource::Upload( RecycleBin, webFileBinaryData, fileName );
generalExcelImportAndExportDataSource.ReadStructure();
- MP_Cell_ScheduleSummary::ImportOutput( Archive,generalExcelImportAndExportDataSource);
+ ArchiveCell_ScheduleSummary::ImportOutput( Archive,generalExcelImportAndExportDataSource);
// 鍚庣画鍒犻櫎
generalExcelImportAndExportDataSource.Delete();
@@ -39,7 +39,7 @@
}
macroPlans := ApplicationMacroPlanner.GetLoadedMacroPlans();
- table := MP_Cell_ScheduleSummary::CreateFullTable( macroPlans,RecycleBin ,Archive, MacroPlan );
+ table := ArchiveCell_ScheduleSummary::CreateFullTable( Archive ,RecycleBin, MacroPlan );
dhScheduleSummaryTable.Data( table );
*]
--
Gitblit v1.9.3