moblor-vue 0.1.55 → 0.1.56

package/dist/moblor-components.esm.js

@@ -4466,17 +4466,7 @@ var DashboardDataConvertor = /** @class */ (function (_super) {
                     showTotalIndexArray.push(index);
                 }
                 var header = {};
-                if (column.type === 'aggregate' && aggregateColumnInfo[column.column]) {
-                    header = aggregateColumnInfo[column.column];
-                    var groupingSortItems = propGroupings
-                        .filter(function (item) { return item.sortAggregate === column.column; });
-                    if (groupingSortItems && groupingSortItems.length === 1) {
-                        sortIndex = index;
-                        sortOrder = groupingSortItems[0].sortOrder.toLowerCase();
-                    }
-                    aggregateIndexArray.push(index);
-                }
-                else if (column.type === 'grouping' && groupingColumnInfo[column.column]) {
+                if (column.type === 'grouping' && groupingColumnInfo[column.column]) {
                     header = groupingColumnInfo[column.column];
                     var groupingSortItems = propGroupings
                         .filter(function (item) { return item.name === column.column; });
@@ -4491,6 +4481,16 @@ var DashboardDataConvertor = /** @class */ (function (_super) {
                         group2IndexArray.push(index);
                     }
                 }
+                else if (column.type === 'aggregate' && aggregateColumnInfo[column.column]) {
+                    header = aggregateColumnInfo[column.column];
+                    var groupingSortItems = propGroupings
+                        .filter(function (item) { return item.sortAggregate === column.column; });
+                    if (groupingSortItems && groupingSortItems.length === 1) {
+                        sortIndex = index;
+                        sortOrder = groupingSortItems[0].sortOrder.toLowerCase();
+                    }
+                    aggregateIndexArray.push(index);
+                }
                 else if (detailColumnInfo[column.column]) {
                     header = detailColumnInfo[column.column];
                 }
@@ -4595,73 +4595,71 @@ var DashboardDataConvertor = /** @class */ (function (_super) {
             }
         };
         var sortTableRows = function () {
+            var convertDateTime = function (dateString) {
+                var datetime = (new Date(dateString)).getTime();
+                return datetime;
+            };
+            var sortNumberFunction = function (aNum, bNum) {
+                if (table.headers[sortIndex].sortOrder === 'desc') {
+                    return bNum - aNum;
+                }
+                return aNum - bNum;
+            };
+            var sortStringFunction = function (aLabel, bLabel) {
+                if (table.headers[sortIndex].sortOrder === 'desc') {
+                    if (aLabel === '-' && bLabel !== '-') {
+                        return 1;
+                    }
+                    if (aLabel !== '-' && bLabel === '-') {
+                        return -1;
+                    }
+                    return bLabel.localeCompare(aLabel);
+                }
+                if (aLabel === '-' && bLabel !== '-') {
+                    return -1;
+                }
+                if (aLabel !== '-' && bLabel === '-') {
+                    return 1;
+                }
+                return aLabel.localeCompare(bLabel);
+            };
             var compare = function (a, b) {
                 var aValue = a.cells[sortIndex].value;
                 var bValue = b.cells[sortIndex].value;
                 var aLabel = (a.cells[sortIndex].label).toLowerCase();
                 var bLabel = (b.cells[sortIndex].label).toLowerCase();
+                var aNumber = 0;
+                var bNumber = 0;
                 if (sortColumnDataType === 'date'
                     || sortColumnDataType === 'datetime'
                     || sortColumnDataType === 'time') {
-                    aValue = aValue ? new Date(aValue) : aValue;
-                    bValue = bValue ? new Date(bValue) : bValue;
-                    aLabel = (aLabel && aLabel !== '-') ? new Date(aLabel) : new Date('1/1/1970 00:00 am');
-                    bLabel = (bLabel && bLabel !== '-') ? new Date(bLabel) : new Date('1/1/1970 00:00 am');
+                    aNumber = aLabel === '-'
+                        ? convertDateTime('1/1/1970 00:00 am')
+                        : convertDateTime(aValue);
+                    bNumber = bLabel === '-'
+                        ? convertDateTime('1/1/1970 00:00 am')
+                        : convertDateTime(bValue);
                 }
                 else if (sortColumnDataType === 'currency'
                     || sortColumnDataType === 'percent'
                     || sortColumnDataType === 'double'
                     || sortColumnDataType === 'int') {
-                    aValue = aValue && aValue.amount ? aValue.amount : aValue;
-                    bValue = bValue && bValue.amount ? bValue.amount : bValue;
+                    aNumber = !isNaN(parseFloat(aValue))
+                        ? parseFloat(aValue) : 0;
+                    bNumber = !isNaN(parseFloat(bValue))
+                        ? parseFloat(bValue) : 0;
                 }
-                if (sort.sortOrder === 'desc') {
-                    if (bValue) {
-                        return bValue > aValue ? 1 : -1;
-                    }
-                    return bLabel.toString().toLowerCase() > aLabel.toString().toLowerCase() ? 1 : -1;
-                }
-                if (aValue) {
-                    return aValue > bValue ? 1 : -1;
+                else {
+                    return sortStringFunction(aLabel, bLabel);
                 }
-                return aLabel > bLabel ? 1 : -1;
+                return sortNumberFunction(aNumber, bNumber);
             };
             var sortByAggregateColumn = function () { return table.rows
-                .sort(function (a, b) {
-                var aValue = a.cells[sortIndex].value;
-                var bValue = b.cells[sortIndex].value;
-                if (aValue === bValue && group1IndexArray.length > 0) {
-                    if (a.cells[0].label === b.cells[0].label && group2IndexArray.length > 0) {
-                        var aLabel = a.cells[group2IndexArray[0]].label;
-                        var bLabel = b.cells[group2IndexArray[0]].label;
-                        return aLabel.toLowerCase() > bLabel.toLowerCase() ? 1 : -1;
-                    }
-                    return (a.cells[0].label).toLowerCase() > (b.cells[0].label).toLowerCase() ? 1 : -1;
-                }
-                return compare(a, b);
-            }); };
+                .sort(function (a, b) { return compare(a, b); }); };
             var sortByGroup1Column = function () { return table.rows
-                .sort(function (a, b) {
-                var aLabel = a.cells[sortIndex].label;
-                var bLabel = b.cells[sortIndex].label;
-                if (aLabel === bLabel && group2IndexArray.length > 0) {
-                    var aGroupLabel = a.cells[group2IndexArray[0]].label;
-                    var bGroupLabel = b.cells[group2IndexArray[0]].label;
-                    return aGroupLabel.toLowerCase() > bGroupLabel.toLowerCase() ? 1 : -1;
-                }
-                return compare(a, b);
-            }); };
+                .sort(function (a, b) { return compare(a, b); }); };
             var sortByGroup2Column = function () { return table.rows
-                .sort(function (a, b) {
-                var aLabel = a.cells[sortIndex].label;
-                var bLabel = b.cells[sortIndex].label;
-                if (aLabel === bLabel) {
-                    var aFirstLabel = a.cells[0].label;
-                    var bFirstLabel = b.cells[0].label;
-                    return aFirstLabel.toLowerCase() > bFirstLabel.toLowerCase() ? 1 : -1;
-                }
-                return compare(a, b);
-            }); };
+                .sort(function (a, b) { return compare(a, b); }); };
             if (sort) {
                 if (groupingColumnInfo[sort.column]) {
                     sortColumnDataType = groupingColumnInfo[sort.column].dataType;
@@ -4722,28 +4720,30 @@ var DashboardDataConvertor = /** @class */ (function (_super) {
             if (visualizationType === 'FlexTable') {
                 var aggregateFields_1 = reportMetadata.aggregates;
                 var aggregateValues_1 = factMap['T!T'].aggregates;
-                tableColumns.forEach(function (c, index) {
-                    if (index === 0) {
-                        table.totals[index] = {
-                            label: 'Total',
-                        };
-                    }
-                    else {
-                        var field = c.column;
-                        var arr_1 = [field, "s!" + field, "a!" + field, "m!" + field, "x!" + field];
-                        var i = aggregateFields_1.findIndex(function (f) { return arr_1.includes(f); });
-                        if (i >= 0) {
+                if (showTotalIndexArray.length > 0) {
+                    tableColumns.forEach(function (c, index) {
+                        if (index === 0) {
                             table.totals[index] = {
-                                label: aggregateValues_1[i].label,
+                                label: 'Total',
                             };
                         }
                         else {
-                            table.totals[index] = {
-                                label: '-',
-                            };
+                            var field = c.column;
+                            var arr_1 = [field, "s!" + field, "a!" + field, "m!" + field, "x!" + field];
+                            var i = aggregateFields_1.findIndex(function (f) { return arr_1.includes(f); });
+                            if (i >= 0) {
+                                table.totals[index] = {
+                                    label: aggregateValues_1[i].label,
+                                };
+                            }
+                            else {
+                                table.totals[index] = {
+                                    label: '-',
+                                };
+                            }
                         }
-                    }
-                });
+                    });
+                }
             }
             else {
                 var hash_1 = caculateTotal();