@easydata/crud 1.4.10 → 1.4.12

package/dist/bundles/easydata.crud.js

@@ -1308,7 +1308,7 @@ var utils_utils;
         }
     }
     utils.strToTime = strToTime;
-    var DT_FORMAT_RGEX = /\[([^\]]+)]|y{4}|M{1,4}|d{1,2}|H{1,2}|h{1,2}|m{2}|s{2}|t{2}/g;
+    var DT_FORMAT_RGEX = /\[([^\]]+)]|y{2,4}|M{1,4}|d{1,2}|H{1,2}|h{1,2}|m{2}|s{2}|t{2}/g;
     /**
      * Returns string representation of the date/time value according to the custom format (second parameter)
      * The format is compatible with the one used in .NET: https://docs.microsoft.com/en-us/dotnet/standard/base-types/custom-date-and-time-format-strings
@@ -1317,6 +1317,7 @@ var utils_utils;
      */
     function dateTimeToStr(date, format) {
         var year = date.getFullYear();
+        var yearStr = year.toString();
         var month = date.getMonth() + 1;
         var day = date.getDate();
         var hour = date.getHours();
@@ -1325,7 +1326,8 @@ var utils_utils;
         var hour12 = hour % 12 || 12; //the remainder of the division by 12. Or 12 if it's 0
         var isPm = hour > 11;
         var matches = {
-            yyyy: year.toString(),
+            yyyy: yearStr,
+            yy: yearStr.substring(yearStr.length - 2),
             MMMM: i18n_i18n.getLongMonthName(month),
             MMM: i18n_i18n.getShortMonthName(month),
             MM: (month < 10) ? '0' + month : month.toString(),
@@ -5023,8 +5025,8 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         this.prevRowTotals = newRow;
     };
     EasyGrid.prototype.applyGroupColumnTemplate = function (template, value, count) {
-        var result = template.replace(/{{\s*GroupValue\s*}}/g, value ? "<span>" + value + "</span>" : '-');
-        result = result.replace(/{{\s*GroupCount\s*}}/g, count ? "<span>" + count + "</span>" : '-');
+        var result = template.replace(/{{\s*GroupValue\s*}}/g, value ? "" + value : '-');
+        result = result.replace(/{{\s*GroupCount\s*}}/g, count ? "" + count : '-');
         return result;
     };
     EasyGrid.prototype.renderTotalsRow = function (level, row) {