mmhglobal-dynamicform 2.6.0 → 2.6.2

package/fesm2020/mmhglobal-dynamicform.mjs

@@ -8155,7 +8155,9 @@ class ZgridComponent extends DataListingFieldBase {
             if (this.zgrid) {
                 if (this.isUseLocalData()) {
                     this.zgrid.data = gData;
-                    this.setDateColForFiltering();
+                    if (!this.data.DisableAutoAppendGridDateFilterCol) {
+                        this.setDateColForFiltering();
+                    }
                 }
                 else {
                     this.zgrid.grid.data = {
@@ -8644,7 +8646,9 @@ class ZgridComponent extends DataListingFieldBase {
             this.zgrid = grid;
             this._state = this.zgrid.state;
             this.columns = this.zgrid.gridColumns;
-            this.setDateColForFiltering();
+            if (!this.data.DisableAutoAppendGridDateFilterCol) {
+                this.setDateColForFiltering();
+            }
             this.setupGridWithInlineEdit();
             this.setupPopoverFeature(this.columns, this.getGridData());
         }), switchMap$1(() => {
@@ -11930,7 +11934,8 @@ class ZudfComponent extends ContainerFieldBase {
                         isGrouped: false,
                         isVisible: field.Visible ?? false,
                         isRequired: field.IsRequired ?? false,
-                        isReadOnly: field.ReadOnly ?? false
+                        isReadOnly: field.ReadOnly ?? false,
+                        dataSourceType: field.zudfDataSourceType ?? null //value aka manual, user, resource aka resource
                     };
                     if (field.MultiValuedGroup) {
                         this.setMultiValueGroup(field);
@@ -11966,7 +11971,8 @@ class ZudfComponent extends ContainerFieldBase {
                             isGrouped: fieldValueGrouped,
                             isVisible: field.Visible ?? false,
                             isRequired: field.IsRequired ?? false,
-                            isReadOnly: field.ReadOnly ?? false
+                            isReadOnly: field.ReadOnly ?? false,
+                            dataSourceType: field.zudfDataSourceType ?? null //value aka manual, user, resource aka resource
                         };
                         if (containerName) {
                             if (!zudfGroup[containerName].includes(field.Value)) {
@@ -12052,16 +12058,20 @@ class ZudfComponent extends ContainerFieldBase {
         const patchedModelData = this.addZModelPropertyPrefix(modelData);
         // Update the zModel values of the form group
         Object.assign(group[this.componentScopeName].zModel, patchedModelData);
-        // Update grid values for any arrays in the model data
+        // Update grid values for any arrays in the model data base on kcard component. 
         for (const model in patchedModelData) {
             if (Array.isArray(patchedModelData[model])) {
                 const gridValue = `${model}${this.prefixValueOption}`;
                 const gridDataSource = `${model}${this.prefixDataSourceName}`;
-                // Update the data source for the grid
-                group[gridDataSource] = patchedModelData[model];
-                // Update the grid value
-                if (group[gridValue]) {
-                    group[gridValue].setData(group[gridDataSource]);
+                // Check is it kcard, sometime can be dropdown.
+                const component = ZComponentHelper.getComponentByValue(this.group, model);
+                if (component?.data?.Type === 'kcard') {
+                    // Update the data source for the grid
+                    group[gridDataSource] = patchedModelData[model];
+                    // Update the grid value
+                    if (group[gridValue]) {
+                        group[gridValue].setData(group[gridDataSource]);
+                    }
                 }
             }
         }
@@ -12292,7 +12302,8 @@ class ZudfComponent extends ContainerFieldBase {
             "Type": "zgrid",
             "Value": 'group.' + gridValueName,
             "Visible": true,
-            "WidthReduce": 500
+            "WidthReduce": 500,
+            "DisableAutoAppendGridDateFilterCol": true
         };
         // Create a property in the group object based on the above declaration, except Name, and also insert column fields.
         // Use the grouping value as the column and skip inserting any container type.