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

lihongji

2024-06-28 890bde3948fb93abb133993a8e9c70fb452ed23e

 _Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl

ÎļþÃû´Ó _Main/BL/Type_ArchivePR/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()  );