ngx-rs-ant 2.2.9 → 2.3.0

package/fesm2015/ngx-rs-ant.mjs

@@ -1711,14 +1711,15 @@ class DataGridService {
         }
         return window.coast.cache[key];
     }
-    getUserColumnDataSource(tenant, className, view, field) {
+    getUserColumnDataSource(tenant, className, view, field, filter) {
         return this.http.get('api/data/custom', {
             params: {
                 executor: 'com.cs.system.data.grid.header.filter.GetUserColumnDataSource',
                 tenant,
                 className,
                 view: view || '',
-                field
+                field,
+                filter: filter || ''
             }
         }).pipe(map(response => {
             response.data.list.unshift({
@@ -1733,14 +1734,15 @@ class DataGridService {
             return response.data.list;
         }));
     }
-    getUnitColumnDataSource(tenant, className, view, field) {
+    getUnitColumnDataSource(tenant, className, view, field, filter) {
         return this.http.get('api/data/custom', {
             params: {
                 executor: 'com.cs.system.data.grid.header.filter.GetUnitColumnDataSource',
                 tenant,
                 className,
                 view: view || '',
-                field
+                field,
+                filter: filter || ''
             }
         }).pipe(map(response => {
             response.data.list.unshift({
@@ -1755,7 +1757,7 @@ class DataGridService {
             return response.data.list;
         }));
     }
-    getConstraintColumnDataSource(tenant, className, view, field, constraintName) {
+    getConstraintColumnDataSource(tenant, className, view, field, constraintName, filter) {
         return this.http.get('api/data/custom', {
             params: {
                 executor: 'com.cs.system.data.grid.header.filter.GetConstraintColumnDataSource',
@@ -1763,7 +1765,8 @@ class DataGridService {
                 className,
                 view: view || '',
                 field,
-                constraintName
+                constraintName,
+                filter: filter || ''
             }
         }).pipe(map(response => {
             response.data.list.unshift({
@@ -1778,14 +1781,15 @@ class DataGridService {
             return response.data.list;
         }));
     }
-    getColumnDataSource(tenant, className, view, field) {
+    getColumnDataSource(tenant, className, view, field, filter) {
         return this.http.get('api/data/custom', {
             params: {
                 executor: 'com.cs.system.data.grid.header.filter.GetColumnDataSource',
                 tenant,
                 className,
                 view: view || '',
-                field
+                field,
+                filter: filter || ''
             }
         }).pipe(map(response => {
             return response.data.list;
@@ -2189,7 +2193,7 @@ class DataGridFactory {
         };
         this.service = new DataGridService(http);
     }
-    makeDataGridColumns(tenant, className, view) {
+    makeDataGridColumns(tenant, className, view, dataGridInstance) {
         const result = new Subject();
         this.service.getMetadataByView(tenant, className, view || '').subscribe(response => {
             const columns = [];
@@ -2304,7 +2308,8 @@ class DataGridFactory {
                                         column.headerFilter.dataSource = {
                                             store: new CustomStore({
                                                 load: () => {
-                                                    return lastValueFrom(this.service.getUserColumnDataSource(tenant, className, view, field.name));
+                                                    const filter = JSON.stringify(dataGridInstance.getCombinedFilter());
+                                                    return lastValueFrom(this.service.getUserColumnDataSource(tenant, className, view, field.name, filter));
                                                 }
                                             }),
                                             paginate: true
@@ -2345,7 +2350,8 @@ class DataGridFactory {
                                         column.headerFilter.dataSource = {
                                             store: new CustomStore({
                                                 load: () => {
-                                                    return lastValueFrom(this.service.getUnitColumnDataSource(tenant, className, view, field.name));
+                                                    const filter = JSON.stringify(dataGridInstance.getCombinedFilter());
+                                                    return lastValueFrom(this.service.getUnitColumnDataSource(tenant, className, view, field.name, filter));
                                                 }
                                             }),
                                             paginate: true
@@ -2383,7 +2389,8 @@ class DataGridFactory {
                                         column.headerFilter.dataSource = {
                                             store: new CustomStore({
                                                 load: () => {
-                                                    return lastValueFrom(this.service.getConstraintColumnDataSource(tenant, className, view, field.name, field.config.constraint.name));
+                                                    const filter = JSON.stringify(dataGridInstance.getCombinedFilter());
+                                                    return lastValueFrom(this.service.getConstraintColumnDataSource(tenant, className, view, field.name, field.config.constraint.name, filter));
                                                 }
                                             }),
                                             paginate: true
@@ -2462,8 +2469,7 @@ class DataGridFactory {
                 if (loadOptions.dataField) {
                     // 未重写headerFilter的dataSource时，headerFilter会调用load方法加载筛选树，重写该方法查询该表所有数据
                     // 该方式存在风险，无法识别DevExtreme一定是通过headerFilter过滤才存在dataField参数
-                    // TODO 需要考虑已存在的过滤条件，与带约束的字段存在冲突，此处存在过滤条件，加载列时带约束的字段构建的dataSource获取不到过滤条件
-                    return lastValueFrom(this.service.getColumnDataSource(tenant, className, view, loadOptions.dataField));
+                    return lastValueFrom(this.service.getColumnDataSource(tenant, className, view, loadOptions.dataField, JSON.stringify(loadOptions.filter)));
                 }
                 let params = '?';
                 if (loadOptions.skip || loadOptions.take) {
@@ -3015,7 +3021,7 @@ class DataGridComponent {
     }
     reload() {
         this.columns.length = 0;
-        this.factory.makeDataGridColumns(this.tenant, this.className, this.view).subscribe(columns => {
+        this.factory.makeDataGridColumns(this.tenant, this.className, this.view, this).subscribe(columns => {
             if (this.customColumnFn) {
                 this.customColumnFn(columns);
             }