From d598335c9e8a665cbc3c148be71ccb0a761ed9fe Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 15 十一月 2024 17:39:19 +0800
Subject: [PATCH] 修复报表的排序问题
---
_Main/BL/Type_ExportXMLData/Method_CalculatePriority.qbl | 2 +-
_Main/BL/Type_ExportXMLManager/Function_CalcFinalXML.qbl | 2 +-
_Main/BL/Type_LocalCell_Default/StaticMethod_GetColumnXML.qbl | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_ExportXMLData/Method_CalculatePriority.qbl b/_Main/BL/Type_ExportXMLData/Method_CalculatePriority.qbl
index 580dd44..2b296d3 100644
--- a/_Main/BL/Type_ExportXMLData/Method_CalculatePriority.qbl
+++ b/_Main/BL/Type_ExportXMLData/Method_CalculatePriority.qbl
@@ -13,7 +13,7 @@
priority := 2 ;
}else if( element.LikeUserLocale( "<name>Unit</name>" )){
priority := 3 ;
- }else if( element.LikeUserLocale( "<name> </name>" )){
+ }else if( element.LikeUserLocale( "<name>@EMPTY@</name>" )){
priority := 4 ;
}else if( element.LikeUserLocale( "<name>Attribute</name>" )){
priority := 5 ;
diff --git a/_Main/BL/Type_ExportXMLManager/Function_CalcFinalXML.qbl b/_Main/BL/Type_ExportXMLManager/Function_CalcFinalXML.qbl
index f3709af..2a0bc33 100644
--- a/_Main/BL/Type_ExportXMLManager/Function_CalcFinalXML.qbl
+++ b/_Main/BL/Type_ExportXMLManager/Function_CalcFinalXML.qbl
@@ -10,7 +10,7 @@
datas := selectsortedset( this,ExportXMLData,data,data.Priority() );
traverse( datas,Elements,data ){
- xmlTemplate := xmlTemplate + data.XML();
+ xmlTemplate := xmlTemplate + data.XML().ReplaceAll( "@EMPTY@"," ");
}
xmlTemplate := xmlTemplate + "</table>";
diff --git a/_Main/BL/Type_LocalCell_Default/StaticMethod_GetColumnXML.qbl b/_Main/BL/Type_LocalCell_Default/StaticMethod_GetColumnXML.qbl
index 9cb69dc..a61d5a7 100644
--- a/_Main/BL/Type_LocalCell_Default/StaticMethod_GetColumnXML.qbl
+++ b/_Main/BL/Type_LocalCell_Default/StaticMethod_GetColumnXML.qbl
@@ -22,7 +22,7 @@
columnXML := columnXML + "</column>";
}
if( type = "attribute" ){
- columnXML1 := "<column><name> </name><type>String</type>";
+ columnXML1 := "<column><name>@EMPTY@</name><type>String</type>";
traverse ( cells, Elements, cell ) {
cellXML := '<cell value="' + cell.LocalRow().Name() + '"/>'
columnXML1 := columnXML1 + cellXML;
--
Gitblit v1.9.3