From 890bde3948fb93abb133993a8e9c70fb452ed23e Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期五, 28 六月 2024 15:58:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/_Main/BL/Type_ArchivePR/StaticMethod_Compared.qbl b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl
similarity index 83%
rename from _Main/BL/Type_ArchivePR/StaticMethod_Compared.qbl
rename to _Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl
index 75469e5..d7d8942 100644
--- a/_Main/BL/Type_ArchivePR/StaticMethod_Compared.qbl
+++ b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl
@@ -2,25 +2,25 @@
#parent: #root
StaticMethod Compared (
RecycleBin recycleBin,
- const ArchivePR baseVersion,
- const ArchivePR compareVersion
+ String baseVersionPath,
+ String compareVersionPath
) as LocalTable
{
TextBody:
[*
// rislai Jun-20-2024 (created)
- localTable := recycleBin.LocalTable( relnew,Name := baseVersion.Name() + "__" + compareVersion.Name());
+ localTable := recycleBin.LocalTable( relnew,Name := baseVersionPath + "__" + compareVersionPath);
baseVersionFile := OSFile::Construct();
compareVersionFile := OSFile::Construct();
try {
- baseVersionFile.Open( baseVersion.FilePath(), "Read", false );
- baseVersionDataSource := GeneralExcelImportAndExportDataSource::Upload( recycleBin, baseVersionFile.ReadBinary(), baseVersion.FilePath() );
+ baseVersionFile.Open( baseVersionPath, "Read", false );
+ baseVersionDataSource := GeneralExcelImportAndExportDataSource::Upload( recycleBin, baseVersionFile.ReadBinary(), baseVersionPath );
baseVersionDataSource.ReadStructure();
- compareVersionFile.Open( compareVersion.FilePath(), "Read", false );
- compareVersionDataSource := GeneralExcelImportAndExportDataSource::Upload( recycleBin, compareVersionFile.ReadBinary(), compareVersion.FilePath() );
+ compareVersionFile.Open( compareVersionPath, "Read", false );
+ compareVersionDataSource := GeneralExcelImportAndExportDataSource::Upload( recycleBin, compareVersionFile.ReadBinary(), compareVersionPath );
compareVersionDataSource.ReadStructure();
baseVersionTable := select( baseVersionDataSource, GeneralExcelImportAndExportDataTable, tempGEIAEDT, true );
@@ -34,14 +34,14 @@
baseVersionRows := construct( GeneralExcelImportAndExportDataRows ,constcontent);
compareVersionRowTree := NamedValueTree::Create();
compareVersionRows := construct( GeneralExcelImportAndExportDataRows ,constcontent);
- ArchivePR::FillRows( baseVersionTable,rowKeys,baseVersionRowTree,baseVersionRows );
- ArchivePR::FillRows( compareVersionTable,rowKeys,compareVersionRowTree,compareVersionRows );
+ LocalCell_DemandComparison::FillRows( baseVersionTable,rowKeys,baseVersionRowTree,baseVersionRows );
+ LocalCell_DemandComparison::FillRows( compareVersionTable,rowKeys,compareVersionRowTree,compareVersionRows );
// 鐢熸垚鍒楁暟鎹�
columnTree := NamedValueTree::Create();
columns := construct( LocalColumns );
- ArchivePR::GenerateColumnIndex( baseVersionTable,localTable,columnTree,columns );
- ArchivePR::GenerateColumnIndex( compareVersionTable,localTable,columnTree,columns );
+ LocalCell_DemandComparison::GenerateColumnIndex( baseVersionTable,localTable,columnTree,columns );
+ LocalCell_DemandComparison::GenerateColumnIndex( compareVersionTable,localTable,columnTree,columns );
columnNames := selectvalues( columns,Elements,column,true,column.Name() );
// 鐢熸垚鏁版嵁
@@ -55,8 +55,8 @@
compareVersionCellTree := NamedValueTree::Create();
compareVersionCells := construct( GeneralExcelImportAndExportDataCells ,constcontent);
- ArchivePR::FillCells( rowKey,baseVersionRowTree,baseVersionRows,baseVersionCellTree,baseVersionCells );
- ArchivePR::FillCells( rowKey,compareVersionRowTree,compareVersionRows,compareVersionCellTree,compareVersionCells );
+ LocalCell_DemandComparison::FillCells( rowKey,baseVersionRowTree,baseVersionRows,baseVersionCellTree,baseVersionCells );
+ LocalCell_DemandComparison::FillCells( rowKey,compareVersionRowTree,compareVersionRows,compareVersionCellTree,compareVersionCells );
row := localTable.LocalRow( relnew,Index := localTable.GetRowIndexCache() );
--
Gitblit v1.9.3