tnx-shared 5.3.382 → 5.3.384

package/bundles/tnx-shared.umd.js

@@ -47168,8 +47168,9 @@
             this.onPickSelected.emit(data);
         };
         EntityPickerDataComponent.prototype.modifyGridInfo = function (gridInfo) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var allow;
+                var value, allow;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -47181,7 +47182,10 @@
                             }
                             else {
                                 if (this._value) {
-                                    gridInfo.filters.push(this.newFilter(this.control.valueField, exports.Operator.notEqual, this._value));
+                                    value = this._value;
+                                    if (typeof (this._value) == 'object')
+                                        value = this._value[(_a = this.control.valueField) !== null && _a !== void 0 ? _a : 'id'];
+                                    gridInfo.filters.push(this.newFilter(this.control.valueField, exports.Operator.notEqual, value));
                                 }
                             }
                             return [4 /*yield*/, appendDefaultFilter(gridInfo.filters, this.control.defaultFilters)];
@@ -47528,7 +47532,7 @@
             this.onUnPick.emit(data);
         };
         EntityPickerSelectedComponent.prototype.unPickAll = function () {
-            this.onUnPickAll.emit(this._selectedValue);
+            this.onUnPickAll.emit(this.itemCanDeletes);
         };
         EntityPickerSelectedComponent.prototype.unPickSelected = function (data) {
             this.onUnPickSelected.emit(data);
@@ -47543,13 +47547,28 @@
         };
         EntityPickerSelectedComponent.prototype.clearFilter = function (evt) {
         };
