@zeedhi/common 1.93.1 → 1.94.0

package/dist/zd-common.esm.js

@@ -6936,6 +6936,17 @@ class GridEditable extends Grid {
         }
         return !this.canEditRow || typeof this.canEditRow !== 'function' || this.canEditRow({ row, component: this });
     }
+    changeData(data) {
+        super.changeData(data);
+        const { uniqueKey } = this.datasource;
+        const foundRow = data === null || data === void 0 ? void 0 : data.find((row) => (row[uniqueKey] !== 0 && !row[uniqueKey]));
+        if (!foundRow || !this.editedRows[foundRow[uniqueKey]]) {
+            return;
+        }
+        const rows = Object.assign({}, this.editedRows);
+        delete rows[foundRow[uniqueKey]];
+        this.editedRows = rows;
+    }
 }
 
 /**
@@ -13159,7 +13170,27 @@ class TreeGridEditable extends TreeGrid {
     checkLookupData(column, row, componentProps) {
         if (row[column.name] && column.lookupData && componentProps.datasource) {
             componentProps.datasource.data = componentProps.datasource.data || [];
-            componentProps.datasource.data.push(column.lookupData[row[column.name]]);
+            const colValue = row[column.name];
+            if (Array.isArray(colValue)) {
+                colValue.forEach((item) => {
+                    const value = typeof item === 'object' ? item[componentProps.dataValue] : item;
+                    if (column.lookupData[value]) {
+                        componentProps.datasource.data.push(column.lookupData[value]);
+                    }
+                });
+                return;
+            }
+            if (colValue && typeof colValue === 'object'
+                && Object.prototype.hasOwnProperty.call(colValue, componentProps.dataValue)) {
+                const value = colValue[componentProps.dataValue];
+                if (column.lookupData[value]) {
+                    componentProps.datasource.data.push(column.lookupData[value]);
+                }
+                return;
+            }
+            if (column.lookupData[colValue]) {
+                componentProps.datasource.data.push(column.lookupData[colValue]);
+            }
         }
     }
     checkCompValidity(component) {
@@ -13398,6 +13429,17 @@ class TreeGridEditable extends TreeGrid {
     callCanEditRow(row) {
         return !this.canEditRow || typeof this.canEditRow !== 'function' || this.canEditRow({ row, component: this });
     }
+    changeData(data) {
+        super.changeData(data);
+        const { uniqueKey } = this.datasource;
+        const foundRow = data === null || data === void 0 ? void 0 : data.find((row) => (row[uniqueKey] !== 0 && !row[uniqueKey]));
+        if (!foundRow || !this.editedRows[foundRow[uniqueKey]]) {
+            return;
+        }
+        const rows = Object.assign({}, this.editedRows);
+        delete rows[foundRow[uniqueKey]];
+        this.editedRows = rows;
+    }
 }
 
 class Icons {

package/dist/zd-common.umd.js

@@ -6943,6 +6943,17 @@
           }
           return !this.canEditRow || typeof this.canEditRow !== 'function' || this.canEditRow({ row, component: this });
       }
+      changeData(data) {
+          super.changeData(data);
+          const { uniqueKey } = this.datasource;
+          const foundRow = data === null || data === void 0 ? void 0 : data.find((row) => (row[uniqueKey] !== 0 && !row[uniqueKey]));
+          if (!foundRow || !this.editedRows[foundRow[uniqueKey]]) {
+              return;
+          }
+          const rows = Object.assign({}, this.editedRows);
+          delete rows[foundRow[uniqueKey]];
+          this.editedRows = rows;
+      }
   }
 
   /**
@@ -13166,7 +13177,27 @@
       checkLookupData(column, row, componentProps) {
           if (row[column.name] && column.lookupData && componentProps.datasource) {
               componentProps.datasource.data = componentProps.datasource.data || [];
-              componentProps.datasource.data.push(column.lookupData[row[column.name]]);
+              const colValue = row[column.name];
+              if (Array.isArray(colValue)) {
+                  colValue.forEach((item) => {
+                      const value = typeof item === 'object' ? item[componentProps.dataValue] : item;
+                      if (column.lookupData[value]) {
+                          componentProps.datasource.data.push(column.lookupData[value]);
+                      }
+                  });
+                  return;
+              }
+              if (colValue && typeof colValue === 'object'
+                  && Object.prototype.hasOwnProperty.call(colValue, componentProps.dataValue)) {
+                  const value = colValue[componentProps.dataValue];
+                  if (column.lookupData[value]) {
+                      componentProps.datasource.data.push(column.lookupData[value]);
+                  }
+                  return;
+              }
+              if (column.lookupData[colValue]) {
+                  componentProps.datasource.data.push(column.lookupData[colValue]);
+              }
           }
       }
       checkCompValidity(component) {
@@ -13405,6 +13436,17 @@
       callCanEditRow(row) {
           return !this.canEditRow || typeof this.canEditRow !== 'function' || this.canEditRow({ row, component: this });
       }
+      changeData(data) {
+          super.changeData(data);
+          const { uniqueKey } = this.datasource;
+          const foundRow = data === null || data === void 0 ? void 0 : data.find((row) => (row[uniqueKey] !== 0 && !row[uniqueKey]));
+          if (!foundRow || !this.editedRows[foundRow[uniqueKey]]) {
+              return;
+          }
+          const rows = Object.assign({}, this.editedRows);
+          delete rows[foundRow[uniqueKey]];
+          this.editedRows = rows;
+      }
   }
 
   class Icons {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.93.1",
+  "version": "1.94.0",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -43,5 +43,5 @@
     "lodash.times": "4.3.*",
     "mockdate": "3.0.*"
   },
-  "gitHead": "91e236011b279ad56d0bdd51caa41f2910ffd1e5"
+  "gitHead": "0f51cae680b4c284f8565c314431600b709e00aa"
 }

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

@@ -203,4 +203,5 @@ export declare class GridEditable extends Grid implements IGridEditable {
      */
     private changeCell;
     callCanEditRow(row: IDictionary<any>): any;
+    changeData(data?: IDictionary<any>[]): void;
 }

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

@@ -188,4 +188,5 @@ export declare class TreeGridEditable extends TreeGrid implements ITreeGridEdita
      */
     private changeCell;
     callCanEditRow(row: IDictionary<any>): boolean;
+    changeData(data?: IDictionary<any>[]): void;
 }