@sankhyalabs/ezui 1.1.7 → 1.1.11

package/dist/custom-elements/index.js

@@ -2750,8 +2750,8 @@ const NavigationBar = ({ dataUnit: du, buttonProps }) => {
     return h("div", { class: "col col--sd-12 align--right" },
       buttonProps.previousVisible ? h("ez-button", { title: "Registro anterior", mode: "icon", enabled: du.hasPrevious(), onClick: () => du.previous(), image: "/themes/default/images/icons/actions-sprite.svg#previous-circle-inverted", class: "button--secondary margin-right--medium" }) : null,
       buttonProps.nextVisible ? h("ez-button", { title: "Pr\u00F3ximo registro", mode: "icon", enabled: du.hasNext(), onClick: () => du.next(), image: "/themes/default/images/icons/actions-sprite.svg#next-circle-inverted", class: "button--secondary margin-right--medium" }) : null,
-      buttonProps.removeVisible ? h("ez-button", { title: "Remover " + du.unitLabel, mode: "icon", enabled: du.hasCurrentRecord(), onClick: () => removeHandler(du), image: "/themes/default/images/icons/actions-sprite.svg#minus-circle-inverted", class: "button--secondary margin-right--medium" }) : null,
-      buttonProps.addVisible ? h("ez-button", { label: "Criar " + du.unitLabel, onClick: () => du.insert(), class: "button--secondary margin-right--medium" }) : null,
+      buttonProps.removeVisible ? h("ez-button", { label: "Remover", enabled: du.hasCurrentRecord(), onClick: () => removeHandler(du), image: "/themes/default/images/icons/actions-sprite.svg#minus-circle-inverted", class: "button--secondary margin-right--medium" }) : null,
+      buttonProps.addVisible ? h("ez-button", { label: "Adicionar", onClick: () => du.insert(), class: "button--secondary margin-right--medium" }) : null,
       buttonProps.reloadVisible ? h("ez-button", { title: "Recarregar", mode: "icon", onClick: () => du.load(), image: "/themes/default/images/icons/actions-sprite.svg#rotate", class: "button--secondary margin-right--medium" }) : null,
       buttonProps.cancelVisible ? h("ez-button", { label: "Cancelar", enabled: du.hasChanges(), onClick: () => du.cancel(), class: "button--secondary margin-right--medium" }) : null,
       buttonProps.saveVisible ? h("ez-button", { label: "Salvar", enabled: du.hasChanges(), onClick: () => du.save(), class: "button--primary margin-right--medium" }) : null);
@@ -2911,7 +2911,7 @@ const FormSheet = ({ store, parentName, source, parentDataUnit, dataUnitBuilder
   const selectedTab = selectCurrentTab(store.getState(), parentName);
   const tabs = source.length > 1 ? source.map(form => h("ez-tab", { label: form.label, tabKey: form.name })) : null;
   const { subForms, items, name } = source[selectedTab];
-  const dataUnit = dataUnitBuilder(source[selectedTab].dataUnit);
+  const dataUnit = dataUnitBuilder(source[selectedTab].dataUnit, parentDataUnit);
   source[selectedTab].dataUnit = dataUnit;
   const hasSubForms = subForms && subForms.length > 0;
   const changeTabHandler = (index) => {
@@ -2935,10 +2935,16 @@ const FormSheet = ({ store, parentName, source, parentDataUnit, dataUnitBuilder
 };
 
 class DataUnit {
-  constructor(name, unitLabel, cardinality = '1') {
+  constructor(name, unitLabel, cardinality = '1', parentDU = null) {
     this.name = name;
     this.unitLabel = unitLabel;
     this.cardinality = cardinality;
+    this._children = [];
+    if (parentDU != null) {
+      parentDU._children.push(this);
+      this.parentDU = parentDU;
+      this.parentDUName = parentDU.name;
+    }
   }
   set store(store) {
     this._store = store;
@@ -2996,21 +3002,57 @@ class DataUnit {
   insert() {
     const insertionIndex = this.records.length;
     const newRecordIndex = selectNewRecordIndex(this._store.getState(), this.name);
-    this.records.push({ record__id: 'NEW_' + (newRecordIndex + 1) });
+    const newRecord = { record__id: 'NEW_' + (newRecordIndex + 1) };
+    this.bindToParent(newRecord);
+    this.records.push(newRecord);
     this._store.dispatch(insertRecord$1(this.name, insertionIndex));
   }
-  getChangesToSave() {
+  buildChange(r) {
     const duChanges = selectDataUnitChanges(this._store.getState(), this.name);
-    const changesByRecord = Object.keys(duChanges).map(record__id => {
-      const record = { record__id };
-      const recordChanges = duChanges[record__id];
-      Object.keys(recordChanges).forEach(fieldName => { record[fieldName] = recordChanges[fieldName]; });
-      return record;
+    let recordChanges;
+    if (duChanges) {
+      recordChanges = duChanges[r.record__id];
+    }
+    let subChanges = [];
+    this._children.forEach(duChild => {
+      subChanges = subChanges.concat(duChild.getSubChanges(r.record__id));
     });
-    return [{
-        dataUnit: this.name,
-        records: changesByRecord
-      }];
+    if (recordChanges || subChanges.length > 0) {
+      const change = {
+        "__data__unit": this.name,
+        "__record__id": r.record__id,
+        "__sub__changes": subChanges
+      };
+      if (recordChanges) {
+        Object.keys(recordChanges).forEach(fieldName => { change[fieldName] = recordChanges[fieldName]; });
+      }
+      return change;
+    }
+    return undefined;
+  }
+  getSubChanges(id) {
+    const result = [];
+    if (this._records) {
+      this._records.filter(r => r.parent__record__id === id).forEach(r => {
+        const c = this.buildChange(r);
+        if (c) {
+          result.push(c);
+        }
+      });
+    }
+    return result;
+  }
+  getChangesToSave() {
+    let result = [];
+    if (this._records) {
+      this._records.forEach(r => {
+        const change = this.buildChange(r);
+        if (change) {
+          result.push(change);
+        }
+      });
+    }
+    return result;
   }
   save() {
     if (!this.validateRecords()) {
@@ -3100,6 +3142,17 @@ class DataUnit {
   }
   set records(records) {
     this._records = records;
+    if (this.parentDU) {
+      this._records.forEach(r => this.bindToParent(r));
+    }
+  }
+  bindToParent(r) {
+    if (this.parentDU) {
+      const parentRecord = this.parentDU.getCurrentRecord();
+      if (parentRecord) {
+        r.parent__record__id = parentRecord.record__id;
+      }
+    }
   }
   get records() {
     if (!this._records) {
@@ -3124,7 +3177,7 @@ class DataUnit {
     const duChanges = selectDataUnitChanges(this._store.getState(), this.name);
     const recordsToValidate = [];
     this.records.forEach((record, i) => {
-      const changes = duChanges[record.record__id];
+      const changes = duChanges ? duChanges[record.record__id] : undefined;
       if (changes) {
         recordsToValidate.push(Object.assign(Object.assign(Object.assign({}, record), changes), { record__index: i, record__changedfields: Object.keys(changes) }));
       }
@@ -3143,20 +3196,36 @@ const EzForm$1 = class extends HTMLElement {
   constructor() {
     super();
     this.__registerHost();
-    this._dataUnits = [];
+    this._dataUnits = new Map();
+    this._duSources = new Map();
     this._requiredFieldsByDU = {};
   }
   async validate() {
-    for (let i = 0; i < this._dataUnits.length; i++) {
-      if (!this._dataUnits[i].validateRecords()) {
+    for (let i = 0; i < this._duSources.size; i++) {
+      const duName = Array.from(this._duSources.keys())[i];
+      let du = this._dataUnits.get(duName);
+      if (du === undefined) {
+        const source = this._duSources.get(duName);
+        du = this.buildDataUnit(source, source.parentDUName);
+      }
+      if (!du.validateRecords()) {
         return false;
       }
     }
+    return true;
   }
   async getChanges() {
+    debugger;
     let allChanges = [];
-    for (let i = 0; i < this._dataUnits.length; i++) {
-      allChanges = allChanges.concat(this._dataUnits[i].getChangesToSave());
+    for (let i = 0; i < this._dataUnits.size; i++) {
+      const du = Array.from(this._dataUnits.values())[i];
+      //Só devemos buscar as alterações de DU raiz, pois os sub DUs serão enviados junto.
+      if (!du.parentDU) {
+        const duChanges = du.getChangesToSave();
+        if (duChanges) {
+          allChanges = allChanges.concat(duChanges);
+        }
+      }
     }
     return allChanges;
   }
@@ -3175,7 +3244,7 @@ const EzForm$1 = class extends HTMLElement {
         }
       });
     };
-    if (records.length == 0) {
+    if (dataUnit.records.length == 0) {
       recordValidator({});
     }
     else {
@@ -3199,8 +3268,9 @@ const EzForm$1 = class extends HTMLElement {
     }
   }
   loadMDFromExecutor(callBack) {
-    if (this._loadMetadataFunction) {
-      const result = this._loadMetadataFunction();
+    const loadMetadataFunction = this.parseExecutor(this.metadataexecutor);
+    if (loadMetadataFunction) {
+      const result = loadMetadataFunction();
       if (result) {
         if (result instanceof Promise) {
           result.then(md => {
@@ -3253,13 +3323,20 @@ const EzForm$1 = class extends HTMLElement {
           }
         });
         (_a = form.subForms) === null || _a === void 0 ? void 0 : _a.forEach((subForm, index) => {
-          const subDU = subForm.dataUnit ? subForm.dataUnit.name : duName;
-          processFields(subDU, subForm, form.name, index);
+          const subDu = subForm.dataUnit;
+          if (subDu) {
+            this._duSources.set(subDu.name, subDu);
+            subDu.parentDUName = duName;
+          }
+          processFields(subDu ? subDu.name : duName, subForm, form.name, index);
         });
       };
       this.metadata = metadata;
       metadata.map((form, index) => {
-        processFields(form.dataUnit.name, form, "__MAIN__FORM__", index);
+        const du = form.dataUnit;
+        const duName = du.name;
+        this._duSources.set(duName, du);
+        processFields(duName, form, "__MAIN__FORM__", index);
       });
       this._store.dispatch(formLoad());
     }
@@ -3271,11 +3348,6 @@ const EzForm$1 = class extends HTMLElement {
     return null;
   }
   componentDidLoad() {
-    this._loadMetadataFunction = this.parseExecutor(this.metadataexecutor);
-    this._loadDataFunction = this.parseExecutor(this.loadexecutor);
-    this._saveFunction = this.parseExecutor(this.saveexecutor);
-    this._removeFunction = this.parseExecutor(this.removeexecutor);
-    this._fieldSearchFunction = this.parseExecutor(this.fieldsearchexecutor);
     if (this.metadata) {
       this.updateMetadata(this.metadata);
     }
@@ -3286,27 +3358,34 @@ const EzForm$1 = class extends HTMLElement {
       }
     }
   }
-  buildDataUnit(dataUnit) {
+  buildDataUnit(dataUnit, parentDataUnit) {
     if (dataUnit) {
       const { name, unitLabel, records, cardinality } = dataUnit;
       if (!(dataUnit instanceof DataUnit)) {
-        dataUnit = new DataUnit(name, unitLabel, cardinality);
-        this._dataUnits.push(dataUnit);
+        let parent;
+        if (parentDataUnit instanceof DataUnit) {
+          parent = parentDataUnit;
+        }
+        else {
+          parent = this._dataUnits.get(parentDataUnit);
+        }
+        dataUnit = new DataUnit(name, unitLabel, cardinality, parent);
+        this._dataUnits.set(dataUnit.name, dataUnit);
         if (records) {
           dataUnit.records = records;
         }
         dataUnit.store = this._store;
-        dataUnit.loadExecutor = this._loadDataFunction;
-        dataUnit.saveExecutor = this._saveFunction;
-        dataUnit.removeExecutor = this._removeFunction;
+        dataUnit.loadExecutor = this.parseExecutor(this.loadexecutor);
+        dataUnit.saveExecutor = this.parseExecutor(this.saveexecutor);
+        dataUnit.removeExecutor = this.parseExecutor(this.removeexecutor);
         dataUnit.recordsValidator = this;
-        dataUnit.fieldSearchExecutor = this._fieldSearchFunction;
+        dataUnit.fieldSearchExecutor = this.parseExecutor(this.fieldsearchexecutor);
       }
     }
     return dataUnit;
   }
   render() {
-    return this.metadata ? h(FormSheet, { store: this._store, source: this.metadata, parentName: "__MAIN__FORM__", dataUnitBuilder: (du) => this.buildDataUnit(du) }) : null;
+    return this.metadata ? h(FormSheet, { store: this._store, source: this.metadata, parentName: "__MAIN__FORM__", dataUnitBuilder: (du, parentDataUnit) => this.buildDataUnit(du, parentDataUnit) }) : null;
   }
   get _host() { return this; }
   static get style() { return ezFormCss; }
@@ -3478,7 +3557,6 @@ const EzModal$1 = class extends HTMLElement {
       console.log(ev === null || ev === void 0 ? void 0 : ev.key);
       if ((ev === null || ev === void 0 ? void 0 : ev.key) === 'Escape' && this.closeesc) {
         this.oppened = false;
-        debugger;
         this.ezChange.emit(this.oppened);
       }
     };
@@ -3487,7 +3565,6 @@ const EzModal$1 = class extends HTMLElement {
     ev === null || ev === void 0 ? void 0 : ev.stopPropagation();
     if (ev instanceof PointerEvent && this.closeoutsideclick) {
       this.oppened = false;
-      debugger;
       this.ezChange.emit(this.oppened);
     }
   }

package/dist/esm/{DataUnit-ac4cc054.js → DataUnit-ab1a3a4d.js}

@@ -170,10 +170,16 @@ const selectErrorMessage = (state, dataUnit, recordId, fieldName) => {
 const selectVisibleButtons = state => state.nonhist.visibleButtons;
 
 class DataUnit {
-  constructor(name, unitLabel, cardinality = '1') {
+  constructor(name, unitLabel, cardinality = '1', parentDU = null) {
     this.name = name;
     this.unitLabel = unitLabel;
     this.cardinality = cardinality;
+    this._children = [];
+    if (parentDU != null) {
+      parentDU._children.push(this);
+      this.parentDU = parentDU;
+      this.parentDUName = parentDU.name;
+    }
   }
   set store(store) {
     this._store = store;
@@ -231,21 +237,57 @@ class DataUnit {
   insert() {
     const insertionIndex = this.records.length;
     const newRecordIndex = selectNewRecordIndex(this._store.getState(), this.name);
-    this.records.push({ record__id: 'NEW_' + (newRecordIndex + 1) });
+    const newRecord = { record__id: 'NEW_' + (newRecordIndex + 1) };
+    this.bindToParent(newRecord);
+    this.records.push(newRecord);
     this._store.dispatch(insertRecord(this.name, insertionIndex));
   }
-  getChangesToSave() {
+  buildChange(r) {
     const duChanges = selectDataUnitChanges(this._store.getState(), this.name);
-    const changesByRecord = Object.keys(duChanges).map(record__id => {
-      const record = { record__id };
-      const recordChanges = duChanges[record__id];
-      Object.keys(recordChanges).forEach(fieldName => { record[fieldName] = recordChanges[fieldName]; });
-      return record;
+    let recordChanges;
+    if (duChanges) {
+      recordChanges = duChanges[r.record__id];
+    }
+    let subChanges = [];
+    this._children.forEach(duChild => {
+      subChanges = subChanges.concat(duChild.getSubChanges(r.record__id));
     });
-    return [{
-        dataUnit: this.name,
-        records: changesByRecord
-      }];
+    if (recordChanges || subChanges.length > 0) {
+      const change = {
+        "__data__unit": this.name,
+        "__record__id": r.record__id,
+        "__sub__changes": subChanges
+      };
+      if (recordChanges) {
+        Object.keys(recordChanges).forEach(fieldName => { change[fieldName] = recordChanges[fieldName]; });
+      }
+      return change;
+    }
+    return undefined;
+  }
+  getSubChanges(id) {
+    const result = [];
+    if (this._records) {
+      this._records.filter(r => r.parent__record__id === id).forEach(r => {
+        const c = this.buildChange(r);
+        if (c) {
+          result.push(c);
+        }
+      });
+    }
+    return result;
+  }
+  getChangesToSave() {
+    let result = [];
+    if (this._records) {
+      this._records.forEach(r => {
+        const change = this.buildChange(r);
+        if (change) {
+          result.push(change);
+        }
+      });
+    }
+    return result;
   }
   save() {
     if (!this.validateRecords()) {
@@ -335,6 +377,17 @@ class DataUnit {
   }
   set records(records) {
     this._records = records;
+    if (this.parentDU) {
+      this._records.forEach(r => this.bindToParent(r));
+    }
+  }
+  bindToParent(r) {
+    if (this.parentDU) {
+      const parentRecord = this.parentDU.getCurrentRecord();
+      if (parentRecord) {
+        r.parent__record__id = parentRecord.record__id;
+      }
+    }
   }
   get records() {
     if (!this._records) {
@@ -359,7 +412,7 @@ class DataUnit {
     const duChanges = selectDataUnitChanges(this._store.getState(), this.name);
     const recordsToValidate = [];
     this.records.forEach((record, i) => {
-      const changes = duChanges[record.record__id];
+      const changes = duChanges ? duChanges[record.record__id] : undefined;
       if (changes) {
         recordsToValidate.push(Object.assign(Object.assign(Object.assign({}, record), changes), { record__index: i, record__changedfields: Object.keys(changes) }));
       }

package/dist/esm/ez-button_14.entry.js

@@ -1,6 +1,6 @@
 import { r as registerInstance, h, c as createEvent, f as forceUpdate, H as Host, g as getElement } from './index-95bb3fd9.js';
 import { M as MaskFormatter } from './RequestMetadata-c265c9d5.js';
-import { s as selectIsCollapsedFieldSet, c as collapseExpandGroup, a as selectCurrentTab, b as selectVisibleButtons, d as changeTab$1, e as showHideNavigationButtons, f as formLoad, D as DataUnit, i as invalidField$1 } from './DataUnit-ac4cc054.js';
+import { s as selectIsCollapsedFieldSet, c as collapseExpandGroup, a as selectCurrentTab, b as selectVisibleButtons, d as changeTab$1, e as showHideNavigationButtons, f as formLoad, D as DataUnit, i as invalidField$1 } from './DataUnit-ab1a3a4d.js';
 
 const ezButtonCss = ":host{--bt--min-width:100px;--bt--height:42px;--bt__icon--width:18px;--bt__inline__icon--padding:12px;--bt--padding-top:var(--space--medium, 12px);--bt--padding-bottom:var(--space--medium, 12px);--bt--padding-right:var(--space--large, 24px);--bt--padding-left:var(--space--large, 24px);--bt--color:var(--text--inverted, #FFF);--bt--font-size:var(--text--medium, 14px);--bt--font-family:var(--font-pattern, Arial);--bt--font-weight:var(--text-weight--large);--bt--background-color:var(--color--primary, #c0c0c0);--bt--border-radius:var(--border--radius-large, 12px);--bt--border:none;--bt--hover--background-color:var(--color--primary-700, var(--bt--background-color));--bt--disabled--color:var(--color--disable-primary, var(--bt--color));--bt--disabled--background-color:var(--color--disabled, var(--bt--background-color));--bt--focus--border:var(--bt--border);--bt--focus--box-shadow:none}button{display:flex;align-items:center;justify-content:center;margin:0;cursor:pointer;transition:background-color 0.2s linear;min-width:var(--bt--min-width);height:var(--bt--height);font-family:var(--bt--font-family);font-size:var(--bt--font-size);font-weight:var(--bt--font-weight);padding:var(--bt--padding-top) var(--bt--padding-right) var(--bt--padding-bottom) var(--bt--padding-left);border-radius:var(--bt--border-radius);background-color:var(--bt--background-color);color:var(--bt--color);fill:var(--bt--color);border:var(--bt--border)}button:hover{background-color:var(--bt--hover--background-color)}button:focus{outline:none;border:var(--bt--focus--border);box-shadow:var(--bt--focus--box-shadow)}button:disabled{background-color:var(--bt--disabled--background-color);color:var(--bt--disabled--color);fill:var(--bt--disabled--color);border:none;cursor:no-drop}button.icon{width:42px;min-width:42px;height:42px;padding:0px}a{font-family:var(--bt--font-family);font-size:var(--bt--font-size);font-weight:var(--bt--font-weight);cursor:pointer;display:flex;align-items:center;justify-content:center}";
 
@@ -2033,8 +2033,8 @@ const NavigationBar = ({ dataUnit: du, buttonProps }) => {
     return h("div", { class: "col col--sd-12 align--right" },
       buttonProps.previousVisible ? h("ez-button", { title: "Registro anterior", mode: "icon", enabled: du.hasPrevious(), onClick: () => du.previous(), image: "/themes/default/images/icons/actions-sprite.svg#previous-circle-inverted", class: "button--secondary margin-right--medium" }) : null,
       buttonProps.nextVisible ? h("ez-button", { title: "Pr\u00F3ximo registro", mode: "icon", enabled: du.hasNext(), onClick: () => du.next(), image: "/themes/default/images/icons/actions-sprite.svg#next-circle-inverted", class: "button--secondary margin-right--medium" }) : null,
-      buttonProps.removeVisible ? h("ez-button", { title: "Remover " + du.unitLabel, mode: "icon", enabled: du.hasCurrentRecord(), onClick: () => removeHandler(du), image: "/themes/default/images/icons/actions-sprite.svg#minus-circle-inverted", class: "button--secondary margin-right--medium" }) : null,
-      buttonProps.addVisible ? h("ez-button", { label: "Criar " + du.unitLabel, onClick: () => du.insert(), class: "button--secondary margin-right--medium" }) : null,
+      buttonProps.removeVisible ? h("ez-button", { label: "Remover", enabled: du.hasCurrentRecord(), onClick: () => removeHandler(du), image: "/themes/default/images/icons/actions-sprite.svg#minus-circle-inverted", class: "button--secondary margin-right--medium" }) : null,
+      buttonProps.addVisible ? h("ez-button", { label: "Adicionar", onClick: () => du.insert(), class: "button--secondary margin-right--medium" }) : null,
       buttonProps.reloadVisible ? h("ez-button", { title: "Recarregar", mode: "icon", onClick: () => du.load(), image: "/themes/default/images/icons/actions-sprite.svg#rotate", class: "button--secondary margin-right--medium" }) : null,
       buttonProps.cancelVisible ? h("ez-button", { label: "Cancelar", enabled: du.hasChanges(), onClick: () => du.cancel(), class: "button--secondary margin-right--medium" }) : null,
       buttonProps.saveVisible ? h("ez-button", { label: "Salvar", enabled: du.hasChanges(), onClick: () => du.save(), class: "button--primary margin-right--medium" }) : null);
@@ -2156,7 +2156,7 @@ const FormSheet = ({ store, parentName, source, parentDataUnit, dataUnitBuilder
   const selectedTab = selectCurrentTab(store.getState(), parentName);
   const tabs = source.length > 1 ? source.map(form => h("ez-tab", { label: form.label, tabKey: form.name })) : null;
   const { subForms, items, name } = source[selectedTab];
-  const dataUnit = dataUnitBuilder(source[selectedTab].dataUnit);
+  const dataUnit = dataUnitBuilder(source[selectedTab].dataUnit, parentDataUnit);
   source[selectedTab].dataUnit = dataUnit;
   const hasSubForms = subForms && subForms.length > 0;
   const changeTabHandler = (index) => {
@@ -2184,20 +2184,36 @@ const ezFormCss = "ez-form{display:flex;flex-direction:column;width:100%}.form-s
 const EzForm = class {
   constructor(hostRef) {
     registerInstance(this, hostRef);
-    this._dataUnits = [];
+    this._dataUnits = new Map();
+    this._duSources = new Map();
     this._requiredFieldsByDU = {};
   }
   async validate() {
-    for (let i = 0; i < this._dataUnits.length; i++) {
-      if (!this._dataUnits[i].validateRecords()) {
+    for (let i = 0; i < this._duSources.size; i++) {
+      const duName = Array.from(this._duSources.keys())[i];
+      let du = this._dataUnits.get(duName);
+      if (du === undefined) {
+        const source = this._duSources.get(duName);
+        du = this.buildDataUnit(source, source.parentDUName);
+      }
+      if (!du.validateRecords()) {
         return false;
       }
     }
+    return true;
   }
   async getChanges() {
+    debugger;
     let allChanges = [];
-    for (let i = 0; i < this._dataUnits.length; i++) {
-      allChanges = allChanges.concat(this._dataUnits[i].getChangesToSave());
+    for (let i = 0; i < this._dataUnits.size; i++) {
+      const du = Array.from(this._dataUnits.values())[i];
+      //Só devemos buscar as alterações de DU raiz, pois os sub DUs serão enviados junto.
+      if (!du.parentDU) {
+        const duChanges = du.getChangesToSave();
+        if (duChanges) {
+          allChanges = allChanges.concat(duChanges);
+        }
+      }
     }
     return allChanges;
   }
@@ -2216,7 +2232,7 @@ const EzForm = class {
         }
       });
     };
-    if (records.length == 0) {
+    if (dataUnit.records.length == 0) {
       recordValidator({});
     }
     else {
@@ -2240,8 +2256,9 @@ const EzForm = class {
     }
   }
   loadMDFromExecutor(callBack) {
-    if (this._loadMetadataFunction) {
-      const result = this._loadMetadataFunction();
+    const loadMetadataFunction = this.parseExecutor(this.metadataexecutor);
+    if (loadMetadataFunction) {
+      const result = loadMetadataFunction();
       if (result) {
         if (result instanceof Promise) {
           result.then(md => {
@@ -2294,13 +2311,20 @@ const EzForm = class {
           }
         });
         (_a = form.subForms) === null || _a === void 0 ? void 0 : _a.forEach((subForm, index) => {
-          const subDU = subForm.dataUnit ? subForm.dataUnit.name : duName;
-          processFields(subDU, subForm, form.name, index);
+          const subDu = subForm.dataUnit;
+          if (subDu) {
+            this._duSources.set(subDu.name, subDu);
+            subDu.parentDUName = duName;
+          }
+          processFields(subDu ? subDu.name : duName, subForm, form.name, index);
         });
       };
       this.metadata = metadata;
       metadata.map((form, index) => {
-        processFields(form.dataUnit.name, form, "__MAIN__FORM__", index);
+        const du = form.dataUnit;
+        const duName = du.name;
+        this._duSources.set(duName, du);
+        processFields(duName, form, "__MAIN__FORM__", index);
       });
       this._store.dispatch(formLoad());
     }
@@ -2312,11 +2336,6 @@ const EzForm = class {
     return null;
   }
   componentDidLoad() {
-    this._loadMetadataFunction = this.parseExecutor(this.metadataexecutor);
-    this._loadDataFunction = this.parseExecutor(this.loadexecutor);
-    this._saveFunction = this.parseExecutor(this.saveexecutor);
-    this._removeFunction = this.parseExecutor(this.removeexecutor);
-    this._fieldSearchFunction = this.parseExecutor(this.fieldsearchexecutor);
     if (this.metadata) {
       this.updateMetadata(this.metadata);
     }
@@ -2327,27 +2346,34 @@ const EzForm = class {
       }
     }
   }
-  buildDataUnit(dataUnit) {
+  buildDataUnit(dataUnit, parentDataUnit) {
     if (dataUnit) {
       const { name, unitLabel, records, cardinality } = dataUnit;
       if (!(dataUnit instanceof DataUnit)) {
-        dataUnit = new DataUnit(name, unitLabel, cardinality);
-        this._dataUnits.push(dataUnit);
+        let parent;
+        if (parentDataUnit instanceof DataUnit) {
+          parent = parentDataUnit;
+        }
+        else {
+          parent = this._dataUnits.get(parentDataUnit);
+        }
+        dataUnit = new DataUnit(name, unitLabel, cardinality, parent);
+        this._dataUnits.set(dataUnit.name, dataUnit);
         if (records) {
           dataUnit.records = records;
         }
         dataUnit.store = this._store;
-        dataUnit.loadExecutor = this._loadDataFunction;
-        dataUnit.saveExecutor = this._saveFunction;
-        dataUnit.removeExecutor = this._removeFunction;
+        dataUnit.loadExecutor = this.parseExecutor(this.loadexecutor);
+        dataUnit.saveExecutor = this.parseExecutor(this.saveexecutor);
+        dataUnit.removeExecutor = this.parseExecutor(this.removeexecutor);
         dataUnit.recordsValidator = this;
-        dataUnit.fieldSearchExecutor = this._fieldSearchFunction;
+        dataUnit.fieldSearchExecutor = this.parseExecutor(this.fieldsearchexecutor);
       }
     }
     return dataUnit;
   }
   render() {
-    return this.metadata ? h(FormSheet, { store: this._store, source: this.metadata, parentName: "__MAIN__FORM__", dataUnitBuilder: (du) => this.buildDataUnit(du) }) : null;
+    return this.metadata ? h(FormSheet, { store: this._store, source: this.metadata, parentName: "__MAIN__FORM__", dataUnitBuilder: (du, parentDataUnit) => this.buildDataUnit(du, parentDataUnit) }) : null;
   }
   get _host() { return getElement(this); }
 };

package/dist/esm/ez-modal.entry.js

@@ -22,7 +22,6 @@ const EzModal = class {
       console.log(ev === null || ev === void 0 ? void 0 : ev.key);
       if ((ev === null || ev === void 0 ? void 0 : ev.key) === 'Escape' && this.closeesc) {
         this.oppened = false;
-        debugger;
         this.ezChange.emit(this.oppened);
       }
     };
@@ -31,7 +30,6 @@ const EzModal = class {
     ev === null || ev === void 0 ? void 0 : ev.stopPropagation();
     if (ev instanceof PointerEvent && this.closeoutsideclick) {
       this.oppened = false;
-      debugger;
       this.ezChange.emit(this.oppened);
     }
   }

package/dist/esm/form-metadata.entry.js

@@ -1,5 +1,5 @@
 import { r as registerInstance, h, g as getElement, H as Host } from './index-95bb3fd9.js';
-import { D as DataUnit } from './DataUnit-ac4cc054.js';
+import { D as DataUnit } from './DataUnit-ab1a3a4d.js';
 
 const FormMetadata = class {
   constructor(hostRef) {

package/dist/ezui/ezui.esm.js

@@ -1 +1 @@
-import{p as e,b as a}from"./p-185c57f4.js";(()=>{const a=import.meta.url,l={};return""!==a&&(l.resourcesUrl=new URL(".",a).href),e(l)})().then((e=>a([["p-fa260f22",[[1,"ez-label-chip",{label:[513],enabled:[516],removable:[516],value:[1540],setFocus:[64],setBlur:[64]}]]],["p-dd4331b7",[[1,"ez-time-input",{label:[513],viewValue:[1537,"view-value"],value:[1026],enabled:[516],errormessage:[1537],showSeconds:[516,"show-seconds"],setFocus:[64],setBlur:[64]}]]],["p-22b82efb",[[1,"ez-action-chip",{label:[513],enabled:[516]}]]],["p-77fdb4fd",[[1,"ez-modal",{modalsize:[1537],align:[1537],oppened:[1540],closeesc:[1540],closeoutsideclick:[1540]}]]],["p-f6fd31ab",[[1,"ez-number-input",{strvalue:[1025],value:[1026],label:[513],enabled:[516],errormessage:[1537],precision:[1538],prettyprecision:[1538],textleft:[516],formatnumber:[513],setFocus:[64],setBlur:[64],handleFocusout:[64]}]]],["p-346050cf",[[1,"form-metadata",{name:[1],label:[1],dataunit:[1025],many:[4],autoload:[4],metadata:[1040]}]]],["p-f95e3c71",[[0,"ez-form",{metadataexecutor:[1],loadexecutor:[1],saveexecutor:[1],removeexecutor:[1],fieldsearchexecutor:[1],metadata:[1040],slavemode:[4],validate:[64],getChanges:[64]}],[1,"ez-combo-box",{value:[1537],label:[513],enabled:[516],showvalue:[516],options:[1040],errormessage:[1537],_inputLabelValue:[32],_criteria:[32],_preSelection:[32],_visibleOptions:[32],setFocus:[64],setBlur:[64]}],[1,"ez-date-input",{label:[513],value:[1040],enabled:[516],errormessage:[1537]}],[1,"ez-search",{value:[1537],label:[1537],enabled:[1540],qtdHotItems:[514,"qtd-hot-items"],showvalue:[516],errormessage:[1537],loadexecutor:[1],hotsearchid:[1],_preSelection:[32],_visibleOptions:[32],onInputTeste:[64]}],[1,"ez-button",{label:[513],enabled:[516],mode:[513],image:[513]}],[1,"ez-check",{value:[1540],enabled:[516],mode:[513],getMode:[64],setFocus:[64]}],[1,"ez-collapsable-box",{value:[1540],label:[513],showHide:[64]}],[1,"ez-tabselector",{selectedindex:[1537],selectedtab:[1537],tabs:[1]}],[1,"ez-text-area",{label:[513],value:[1537],enabled:[516],loading:[516],errormessage:[1537],rows:[1538],setFocus:[64],setBlur:[64]}],[1,"place-holder"],[1,"ez-calendar",{value:[1040],floating:[516],show:[64],hide:[64]}],[1,"ez-popover",{autoclose:[516],top:[1537],left:[1537],bottom:[1537],right:[1537],boxwidth:[513],isOpened:[1540,"is-opened"],updatePosition:[64],show:[64],hide:[64]}],[1,"ez-icon",{size:[513],href:[513]}],[1,"ez-text-input",{label:[513],value:[1537],enabled:[516],loading:[516],errormessage:[1537],onlynumber:[516],mask:[1],restrict:[1],setFocus:[64],setBlur:[64]}]]]],e)));
+import{p as e,b as a}from"./p-185c57f4.js";(()=>{const a=import.meta.url,l={};return""!==a&&(l.resourcesUrl=new URL(".",a).href),e(l)})().then((e=>a([["p-fa260f22",[[1,"ez-label-chip",{label:[513],enabled:[516],removable:[516],value:[1540],setFocus:[64],setBlur:[64]}]]],["p-dd4331b7",[[1,"ez-time-input",{label:[513],viewValue:[1537,"view-value"],value:[1026],enabled:[516],errormessage:[1537],showSeconds:[516,"show-seconds"],setFocus:[64],setBlur:[64]}]]],["p-22b82efb",[[1,"ez-action-chip",{label:[513],enabled:[516]}]]],["p-77fdb4fd",[[1,"ez-modal",{modalsize:[1537],align:[1537],oppened:[1540],closeesc:[1540],closeoutsideclick:[1540]}]]],["p-f6fd31ab",[[1,"ez-number-input",{strvalue:[1025],value:[1026],label:[513],enabled:[516],errormessage:[1537],precision:[1538],prettyprecision:[1538],textleft:[516],formatnumber:[513],setFocus:[64],setBlur:[64],handleFocusout:[64]}]]],["p-b02e731e",[[1,"form-metadata",{name:[1],label:[1],dataunit:[1025],many:[4],autoload:[4],metadata:[1040]}]]],["p-83f1d308",[[0,"ez-form",{metadataexecutor:[1],loadexecutor:[1],saveexecutor:[1],removeexecutor:[1],fieldsearchexecutor:[1],metadata:[1040],slavemode:[4],validate:[64],getChanges:[64]}],[1,"ez-combo-box",{value:[1537],label:[513],enabled:[516],showvalue:[516],options:[1040],errormessage:[1537],_inputLabelValue:[32],_criteria:[32],_preSelection:[32],_visibleOptions:[32],setFocus:[64],setBlur:[64]}],[1,"ez-date-input",{label:[513],value:[1040],enabled:[516],errormessage:[1537]}],[1,"ez-search",{value:[1537],label:[1537],enabled:[1540],qtdHotItems:[514,"qtd-hot-items"],showvalue:[516],errormessage:[1537],loadexecutor:[1],hotsearchid:[1],_preSelection:[32],_visibleOptions:[32],onInputTeste:[64]}],[1,"ez-button",{label:[513],enabled:[516],mode:[513],image:[513]}],[1,"ez-check",{value:[1540],enabled:[516],mode:[513],getMode:[64],setFocus:[64]}],[1,"ez-collapsable-box",{value:[1540],label:[513],showHide:[64]}],[1,"ez-tabselector",{selectedindex:[1537],selectedtab:[1537],tabs:[1]}],[1,"ez-text-area",{label:[513],value:[1537],enabled:[516],loading:[516],errormessage:[1537],rows:[1538],setFocus:[64],setBlur:[64]}],[1,"place-holder"],[1,"ez-calendar",{value:[1040],floating:[516],show:[64],hide:[64]}],[1,"ez-popover",{autoclose:[516],top:[1537],left:[1537],bottom:[1537],right:[1537],boxwidth:[513],isOpened:[1540,"is-opened"],updatePosition:[64],show:[64],hide:[64]}],[1,"ez-icon",{size:[513],href:[513]}],[1,"ez-text-input",{label:[513],value:[1537],enabled:[516],loading:[516],errormessage:[1537],onlynumber:[516],mask:[1],restrict:[1],setFocus:[64],setBlur:[64]}]]]],e)));