ngx-rs-ant 0.9.6 → 0.9.9

package/fesm2020/ngx-rs-ant.mjs

@@ -895,12 +895,12 @@ class DataGridComponent {
         this.reload();
     }
     reload() {
-        this.dxDataGrid.instance?.state(null);
+        this.columns.length = 0;
         this.service.getMetadataByView(this.tenant, this.className, this.view || '').subscribe((response) => {
-            this.columns = [];
+            const columns = [];
             for (let field of response.data.columns) {
                 if (field.type === 'FILE') {
-                    this.columns.push({
+                    columns.push({
                         dataField: field.name,
                         caption: field.caption,
                         dataType: 'string',
@@ -924,7 +924,7 @@ class DataGridComponent {
                         format: this.typeMap[field.dataType].format,
                         visible: field.visible
                     };
-                    this.columns.push(column);
+                    columns.push(column);
                     switch (field.dataType) {
                         case 'BOOLEAN':
                             column.allowHeaderFiltering = false;
@@ -1131,7 +1131,7 @@ class DataGridComponent {
                     }
                 }
                 else if (field.type === 'RELATION') {
-                    this.columns.push({
+                    columns.push({
                         dataField: field.name,
                         caption: field.caption,
                         dataType: 'string',
@@ -1143,8 +1143,9 @@ class DataGridComponent {
                 }
             }
             if (this.customColumnFn) {
-                this.customColumnFn(this.columns);
+                this.customColumnFn(columns);
             }
+            this.columns = columns;
         });
         this.dataSource = new CustomStore({
             key: 'oid',
@@ -1395,6 +1396,13 @@ class FormComponent {
     submitForm($event) {
         if (!$event.valid) {
             this.submitCallback.emit({ success: false });
+            for (let controlKey in this.formGroup.controls) {
+                const control = this.formGroup.controls[controlKey];
+                if (!control.valid && control.originElement) {
+                    control.originElement.scrollIntoView();
+                    break;
+                }
+            }
             return;
         }
         this.service.createOrUpdate(this.tenant, this.className, {