cx 24.3.7 → 24.3.9

package/src/util/Format.js

@@ -1,242 +1,234 @@
-import {debug} from "./Debug";
-import {GlobalCacheIdentifier} from './GlobalCacheIdentifier';
-import {isNumber} from '../util/isNumber';
-import {isUndefined} from '../util/isUndefined';
-import {isArray} from '../util/isArray';
-
-//Culture dependent formatters are defined in the ui package.
-
-const defaultFormatter = v => v.toString();
-
-let formatFactory = {
-
-   string: function() {
-      return defaultFormatter
-   },
-
-   wrap: function(part0, prefix, suffix) {
-      if (!prefix)
-         prefix = '';
-
-      if (!suffix)
-         suffix = '';
-
-      return value => prefix + value.toString() + suffix;
-   },
-
-   fixed: function(part0, digits) {
-      return value => value.toFixed(digits)
-   },
-
-   prefix: function(part0, prefix) {
-      if (!prefix)
-         prefix = '';
-
-      return value => prefix + value.toString();
-   },
-
-   suffix: function(part0, suffix) {
-      if (!suffix)
-         suffix = '';
-
-      return value => value.toString() + suffix;
-   },
-
-   uppercase: function() {
-      return value => value.toString().toUpperCase();
-   },
-
-   lowercase: function() {
-      return value => value.toString().toLowerCase();
-   },
-
-   urlencode: function() {
-      return value => encodeURIComponent(value);
-   },
-   
-   number: function (part0, minFractionDigits, maxFractionDigits) {
-      let {minimumFractionDigits, maximumFractionDigits} = resolveMinMaxFractionDigits(minFractionDigits, maxFractionDigits);
-      let trimmable = maximumFractionDigits - minimumFractionDigits;
-      if (trimmable > 0) {
-         if (minimumFractionDigits == 0)
-            ++trimmable;
-         return value => trimFractionZeros(value.toFixed(maximumFractionDigits), trimmable);
-      }
-      return value => value.toFixed(maximumFractionDigits);
-   },
-
-   percentage: function (part0, minFractionDigits, maxFractionDigits) {
-      let numberFormatter = formatFactory.number(part0, minFractionDigits, maxFractionDigits);
-      return value => numberFormatter(value * 100) + '%';
-   },
-
-   percentageSign: function (part0, minFractionDigits, maxFractionDigits) {
-      let numberFormatter = formatFactory.number(part0, minFractionDigits, maxFractionDigits);
-      return value => numberFormatter(value) + '%';
-   },
-
-   date: function () {
-      return value => {
-         let date = new Date(value);
-         return `${date.getMonth() + 1}/${date.getDate()}/${date.getFullYear()}`;
-      }
-   },
-
-   time: function () {
-      return value => {
-         let date = new Date(value);
-         let h = date.getHours() >= 10 ? date.getHours() : '0' + date.getHours();
-         let m = date.getMinutes() >= 10 ? date.getMinutes() : '0' + date.getMinutes();
-         return `${h}:${m}`;
-      }
-   },
-
-   datetime: function () {
-      let date = formatFactory.date();
-      let time = formatFactory.time();
-      return value => date(value) + ' ' + time(value);
-   },
-
-   ellipsis: function (part0, length, where) {
-      length = Number(length);
-      if (!(length > 3))
-         length = 10;
-      switch (where) {
-         default:
-         case "end":
-            return (value) => {
-               let s = String(value);
-               if (s.length > length)
-                  return s.substring(0, length - 3) + "...";
-               return s;
-            };
-
-         case "start":
-            return (value) => {
-               let s = String(value);
-               if (s.length > length)
-                  return "..." + s.substring(s.length - length + 3);
-               return s;
-            };
-
-         case "middle":
-            return (value) => {
-               let s = String(value);
-               if (s.length > length) {
-                  let x = Math.floor(length - 2) / 2;
-                  return s.substring(0, x) + "..." + s.substring(s.length - (length - 3 - x));
-               }
-               return s;
-            };
-      }
-   }
-};
-
-formatFactory.s = formatFactory.str = formatFactory.string;
-formatFactory.f = formatFactory.fixed;
-formatFactory.n = formatFactory.number;
-formatFactory.p = formatFactory.percentage;
-formatFactory.ps = formatFactory.percentageSign;
-formatFactory.d = formatFactory.date;
-formatFactory.t = formatFactory.time;
-formatFactory.dt = formatFactory.datetime;
-
-function buildFormatter(format) {
-   let formatter = defaultFormatter, nullText = '';
-   if (format) {
-      let pipeParts = format.split('|');
-      nullText = pipeParts[1] || '';
-      let colonSepParts = pipeParts[0].split(':');
-      for (let i = 0; i < colonSepParts.length; i++) {
-         let parts = colonSepParts[i].split(';');
-         let factory = formatFactory[parts[0]];
-         if (!factory)
-            debug('Unknown string format: ' + format);
-         else if (i == 0)
-            formatter = factory(...parts);
-         else {
-            let outerFmt = factory(...parts);
-            let innerFmt = formatter;
-            formatter = v => outerFmt(innerFmt(v));
-         }
-      }
-   }
-   return v => (v == null || v === '') ? nullText : formatter(v);
-}
-
-let format = {
-   cache: {},
-};
-
-function getFormatCache() {
-   if (format.cacheIdentifier != GlobalCacheIdentifier.get()) {
-      format = {
-         cache: {},
-         cacheIdentifier: GlobalCacheIdentifier.get()
-      };
-   }
-   return format.cache;
-}
-
-function getFormatter(format) {
-   if (!format)
-      format = '';
-   let formatCache = getFormatCache();
-   let formatter = formatCache[format];
-   if (!formatter)
-      formatter = formatCache[format] = buildFormatter(format);
-
-   return formatter;
-}
-
-export class Format {
-
-   static value(v, format) {
-      let formatter = getFormatter(format);
-      return formatter(v);
-   }
-
-   static parse(format) {
-      return getFormatter(format);
-   }
-
-   static register(format, formatter) {
-      this.registerFactory(format, () => formatter);
-   }
-
-   static registerFactory(format, factory) {
-      if (isArray(format))
-         format.forEach(f => this.registerFactory(f, factory));
-      else
-         formatFactory[format] = factory;
-   }
-}
-
-export function resolveMinMaxFractionDigits(minimumFractionDigits, maximumFractionDigits) {
-   minimumFractionDigits = minimumFractionDigits != null ? Number(minimumFractionDigits) : minimumFractionDigits;
-   maximumFractionDigits = maximumFractionDigits != null ? Number(maximumFractionDigits) : maximumFractionDigits;
-
-   if (isNumber(minimumFractionDigits)) {
-      if (isUndefined(maximumFractionDigits))
-         maximumFractionDigits = minimumFractionDigits;
-      else if (isNumber(maximumFractionDigits) && maximumFractionDigits < minimumFractionDigits)
-         maximumFractionDigits = minimumFractionDigits;
-   }
-   else if (minimumFractionDigits == null && maximumFractionDigits == null) {
-      minimumFractionDigits = 0;
-      maximumFractionDigits = 18;
-   }
-
-   return {
-      minimumFractionDigits,
-      maximumFractionDigits
-   }
-}
-
-export function trimFractionZeros(str, max) {
-   let cnt = 0, l = str.length;
-   while (cnt < max && (str[l - 1 - cnt] === '0' || str[l - 1 - cnt] === '.'))
-      cnt++;
-
-   return cnt > 0 ? str.substring(0, l - cnt) : str;
-}
+import { debug } from "./Debug";
+import { GlobalCacheIdentifier } from "./GlobalCacheIdentifier";
+import { isNumber } from "../util/isNumber";
+import { isUndefined } from "../util/isUndefined";
+import { isArray } from "../util/isArray";
+
+//Culture dependent formatters are defined in the ui package.
+
+const defaultFormatter = (v) => v.toString();
+
+let formatFactory = {
+   string: function () {
+      return defaultFormatter;
+   },
+
+   wrap: function (part0, prefix, suffix) {
+      if (!prefix) prefix = "";
+
+      if (!suffix) suffix = "";
+
+      return (value) => prefix + value.toString() + suffix;
+   },
+
+   fixed: function (part0, digits) {
+      return (value) => value.toFixed(digits);
+   },
+
+   prefix: function (part0, prefix) {
+      if (!prefix) prefix = "";
+
+      return (value) => prefix + value.toString();
+   },
+
+   suffix: function (part0, suffix) {
+      if (!suffix) suffix = "";
+
+      return (value) => value.toString() + suffix;
+   },
+
+   uppercase: function () {
+      return (value) => value.toString().toUpperCase();
+   },
+
+   lowercase: function () {
+      return (value) => value.toString().toLowerCase();
+   },
+
+   urlencode: function () {
+      return (value) => encodeURIComponent(value);
+   },
+
+   number: function (part0, minFractionDigits, maxFractionDigits) {
+      let { minimumFractionDigits, maximumFractionDigits } = resolveMinMaxFractionDigits(
+         minFractionDigits,
+         maxFractionDigits,
+      );
+      let trimmable = maximumFractionDigits - minimumFractionDigits;
+      if (trimmable > 0) {
+         if (minimumFractionDigits == 0) ++trimmable;
+         return (value) => trimFractionZeros(value.toFixed(maximumFractionDigits), trimmable);
+      }
+      return (value) => value.toFixed(maximumFractionDigits);
+   },
+
+   percentage: function (part0, minFractionDigits, maxFractionDigits) {
+      let numberFormatter = formatFactory.number(part0, minFractionDigits, maxFractionDigits);
+      return (value) => numberFormatter(value * 100) + "%";
+   },
+
+   percentageSign: function (part0, minFractionDigits, maxFractionDigits) {
+      let numberFormatter = formatFactory.number(part0, minFractionDigits, maxFractionDigits);
+      return (value) => numberFormatter(value) + "%";
+   },
+
+   date: function () {
+      return (value) => {
+         let date = new Date(value);
+         return `${date.getMonth() + 1}/${date.getDate()}/${date.getFullYear()}`;
+      };
+   },
+
+   time: function () {
+      return (value) => {
+         let date = new Date(value);
+         let h = date.getHours() >= 10 ? date.getHours() : "0" + date.getHours();
+         let m = date.getMinutes() >= 10 ? date.getMinutes() : "0" + date.getMinutes();
+         return `${h}:${m}`;
+      };
+   },
+
+   datetime: function () {
+      let date = formatFactory.date();
+      let time = formatFactory.time();
+      return (value) => date(value) + " " + time(value);
+   },
+
+   ellipsis: function (part0, length, where) {
+      length = Number(length);
+      if (!(length > 3)) length = 10;
+      switch (where) {
+         default:
+         case "end":
+            return (value) => {
+               let s = String(value);
+               if (s.length > length) return s.substring(0, length - 3) + "...";
+               return s;
+            };
+
+         case "start":
+            return (value) => {
+               let s = String(value);
+               if (s.length > length) return "..." + s.substring(s.length - length + 3);
+               return s;
+            };
+
+         case "middle":
+            return (value) => {
+               let s = String(value);
+               if (s.length > length) {
+                  let x = Math.floor(length - 2) / 2;
+                  return s.substring(0, x) + "..." + s.substring(s.length - (length - 3 - x));
+               }
+               return s;
+            };
+      }
+   },
+};
+
+formatFactory.s = formatFactory.str = formatFactory.string;
+formatFactory.f = formatFactory.fixed;
+formatFactory.n = formatFactory.number;
+formatFactory.p = formatFactory.percentage;
+formatFactory.ps = formatFactory.percentageSign;
+formatFactory.d = formatFactory.date;
+formatFactory.t = formatFactory.time;
+formatFactory.dt = formatFactory.datetime;
+
+function buildFormatter(format) {
+   let formatter = defaultFormatter,
+      nullText = "";
+   if (format) {
+      let pipeParts = format.split("|");
+      nullText = pipeParts[1] || "";
+      let colonSepParts = pipeParts[0].split(":");
+      for (let i = 0; i < colonSepParts.length; i++) {
+         let parts = colonSepParts[i].split(";");
+         let factory = formatFactory[parts[0]];
+         if (!factory) debug("Unknown string format: " + format);
+         else if (i == 0) formatter = factory(...parts);
+         else {
+            let outerFmt = factory(...parts);
+            let innerFmt = formatter;
+            formatter = (v) => outerFmt(innerFmt(v));
+         }
+      }
+   }
+   return (v) => (v == null || v === "" ? nullText : formatter(v));
+}
+
+let format = {
+   cache: {},
+};
+
+function getDefaultFormatCache() {
+   if (format.cacheIdentifier != GlobalCacheIdentifier.get()) {
+      format = {
+         cache: {},
+         cacheIdentifier: GlobalCacheIdentifier.get(),
+      };
+   }
+   return format.cache;
+}
+
+let getFormatCache = getDefaultFormatCache;
+
+export function setGetFormatCacheCallback(callback) {
+   getFormatCache = callback;
+}
+
+function getFormatter(format) {
+   if (!format) format = "";
+   let formatCache = getFormatCache();
+   let formatter = formatCache[format];
+   if (!formatter) formatter = formatCache[format] = buildFormatter(format);
+
+   return formatter;
+}
+
+export class Format {
+   static value(v, format) {
+      let formatter = getFormatter(format);
+      return formatter(v);
+   }
+
+   static parse(format) {
+      return getFormatter(format);
+   }
+
+   static register(format, formatter) {
+      this.registerFactory(format, () => formatter);
+   }
+
+   static registerFactory(format, factory) {
+      if (isArray(format)) format.forEach((f) => this.registerFactory(f, factory));
+      else formatFactory[format] = factory;
+   }
+}
+
+export function resolveMinMaxFractionDigits(minimumFractionDigits, maximumFractionDigits) {
+   minimumFractionDigits = minimumFractionDigits != null ? Number(minimumFractionDigits) : minimumFractionDigits;
+   maximumFractionDigits = maximumFractionDigits != null ? Number(maximumFractionDigits) : maximumFractionDigits;
+
+   if (isNumber(minimumFractionDigits)) {
+      if (isUndefined(maximumFractionDigits)) maximumFractionDigits = minimumFractionDigits;
+      else if (isNumber(maximumFractionDigits) && maximumFractionDigits < minimumFractionDigits)
+         maximumFractionDigits = minimumFractionDigits;
+   } else if (minimumFractionDigits == null && maximumFractionDigits == null) {
+      minimumFractionDigits = 0;
+      maximumFractionDigits = 18;
+   }
+
+   return {
+      minimumFractionDigits,
+      maximumFractionDigits,
+   };
+}
+
+export function trimFractionZeros(str, max) {
+   let cnt = 0,
+      l = str.length;
+   while (cnt < max && (str[l - 1 - cnt] === "0" || str[l - 1 - cnt] === ".")) cnt++;
+
+   return cnt > 0 ? str.substring(0, l - cnt) : str;
+}

