dattatable 2.11.66 → 2.11.68

package/build/common/itemForm.js

@@ -534,7 +534,14 @@ var ItemForm = /** @class */ (function () {
         // See if we are rendering a display form
         if (this.IsDisplay) {
             // Call the item form button rendering event
-            var formButtons = [];
+            var formButtons = [{
+                    text: "Close",
+                    type: gd_sprest_bs_1.Components.ButtonTypes.OutlineSecondary,
+                    onClick: function () {
+                        // Hide the form
+                        _this._useModal ? _1.Modal.hide() : _1.CanvasForm.hide();
+                    }
+                }];
             formButtons = this._onFormButtonsRendering ? this._onFormButtonsRendering(formButtons) : formButtons;
             // Render the form buttons
             formButtons && formButtons.length > 0 ? gd_sprest_bs_1.Components.ButtonGroup({
@@ -551,6 +558,13 @@ var ItemForm = /** @class */ (function () {
                         // Save the form
                         _this.save().then(function () { }, function () { });
                     }
+                }, {
+                    text: "Close",
+                    type: gd_sprest_bs_1.Components.ButtonTypes.OutlineSecondary,
+                    onClick: function () {
+                        // Hide the form
+                        _this._useModal ? _1.Modal.hide() : _1.CanvasForm.hide();
+                    }
                 }];
             formButtons = this._onFormButtonsRendering ? this._onFormButtonsRendering(formButtons) : formButtons;
             // Render the form buttons

package/build/dashboard/table.js

@@ -81,6 +81,18 @@ var DataTable = /** @class */ (function () {
                         type: "full_numbers"
                     }
                 }
+            },
+            render: function (data, type, row, meta) {
+                // See if we are sorting
+                if (type == "sort") {
+                    // Get the cell element
+                    var elCell = meta.settings.aoData[meta.row].anCells[meta.col];
+                    if (elCell) {
+                        // Return the order/sort attribute, inner html or data value
+                        return elCell.getAttribute("data-order") || elCell.getAttribute("data-sort") || elCell.innerHTML || data;
+                    }
+                }
+                return data;
             }
         };
         // Render the table