@acorex/platform 21.0.0-next.89 → 21.0.0-next.90

package/fesm2022/acorex-platform-core.mjs

@@ -5704,6 +5704,24 @@ function toFilterSearchText(value) {
     }
     return undefined;
 }
+function toSortComparableValue(value, locale) {
+    if (value == null) {
+        return '';
+    }
+    if (typeof value === 'number' || typeof value === 'boolean') {
+        return value;
+    }
+    if (typeof value === 'string') {
+        return value.toLocaleLowerCase(locale);
+    }
+    if (value instanceof Date) {
+        return value.getTime();
+    }
+    if (isLocaleStringMap(value)) {
+        return resolveMultiLanguageString(value, locale).toLocaleLowerCase(locale);
+    }
+    return String(value).toLocaleLowerCase(locale);
+}
 function filterValuesAreEqual(itemRaw, condRaw) {
     if (typeof condRaw === 'string' && isLocaleStringMap(itemRaw)) {
         return Object.values(itemRaw).some((v) => v.toLowerCase() === condRaw.toLowerCase());
@@ -5922,11 +5940,11 @@ function applyFilterArray(dataArray, filters, logic = 'and') {
         return dataArray;
     }
 }
-function applySortArray(dataArray, sorts) {
+function applySortArray(dataArray, sorts, locale = 'en-US') {
     if (sorts && sorts.length > 0) {
-        const sortFields = sorts.map((s) => s.field);
-        const sortOrders = sorts.map((s) => s.dir);
-        return orderBy(dataArray, sortFields, sortOrders);
+        const iteratees = sorts.map((s) => (item) => toSortComparableValue(get(item, s.field), locale));
+        const sortOrders = sorts.map((s) => (s.dir === 'desc' ? 'desc' : 'asc'));
+        return orderBy(dataArray, iteratees, sortOrders);
     }
     else
         return dataArray;