ngx-rs-ant 0.10.5 → 0.10.7

package/fesm2020/ngx-rs-ant.mjs

@@ -822,10 +822,11 @@ class DataGridService {
             return response.data.list;
         }));
     }
-    getColumnDataSource(className, view, field) {
+    getColumnDataSource(tenant, className, view, field) {
         return this.http.get('api/data/custom', {
             params: {
                 executor: 'com.cs.system.data.grid.header.filter.GetColumnDataSource',
+                tenant,
                 className,
                 view: view || '',
                 field
@@ -989,7 +990,7 @@ class DataGridComponent {
     }
     reload() {
         this.columns.length = 0;
-        this.service.getMetadataByView(this.tenant, this.className, this.view || '').subscribe((response) => {
+        this.service.getMetadataByView(this.tenant, this.className, this.view || '').subscribe(response => {
             const columns = [];
             for (let field of response.data.columns) {
                 switch (field.type) {
@@ -1270,7 +1271,7 @@ class DataGridComponent {
                 if (loadOptions.dataField) {
                     // 未重写headerFilter的dataSource时，headerFilter会调用load方法加载筛选树，重写该方法查询该表所有数据
                     // 该方式存在风险，无法识别一定是通过headerFilter过滤才存在dataField参数
-                    return lastValueFrom(this.service.getColumnDataSource(this.className, this.view, loadOptions.dataField));
+                    return lastValueFrom(this.service.getColumnDataSource(this.tenant, this.className, this.view, loadOptions.dataField));
                 }
                 let params = '?';
                 if (loadOptions.skip || loadOptions.take) {
@@ -1462,6 +1463,16 @@ class FormService {
             }
         });
     }
+    getInitModelByTemplate(tenant, className, template) {
+        let api = 'api/data/' + className + '/new';
+        return this.http.get(api, {
+            params: {
+                tenant,
+                className,
+                template: template || ''
+            }
+        });
+    }
     createOrUpdate(tenant, className, model) {
         let api = 'api/data/' + className;
         if (model.oid) {
@@ -1490,12 +1501,12 @@ class FormComponent {
         this.loading = false;
     }
     ngOnInit() {
-        this.service.getFormTemplateConfig(this.tenant, this.className, this.template).subscribe((response) => {
+        this.loading = true;
+        this.service.getFormTemplateConfig(this.tenant, this.className, this.template).subscribe(response => {
             this.config = response.data.template;
             if (this.copyOid || this.oid) {
-                this.loading = true;
                 this.service.getOne(this.tenant, this.className, this.copyOid || this.oid, this.template)
-                    .subscribe((response) => {
+                    .subscribe(response => {
                     if (this.copyOid) {
                         delete response.data.oid;
                     }
@@ -1505,8 +1516,11 @@ class FormComponent {
                 });
             }
             else {
-                this.model = {};
-                this.loaded = true;
+                this.service.getInitModelByTemplate(this.tenant, this.className, this.template).subscribe(response => {
+                    this.model = response.data;
+                    this.loaded = true;
+                    this.loading = false;
+                });
             }
         });
     }
@@ -1525,7 +1539,7 @@ class FormComponent {
         this.service.createOrUpdate(this.tenant, this.className, {
             oid: this.oid,
             ...this.model
-        }).subscribe((response) => {
+        }).subscribe(response => {
             this.submitCallback.emit(response);
         });
     }