From 332b8d3da45f20ffa4470e6b07109ec3babd862d Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 06 十一月 2024 12:28:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl b/_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl
index a1302ef..81bbd7f 100644
--- a/_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl
+++ b/_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl
@@ -11,10 +11,16 @@
stringDate := date.Format( "Y/M2/D2");
perSuffx := ifexpr( this.CustomDate().Week() < 10,"0"+[String]this.CustomDate().Week(),[String]this.CustomDate().Week() );
value := "KW" + perSuffx + " - " + stringDate;
+ }else if( this.TimeUnit() = "Month" ){
+ us_locale := Locale::Construct( 'en_us' );
+
+ date := this.CustomDate();
+ stringDate := date.Format( "Y: MM / M" + "鏈�" ,us_locale )
+ value := stringDate;
}else{
value := this.CustomDate().Format( "Y/M2/D2" );
}
- this.WeekDate( value );
+ this.DisplayDate( value );
*]
}
--
Gitblit v1.9.3