@magic-xpa/gui 4.801.0-dev481.340 → 4.801.0-dev481.342

package/fesm2020/magic-xpa-gui.mjs

@@ -5371,7 +5371,7 @@ class DisplayConvertor {
             case StorageAttribute.DATE: {
                 if (useNative) {
                     let dt;
-                    dt = this.fromMgDateToNativeDate(mgValue, compIdx);
+                    dt = this.fromMgDateToNativeDate(mgValue, pic, compIdx);
                     return dt;
                 }
                 else {
@@ -5619,7 +5619,7 @@ class DisplayConvertor {
         let time = new NUM_TYPE(dataStr).NUM_2_ULONG();
         return this.time_2_a_pic(mask, maskSize, time, pic, time_date_pic_Z_edt, false);
     }
-    fromMgDateToNativeDate(dataStr, compIdx) {
+    fromMgDateToNativeDate(dataStr, pic, compIdx) {
         let date = new NUM_TYPE(dataStr).NUM_2_ULONG();
         let breakParams;
         breakParams = new DateBreakParams();
@@ -5628,7 +5628,45 @@ class DisplayConvertor {
             breakParams.month = breakParams.month - 1;
         if (breakParams.year == 0 && breakParams.month == 0 && breakParams.day == 0)
             return null;
-        let nativeDt = new Date(breakParams.year, breakParams.month, breakParams.day);
+        let maskStr = pic.getMask();
+        let outVal = NString.ToCharArray(maskStr);
+        let len = pic.getMaskSize();
+        let year = breakParams.year;
+        let outIdx = 0;
+        while (len > 0) {
+            switch (outVal[outIdx].charCodeAt(0)) {
+                case PICInterface.PIC_YY:
+                    {
+                        this.int_2_a(outVal, outIdx, 2, breakParams.year, '0');
+                        let yearStr = NString.FromChars(outVal);
+                        year = +yearStr.substr(outIdx);
+                        outIdx += 2;
+                        len -= 2;
+                    }
+                    break;
+                case PICInterface.PIC_YY:
+                    {
+                        this.int_2_a(outVal, outIdx, 2, breakParams.year, '0');
+                        let yearStr = NString.FromChars(outVal);
+                        year = +yearStr.substr(outIdx);
+                        outIdx += 2;
+                        len -= 2;
+                    }
+                    break;
+                case PICInterface.PIC_YYYY:
+                    this.int_2_a(outVal, outIdx, 4, year, '0');
+                    let yearStr = NString.FromChars(outVal);
+                    year = +yearStr.substr(outIdx);
+                    outIdx += 4;
+                    len -= 4;
+                    break;
+                default:
+                    outIdx++;
+                    len--;
+                    break;
+            }
+        }
+        let nativeDt = new Date(year, breakParams.month, breakParams.day);
         return nativeDt;
     }
     fromNativeDateToMgDateNumber(nativeDate, pic) {