tnx-shared 5.3.311 → 5.3.313

package/bundles/tnx-shared.umd.js

@@ -19086,7 +19086,8 @@
                             || !(control instanceof AutoCompletePickerControlSchema))
                             continue;
                         _this.logSetting.arrValueAfterUpdate.push(new LogColumn({
-                            column: control.label,
+                            field: control.field,
+                            label: control.label,
                             valueBefore: control._component.dataSource.map(function (p) { return p.label; }).join(', '),
                             visible: false,
                             valueAfter: ''
@@ -19288,7 +19289,7 @@
         };
         DataFormBase.prototype.addSinglePropertyLog = function (control, oldValue, newValue) {
             if (control instanceof AutoCompletePickerControlSchema) {
-                var logColumn = this.logSetting.arrValueAfterUpdate.find(function (p) { return p.column == control.label; });
+                var logColumn = this.logSetting.arrValueAfterUpdate.find(function (p) { return p.field == control.field; });
                 var dataSource = control._component.selectedValueObject;
                 if (!Array.isArray(dataSource))
                     dataSource = [dataSource];
@@ -19298,7 +19299,8 @@
             else {
                 var dataSource = control._component.dataSourceInternal;
                 this.logSetting.arrValueAfterUpdate.push(new LogColumn({
-                    column: control.label,
+                    field: control.field,
+                    label: control.label,
                     valueBefore: this.getSingleLabel(control, dataSource, oldValue),
                     valueAfter: this.getSingleLabel(control, dataSource, newValue)
                 }));
@@ -19306,14 +19308,15 @@
         };
         DataFormBase.prototype.addMultiplePropertyLog = function (control, oldValue, newValue) {
             if (control instanceof AutoCompletePickerControlSchema) {
-                var logColumn = this.logSetting.arrValueAfterUpdate.find(function (p) { return p.column == control.label; });
+                var logColumn = this.logSetting.arrValueAfterUpdate.find(function (p) { return p.field == control.field; });
                 logColumn.visible = true;
                 logColumn.valueAfter = this.getMultipleLabel(control, control._component.selectedValueObject, newValue);
             }
             else {
                 var dataSource = control._component.dataSourceInternal;
                 this.logSetting.arrValueAfterUpdate.push(new LogColumn({
-                    column: control.label,
+                    field: control.field,
+                    label: control.label,
                     valueBefore: this.getMultipleLabel(control, dataSource, oldValue),
                     valueAfter: this.getMultipleLabel(control, dataSource, newValue)
                 }));
@@ -19365,7 +19368,8 @@
                                 if (oldValue != newValue) {
                                     var _h = __read(this.getLogValueDefault(control, oldValue, newValue), 2), valueBefore = _h[0], valueAfter = _h[1];
                                     this.logSetting.arrValueAfterUpdate.push(new LogColumn({
-                                        column: control.label,
+                                        field: control.field,
+                                        label: control.label,
                                         valueBefore: valueBefore,
                                         valueAfter: valueAfter,
                                         isHtml: (control instanceof EditorControlSchema || control instanceof TextAreaControlSchema)
@@ -47826,7 +47830,7 @@
     EntityPickerComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'entity-picker',
-                    template: "<crud-list #crudList [templates]=\"children\" [model]=\"model\" [setting]=\"setting\" [dataSource]=\"model.dataSource\"\n    [hiddenDelete]=\"readOnly\" (onReload)=\"_triggerProcessData($event)\" (onAdd)=\"_add($event)\" (onEdit)=\"_edit($event)\"\n    (onView)=\"_view($event)\" (onDelete)=\"_delete($event)\" (onDeleteMultiple)=\"_deleteMultiple($event)\"\n    (onReloaded)=\"_unmarkLoading()\" class=\"--no-wrapper-padding\">\n    <ng-template #toolbar let-crudList=\"crudList\">\n        <button *ngIf=\"!readOnly\" type=\"button\" pButton icon=\"pi pi-external-link\" class=\"p-button-text\"\n            [label]=\"control.title\" [disabled]=\"control.disabled\" (click)=\"selectEntity()\"></button>\n        <ng-container *ngIf=\"required\">\n            <span class=\"star-required\">*</span>\n        </ng-container>\n        <ng-container *ngIf=\"control.multiple && !readOnly && !setting.hiddenCheckbox\">\n            <button type=\"button\" pButton class=\"p-button-warning p-button-text p-button-rounded link-or-action\"\n                icon=\"pi pi-trash\" label=\"B\u1ECF m\u1EE5c \u0111\u00E3 ch\u1ECDn\" tooltipPosition=\"top\"\n                [disabled]=\"model.selectedItems.length == 0\" (click)=\"handleUnMultiPickEntity()\"></button>\n        </ng-container>\n    </ng-template>\n    <ng-template #function let-crudList=\"crudList\" let-rowData=\"rowData\" let-index=\"index\">\n        <div *ngIf=\"!control.rowButtonTemplate && !readOnly\" class=\"p-toolbar-group-center button-group\">\n            <ng-container *ngIf=\"control.rowButtonBeforeTemplate\" class=\"p-toolbar-group-center button-group\">\n                <ng-container\n                    *ngTemplateOutlet=\"control.rowButtonBeforeTemplate; context: {rowData: rowData, rowIndex: index, control: control}\">\n                </ng-container>\n            </ng-container>\n            <button type=\"button\" pButton class=\"p-button-warning p-button-text p-button-rounded link-or-action\"\n                icon=\"pi pi-trash\" pTooltip=\"B\u1ECF ch\u1ECDn m\u1EE5c n\u00E0y\" tooltipPosition=\"top\"\n                (click)=\"handleUnPickEntity(rowData)\"></button>\n        </div>\n        <div *ngIf=\"control.rowButtonTemplate\" class=\"p-toolbar-group-center button-group\">\n            <ng-container\n                *ngTemplateOutlet=\"control.rowButtonTemplate; context: {rowData: rowData, rowIndex: index, control: control}\">\n            </ng-container>\n        </div>\n    </ng-template>\n</crud-list>\n<tn-dialog #dialog *ngIf=\"showDetailForm\" styleClass=\"entity-picker-box-dialog no-padding\" [useDefaultScrollBar]=\"true\"\n    [header]=\"control.title | translate\" [popupSize]=\"popupSize\" (onHide)=\"handleHide($event)\">\n    <entity-picker-box #entityPickerBox [control]=\"control\" [parentSetting]=\"setting\" [advanceData]=\"advanceData\"\n        (onRowSelect)=\"handleEntityPickerBoxRowSelect($event)\" [selectedValue]=\"selectedValue\"\n        (onChanged)=\"handleChangeEntity($event)\" (onSelect)=\"handleSelectEntity($event)\"\n        (onUnSelect)=\"handleUnSelectEntity($event)\" (onDone)=\"handleHide($event)\">\n    </entity-picker-box>\n    <ng-template #footer>\n        <button type=\"button\" pButton class=\"p-button-text\" (click)=\"onClickSubmitButton($event, entityPickerBox)\"\n            [label]=\"'Ho\u00E0n th\u00E0nh' | translate\" icon=\"pi pi-check\"></button>\n    </ng-template>\n</tn-dialog>",
+                    template: "<crud-list #crudList [templates]=\"children\" [model]=\"model\" [setting]=\"setting\" [dataSource]=\"model.dataSource\"\n    [hiddenDelete]=\"readOnly\" (onReload)=\"_triggerProcessData($event)\" (onAdd)=\"_add($event)\" (onEdit)=\"_edit($event)\"\n    (onView)=\"_view($event)\" (onDelete)=\"_delete($event)\" (onDeleteMultiple)=\"_deleteMultiple($event)\"\n    [showScrollHorizontal]=\"true\" (onReloaded)=\"_unmarkLoading()\" class=\"--no-wrapper-padding\">\n    <ng-template #toolbar let-crudList=\"crudList\">\n        <button *ngIf=\"!readOnly\" type=\"button\" pButton icon=\"pi pi-external-link\" class=\"p-button-text\"\n            [label]=\"control.title\" [disabled]=\"control.disabled\" (click)=\"selectEntity()\"></button>\n        <ng-container *ngIf=\"required\">\n            <span class=\"star-required\">*</span>\n        </ng-container>\n        <ng-container *ngIf=\"control.multiple && !readOnly && !setting.hiddenCheckbox\">\n            <button type=\"button\" pButton class=\"p-button-warning p-button-text p-button-rounded link-or-action\"\n                icon=\"pi pi-trash\" label=\"B\u1ECF m\u1EE5c \u0111\u00E3 ch\u1ECDn\" tooltipPosition=\"top\"\n                [disabled]=\"model.selectedItems.length == 0\" (click)=\"handleUnMultiPickEntity()\"></button>\n        </ng-container>\n    </ng-template>\n    <ng-template #function let-crudList=\"crudList\" let-rowData=\"rowData\" let-index=\"index\">\n        <div *ngIf=\"!control.rowButtonTemplate && !readOnly\" class=\"p-toolbar-group-center button-group\">\n            <ng-container *ngIf=\"control.rowButtonBeforeTemplate\" class=\"p-toolbar-group-center button-group\">\n                <ng-container\n                    *ngTemplateOutlet=\"control.rowButtonBeforeTemplate; context: {rowData: rowData, rowIndex: index, control: control}\">\n                </ng-container>\n            </ng-container>\n            <button type=\"button\" pButton class=\"p-button-warning p-button-text p-button-rounded link-or-action\"\n                icon=\"pi pi-trash\" pTooltip=\"B\u1ECF ch\u1ECDn m\u1EE5c n\u00E0y\" tooltipPosition=\"top\"\n                (click)=\"handleUnPickEntity(rowData)\"></button>\n        </div>\n        <div *ngIf=\"control.rowButtonTemplate\" class=\"p-toolbar-group-center button-group\">\n            <ng-container\n                *ngTemplateOutlet=\"control.rowButtonTemplate; context: {rowData: rowData, rowIndex: index, control: control}\">\n            </ng-container>\n        </div>\n    </ng-template>\n</crud-list>\n<tn-dialog #dialog *ngIf=\"showDetailForm\" styleClass=\"entity-picker-box-dialog no-padding\" [useDefaultScrollBar]=\"true\"\n    [header]=\"control.title | translate\" [popupSize]=\"popupSize\" (onHide)=\"handleHide($event)\">\n    <entity-picker-box #entityPickerBox [control]=\"control\" [parentSetting]=\"setting\" [advanceData]=\"advanceData\"\n        (onRowSelect)=\"handleEntityPickerBoxRowSelect($event)\" [selectedValue]=\"selectedValue\"\n        (onChanged)=\"handleChangeEntity($event)\" (onSelect)=\"handleSelectEntity($event)\"\n        (onUnSelect)=\"handleUnSelectEntity($event)\" (onDone)=\"handleHide($event)\">\n    </entity-picker-box>\n    <ng-template #footer>\n        <button type=\"button\" pButton class=\"p-button-text\" (click)=\"onClickSubmitButton($event, entityPickerBox)\"\n            [label]=\"'Ho\u00E0n th\u00E0nh' | translate\" icon=\"pi pi-check\"></button>\n    </ng-template>\n</tn-dialog>",
                     providers: [
                         {
                             provide: forms.NG_VALUE_ACCESSOR,
@@ -53258,10 +53262,7 @@
             this.bounceNoti = false;
         };
         TnAppNotificationComponent.prototype.handleClicked = function () {
-            if (!this.environment.clientDomain.thongbaoDomain) {
-                return this._notifierService.showWarning('Thiếu cấu hình domain thông báo');
-            }
-            var thongBaoDomain = this.environment.clientDomain.thongbaoDomain + "/quanly-thongbao-noibo";
+            var thongBaoDomain = "/thong-bao";
             window.open(thongBaoDomain);
         };
         return TnAppNotificationComponent;