@smartbit4all/ng-client 3.2.2 → 3.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/smart-filter-editor/smart-filter-editor-content/smart-filter-editor-content.component.mjs +31 -27
- package/fesm2015/smartbit4all-ng-client.mjs +25 -22
- package/fesm2015/smartbit4all-ng-client.mjs.map +1 -1
- package/fesm2020/smartbit4all-ng-client.mjs +27 -24
- package/fesm2020/smartbit4all-ng-client.mjs.map +1 -1
- package/lib/smart-filter-editor/smart-filter-editor-content/smart-filter-editor-content.component.d.ts +9 -6
- package/package.json +1 -1
- package/smartbit4all-ng-client-3.2.3.tgz +0 -0
- package/smartbit4all-ng-client-3.2.2.tgz +0 -0
|
@@ -13607,24 +13607,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
|
|
|
13607
13607
|
}] } });
|
|
13608
13608
|
|
|
13609
13609
|
class SmartFilterEditorContentComponent {
|
|
13610
|
-
constructor(layoutService) {
|
|
13610
|
+
constructor(layoutService, cfService) {
|
|
13611
13611
|
this.layoutService = layoutService;
|
|
13612
|
+
this.cfService = cfService;
|
|
13612
13613
|
this._destroy$ = new Subject();
|
|
13613
13614
|
this.uiActionModels = [];
|
|
13614
13615
|
this.expressionUiActionModels = [];
|
|
13615
13616
|
this.type = FilterExpressionBuilderUiModel.TypeEnum;
|
|
13616
13617
|
}
|
|
13617
|
-
ngAfterViewInit() { }
|
|
13618
13618
|
ngOnInit() {
|
|
13619
|
-
this.service.load();
|
|
13620
13619
|
this.service.modelChanged.pipe(takeUntil(this._destroy$)).subscribe(() => this.setUp());
|
|
13620
|
+
this.service.load();
|
|
13621
13621
|
}
|
|
13622
13622
|
ngOnDestroy() {
|
|
13623
13623
|
this._destroy$.next();
|
|
13624
13624
|
this._destroy$.complete();
|
|
13625
13625
|
}
|
|
13626
13626
|
setupSimpleFilter() {
|
|
13627
|
-
if (this.
|
|
13627
|
+
if (this.simpleFilterFormChild) {
|
|
13628
13628
|
return;
|
|
13629
13629
|
}
|
|
13630
13630
|
let widgets = [];
|
|
@@ -13666,24 +13666,25 @@ class SmartFilterEditorContentComponent {
|
|
|
13666
13666
|
useOnBlurEvent: true,
|
|
13667
13667
|
widgets,
|
|
13668
13668
|
};
|
|
13669
|
+
this.simpleFilterFormChild = this.cfService.createComponent(this.simpleFilterFormVcRef, SmartformComponent, new Map([['smartForm', this.simpleFilterForm]]));
|
|
13669
13670
|
if (this.smartFilterChangeSubscription) {
|
|
13670
13671
|
this.smartFilterChangeSubscription.unsubscribe();
|
|
13671
13672
|
}
|
|
13672
|
-
this.smartFilterChangeSubscription = this.simpleFilterFormChild.onBlurSubject?.pipe(takeUntil(this._destroy$)).subscribe(() => {
|
|
13673
|
+
this.smartFilterChangeSubscription = this.simpleFilterFormChild.instance.onBlurSubject?.pipe(takeUntil(this._destroy$)).subscribe(() => {
|
|
13673
13674
|
this.saveFilter();
|
|
13674
13675
|
});
|
|
13675
13676
|
if (this.smartFilterSophisticatedChangeSubscription) {
|
|
13676
13677
|
this.smartFilterSophisticatedChangeSubscription.unsubscribe();
|
|
13677
13678
|
}
|
|
13678
13679
|
this.smartFilterSophisticatedChangeSubscription =
|
|
13679
|
-
this.simpleFilterFormChild.sophisticatedValueChange?.pipe(takeUntil(this._destroy$)).subscribe((change) => {
|
|
13680
|
+
this.simpleFilterFormChild.instance.sophisticatedValueChange?.pipe(takeUntil(this._destroy$)).subscribe((change) => {
|
|
13680
13681
|
if (change.kind === 'selection') {
|
|
13681
13682
|
this.saveFilter();
|
|
13682
13683
|
}
|
|
13683
13684
|
});
|
|
13684
13685
|
}
|
|
13685
13686
|
extractFilterFieldFromFormModel() {
|
|
13686
|
-
let simpleFilter = this.simpleFilterFormChild?.submitForm(false).componentModel.data;
|
|
13687
|
+
let simpleFilter = this.simpleFilterFormChild?.instance.submitForm(false).componentModel.data;
|
|
13687
13688
|
let result = [];
|
|
13688
13689
|
Object.keys(simpleFilter).forEach((key) => {
|
|
13689
13690
|
result.push(simpleFilter[key]);
|
|
@@ -13743,10 +13744,11 @@ class SmartFilterEditorContentComponent {
|
|
|
13743
13744
|
componentModel: { data: this.service.model?.selectedField },
|
|
13744
13745
|
widgets: generatedWidgets,
|
|
13745
13746
|
};
|
|
13747
|
+
this.formChild = this.cfService.createComponent(this.formChildVcRef, SmartformComponent, new Map([['smartForm', this.smartForm]]));
|
|
13746
13748
|
if (this.smartformChangeSubscription) {
|
|
13747
13749
|
this.smartformChangeSubscription.unsubscribe();
|
|
13748
13750
|
}
|
|
13749
|
-
this.smartformChangeSubscription = this.formChild?.onBlurSubject
|
|
13751
|
+
this.smartformChangeSubscription = this.formChild?.instance.onBlurSubject
|
|
13750
13752
|
?.pipe(takeUntil(this._destroy$))
|
|
13751
13753
|
.subscribe(() => {
|
|
13752
13754
|
this.save();
|
|
@@ -13754,16 +13756,17 @@ class SmartFilterEditorContentComponent {
|
|
|
13754
13756
|
if (this.smartformSophisticatedChangeSubscription) {
|
|
13755
13757
|
this.smartformSophisticatedChangeSubscription.unsubscribe();
|
|
13756
13758
|
}
|
|
13757
|
-
this.smartformSophisticatedChangeSubscription =
|
|
13758
|
-
|
|
13759
|
-
|
|
13760
|
-
|
|
13761
|
-
|
|
13762
|
-
|
|
13763
|
-
|
|
13759
|
+
this.smartformSophisticatedChangeSubscription =
|
|
13760
|
+
this.formChild?.instance.sophisticatedValueChange
|
|
13761
|
+
?.pipe(takeUntil(this._destroy$))
|
|
13762
|
+
.subscribe((change) => {
|
|
13763
|
+
if (change.key === 'expressionData.currentOperation') {
|
|
13764
|
+
this.save();
|
|
13765
|
+
}
|
|
13766
|
+
});
|
|
13764
13767
|
}
|
|
13765
13768
|
save() {
|
|
13766
|
-
this.formChild?.submitForm(false);
|
|
13769
|
+
this.formChild?.instance.submitForm(false);
|
|
13767
13770
|
this.service.peformWidgetAction({
|
|
13768
13771
|
code: 'UPDATE_FILTER_EXPRESSION',
|
|
13769
13772
|
params: {
|
|
@@ -13823,19 +13826,19 @@ class SmartFilterEditorContentComponent {
|
|
|
13823
13826
|
return widget;
|
|
13824
13827
|
}
|
|
13825
13828
|
}
|
|
13826
|
-
SmartFilterEditorContentComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartFilterEditorContentComponent, deps: [{ token: SmartformLayoutDefinitionService }], target: i0.ɵɵFactoryTarget.Component });
|
|
13827
|
-
SmartFilterEditorContentComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: SmartFilterEditorContentComponent, selector: "smart-filter-expression-editor", inputs: { service: "service" }, viewQueries: [{ propertyName: "
|
|
13829
|
+
SmartFilterEditorContentComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartFilterEditorContentComponent, deps: [{ token: SmartformLayoutDefinitionService }, { token: ComponentFactoryService }], target: i0.ɵɵFactoryTarget.Component });
|
|
13830
|
+
SmartFilterEditorContentComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: SmartFilterEditorContentComponent, selector: "smart-filter-expression-editor", inputs: { service: "service" }, viewQueries: [{ propertyName: "formChildVcRef", first: true, predicate: ["form"], descendants: true, read: ViewContainerRef }, { propertyName: "simpleFilterFormVcRef", first: true, predicate: ["simpleFilterFromChild"], descendants: true, read: ViewContainerRef }], ngImport: i0, template: "<div class=\"targetGroupContentContainer\">\r\n <h3>{{ service.model?.model?.label }}</h3>\r\n\r\n <div *ngIf=\"service.model?.type === type.Simple; then simpleFilter; else complexFilter\"></div>\r\n\r\n <ng-template #simpleFilter>\r\n <div class=\"expressionsContainer\">\r\n <ng-template #simpleFilterFromChild></ng-template>\r\n </div>\r\n </ng-template>\r\n <ng-template #complexFilter>\r\n <div class=\"uiActionsBar\" *ngIf=\"!service.model?.readOnly\">\r\n <div class=\"uiActionsInsideOfBar\">\r\n <smart-ui-action-toolbar [uiActionModels]=\"uiActionModels\"></smart-ui-action-toolbar>\r\n </div>\r\n </div>\r\n <div\r\n *ngIf=\"\r\n service?.model?.model?.workplaceList?.filters?.length;\r\n then withParameters;\r\n else withoutParameters\r\n \"\r\n ></div>\r\n <ng-template #withoutParameters>\r\n <div class=\"withoutParametersContainer\">\r\n <span class=\"mat-body\"> M\u00E9g nincs megadva param\u00E9ter </span>\r\n </div>\r\n </ng-template>\r\n <ng-template #withParameters>\r\n <div class=\"withParametersContainer\">\r\n <div\r\n class=\"expressionsContainer\"\r\n *ngIf=\"service?.model?.model?.workplaceList?.filters?.length\"\r\n >\r\n <app-expression-items\r\n [items]=\"(service.model?.model?.workplaceList)!.filters\"\r\n ></app-expression-items>\r\n </div>\r\n <div class=\"expressionEditorContainer\">\r\n <ng-template #form></ng-template>\r\n <div *ngIf=\"smartForm\">\r\n <button (click)=\"remove()\" mat-raised-button color=\"primary\">T\u00F6rl\u00E9s</button>\r\n </div>\r\n </div>\r\n </div>\r\n </ng-template>\r\n </ng-template>\r\n</div>\r\n", styles: [".targetGroupContentContainer{padding:1.5rem;display:flex;flex-direction:column;gap:2.5rem;height:calc(100% - 3rem);overflow:auto;position:relative}.targetGroupContentContainer h3{margin:0;font-weight:600}.uiActionsBar{padding:1.5rem;border-radius:.25rem;background-color:var(--container-color)}.uiActionsBar,.uiActionsInsideOfBar{display:flex;flex-direction:row;gap:1rem}.uiActionsInsideOfBar{position:relative;left:-3rem}.section,.notSection{display:flex;flex-direction:row;gap:1rem}.section:before{content:\"\";border:1px solid #d9d9d9;align-self:stretch}.withoutParametersContainer{display:flex;flex-direction:column;padding:2rem;background-color:var(--container-color);border-radius:.25rem}.withoutParametersContainer .mat-body{font-weight:600;text-align:center}.withParametersContainer{display:flex;flex-direction:column;padding:1.5rem;background-color:var(--container-color);border-radius:.25rem;gap:.75rem}.expressionsContainer{display:flex;flex-direction:row;flex-wrap:wrap;gap:.75rem;margin-bottom:1px solid #cdcdcd}.expressionEditorContainer{display:flex;flex-direction:column;gap:.75rem}\n"], components: [{ type: UiActionToolbarComponent, selector: "smart-ui-action-toolbar", inputs: ["uiActionModels", "uiActionDescriptorService"] }, { type: SmartFilterExpressionItemsComponent, selector: "app-expression-items", inputs: ["items"] }, { type: i3.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button], button[mat-fab], button[mat-mini-fab], button[mat-stroked-button], button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }], directives: [{ type: i3$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
|
|
13828
13831
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartFilterEditorContentComponent, decorators: [{
|
|
13829
13832
|
type: Component,
|
|
13830
|
-
args: [{ selector: 'smart-filter-expression-editor', template: "<div class=\"targetGroupContentContainer\">\r\n <h3>{{ service.model?.model?.label }}</h3>\r\n\r\n <div *ngIf=\"service.model?.type === type.Simple; then simpleFilter; else complexFilter\"></div>\r\n\r\n <ng-template #simpleFilter>\r\n <div class=\"expressionsContainer\">\r\n <
|
|
13831
|
-
}], ctorParameters: function () { return [{ type: SmartformLayoutDefinitionService }]; }, propDecorators: { service: [{
|
|
13833
|
+
args: [{ selector: 'smart-filter-expression-editor', template: "<div class=\"targetGroupContentContainer\">\r\n <h3>{{ service.model?.model?.label }}</h3>\r\n\r\n <div *ngIf=\"service.model?.type === type.Simple; then simpleFilter; else complexFilter\"></div>\r\n\r\n <ng-template #simpleFilter>\r\n <div class=\"expressionsContainer\">\r\n <ng-template #simpleFilterFromChild></ng-template>\r\n </div>\r\n </ng-template>\r\n <ng-template #complexFilter>\r\n <div class=\"uiActionsBar\" *ngIf=\"!service.model?.readOnly\">\r\n <div class=\"uiActionsInsideOfBar\">\r\n <smart-ui-action-toolbar [uiActionModels]=\"uiActionModels\"></smart-ui-action-toolbar>\r\n </div>\r\n </div>\r\n <div\r\n *ngIf=\"\r\n service?.model?.model?.workplaceList?.filters?.length;\r\n then withParameters;\r\n else withoutParameters\r\n \"\r\n ></div>\r\n <ng-template #withoutParameters>\r\n <div class=\"withoutParametersContainer\">\r\n <span class=\"mat-body\"> M\u00E9g nincs megadva param\u00E9ter </span>\r\n </div>\r\n </ng-template>\r\n <ng-template #withParameters>\r\n <div class=\"withParametersContainer\">\r\n <div\r\n class=\"expressionsContainer\"\r\n *ngIf=\"service?.model?.model?.workplaceList?.filters?.length\"\r\n >\r\n <app-expression-items\r\n [items]=\"(service.model?.model?.workplaceList)!.filters\"\r\n ></app-expression-items>\r\n </div>\r\n <div class=\"expressionEditorContainer\">\r\n <ng-template #form></ng-template>\r\n <div *ngIf=\"smartForm\">\r\n <button (click)=\"remove()\" mat-raised-button color=\"primary\">T\u00F6rl\u00E9s</button>\r\n </div>\r\n </div>\r\n </div>\r\n </ng-template>\r\n </ng-template>\r\n</div>\r\n", styles: [".targetGroupContentContainer{padding:1.5rem;display:flex;flex-direction:column;gap:2.5rem;height:calc(100% - 3rem);overflow:auto;position:relative}.targetGroupContentContainer h3{margin:0;font-weight:600}.uiActionsBar{padding:1.5rem;border-radius:.25rem;background-color:var(--container-color)}.uiActionsBar,.uiActionsInsideOfBar{display:flex;flex-direction:row;gap:1rem}.uiActionsInsideOfBar{position:relative;left:-3rem}.section,.notSection{display:flex;flex-direction:row;gap:1rem}.section:before{content:\"\";border:1px solid #d9d9d9;align-self:stretch}.withoutParametersContainer{display:flex;flex-direction:column;padding:2rem;background-color:var(--container-color);border-radius:.25rem}.withoutParametersContainer .mat-body{font-weight:600;text-align:center}.withParametersContainer{display:flex;flex-direction:column;padding:1.5rem;background-color:var(--container-color);border-radius:.25rem;gap:.75rem}.expressionsContainer{display:flex;flex-direction:row;flex-wrap:wrap;gap:.75rem;margin-bottom:1px solid #cdcdcd}.expressionEditorContainer{display:flex;flex-direction:column;gap:.75rem}\n"] }]
|
|
13834
|
+
}], ctorParameters: function () { return [{ type: SmartformLayoutDefinitionService }, { type: ComponentFactoryService }]; }, propDecorators: { service: [{
|
|
13832
13835
|
type: Input
|
|
13833
|
-
}],
|
|
13836
|
+
}], formChildVcRef: [{
|
|
13834
13837
|
type: ViewChild,
|
|
13835
|
-
args: ['form']
|
|
13836
|
-
}],
|
|
13838
|
+
args: ['form', { read: ViewContainerRef }]
|
|
13839
|
+
}], simpleFilterFormVcRef: [{
|
|
13837
13840
|
type: ViewChild,
|
|
13838
|
-
args: ['simpleFilterFromChild']
|
|
13841
|
+
args: ['simpleFilterFromChild', { read: ViewContainerRef }]
|
|
13839
13842
|
}] } });
|
|
13840
13843
|
|
|
13841
13844
|
class SmartFilterEditorModule {
|