@easydata/crud 1.4.4 → 1.4.5

package/dist/bundles/easydata.crud.js

@@ -4181,7 +4181,7 @@ var CellRendererType;
 })(CellRendererType || (CellRendererType = {}));
 var StringCellRendererDefault = function (value, column, cellValueElement, rowElement) {
     var text = value ? value.toString().replace(/\n/g, '\u21B5 ') : '';
-    cellValueElement.innerHTML = text;
+    cellValueElement.innerText = text;
     cellValueElement.title = text;
     if (column.align == GridColumnAlign.NONE) {
         cellValueElement.classList.add(cssPrefix + "-cell-value-align-left");
@@ -4200,7 +4200,7 @@ var NumberCellRendererDefault = function (value, column, cellValueElement, rowEl
             strValue = value.toLocaleString();
         }
     }
-    cellValueElement.innerHTML = strValue;
+    cellValueElement.innerText = strValue;
     cellValueElement.title = strValue;
     if (column.align == GridColumnAlign.NONE) {
         cellValueElement.classList.add(cssPrefix + "-cell-value-align-right");
@@ -4232,7 +4232,7 @@ var DateTimeCellRendererDefault = function (value, column, cellValueElement, row
             }
         }
     }
-    cellValueElement.innerHTML = strValue;
+    cellValueElement.innerText = strValue;
     cellValueElement.title = strValue;
     if (column.align == GridColumnAlign.NONE) {
         cellValueElement.classList.add(cssPrefix + "-cell-value-align-right");
@@ -7121,7 +7121,7 @@ var text_filter_widget_TextFilterWidget = /** @class */ (function () {
     };
     TextFilterWidget.prototype.inputKeydownHandler = function (ev) {
         if (ev.keyCode == 13) {
-            this.applyFilter();
+            this.applyFilter(true);
         }
     };
     TextFilterWidget.prototype.inputKeyupHandler = function () {
@@ -7130,29 +7130,31 @@ var text_filter_widget_TextFilterWidget = /** @class */ (function () {
             clearTimeout(this.applyFilterTimeout);
         }
         this.applyFilterTimeout = setTimeout(function () {
-            _this.applyFilter();
+            _this.applyFilter(true);
         }, this.options.instantTimeout);
     };
     TextFilterWidget.prototype.clearButtonClickHander = function () {
         this.filterInput.value = '';
         this.filterInput.focus();
-        this.applyFilter();
+        this.applyFilter(true);
     };
     TextFilterWidget.prototype.searchButtonClickHandler = function () {
-        this.applyFilter();
+        this.applyFilter(true);
     };
-    TextFilterWidget.prototype.applyFilter = function () {
+    TextFilterWidget.prototype.applyFilter = function (checkChange) {
         var _this = this;
         if (this.applyFilterTimeout) {
             clearTimeout(this.applyFilterTimeout);
         }
         var filterValue = this.filter.getValue();
-        if (filterValue != this.filterInput.value) {
+        if (!checkChange || filterValue != this.filterInput.value) {
             this.filter.apply(this.filterInput.value)
                 .then(function (data) {
                 _this.grid.setData(data);
             });
+            return true;
         }
+        return false;
     };
     TextFilterWidget.prototype.highlightCellRenderer = function (defaultRenderer, value, column, cellElement, rowElement) {
         if (utils_utils.isNumericType(column.type)
@@ -7167,7 +7169,12 @@ var text_filter_widget_TextFilterWidget = /** @class */ (function () {
                 else {
                     value = value.toLocaleString();
                 }
-                value = this.highlightText(value.toString());
+                var result = this.highlightText(value.toString());
+                if (result instanceof HTMLElement) {
+                    cellElement.title = value;
+                    cellElement.appendChild(result);
+                    return;
+                }
             }
         }
         defaultRenderer(value, column, cellElement, rowElement);
@@ -7176,8 +7183,6 @@ var text_filter_widget_TextFilterWidget = /** @class */ (function () {
         var normalizedContent = content.toLowerCase();
         var filterValue = this.filter.getValue().toString();
         if (filterValue && filterValue.length > 0 && content && content.length > 0) {
-            var insertValue1 = "<span style='background-color: yellow'>";
-            var insertValue2 = "</span>";
             var indexInMas = [];
             var words = filterValue.split('||').map(function (w) { return w.trim().toLowerCase(); });
             for (var i = 0; i < words.length; i++) {
@@ -7186,7 +7191,10 @@ var text_filter_widget_TextFilterWidget = /** @class */ (function () {
                 if (!lowerWord.length)
                     continue;
                 if (lowerWord === normalizedContent) {
-                    return insertValue1 + content + insertValue2;
+                    var highlightSpan = document.createElement('span');
+                    highlightSpan.style.backgroundColor = 'yellow';
+                    highlightSpan.innerText = content;
+                    return highlightSpan;
                 }
                 while (pos < content.length - 1) {
                     var index = normalizedContent.indexOf(lowerWord, pos);
@@ -7226,24 +7234,24 @@ var text_filter_widget_TextFilterWidget = /** @class */ (function () {
                         i++;
                     }
                 }
-                var result = '';
+                var div = document.createElement('div');
                 for (var i = 0; i < indexInMas.length; i++) {
                     if (i === 0) {
-                        result += content.substring(0, indexInMas[i].index);
-                    }
-                    result += insertValue1
-                        + content.substring(indexInMas[i].index, indexInMas[i].index + indexInMas[i].length)
-                        + insertValue2;
-                    if (i < indexInMas.length - 1) {
-                        result += content.substring(indexInMas[i].index
-                            + indexInMas[i].length, indexInMas[i + 1].index);
-                    }
-                    else {
-                        result += content.substring(indexInMas[i].index
-                            + indexInMas[i].length);
+                        var text_1 = document.createTextNode(content.substring(0, indexInMas[i].index));
+                        div.appendChild(text_1);
                     }
+                    var highlightSpan = document.createElement('span');
+                    highlightSpan.style.backgroundColor = 'yellow';
+                    highlightSpan.innerText = content.substring(indexInMas[i].index, indexInMas[i].index + indexInMas[i].length);
+                    div.appendChild(highlightSpan);
+                    var text = (i < indexInMas.length - 1)
+                        ? document.createTextNode(content.substring(indexInMas[i].index
+                            + indexInMas[i].length, indexInMas[i + 1].index))
+                        : document.createTextNode(content.substring(indexInMas[i].index
+                            + indexInMas[i].length));
+                    div.appendChild(text);
                 }
-                content = result;
+                return div;
             }
         }
         return content;
@@ -8086,7 +8094,7 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
                 }).toDOM();
                 _this.slot.insertBefore(filterBarDiv, gridSlot);
                 var dataFilter = _this.context.createFilter();
-                new text_filter_widget_TextFilterWidget(filterWidgetSlot_1, _this.grid, dataFilter);
+                _this.filterWidget = new text_filter_widget_TextFilterWidget(filterWidgetSlot_1, _this.grid, dataFilter);
             }
         });
     };
@@ -8140,7 +8148,7 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
     };
     EntityDataView.prototype.editClickHandler = function (ev, rowIndex) {
         var _this = this;
-        this.context.getData().getRow(rowIndex)
+        this.grid.getData().getRow(rowIndex)
             .then(function (row) {
             if (row) {
                 _this.showEditForm(row);
@@ -8179,7 +8187,7 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
     };
     EntityDataView.prototype.deleteClickHandler = function (ev, rowIndex) {
         var _this = this;
-        this.context.getData().getRow(rowIndex)
+        this.grid.getData().getRow(rowIndex)
             .then(function (row) {
             if (row) {
                 var activeEntity = _this.context.getActiveEntity();
@@ -8220,7 +8228,13 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
         var _this = this;
         return this.context.fetchDataset()
             .then(function () {
-            _this.grid.refresh();
+            var processed = false;
+            if (_this.filterWidget) {
+                processed = _this.filterWidget.applyFilter(false);
+            }
+            if (!processed) {
+                _this.grid.refresh();
+            }
         });
     };
     return EntityDataView;