@zeedhi/common 1.88.1 → 1.89.1

package/LICENSE

@@ -0,0 +1,24 @@
+MIT License
+
+Copyright (c) 2019 Zeedhi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+This repository includes one file originally copied from https://github.com/vuetifyjs/vuetify/
+under /blob/v1.5.16/packages/vuetify/src/util/, mask.ts.

package/dist/zd-common.esm.js

@@ -3147,6 +3147,7 @@ class Dialog extends Component {
                     }
                 },
                 stop: true,
+                index: 89,
             },
             esc: {
                 event: () => {
@@ -3162,6 +3163,7 @@ class Dialog extends Component {
                         this.hide();
                     }
                 },
+                index: 89,
                 stop: true,
             },
         };
@@ -5721,41 +5723,13 @@ FormatterParserProvider.registerFormatter('column_ZdSelect', ({ column, value, r
     if (!Object.keys(currentRow).length)
         return typeof value === 'object' ? '' : value;
     const textColumn = formatterDataText || dataText;
-    if (textColumn) {
-        if (typeof textColumn === 'string') {
-            return currentRow[textColumn] || value;
-        }
-        const dataTextNames = [];
-        const masks = [];
-        textColumn.forEach((text) => {
-            if (typeof text === 'string') {
-                dataTextNames.push(text);
-                masks.push('');
-            }
-            else {
-                dataTextNames.push(text.name);
-                if (Accessor.isAccessorDefinition(text.mask)) {
-                    const [controller, accessor] = Accessor.getAccessor(text.mask);
-                    masks.push(Loader.getInstance(controller)[accessor]);
-                }
-                else {
-                    masks.push(text.mask);
-                }
-            }
-        });
-        return dataTextNames.reduce((result, columnName, index) => {
-            const rowCell = currentRow[columnName];
-            if (rowCell !== undefined && rowCell !== null) {
-                const separator = index > 0 ? (dataTextSeparator || ' | ') : '';
-                const mask = masks[index];
-                const maskValue = typeof mask === 'function' ? mask(rowCell) : mask;
-                const masked = masks[index] ? Mask.getValueWithMask(rowCell, maskValue) : rowCell;
-                return result + separator + masked;
-            }
-            return result;
-        }, '');
+    if (!textColumn)
+        return value;
+    if (typeof textColumn === 'string') {
+        return currentRow[textColumn] || value;
     }
-    return value;
+    const formatterFn = FormatterParserProvider.getFormatter('ZdSelect');
+    return formatterFn(currentRow, { dataText: textColumn, dataTextSeparator });
 });
 FormatterParserProvider.registerFormatter('column_ZdSelectMultiple', ({ column, value, row, componentProps, }) => {
     if (!value || !Array.isArray(value) || value.length === 0)
@@ -5955,21 +5929,25 @@ class Grid extends Iterable {
             up: {
                 event: this.navigateUp.bind(this),
                 stop: true,
+                index: 99,
                 active: true,
             },
             down: {
                 event: this.navigateDown.bind(this),
                 stop: true,
+                index: 99,
                 active: true,
             },
             pageup: {
                 event: this.navigatePageUp.bind(this),
                 stop: true,
+                index: 99,
                 active: true,
             },
             pagedown: {
                 event: this.navigatePageDown.bind(this),
                 stop: true,
+                index: 99,
                 active: true,
             },
         };
@@ -6357,6 +6335,7 @@ class GridEditable extends Grid {
          * Enter edit mode on double click
          */
         this.doubleClickEdit = false;
+        this.singleEdit = false;
         /**
          * Edited rows
          * @private
@@ -6376,6 +6355,7 @@ class GridEditable extends Grid {
         this.cancelEditedRowsKeyMapping = {
             esc: {
                 event: this.cancelEditedRows.bind(this),
+                index: 99,
                 stop: true,
                 input: true,
                 active: true,
@@ -6385,6 +6365,7 @@ class GridEditable extends Grid {
         this.doubleClickEdit = this.getInitValue('doubleClickEdit', props.doubleClickEdit, this.doubleClickEdit);
         this.canEditRow = this.getInitValue('canEditRow', props.canEditRow, this.canEditRow);
         this.editingNewRows = this.getInitValue('editingNewRows', props.editingNewRows, this.editingNewRows);
+        this.singleEdit = this.getInitValue('singleEdit', props.singleEdit, this.singleEdit);
         this.createAccessors();
     }
     onMounted(element) {
@@ -6493,6 +6474,13 @@ class GridEditable extends Grid {
             });
         }
     }
+    getVisibleValue(row, column) {
+        const key = row[this.datasource.uniqueKey];
+        if (this.editedRows[key] && Object.prototype.hasOwnProperty.call(this.editedRows[key], column.name)) {
+            return this.editedRows[key][column.name];
+        }
+        return row[column.name];
+    }
     /**
      * Returns editable component properties based on the column definition
      * @param column Column definition
@@ -6503,13 +6491,7 @@ class GridEditable extends Grid {
     getEditableComponent(column, row, cellProps, events) {
         const key = row[this.datasource.uniqueKey];
         const compName = this.getCompName(key, column.name);
-        let colValue;
-        if (this.editedRows[key] && Object.prototype.hasOwnProperty.call(this.editedRows[key], column.name)) {
-            colValue = this.editedRows[key][column.name];
-        }
-        else {
-            colValue = row[column.name];
-        }
+        const colValue = this.getVisibleValue(row, column);
         const componentProps = merge({}, column.componentProps, cellProps === null || cellProps === void 0 ? void 0 : cellProps.componentProps);
         let compEvents = {};
         if (componentProps && componentProps.events) {
@@ -6650,7 +6632,9 @@ class GridEditable extends Grid {
      */
     cancelEditedRows() {
         return __awaiter(this, void 0, void 0, function* () {
+            const { page } = this.datasource;
             yield this.cancelAddedRows();
+            yield this.datasource.setPage(page);
             this.editing = false;
             this.editedRows = {};
             this.invalidComponents = {};
@@ -6658,7 +6642,7 @@ class GridEditable extends Grid {
     }
     cancelAddedRows() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { data, page } = this.datasource;
+            const { data } = this.datasource;
             const allData = this.datasource.allData || data;
             Promise.resolve(allData);
             for (let index = allData.length - 1; index >= 0; index -= 1) {
@@ -6668,8 +6652,6 @@ class GridEditable extends Grid {
                 }
             }
             yield this.datasource.updateData(allData);
-            yield this.datasource.get();
-            yield this.datasource.setPage(page);
         });
     }
     addDataRow(row) {
@@ -6685,6 +6667,7 @@ class GridEditable extends Grid {
      */
     saveEditedRows(revalidate = false) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { page } = this.datasource;
             yield this.cancelAddedRows();
             const response = yield Promise.all(this.getEditedRows(revalidate).map((row) => this.addDataRow(row)));
             this.editing = false;
@@ -6692,7 +6675,7 @@ class GridEditable extends Grid {
             this.addedRows = {};
             this.invalidComponents = {};
             this.addedRows = {};
-            yield this.datasource.get();
+            yield this.datasource.setPage(page);
             return response;
         });
     }
@@ -6701,7 +6684,7 @@ class GridEditable extends Grid {
      * @param revalidate Defines if the fields should be revalidated
      * @throws Will throw when it finds an invalid row
      */
-    getEditedRows(revalidate = false) {
+    getEditedRows(revalidate = false, silent = false) {
         const editedRows = [];
         Object.keys(this.editedRows).forEach((key) => {
             const row = Object.assign(Object.assign({}, this.editedRows[key].originalRow), this.editedRows[key]);
@@ -6712,7 +6695,7 @@ class GridEditable extends Grid {
                     delete row[`${attr}_original`];
                 }
             });
-            if (!this.isGridValid(revalidate)) {
+            if (!silent && !this.isGridValid(revalidate)) {
                 throw new Error('Invalid rows');
             }
             editedRows.push(row);
@@ -7484,16 +7467,19 @@ class Select extends TextInput {
                 yield this.setValue(this.value, false);
                 this.removePushedValue();
             }
-            if (this.pushedValue && this.indexOf(this.pushedValue) === -1) {
-                const filterValue = this.pushedValue[this.dataValue];
-                const foundInData = this.datasource.data.find(this.getCondition(filterValue));
-                if (!foundInData) {
-                    this.datasource.data.unshift(this.pushedValue);
-                }
-            }
+            this.insertSelected();
             return response;
         });
     }
+    insertSelected() {
+        if (this.datasource.search || !this.pushedValue || this.indexOf(this.pushedValue) !== -1)
+            return;
+        const filterValue = this.pushedValue[this.dataValue];
+        const foundInData = this.datasource.data.find(this.getCondition(filterValue));
+        if (!foundInData) {
+            this.datasource.data.unshift(this.pushedValue);
+        }
+    }
     get search() {
         return this.searchValue;
     }
@@ -7773,14 +7759,14 @@ class Select extends TextInput {
     loadMore() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.datasource.setLimit(this.datasource.limit + this.loadMoreQtty);
-            if (!this.datasource.search) {
-                this.afterLoad();
-                const { dataValue } = this;
-                const isSelected = this.selectValue && this.pushedValue && this.selectValue[dataValue] === this.pushedValue[dataValue];
-                if (isSelected)
-                    return;
-                this.removePushedValue();
-            }
+            if (this.datasource.search)
+                return;
+            this.afterLoad();
+            const { dataValue } = this;
+            const isSelected = this.selectValue && this.pushedValue && this.selectValue[dataValue] === this.pushedValue[dataValue];
+            if (isSelected)
+                return;
+            this.removePushedValue();
         });
     }
     /**
@@ -9889,7 +9875,6 @@ class SelectMultiple extends Select {
             const parsedValue = this.parserFn(value, this);
             if (parsedValue !== this.datasource.search) {
                 yield this.datasource.setSearch(parsedValue);
-                this.insertSelected();
             }
         });
     }
@@ -9918,6 +9903,7 @@ class SelectMultiple extends Select {
                 yield this.updateSearch(value);
             }
             else {
+                this.datasource.search = value;
                 if (!this.manualMode) {
                     this.datasource.data = [...this.cachedData];
                     this.datasource.total = this.cachedTotal;
@@ -9945,29 +9931,11 @@ class SelectMultiple extends Select {
         if (!value || value.length === 0) {
             return [];
         }
-        const dataTextNames = [];
-        const masks = [];
-        this.dataText.forEach((text) => {
-            if (typeof text === 'string') {
-                dataTextNames.push(text);
-                masks.push('');
-            }
-            else {
-                dataTextNames.push(text.name);
-                masks.push(text.mask);
-            }
-        });
+        const selectFormatter = FormatterParserProvider.getFormatter('ZdSelect');
         const formattedValue = value.map((row) => {
             const isDisabled = this.dataDisabled && row[this.dataDisabled];
             const formattedRow = { value: row[this.dataValue], disabled: isDisabled, originalRow: row };
-            formattedRow.text = dataTextNames.reduce((result, columnName, index) => {
-                if (row[columnName]) {
-                    const separator = index > 0 ? this.dataTextSeparator : '';
-                    const masked = masks[index] ? Mask.getValueWithMask(row[columnName], masks[index]) : row[columnName];
-                    return result + separator + masked;
-                }
-                return result;
-            }, '');
+            formattedRow.text = selectFormatter(row, this);
             return formattedRow;
         });
         return formattedValue;
@@ -9997,7 +9965,6 @@ class SelectMultiple extends Select {
                 const foundInData = this.datasource.data.find(this.getCondition(value));
                 return !foundInData;
             });
-            this.insertSelected();
             if (!this.datasource.search) {
                 this.setCache();
             }
@@ -10069,9 +10036,6 @@ class SelectMultiple extends Select {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.preventLoadOnFocus) {
                 yield this.datasource.get();
-                const values = this.datasource.data.map((row) => row[this.dataValue]);
-                // remove inserted items that are already in datasource
-                this.insertedValues = this.insertedValues.filter((inserted) => !values.includes(inserted[this.dataValue]));
                 this.preventLoadOnFocus = true;
             }
             this.setCache();
@@ -12643,11 +12607,13 @@ class TreeGrid extends Grid {
             right: {
                 event: this.navigateToggle.bind(this, false),
                 stop: true,
+                index: 99,
                 active: true,
             },
             left: {
                 event: this.navigateToggle.bind(this, true),
                 stop: true,
+                index: 99,
                 active: true,
             },
         };
@@ -12884,6 +12850,7 @@ class TreeGridEditable extends TreeGrid {
           * Editing rows
           */
         this.editing = false;
+        this.singleEdit = false;
         /**
           * Edited rows
           * @private
@@ -12901,6 +12868,7 @@ class TreeGridEditable extends TreeGrid {
         this.cancelEditedRowsKeyMapping = {
             esc: {
                 event: this.cancelEditedRows.bind(this),
+                index: 99,
                 stop: true,
                 input: true,
                 active: true,
@@ -12908,6 +12876,7 @@ class TreeGridEditable extends TreeGrid {
         };
         this.doubleClickEdit = this.getInitValue('doubleClickEdit', props.doubleClickEdit, this.doubleClickEdit);
         this.canEditRow = this.getInitValue('canEditRow', props.canEditRow, this.canEditRow);
+        this.singleEdit = this.getInitValue('singleEdit', props.singleEdit, this.singleEdit);
         this.noDataSlot = this.changeDefaultSlotNames(this.noDataSlot);
         this.createAccessors();
     }
@@ -13017,6 +12986,13 @@ class TreeGridEditable extends TreeGrid {
             });
         }
     }
+    getVisibleValue(row, column) {
+        const key = row[this.datasource.uniqueKey];
+        if (this.editedRows[key] && Object.prototype.hasOwnProperty.call(this.editedRows[key], column.name)) {
+            return this.editedRows[key][column.name];
+        }
+        return row[column.name];
+    }
     /**
      * Returns editable component properties based on the column definition
      * @param column Column definition
@@ -13027,13 +13003,7 @@ class TreeGridEditable extends TreeGrid {
     getEditableComponent(column, row, cellProps, events) {
         const key = row[this.datasource.uniqueKey];
         const compName = this.getCompName(key, column.name);
-        let colValue;
-        if (this.editedRows[key] && Object.prototype.hasOwnProperty.call(this.editedRows[key], column.name)) {
-            colValue = this.editedRows[key][column.name];
-        }
-        else {
-            colValue = row[column.name];
-        }
+        const colValue = this.getVisibleValue(row, column);
         const componentProps = merge({}, column.componentProps, cellProps.componentProps);
         let compEvents = {};
         if (componentProps && componentProps.events) {
@@ -13129,10 +13099,24 @@ class TreeGridEditable extends TreeGrid {
      * @param column Column
      * @param row Row
      */
-    isValid(column, row) {
+    isValid(column, row, revalidate = false) {
         const key = row[this.datasource.uniqueKey];
         const compName = this.getCompName(key, column.name);
-        return !Object.prototype.hasOwnProperty.call(this.invalidComponents, compName);
+        if (!revalidate) {
+            return !Object.prototype.hasOwnProperty.call(this.invalidComponents, compName);
+        }
+        try {
+            const input = this.getComponent(key, column.name);
+            const isValid = input.validate();
+            this.checkCompValidity(input);
+            return isValid;
+        }
+        catch (e) {
+            if (e instanceof InstanceNotFoundError) {
+                return true;
+            }
+            throw e;
+        }
     }
     /**
      * Cancels all edited rows and enable grid components
@@ -13175,7 +13159,7 @@ class TreeGridEditable extends TreeGrid {
      * Retrieves all edited rows if they are valid
      * @throws Will throw when it finds an invalid row
      */
-    getEditedRows() {
+    getEditedRows(revalidate = false, silent = false) {
         const editedRows = [];
         Object.keys(this.editedRows).forEach((key) => {
             const row = Object.assign(Object.assign({}, this.editedRows[key].originalRow), this.editedRows[key]);
@@ -13188,15 +13172,29 @@ class TreeGridEditable extends TreeGrid {
                     delete row[attr];
                 }
             });
-            if (!this.isGridValid()) {
+            if (!silent && !this.isGridValid(revalidate)) {
                 throw new Error('Invalid rows');
             }
             editedRows.push(row);
         });
         return editedRows;
     }
-    isGridValid() {
-        return Object.keys(this.invalidComponents).length === 0;
+    /**
+     * Checks whether the grid is valid or not
+     * @param revalidate Defines if the fields should be revalidated
+     */
+    isGridValid(revalidate = false) {
+        if (!revalidate) {
+            return Object.keys(this.invalidComponents).length === 0;
+        }
+        let allValid = true;
+        this.datasource.data.forEach((row) => this.columns.forEach((column) => {
+            if (!column.isVisible || !column.editable)
+                return;
+            if (!this.isValid(column, row, true))
+                allValid = false;
+        }));
+        return allValid;
     }
     /**
      * Gets the editable component name
@@ -13872,7 +13870,7 @@ class PDFReport extends BaseReport {
         else if (column.componentProps && Object.keys(column.componentProps).length) {
             const { component } = column.componentProps;
             if (this.isNumberComponent(component)) {
-                format = { type: 'float' };
+                format = { type: 'float', params: {} };
                 mask = this.checkAccessor(column.componentProps.mask);
                 if (mask) {
                     format.params = {};

package/dist/zd-common.umd.js

@@ -3154,6 +3154,7 @@
                       }
                   },
                   stop: true,
+                  index: 89,
               },
               esc: {
                   event: () => {
@@ -3169,6 +3170,7 @@
                           this.hide();
                       }
                   },
+                  index: 89,
                   stop: true,
               },
           };
@@ -5728,41 +5730,13 @@
       if (!Object.keys(currentRow).length)
           return typeof value === 'object' ? '' : value;
       const textColumn = formatterDataText || dataText;
-      if (textColumn) {
-          if (typeof textColumn === 'string') {
-              return currentRow[textColumn] || value;
-          }
-          const dataTextNames = [];
-          const masks = [];
-          textColumn.forEach((text) => {
-              if (typeof text === 'string') {
-                  dataTextNames.push(text);
-                  masks.push('');
-              }
-              else {
-                  dataTextNames.push(text.name);
-                  if (core.Accessor.isAccessorDefinition(text.mask)) {
-                      const [controller, accessor] = core.Accessor.getAccessor(text.mask);
-                      masks.push(core.Loader.getInstance(controller)[accessor]);
-                  }
-                  else {
-                      masks.push(text.mask);
-                  }
-              }
-          });
-          return dataTextNames.reduce((result, columnName, index) => {
-              const rowCell = currentRow[columnName];
-              if (rowCell !== undefined && rowCell !== null) {
-                  const separator = index > 0 ? (dataTextSeparator || ' | ') : '';
-                  const mask = masks[index];
-                  const maskValue = typeof mask === 'function' ? mask(rowCell) : mask;
-                  const masked = masks[index] ? core.Mask.getValueWithMask(rowCell, maskValue) : rowCell;
-                  return result + separator + masked;
-              }
-              return result;
-          }, '');
+      if (!textColumn)
+          return value;
+      if (typeof textColumn === 'string') {
+          return currentRow[textColumn] || value;
       }
-      return value;
+      const formatterFn = core.FormatterParserProvider.getFormatter('ZdSelect');
+      return formatterFn(currentRow, { dataText: textColumn, dataTextSeparator });
   });
   core.FormatterParserProvider.registerFormatter('column_ZdSelectMultiple', ({ column, value, row, componentProps, }) => {
       if (!value || !Array.isArray(value) || value.length === 0)
@@ -5962,21 +5936,25 @@
               up: {
                   event: this.navigateUp.bind(this),
                   stop: true,
+                  index: 99,
                   active: true,
               },
               down: {
                   event: this.navigateDown.bind(this),
                   stop: true,
+                  index: 99,
                   active: true,
               },
               pageup: {
                   event: this.navigatePageUp.bind(this),
                   stop: true,
+                  index: 99,
                   active: true,
               },
               pagedown: {
                   event: this.navigatePageDown.bind(this),
                   stop: true,
+                  index: 99,
                   active: true,
               },
           };
@@ -6364,6 +6342,7 @@
            * Enter edit mode on double click
            */
           this.doubleClickEdit = false;
+          this.singleEdit = false;
           /**
            * Edited rows
            * @private
@@ -6383,6 +6362,7 @@
           this.cancelEditedRowsKeyMapping = {
               esc: {
                   event: this.cancelEditedRows.bind(this),
+                  index: 99,
                   stop: true,
                   input: true,
                   active: true,
@@ -6392,6 +6372,7 @@
           this.doubleClickEdit = this.getInitValue('doubleClickEdit', props.doubleClickEdit, this.doubleClickEdit);
           this.canEditRow = this.getInitValue('canEditRow', props.canEditRow, this.canEditRow);
           this.editingNewRows = this.getInitValue('editingNewRows', props.editingNewRows, this.editingNewRows);
+          this.singleEdit = this.getInitValue('singleEdit', props.singleEdit, this.singleEdit);
           this.createAccessors();
       }
       onMounted(element) {
@@ -6500,6 +6481,13 @@
               });
           }
       }
+      getVisibleValue(row, column) {
+          const key = row[this.datasource.uniqueKey];
+          if (this.editedRows[key] && Object.prototype.hasOwnProperty.call(this.editedRows[key], column.name)) {
+              return this.editedRows[key][column.name];
+          }
+          return row[column.name];
+      }
       /**
        * Returns editable component properties based on the column definition
        * @param column Column definition
@@ -6510,13 +6498,7 @@
       getEditableComponent(column, row, cellProps, events) {
           const key = row[this.datasource.uniqueKey];
           const compName = this.getCompName(key, column.name);
-          let colValue;
-          if (this.editedRows[key] && Object.prototype.hasOwnProperty.call(this.editedRows[key], column.name)) {
-              colValue = this.editedRows[key][column.name];
-          }
-          else {
-              colValue = row[column.name];
-          }
+          const colValue = this.getVisibleValue(row, column);
           const componentProps = merge__default["default"]({}, column.componentProps, cellProps === null || cellProps === void 0 ? void 0 : cellProps.componentProps);
           let compEvents = {};
           if (componentProps && componentProps.events) {
@@ -6657,7 +6639,9 @@
        */
       cancelEditedRows() {
           return __awaiter(this, void 0, void 0, function* () {
+              const { page } = this.datasource;
               yield this.cancelAddedRows();
+              yield this.datasource.setPage(page);
               this.editing = false;
               this.editedRows = {};
               this.invalidComponents = {};
@@ -6665,7 +6649,7 @@
       }
       cancelAddedRows() {
           return __awaiter(this, void 0, void 0, function* () {
-              const { data, page } = this.datasource;
+              const { data } = this.datasource;
               const allData = this.datasource.allData || data;
               Promise.resolve(allData);
               for (let index = allData.length - 1; index >= 0; index -= 1) {
@@ -6675,8 +6659,6 @@
                   }
               }
               yield this.datasource.updateData(allData);
-              yield this.datasource.get();
-              yield this.datasource.setPage(page);
           });
       }
       addDataRow(row) {
@@ -6692,6 +6674,7 @@
        */
       saveEditedRows(revalidate = false) {
           return __awaiter(this, void 0, void 0, function* () {
+              const { page } = this.datasource;
               yield this.cancelAddedRows();
               const response = yield Promise.all(this.getEditedRows(revalidate).map((row) => this.addDataRow(row)));
               this.editing = false;
@@ -6699,7 +6682,7 @@
               this.addedRows = {};
               this.invalidComponents = {};
               this.addedRows = {};
-              yield this.datasource.get();
+              yield this.datasource.setPage(page);
               return response;
           });
       }
@@ -6708,7 +6691,7 @@
        * @param revalidate Defines if the fields should be revalidated
        * @throws Will throw when it finds an invalid row
        */
-      getEditedRows(revalidate = false) {
+      getEditedRows(revalidate = false, silent = false) {
           const editedRows = [];
           Object.keys(this.editedRows).forEach((key) => {
               const row = Object.assign(Object.assign({}, this.editedRows[key].originalRow), this.editedRows[key]);
@@ -6719,7 +6702,7 @@
                       delete row[`${attr}_original`];
                   }
               });
-              if (!this.isGridValid(revalidate)) {
+              if (!silent && !this.isGridValid(revalidate)) {
                   throw new Error('Invalid rows');
               }
               editedRows.push(row);
@@ -7491,16 +7474,19 @@
                   yield this.setValue(this.value, false);
                   this.removePushedValue();
               }
-              if (this.pushedValue && this.indexOf(this.pushedValue) === -1) {
-                  const filterValue = this.pushedValue[this.dataValue];
-                  const foundInData = this.datasource.data.find(this.getCondition(filterValue));
-                  if (!foundInData) {
-                      this.datasource.data.unshift(this.pushedValue);
-                  }
-              }
+              this.insertSelected();
               return response;
           });
       }
+      insertSelected() {
+          if (this.datasource.search || !this.pushedValue || this.indexOf(this.pushedValue) !== -1)
+              return;
+          const filterValue = this.pushedValue[this.dataValue];
+          const foundInData = this.datasource.data.find(this.getCondition(filterValue));
+          if (!foundInData) {
+              this.datasource.data.unshift(this.pushedValue);
+          }
+      }
       get search() {
           return this.searchValue;
       }
@@ -7780,14 +7766,14 @@
       loadMore() {
           return __awaiter(this, void 0, void 0, function* () {
               yield this.datasource.setLimit(this.datasource.limit + this.loadMoreQtty);
-              if (!this.datasource.search) {
-                  this.afterLoad();
-                  const { dataValue } = this;
-                  const isSelected = this.selectValue && this.pushedValue && this.selectValue[dataValue] === this.pushedValue[dataValue];
-                  if (isSelected)
-                      return;
-                  this.removePushedValue();
-              }
+              if (this.datasource.search)
+                  return;
+              this.afterLoad();
+              const { dataValue } = this;
+              const isSelected = this.selectValue && this.pushedValue && this.selectValue[dataValue] === this.pushedValue[dataValue];
+              if (isSelected)
+                  return;
+              this.removePushedValue();
           });
       }
       /**
@@ -9896,7 +9882,6 @@
               const parsedValue = this.parserFn(value, this);
               if (parsedValue !== this.datasource.search) {
                   yield this.datasource.setSearch(parsedValue);
-                  this.insertSelected();
               }
           });
       }
@@ -9925,6 +9910,7 @@
                   yield this.updateSearch(value);
               }
               else {
+                  this.datasource.search = value;
                   if (!this.manualMode) {
                       this.datasource.data = [...this.cachedData];
                       this.datasource.total = this.cachedTotal;
@@ -9952,29 +9938,11 @@
           if (!value || value.length === 0) {
               return [];
           }
-          const dataTextNames = [];
-          const masks = [];
-          this.dataText.forEach((text) => {
-              if (typeof text === 'string') {
-                  dataTextNames.push(text);
-                  masks.push('');
-              }
-              else {
-                  dataTextNames.push(text.name);
-                  masks.push(text.mask);
-              }
-          });
+          const selectFormatter = core.FormatterParserProvider.getFormatter('ZdSelect');
           const formattedValue = value.map((row) => {
               const isDisabled = this.dataDisabled && row[this.dataDisabled];
               const formattedRow = { value: row[this.dataValue], disabled: isDisabled, originalRow: row };
-              formattedRow.text = dataTextNames.reduce((result, columnName, index) => {
-                  if (row[columnName]) {
-                      const separator = index > 0 ? this.dataTextSeparator : '';
-                      const masked = masks[index] ? core.Mask.getValueWithMask(row[columnName], masks[index]) : row[columnName];
-                      return result + separator + masked;
-                  }
-                  return result;
-              }, '');
+              formattedRow.text = selectFormatter(row, this);
               return formattedRow;
           });
           return formattedValue;
@@ -10004,7 +9972,6 @@
                   const foundInData = this.datasource.data.find(this.getCondition(value));
                   return !foundInData;
               });
-              this.insertSelected();
               if (!this.datasource.search) {
                   this.setCache();
               }
@@ -10076,9 +10043,6 @@
           return __awaiter(this, void 0, void 0, function* () {
               if (!this.preventLoadOnFocus) {
                   yield this.datasource.get();
-                  const values = this.datasource.data.map((row) => row[this.dataValue]);
-                  // remove inserted items that are already in datasource
-                  this.insertedValues = this.insertedValues.filter((inserted) => !values.includes(inserted[this.dataValue]));
                   this.preventLoadOnFocus = true;
               }
               this.setCache();
@@ -12650,11 +12614,13 @@
               right: {
                   event: this.navigateToggle.bind(this, false),
                   stop: true,
+                  index: 99,
                   active: true,
               },
               left: {
                   event: this.navigateToggle.bind(this, true),
                   stop: true,
+                  index: 99,
                   active: true,
               },
           };
@@ -12891,6 +12857,7 @@
             * Editing rows
             */
           this.editing = false;
+          this.singleEdit = false;
           /**
             * Edited rows
             * @private
@@ -12908,6 +12875,7 @@
           this.cancelEditedRowsKeyMapping = {
               esc: {
                   event: this.cancelEditedRows.bind(this),
+                  index: 99,
                   stop: true,
                   input: true,
                   active: true,
@@ -12915,6 +12883,7 @@
           };
           this.doubleClickEdit = this.getInitValue('doubleClickEdit', props.doubleClickEdit, this.doubleClickEdit);
           this.canEditRow = this.getInitValue('canEditRow', props.canEditRow, this.canEditRow);
+          this.singleEdit = this.getInitValue('singleEdit', props.singleEdit, this.singleEdit);
           this.noDataSlot = this.changeDefaultSlotNames(this.noDataSlot);
           this.createAccessors();
       }
@@ -13024,6 +12993,13 @@
               });
           }
       }
+      getVisibleValue(row, column) {
+          const key = row[this.datasource.uniqueKey];
+          if (this.editedRows[key] && Object.prototype.hasOwnProperty.call(this.editedRows[key], column.name)) {
+              return this.editedRows[key][column.name];
+          }
+          return row[column.name];
+      }
       /**
        * Returns editable component properties based on the column definition
        * @param column Column definition
@@ -13034,13 +13010,7 @@
       getEditableComponent(column, row, cellProps, events) {
           const key = row[this.datasource.uniqueKey];
           const compName = this.getCompName(key, column.name);
-          let colValue;
-          if (this.editedRows[key] && Object.prototype.hasOwnProperty.call(this.editedRows[key], column.name)) {
-              colValue = this.editedRows[key][column.name];
-          }
-          else {
-              colValue = row[column.name];
-          }
+          const colValue = this.getVisibleValue(row, column);
           const componentProps = merge__default["default"]({}, column.componentProps, cellProps.componentProps);
           let compEvents = {};
           if (componentProps && componentProps.events) {
@@ -13136,10 +13106,24 @@
        * @param column Column
        * @param row Row
        */
-      isValid(column, row) {
+      isValid(column, row, revalidate = false) {
           const key = row[this.datasource.uniqueKey];
           const compName = this.getCompName(key, column.name);
-          return !Object.prototype.hasOwnProperty.call(this.invalidComponents, compName);
+          if (!revalidate) {
+              return !Object.prototype.hasOwnProperty.call(this.invalidComponents, compName);
+          }
+          try {
+              const input = this.getComponent(key, column.name);
+              const isValid = input.validate();
+              this.checkCompValidity(input);
+              return isValid;
+          }
+          catch (e) {
+              if (e instanceof core.InstanceNotFoundError) {
+                  return true;
+              }
+              throw e;
+          }
       }
       /**
        * Cancels all edited rows and enable grid components
@@ -13182,7 +13166,7 @@
        * Retrieves all edited rows if they are valid
        * @throws Will throw when it finds an invalid row
        */
-      getEditedRows() {
+      getEditedRows(revalidate = false, silent = false) {
           const editedRows = [];
           Object.keys(this.editedRows).forEach((key) => {
               const row = Object.assign(Object.assign({}, this.editedRows[key].originalRow), this.editedRows[key]);
@@ -13195,15 +13179,29 @@
                       delete row[attr];
                   }
               });
-              if (!this.isGridValid()) {
+              if (!silent && !this.isGridValid(revalidate)) {
                   throw new Error('Invalid rows');
               }
               editedRows.push(row);
           });
           return editedRows;
       }
-      isGridValid() {
-          return Object.keys(this.invalidComponents).length === 0;
+      /**
+       * Checks whether the grid is valid or not
+       * @param revalidate Defines if the fields should be revalidated
+       */
+      isGridValid(revalidate = false) {
+          if (!revalidate) {
+              return Object.keys(this.invalidComponents).length === 0;
+          }
+          let allValid = true;
+          this.datasource.data.forEach((row) => this.columns.forEach((column) => {
+              if (!column.isVisible || !column.editable)
+                  return;
+              if (!this.isValid(column, row, true))
+                  allValid = false;
+          }));
+          return allValid;
       }
       /**
        * Gets the editable component name
@@ -13879,7 +13877,7 @@
           else if (column.componentProps && Object.keys(column.componentProps).length) {
               const { component } = column.componentProps;
               if (this.isNumberComponent(component)) {
-                  format = { type: 'float' };
+                  format = { type: 'float', params: {} };
                   mask = this.checkAccessor(column.componentProps.mask);
                   if (mask) {
                       format.params = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.88.1",
+  "version": "1.89.1",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -42,5 +42,6 @@
     "@types/lodash.times": "4.3.*",
     "lodash.times": "4.3.*",
     "mockdate": "3.0.*"
-  }
+  },
+  "gitHead": "b8f34057380d34e71990d639009264adf0a652e6"
 }

package/types/components/zd-grid/grid-column.d.ts

@@ -26,10 +26,6 @@ export declare class GridColumn extends Column implements IGridColumn {
         events?: import("..").IComponentEvents<import("@zeedhi/core").IEventParam<any>> | undefined;
         directives?: import("..").IComponentDirectives | undefined;
         isVisible?: string | boolean | undefined;
-        /**
-         * Creates a new Grid Column.
-         * @param props Grid column properties
-         */
         dark?: boolean | undefined;
         light?: boolean | undefined;
         keyMap?: import("@zeedhi/core").IKeyMap<import("@zeedhi/core").IEventParam<any>> | undefined;

package/types/components/zd-grid/grid-editable.d.ts

@@ -1,5 +1,6 @@
-import { IDictionary } from '@zeedhi/core';
+import { IDictionary, IKeyMap } from '@zeedhi/core';
 import { IGridColumnEditable, IGridEditable } from './interfaces';
+import { Input } from '../zd-input/input';
 import { Grid } from '..';
 import { GridColumnEditable } from './grid-column-editable';
 /**
@@ -25,6 +26,7 @@ export declare class GridEditable extends Grid implements IGridEditable {
         row: IDictionary<any>;
         component: GridEditable;
     }) => boolean;
+    singleEdit: boolean;
     /**
      * Edited rows
      * @private
@@ -41,7 +43,7 @@ export declare class GridEditable extends Grid implements IGridEditable {
      */
     private invalidComponents;
     editingNewRows: boolean;
-    protected cancelEditedRowsKeyMapping: any;
+    protected cancelEditedRowsKeyMapping: IKeyMap;
     constructor(props: IGridEditable);
     onMounted(element: any): void;
     onBeforeDestroy(): void;
@@ -87,6 +89,7 @@ export declare class GridEditable extends Grid implements IGridEditable {
      * @param element DOM Element
      */
     selectAllClick(isSelected: boolean, event: Event, element: any): void;
+    getVisibleValue(row: IDictionary, column: IGridColumnEditable): any;
     /**
      * Returns editable component properties based on the column definition
      * @param column Column definition
@@ -111,7 +114,7 @@ export declare class GridEditable extends Grid implements IGridEditable {
     /**
      * change event of editable components
      */
-    private changeEditableComponent;
+    protected changeEditableComponent(column: IGridColumnEditable, row: IDictionary<any>, value: any, component?: Input): void;
     private updateOriginalRow;
     /**
      * Checks if column is edited
@@ -143,7 +146,7 @@ export declare class GridEditable extends Grid implements IGridEditable {
      * @param revalidate Defines if the fields should be revalidated
      * @throws Will throw when it finds an invalid row
      */
-    getEditedRows(revalidate?: boolean): IDictionary<any>[];
+    getEditedRows(revalidate?: boolean, silent?: boolean): IDictionary<any>[];
     /**
      * Checks whether the grid is valid or not
      * @param revalidate Defines if the fields should be revalidated

package/types/components/zd-grid/grid.d.ts

@@ -1,4 +1,4 @@
-import { IDictionary } from '@zeedhi/core';
+import { IDictionary, IKeyMap } from '@zeedhi/core';
 import { Component } from '../zd-component/component';
 import { IComponent, IComponentRender } from '../zd-component/interfaces';
 import { Iterable } from '../zd-iterable/iterable';
@@ -145,7 +145,7 @@ export declare class Grid extends Iterable implements IGrid {
      * @param props Grid properties
      */
     constructor(props: IGrid);
-    protected navigationKeyMapping: any;
+    protected navigationKeyMapping: IKeyMap;
     onMounted(element: any): void;
     onBeforeDestroy(): void;
     /**

package/types/components/zd-grid/interfaces.d.ts

@@ -64,6 +64,7 @@ export interface IGridEditable extends IGrid {
     columns?: IGridColumnEditable[];
     doubleClickEdit?: boolean;
     events?: IGridEditableEvents;
+    singleEdit?: boolean;
     canEditRow?: (args: {
         row: IDictionary<any>;
         component: GridEditable;

package/types/components/zd-select/select.d.ts

@@ -123,6 +123,7 @@ export declare class Select extends TextInput implements ISelect {
      */
     private getDefaultDatasource;
     overrideGet(): void;
+    protected insertSelected(): void;
     get search(): string;
     set search(value: string);
     /**

package/types/components/zd-select-multiple/select-multiple.d.ts

@@ -66,7 +66,7 @@ export declare class SelectMultiple extends Select implements ISelectMultiple {
     /**
      * Inserts selected items in datasource
      */
-    private insertSelected;
+    protected insertSelected(): void;
     protected removePushedValue(): void;
     protected doSearch(value: string): Promise<void>;
     /**

package/types/components/zd-tree-grid/interfaces.d.ts

@@ -13,6 +13,7 @@ export interface ITreeGridEditable extends ITreeGrid {
     columns?: IGridColumnEditable[];
     doubleClickEdit?: boolean;
     events?: IGridEditableEvents;
+    singleEdit?: boolean;
     canEditRow?: (args: {
         row: IDictionary<any>;
         component: TreeGridEditable;

package/types/components/zd-tree-grid/tree-grid-editable.d.ts

@@ -19,6 +19,7 @@ export declare class TreeGridEditable extends TreeGrid implements ITreeGridEdita
         row: IDictionary<any>;
         component: TreeGridEditable;
     }) => boolean;
+    singleEdit: boolean;
     /**
       * Edited rows
       * @private
@@ -79,6 +80,7 @@ export declare class TreeGridEditable extends TreeGrid implements ITreeGridEdita
      * @param element DOM Element
      */
     selectAllClick(isSelected: boolean, event?: Event, element?: any): void;
+    getVisibleValue(row: IDictionary, column: IGridColumnEditable): any;
     /**
      * Returns editable component properties based on the column definition
      * @param column Column definition
@@ -116,7 +118,7 @@ export declare class TreeGridEditable extends TreeGrid implements ITreeGridEdita
      * @param column Column
      * @param row Row
      */
-    isValid(column: IGridColumnEditable, row: IDictionary): boolean;
+    isValid(column: IGridColumnEditable, row: IDictionary, revalidate?: boolean): boolean;
     /**
      * Cancels all edited rows and enable grid components
      */
@@ -135,8 +137,12 @@ export declare class TreeGridEditable extends TreeGrid implements ITreeGridEdita
      * Retrieves all edited rows if they are valid
      * @throws Will throw when it finds an invalid row
      */
-    getEditedRows(): IDictionary<any>[];
-    isGridValid(): boolean;
+    getEditedRows(revalidate?: boolean, silent?: boolean): IDictionary<any>[];
+    /**
+     * Checks whether the grid is valid or not
+     * @param revalidate Defines if the fields should be revalidated
+     */
+    isGridValid(revalidate?: boolean): boolean;
     /**
      * Gets the editable component name
      * @param key Row unique key

package/types/services/zd-json-cache/json-cache-service.d.ts

@@ -0,0 +1,12 @@
+export interface IJSONObject {
+    path: string;
+}
+export declare class JsonCacheService {
+    /**
+     * jsons collection
+     */
+    static jsonCollection: IJSONObject[];
+    static saveJSONCache(jsonCollection: IJSONObject[]): Promise<void>;
+    static getJSONCache(path: string): any;
+    static clearJSONCache(jsonCollection: IJSONObject[]): void;
+}