package/src/widgets/grid/Grid.js

@@ -43,6 +43,7 @@ import { unfocusElement } from "../../ui/FocusManager";
 import { tooltipMouseMove, tooltipMouseLeave } from "../overlay/tooltip-ops";
 import { Container } from "../../ui/Container";
 import { findFirstChild } from "../../util/DOM";
+import { Binding } from "../../data/Binding";
 
 export class Grid extends Container {
    declareData(...args) {
@@ -910,9 +911,9 @@ export class Grid extends Container {
                   }
 
                   if (colSpan > 1) skip = colSpan - 1;
-               } else if (c.aggregate && c.aggregateAlias && c.caption !== false) {
+               } else if (c.aggregate && c.aggregateAliasGetter && c.caption !== false) {
                   empty = false;
-                  v = group[c.aggregateAlias];
+                  v = c.aggregateAliasGetter(group);
                   if (isString(ci.data.format)) v = Format.value(v, ci.data.format);
                }
 
@@ -993,9 +994,9 @@ export class Grid extends Container {
                }
 
                if (colSpan > 1) skip = colSpan - 1;
-            } else if (c.aggregate && c.aggregateAlias && c.footer !== false) {
+            } else if (c.aggregate && c.aggregateAliasGetter && c.footer !== false) {
                empty = false;
-               v = group[c.aggregateAlias];
+               v = c.aggregateAliasGetter(group);
                if (isString(ci.data.format)) v = Format.value(v, ci.data.format);
             }
 
@@ -1594,9 +1595,11 @@ class GridComponent extends VDOM.Component {
             </tbody>
          );
 
+         let dataRecordClass = CSS.element(baseClass, "data");
+
          let isDataRecord = widget.buffered
-            ? (item) => item.props?.instance?.data?.class == "cxe-grid-data"
-            : (item) => item.props?.record?.type;
+            ? (item) => item?.props?.instance?.data?.class == dataRecordClass
+            : (item) => item?.props?.record?.type;
 
          let index = 0;
          while (index < children.length && !isDataRecord(children[index])) index++;
@@ -3108,6 +3111,7 @@ class GridColumnHeader extends Widget {
       if (!this.aggregateField && this.field) this.aggregateField = this.field;
 
       if (!this.aggregateAlias) this.aggregateAlias = this.aggregateField;
+      if (this.aggregateAlias) this.aggregateAliasGetter = Binding.get(this.aggregateAlias).value;
 
       if (this.footer && isSelector(this.footer))
          this.footer = {