+        EntityPickerSelectedComponent.prototype._onCheckAll = function (evt) {
+            var _this = this;
+            if (this._readOnlyValues.length > 0) {
+                this.model.selectedItems = [];
+                this.model.dataSource.forEach(function (item) {
+                    var unChecked = _this._readOnlyValues.includes(item[_this.control.valueField]);
+                    if (!unChecked) {
+                        _this.model.selectedItems.push(item);
+                    }
+                    else {
+                        item._checked = false;
+                    }
+                });
+            }
+        };
         return EntityPickerSelectedComponent;
     }(DataListBase));
     EntityPickerSelectedComponent.decorators = [
         { type: i0.Component, args: [{
                     // tslint:disable-next-line: component-selector
                     selector: 'app-entity-picker-selected',
-                    template: "<crud-list #crudList [templates]=\"templates\" [model]=\"model\" [setting]=\"setting\" [dataSource]=\"model.dataSource\" [showScrollHorizontal]=\"true\"\n    (onContentInit)=\"onContentInit.emit($event)\" (onReload)=\"_triggerProcessData($event)\" (onAdd)=\"_add($event)\"\n    (onEdit)=\"_edit($event)\" (onView)=\"_view($event)\" (onDelete)=\"_delete($event)\"\n    (onDeleteMultiple)=\"_deleteMultiple($event)\" (onReloaded)=\"_unmarkLoading()\">\n    <ng-template #customTitle>\n        <h1 [innerHTML]=\"dom.bypassSecurityTrustHtml(control.titlePicked)\"></h1>\n    </ng-template>\n    <ng-template #toolbar let-crudList=\"crudList\" let-selectedItems=\"selectedItems\">\n        <button *ngIf=\"!itemCanDeletes.length && !model.dataSource.length && setting.hiddenAdvanceSearch\" pButton\n            style=\"visibility: hidden\"></button>\n        <button *ngIf=\"itemCanDeletes.length\" type=\"button\" pButton pRipple\n            label=\"B\u1ECF t\u1EA5t c\u1EA3 ({{_selectedValue.length}})\" icon=\"pi pi-angle-double-left\"\n            class=\"p-button-text p-button-danger\" [disabled]=\"model.loading\" (click)=\"unPickAll()\"></button>\n        <button *ngIf=\"selectedItems.length > 0\" type=\"button\" pButton pRipple\n            label=\"B\u1ECF m\u1EE5c \u0111\u00E3 ch\u1ECDn ({{selectedItems.length}})\" icon=\"pi pi-angle-left\"\n            class=\"p-button-text p-button-danger\" [disabled]=\"model.loading\"\n            (click)=\"unPickSelected(selectedItems)\"></button>\n    </ng-template>\n\n    <ng-template let-crudList=\"crudList\" #function let-rowData=\"rowData\">\n        <button *ngIf=\"!rowData.hiddenDelete\" pButton type=\"button\"\n            class=\"link-or-action p-button-danger p-button-text p-button-rounded\" icon=\"pi pi-times\"\n            pTooltip=\"B\u1ECF ch\u1ECDn m\u1EE5c n\u00E0y\" tooltipPosition=\"top\" (click)=\"unPickEntity(rowData)\"></button>\n    </ng-template>\n\n</crud-list>",
+                    template: "<crud-list #crudList [templates]=\"templates\" [model]=\"model\" [setting]=\"setting\" [dataSource]=\"model.dataSource\"\n    [showScrollHorizontal]=\"true\" (onContentInit)=\"onContentInit.emit($event)\" (onReload)=\"_triggerProcessData($event)\"\n    (onAdd)=\"_add($event)\" (onEdit)=\"_edit($event)\" (onView)=\"_view($event)\" (onDelete)=\"_delete($event)\"\n    (onDeleteMultiple)=\"_deleteMultiple($event)\" (onReloaded)=\"_unmarkLoading()\" (onCheckAll)=\"_onCheckAll($event)\">\n    <ng-template #customTitle>\n        <h1 [innerHTML]=\"dom.bypassSecurityTrustHtml(control.titlePicked)\"></h1>\n    </ng-template>\n    <ng-template #toolbar let-crudList=\"crudList\" let-selectedItems=\"selectedItems\">\n        <button *ngIf=\"!itemCanDeletes.length && !model.dataSource.length && setting.hiddenAdvanceSearch\" pButton\n            style=\"visibility: hidden\"></button>\n        <button *ngIf=\"itemCanDeletes.length\" type=\"button\" pButton pRipple\n            label=\"B\u1ECF t\u1EA5t c\u1EA3 ({{itemCanDeletes.length}})\" icon=\"pi pi-angle-double-left\"\n            class=\"p-button-text p-button-danger\" [disabled]=\"model.loading\" (click)=\"unPickAll()\"></button>\n        <button *ngIf=\"selectedItems.length > 0\" type=\"button\" pButton pRipple\n            label=\"B\u1ECF m\u1EE5c \u0111\u00E3 ch\u1ECDn ({{selectedItems.length}})\" icon=\"pi pi-angle-left\"\n            class=\"p-button-text p-button-danger\" [disabled]=\"model.loading\"\n            (click)=\"unPickSelected(selectedItems)\"></button>\n    </ng-template>\n\n    <ng-template let-crudList=\"crudList\" #function let-rowData=\"rowData\">\n        <button *ngIf=\"!rowData.hiddenDelete\" pButton type=\"button\"\n            class=\"link-or-action p-button-danger p-button-text p-button-rounded\" icon=\"pi pi-times\"\n            pTooltip=\"B\u1ECF ch\u1ECDn m\u1EE5c n\u00E0y\" tooltipPosition=\"top\" (click)=\"unPickEntity(rowData)\"></button>\n    </ng-template>\n\n</crud-list>",
                     providers: [ComponentContextService],
                     styles: ["::ng-deep app-entity-picker-selected .custom-card{padding:.5em .5em 0!important}"]
                 },] }
@@ -48667,11 +48686,18 @@
                 }
             }
         };
+        // Sang VV đã sửa
         EntityPickerComponent.prototype.getObjSelectValueFromValue = function (value) {
-            var temp = {
-                _dropdownvalue: this.control.valueField,
-            };
-            temp[this.control.valueField] = value;
+            var temp = {};
+            if (typeof (value) == 'object') {
+                temp = Object.assign(Object.assign({}, value), { _dropdownvalue: this.control.valueField });
+            }
+            else {
+                temp = {
+                    _dropdownvalue: this.control.valueField,
+                };
+                temp[this.control.valueField] = value;
+            }
             return temp;
         };
         EntityPickerComponent.prototype.registerOnChange = function (fn) {