ngx-rs-ant 2.3.0 → 2.3.2

package/fesm2020/ngx-rs-ant.mjs

@@ -2254,40 +2254,9 @@ class DataGridFactory {
                                 break;
                             case 'DOUBLE':
                             case 'INTEGER':
-                                column.headerFilter.dataSource = (options) => {
-                                    options.dataSource.postProcess = (data) => {
-                                        data.unshift({
-                                            key: '',
-                                            value: null,
-                                            text: '(空白)'
-                                        });
-                                        data.push({
-                                            key: '__',
-                                            value: '__',
-                                            text: '__',
-                                            visible: false
-                                        });
-                                    };
-                                };
                                 column.alignment = 'right';
                                 break;
                             case 'STRING':
-                                column.headerFilter.dataSource = (options) => {
-                                    // TODO 超过20条会分页添加多次，不分页前端性能差，考虑在构建dataSource时处理，与日期类型存在冲突
-                                    options.dataSource.postProcess = (data) => {
-                                        data.unshift({
-                                            key: '',
-                                            value: null,
-                                            text: '(空白)'
-                                        });
-                                        data.push({
-                                            key: '__',
-                                            value: '__',
-                                            text: '__',
-                                            visible: false
-                                        });
-                                    };
-                                };
                                 switch (field.config.constraint.type) {
                                     case 'USER':
                                         if (column.viewConfig) {
@@ -2299,7 +2268,7 @@ class DataGridFactory {
                                         column.headerFilter.dataSource = {
                                             store: new CustomStore({
                                                 load: () => {
-                                                    const filter = JSON.stringify(dataGridInstance.getCombinedFilter());
+                                                    const filter = JSON.stringify(dataGridInstance.instance.getCombinedFilter());
                                                     return lastValueFrom(this.service.getUserColumnDataSource(tenant, className, view, field.name, filter));
                                                 }
                                             }),
@@ -2344,7 +2313,7 @@ class DataGridFactory {
                                         column.headerFilter.dataSource = {
                                             store: new CustomStore({
                                                 load: () => {
-                                                    const filter = JSON.stringify(dataGridInstance.getCombinedFilter());
+                                                    const filter = JSON.stringify(dataGridInstance.instance.getCombinedFilter());
                                                     return lastValueFrom(this.service.getUnitColumnDataSource(tenant, className, view, field.name, filter));
                                                 }
                                             }),
@@ -2383,7 +2352,7 @@ class DataGridFactory {
                                         column.headerFilter.dataSource = {
                                             store: new CustomStore({
                                                 load: () => {
-                                                    const filter = JSON.stringify(dataGridInstance.getCombinedFilter());
+                                                    const filter = JSON.stringify(dataGridInstance.instance.getCombinedFilter());
                                                     return lastValueFrom(this.service.getConstraintColumnDataSource(tenant, className, view, field.name, field.config.constraint.name, filter));
                                                 }
                                             }),
@@ -3017,7 +2986,7 @@ class DataGridComponent {
     }
     reload() {
         this.columns.length = 0;
-        this.factory.makeDataGridColumns(this.tenant, this.className, this.view, this).subscribe(columns => {
+        this.factory.makeDataGridColumns(this.tenant, this.className, this.view, this.dxDataGrid).subscribe(columns => {
             if (this.customColumnFn) {
                 this.customColumnFn(columns);
             }
@@ -3337,6 +3306,7 @@ DataGridModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version:
         CellComponentTemplateComponent], imports: [CommonModule,
         DevExtremeModule,
         FormModule], exports: [DataGridComponent,
+        CellComponentTemplateComponent,
         RowButtonsTemplateDirective,
         CustomTemplateDirective] });
 DataGridModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: DataGridModule, imports: [CommonModule,
@@ -3359,6 +3329,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
                     ],
                     exports: [
                         DataGridComponent,
+                        CellComponentTemplateComponent,
                         RowButtonsTemplateDirective,
                         CustomTemplateDirective
                     ]
@@ -5172,5 +5143,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { BoxContainerComponent, BoxContainerModule, CamundaBpmnEditorComponent, CamundaBpmnEditorModule, CamundaBpmnViewerComponent, CamundaBpmnViewerModule, CellComponentBase, CellConfigBase, ChangeFilter, CodeEditorComponent, CodeEditorModule, CustomTemplateDirective, DataGridComponent, DataGridFactory, DataGridModule, DataGridService, DrawerComponent, DrawerModule, DrawerService, DxNativeElementPipe, DynamicParamsComponent, DynamicParamsModule, FieldSelectorComponent, FormComponent, FormItemComponentBase, FormItemConfigBase, FormModule, FormService, FullscreenDirective, IconSelectorComponent, IconSelectorModule, ItemConfigComponent, ItemStyleComponent, MarkItemComponentBase, MarkItemConfigBase, ModalComponent, ModalComponentBase, ModalConfigBase, ModalModule, ModalService, NodeComponent, PageItemComponentBase, PageItemConfigBase, PdfViewerComponent, PluginManager, RowButtonsTemplateDirective, SectionComponent, SectionModule, SectionService, TooltipContentTemplateDirective, WebsocketModule, WebsocketService, WordDesignerComponent, WordDesignerModule, WordEditorComponent, WordEditorModule, addWatermark, deepClone, downloadFile, evaluateFilter, fileTypeIcon, filenameFromDisposition, formatFileSize, localeSortMethod, notifyError, notifySuccess, notifyWarning, openBrowserTab, supportPreviewExt, validate, validateGroup, validateGroupByName };
+export { BoxContainerComponent, BoxContainerModule, CamundaBpmnEditorComponent, CamundaBpmnEditorModule, CamundaBpmnViewerComponent, CamundaBpmnViewerModule, CellComponentBase, CellComponentTemplateComponent, CellConfigBase, ChangeFilter, CodeEditorComponent, CodeEditorModule, CustomTemplateDirective, DataGridComponent, DataGridFactory, DataGridModule, DataGridService, DrawerComponent, DrawerModule, DrawerService, DxNativeElementPipe, DynamicParamsComponent, DynamicParamsModule, FieldSelectorComponent, FormComponent, FormItemComponentBase, FormItemConfigBase, FormModule, FormService, FullscreenDirective, IconSelectorComponent, IconSelectorModule, ItemConfigComponent, ItemStyleComponent, MarkItemComponentBase, MarkItemConfigBase, ModalComponent, ModalComponentBase, ModalConfigBase, ModalModule, ModalService, NodeComponent, PageItemComponentBase, PageItemConfigBase, PdfViewerComponent, PluginManager, RowButtonsTemplateDirective, SectionComponent, SectionModule, SectionService, TooltipContentTemplateDirective, WebsocketModule, WebsocketService, WordDesignerComponent, WordDesignerModule, WordEditorComponent, WordEditorModule, addWatermark, deepClone, downloadFile, evaluateFilter, fileTypeIcon, filenameFromDisposition, formatFileSize, localeSortMethod, notifyError, notifySuccess, notifyWarning, openBrowserTab, supportPreviewExt, validate, validateGroup, validateGroupByName };
 //# sourceMappingURL=ngx-rs-ant.mjs.map