tnx-shared 5.3.290 → 5.3.292

package/bundles/tnx-shared.umd.js

@@ -2063,6 +2063,7 @@
             _this.insertPlusUrl = '';
             _this.loadInFirstDisplay = true;
             _this.autoGetData = true;
+            _this.isAllowDisabled = true;
             _this.valueField = 'id';
             _this.displayField = 'ten';
             _this.autoDisplayFirst = false;
@@ -8015,6 +8016,7 @@
     var EXCEL_EXTENSION$1 = '.xlsx';
     var BaseService = /** @class */ (function () {
         function BaseService(http, injector, serviceUri) {
+            var _a, _b;
             this.serviceUri = '';
             this.endPoint = '';
             this.serviceCode = '';
@@ -8024,8 +8026,6 @@
             this.apiGetData = 'GetData';
             this.apiGetAll = 'GetAllByFilter';
             this.apiGetDetailByFilter = 'GetByFilter';
-            this.fieldSort = '';
-            this.fieldSuDung = '';
             this.disableFieldNotUse = false;
             this.RETRY_COUNT = 0;
             this.REPLAY_COUNT = 1;
@@ -8035,6 +8035,8 @@
             this.serviceUri = serviceUri;
             this._commonService = injector.get(CommonService);
             this._signalrServicePrivate = injector.get(SignalRService);
+            var environment = this._injector.get(ModuleConfigService).getConfig().environment;
+            this.disableFieldNotUse = (_b = (_a = environment === null || environment === void 0 ? void 0 : environment.cauHinhNghiepVu) === null || _a === void 0 ? void 0 : _a.disableFieldNotUse) !== null && _b !== void 0 ? _b : false;
         }
         BaseService.prototype.setCurrentServiceUri = function (key) {
         };
@@ -8273,8 +8275,8 @@
         BaseService.prototype.checkDuplicatedByField = function (field, value, id) {
             return __awaiter(this, void 0, void 0, function () {
                 var filters, result;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             filters = [
                                 new Filter({
@@ -8290,7 +8292,7 @@
                             ];
                             return [4 /*yield*/, this.checkExistByFilter(filters)];
                         case 1:
-                            result = _a.sent();
+                            result = _c.sent();
                             if (!result.success)
                                 return [2 /*return*/, true];
                             return [2 /*return*/, result.data];
@@ -8384,7 +8386,7 @@
          * @private
          */
         BaseService.prototype.getTreeModelBase = function (rawData, fieldParent, fieldParentTreeItem) {
-            var e_1, _a;
+            var e_1, _c;
             if (rawData == null || rawData.length == 0) {
                 return [];
             }
@@ -8418,7 +8420,7 @@
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (rawData_1_1 && !rawData_1_1.done && (_a = rawData_1.return)) _a.call(rawData_1);
+                    if (rawData_1_1 && !rawData_1_1.done && (_c = rawData_1.return)) _c.call(rawData_1);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -8432,7 +8434,7 @@
          * @private
          */
         BaseService.prototype.getTreeData = function (rawData, fieldParent, fieldParentTreeItem) {
-            var e_2, _a, e_3, _b, e_4, _c;
+            var e_2, _c, e_3, _d, e_4, _e;
             if (rawData == null)
                 return [];
             // let count = 0;
@@ -8519,12 +8521,12 @@
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (rawData_2_1 && !rawData_2_1.done && (_a = rawData_2.return)) _a.call(rawData_2);
+                    if (rawData_2_1 && !rawData_2_1.done && (_c = rawData_2.return)) _c.call(rawData_2);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
             var funcSetPrefix = function (node, parentNode, prefix) {
-                var e_5, _a;
+                var e_5, _c;
                 // count++;
                 node.data._prefix = prefix;
                 node.data._level = parentNode.data._level + 1;
@@ -8533,15 +8535,15 @@
                     return;
                 }
                 try {
-                    for (var _b = __values(node.children), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var child = _c.value;
+                    for (var _d = __values(node.children), _e = _d.next(); !_e.done; _e = _d.next()) {
+                        var child = _e.value;
                         funcSetPrefix(child, node, prefix + '---');
                     }
                 }
                 catch (e_5_1) { e_5 = { error: e_5_1 }; }
                 finally {
                     try {
-                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                        if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
                     }
                     finally { if (e_5) throw e_5.error; }
                 }
@@ -8561,15 +8563,15 @@
                         continue;
                     }
                     try {
-                        for (var _d = (e_4 = void 0, __values(node.children)), _e = _d.next(); !_e.done; _e = _d.next()) {
-                            var child = _e.value;
+                        for (var _f = (e_4 = void 0, __values(node.children)), _g = _f.next(); !_g.done; _g = _f.next()) {
+                            var child = _g.value;
                             funcSetPrefix(child, node, '|--');
                         }
                     }
                     catch (e_4_1) { e_4 = { error: e_4_1 }; }
                     finally {
                         try {
-                            if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
+                            if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
                         }
                         finally { if (e_4) throw e_4.error; }
                     }
@@ -8578,7 +8580,7 @@
             catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
-                    if (roots_1_1 && !roots_1_1.done && (_b = roots_1.return)) _b.call(roots_1);
+                    if (roots_1_1 && !roots_1_1.done && (_d = roots_1.return)) _d.call(roots_1);
                 }
                 finally { if (e_3) throw e_3.error; }
             }
@@ -8737,13 +8739,13 @@
         BaseService.prototype.getWorkflowSettingByCode = function (workflowCode) {
             return __awaiter(this, void 0, void 0, function () {
                 var workflowSetting, jsonSchema, stateMachineData;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0: return [4 /*yield*/, this.getDetailByFilter([
                                 this.newFilter('code', exports.Operator.equal, workflowCode)
                             ])];
                         case 1:
-                            workflowSetting = (_a.sent()).data;
+                            workflowSetting = (_c.sent()).data;
                             if (workflowSetting == null)
                                 return [2 /*return*/, null];
                             jsonSchema = workflowSetting['data'];
@@ -8835,11 +8837,11 @@
                 FileSaver__namespace.saveAs(res, fileName);
             }).catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
                 var errorText;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0: return [4 /*yield*/, err.error.text()];
                         case 1:
-                            errorText = _a.sent();
+                            errorText = _c.sent();
                             console.error(errorText);
                             return [2 /*return*/];
                     }
@@ -8933,8 +8935,8 @@
             if (sortDir === void 0) { sortDir = null; }
             return __awaiter(this, void 0, void 0, function () {
                 var arrFilter, arrSort, arrResult;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             arrValue = (arrValue || []).filter(function (val, ind, arr) { return (val === 0 || val) && arr.indexOf(val) === ind; });
                             if (!arrValue || !arrValue.length)
@@ -8953,7 +8955,7 @@
                             }
                             return [4 /*yield*/, this.getAll(arrFilter, getFields, arrSort)];
                         case 1:
-                            arrResult = (_a.sent()).data;
+                            arrResult = (_c.sent()).data;
                             return [2 /*return*/, (arrResult || [])];
                     }
                 });
@@ -8964,11 +8966,11 @@
             if (valueField === void 0) { valueField = null; }
             return __awaiter(this, void 0, void 0, function () {
                 var arrResult, rsDic;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0: return [4 /*yield*/, this.getByField(field, arrValue, getFields)];
                         case 1:
-                            arrResult = _a.sent();
+                            arrResult = _c.sent();
                             rsDic = {};
                             if (!arrResult.length) {
                                 return [2 /*return*/, rsDic];
@@ -9017,7 +9019,7 @@
         };
         BaseService.prototype.getDataTrinhKy = function (item, rowData) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
+                return __generator(this, function (_c) {
                     return [2 /*return*/, []];
                 });
             });
@@ -20177,6 +20179,8 @@
                 }),
                 new ColumnSchemaBase({
                     field: 'email',
+                    operator: exports.Operator.equal,
+                    isOverrideFilter: true,
                     width: '180px'
                 }),
                 new ColumnSchemaBase({
@@ -20746,7 +20750,8 @@
                 new EntityPickerColumn({
                     label: 'Email',
                     code: 'email',
-                    fullTextSearch: true,
+                    operator: exports.Operator.equal,
+                    isOverrideFilter: true,
                     width: '170px',
                 }),
                 new EntityPickerColumn({
@@ -20816,7 +20821,8 @@
                 new EntityPickerColumn({
                     label: 'Email',
                     code: 'email',
-                    fullTextSearch: true,
+                    operator: exports.Operator.equal,
+                    isOverrideFilter: true,
                     width: '170px',
                 })
             ];
@@ -24440,7 +24446,7 @@
                             isArrayField: col.isArrayField ? true : false
                         });
                         templateFilter.push(filter);
-                        _this.filterSchema.dropdown[col.field] = new DropdownControlSchema(Object.assign(Object.assign({}, col), { appendTo: 'body', placeholder: "Ch\u1ECDn " + col.label, multiple: filterMuliple.includes(filter.operator), loadOnInit: true, isServerLoad: col.isServerLoad }));
+                        _this.filterSchema.dropdown[col.field] = new DropdownControlSchema(Object.assign(Object.assign({}, col), { appendTo: 'body', placeholder: "Ch\u1ECDn " + col.label, multiple: filterMuliple.includes(filter.operator), loadOnInit: true, isServerLoad: col.isServerLoad, isAllowDisabled: false }));
                     }
                     else {
                         _this._notifierService.showWarning("Ch\u01B0a c\u1EA5u h\u00ECnh baseService ho\u1EB7c dataSource cho c\u1ED9t " + col.field + ": " + col.label);
@@ -24869,7 +24875,7 @@
                             }
                             else {
                                 if (col.baseService || (col.dataSource && col.dataSource.length > 0)) {
-                                    searchInfo.fieldDropdown[col.field] = new DropdownControlSchema(Object.assign(Object.assign({}, col), { label: col.label, operator: col.multiple ? exports.Operator.in : exports.Operator.equal, mdWidth: col.mdWidth ? col.mdWidth : 10, loadOnInit: true }));
+                                    searchInfo.fieldDropdown[col.field] = new DropdownControlSchema(Object.assign(Object.assign({}, col), { label: col.label, operator: col.multiple ? exports.Operator.in : exports.Operator.equal, mdWidth: col.mdWidth ? col.mdWidth : 10, loadOnInit: true, isAllowDisabled: false }));
                                     searchInfo.schema.push(searchInfo.fieldDropdown[col.field]);
                                 }
                                 else if (col.dataType == 'int') {
@@ -27676,7 +27682,7 @@
                 var resultValidate, flashShow;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
-                        case 0: return [4 /*yield*/, this.validateEdit()];
+                        case 0: return [4 /*yield*/, this.validateEdit(rowData)];
                         case 1:
                             resultValidate = _b.sent();
                             if (!resultValidate) {
@@ -27702,7 +27708,7 @@
                 });
             });
         };
-        ListBase.prototype.validateEdit = function () {
+        ListBase.prototype.validateEdit = function (rowData) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
                     return [2 /*return*/, true];
@@ -27734,35 +27740,57 @@
         ListBase.prototype.getPromiseDeleteItem = function (rowData) {
             return this.setting.baseService.delete(rowData.id, this.deletePlusUrl);
         };
+        ListBase.prototype.validateDelete = function (items) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_b) {
+                    return [2 /*return*/, true];
+                });
+            });
+        };
         ListBase.prototype._delete = function (rowData) {
-            var _this = this;
-            if (rowData.__disableDelete) {
-                return;
-            }
-            this._notifierService.showDeleteConfirm().then(function (rs) {
-                if (!rs) {
-                    return;
-                }
-                if (_this.setting.baseService) {
-                    _this.getPromiseDeleteItem(rowData)
-                        .then(function (response) {
-                        if (response.success) {
-                            _this.beforeReloadAfterDelete([rowData.id]);
-                            if (_this.setting.showVersionButton) {
-                                _this.context.fireEvent(ComCtxConstants.COMMON.RELOAD_DATA_VERSION, {}, true);
+            return __awaiter(this, void 0, void 0, function () {
+                var resultValidate;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            if (rowData.__disableDelete) {
+                                return [2 /*return*/];
                             }
-                            else {
-                                _this._triggerProcessData();
+                            return [4 /*yield*/, this.validateDelete([rowData])];
+                        case 1:
+                            resultValidate = _b.sent();
+                            if (!resultValidate) {
+                                return [2 /*return*/];
                             }
-                            _this._notifierService.showDeleteDataSuccess();
-                        }
-                        else {
-                            _this._notifierService.showWarningByResponse(response);
-                        }
-                    }, function (error) {
-                        _this._notifierService.showDeleteDataError();
-                    });
-                }
+                            this._notifierService.showDeleteConfirm().then(function (rs) {
+                                if (!rs) {
+                                    return;
+                                }
+                                if (_this.setting.baseService) {
+                                    _this.getPromiseDeleteItem(rowData)
+                                        .then(function (response) {
+                                        if (response.success) {
+                                            _this.beforeReloadAfterDelete([rowData.id]);
+                                            if (_this.setting.showVersionButton) {
+                                                _this.context.fireEvent(ComCtxConstants.COMMON.RELOAD_DATA_VERSION, {}, true);
+                                            }
+                                            else {
+                                                _this._triggerProcessData();
+                                            }
+                                            _this._notifierService.showDeleteDataSuccess();
+                                        }
+                                        else {
+                                            _this._notifierService.showWarningByResponse(response);
+                                        }
+                                    }, function (error) {
+                                        _this._notifierService.showDeleteDataError();
+                                    });
+                                }
+                            });
+                            return [2 /*return*/];
+                    }
+                });
             });
         };
         ListBase.prototype.getPromiseDeleteItems = function (items) {
@@ -27770,23 +27798,37 @@
             return this.setting.baseService.deleteMany(ids, this.deleteManyPlusUrl);
         };
         ListBase.prototype._deleteMultiple = function (items) {
-            var _this = this;
-            this._notifierService.showDeleteConfirm('Bạn có chắc chắn muốn xóa bản ghi đã chọn (Và các bản ghi con tương ứng)?').then(function (rs) {
-                if (!rs) {
-                    return;
-                }
-                if (_this.setting.baseService) {
-                    _this.getPromiseDeleteItems(items).then(function (response) {
-                        if (response.success) {
-                            _this.beforeReloadAfterDelete(items.map(function (q) { return q.id; }));
-                            _this._triggerProcessData();
-                            _this._notifierService.showDeleteDataSuccess();
-                        }
-                        else {
-                            _this._notifierService.showWarningByResponse(response);
-                        }
-                    });
-                }
+            return __awaiter(this, void 0, void 0, function () {
+                var resultValidate;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.validateDelete(items)];
+                        case 1:
+                            resultValidate = _b.sent();
+                            if (!resultValidate) {
+                                return [2 /*return*/];
+                            }
+                            this._notifierService.showDeleteConfirm('Bạn có chắc chắn muốn xóa bản ghi đã chọn (Và các bản ghi con tương ứng)?').then(function (rs) {
+                                if (!rs) {
+                                    return;
+                                }
+                                if (_this.setting.baseService) {
+                                    _this.getPromiseDeleteItems(items).then(function (response) {
+                                        if (response.success) {
+                                            _this.beforeReloadAfterDelete(items.map(function (q) { return q.id; }));
+                                            _this._triggerProcessData();
+                                            _this._notifierService.showDeleteDataSuccess();
+                                        }
+                                        else {
+                                            _this._notifierService.showWarningByResponse(response);
+                                        }
+                                    });
+                                }
+                            });
+                            return [2 /*return*/];
+                    }
+                });
             });
         };
         ListBase.prototype.beforeReloadAfterDelete = function (ids) {
@@ -32432,6 +32474,9 @@
                         _this.handleSearch(null, evt.control.field);
                     };
                 }
+                if (column instanceof DropdownControlSchema) {
+                    column.isAllowDisabled = false;
+                }
                 if (column instanceof NumberRangeControlSchema) {
                     _this.lstNumberRangeControl.push(column.field);
                 }
@@ -32478,7 +32523,7 @@
                         if (isLazyLoad) {
                             _this.lstControlLazyLoad.push(column.field);
                         }
-                        result.push(new DropdownControlSchema(Object.assign(Object.assign({}, column), { placeholder: (_a = column.placeholder) !== null && _a !== void 0 ? _a : "Ch\u1ECDn " + column.label, multiple: !column.single, dataSource: dataSource, mdWidth: _this.mdWidth, isLazyLoad: isLazyLoad, showLabel: false, showClear: true, onChanged: function (evt) {
+                        result.push(new DropdownControlSchema(Object.assign(Object.assign({}, column), { placeholder: (_a = column.placeholder) !== null && _a !== void 0 ? _a : "Ch\u1ECDn " + column.label, isAllowDisabled: false, multiple: !column.single, dataSource: dataSource, mdWidth: _this.mdWidth, isLazyLoad: isLazyLoad, showLabel: false, showClear: true, onChanged: function (evt) {
                                 var _a;
                                 if (column.dataType == exports.DataType.boolean) {
                                     evt.parentModel[column.field] = column.single ? (_a = evt.value.id) !== null && _a !== void 0 ? _a : evt.value : evt.value.map(function (p) { return p.id; });
@@ -32792,6 +32837,8 @@
             _this.loading = false;
             _this.page = 1;
             _this.totalPage = 2;
+            _this.fieldSuDung = 'suDung';
+            _this.disableFieldNotUse = false;
             _this.modifyOptionWhenFilter = function (options) {
                 _this.dropdownOptions = _this.dropdown._options;
                 _this._modifyOptionWhenFilter(options);
@@ -32923,13 +32970,14 @@
                 if (this.control.loadOnInit && !this.control.isLazyLoad) {
                     this._getData();
                 }
+                if (this.control.baseService instanceof MasterDataService) {
+                    this.control.maxItemDisplay = 9999;
+                }
+                this.disableFieldNotUse = this.control.baseService['disableFieldNotUse'];
             }
             if (!this._deviceDetectorService.isDesktop()) {
                 this.hideTransitionOptions = this.showTransitionOptions = '';
             }
-            if (this.control.baseService instanceof MasterDataService) {
-                this.control.maxItemDisplay = 9999;
-            }
             if (this.control.onInit) {
                 this.control.onInit(this);
             }
@@ -33093,6 +33141,7 @@
             this._getData();
         };
         DropdownComponent.prototype.combineDataSource = function (dataSource, page) {
+            var _this = this;
             this.autofocusSelectedItem = true;
             if (!dataSource)
                 dataSource = [];
@@ -33131,9 +33180,9 @@
                     this._hasLoadedDatasource = true;
                 }
             }
-            if (this.control.baseService && this.control.baseService['disableFieldNotUse']) {
-                var fieldSuDung_1 = this.control.baseService['fieldSuDung'];
-                this.dataSourceInternal.forEach(function (item) { return item.inactive = !item.value[fieldSuDung_1]; });
+            if (this.disableFieldNotUse && this.control.isAllowDisabled
+                && this.dataSourceInternal.some(function (p) { return p.value.hasOwnProperty(_this.fieldSuDung); })) {
+                this.dataSourceInternal.forEach(function (item) { return item.inactive = !item.value[_this.fieldSuDung]; });
             }
         };
         DropdownComponent.prototype.appendDataSource = function (destSource, dataSource, direction) {
@@ -33437,25 +33486,13 @@
             if (page === void 0) { page = 1; }
             if (pageSize === void 0) { pageSize = null; }
             return __awaiter(this, void 0, void 0, function () {
-                var dataSource, totalPage, fieldSuDung, dropdownOptions, response, result, dataSource_3, dataSource_3_1, item;
+                var dataSource, totalPage, dropdownOptions, response, result, dataSource_3, dataSource_3_1, item;
                 var e_5, _a;
-                var _this = this;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             dataSource = null;
                             totalPage = 1;
-                            if (this.control.baseService['fieldSort']) {
-                                this.control.sorts = [this.newSort(this.control.baseService['fieldSort'])];
-                            }
-                            fieldSuDung = this.control.baseService['fieldSuDung'];
-                            if (fieldSuDung) {
-                                this.control.sorts.splice(0, 0, this.newSort(fieldSuDung, -1));
-                                this.control.fieldPlus += "," + fieldSuDung;
-                                this.control.funcGetLabel = function (item) {
-                                    return item[fieldSuDung] ? item[_this.control.displayField] : item[_this.control.displayField] + " (Kh\u00F4ng s\u1EED d\u1EE5ng)";
-                                };
-                            }
                             dropdownOptions = this._crudService.createDropdownOptions(this.control);
                             dropdownOptions.page = page;
                             if (pageSize) {
@@ -33590,14 +33627,18 @@
             var _this = this;
             if (this.control.multiple) {
                 if (!event.itemValue) {
-                    // Trường hợp select all
-                    if (event.value.length) {
-                        this._value = this.dataSourceInternal.map(function (q) { return q.value; });
-                    }
                     // Trường hợp unselect all
-                    else {
+                    if (!event.value.length || event.value.every(function (p) { return p.hasOwnProperty(_this.fieldSuDung) && !p[_this.fieldSuDung]; })) {
                         this._value = [];
                     }
+                    // Trường hợp select all
+                    else {
+                        var tmpDataSource = __spreadArray([], __read(this.dataSourceInternal));
+                        if (this.dataSourceInternal.some(function (p) { return p.hasOwnProperty('inactive'); })) {
+                            tmpDataSource = tmpDataSource.filter(function (p) { return !p.inactive; });
+                        }
+                        this._value = tmpDataSource.map(function (q) { return q.value; });
+                    }
                 }
                 else if (this.control.selectDescendant) {
                     var parentIds_1 = [event.itemValue[this.control.valueField]];
@@ -40301,7 +40342,6 @@
             _this.entityName = 'DM_ChucVu';
             _this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.canboEndpoint;
             _this._moduleConfig = _moduleConfigService.getConfig();
-            _this.fieldSuDung = 'trangThai';
             return _this;
         }
         return DmChucVuService;
@@ -43808,26 +43848,28 @@
         };
         AutoCompletePickerComponent.prototype.buildFilterKeyword = function () {
             var _this = this;
+            var _a;
+            var operator = (_a = this.control.operatorFieldSearchText) !== null && _a !== void 0 ? _a : exports.Operator.contain;
             if (this.fieldSearchText.length == 1) {
-                this.getFilterOnSearch = function (value) { return _this.newFilter(_this.control.displayField, exports.Operator.contain, value); };
+                this.getFilterOnSearch = function (value) { return _this.newFilter(_this.control.displayField, operator, value); };
             }
             else {
                 this.getFilterOnSearch = function (value) {
-                    var e_1, _a;
+                    var e_1, _b;
                     var result = new Filter({
                         logic: 'or',
                         filters: []
                     });
                     try {
-                        for (var _b = __values(_this.fieldSearchText), _c = _b.next(); !_c.done; _c = _b.next()) {
-                            var fieldSearch = _c.value;
-                            result.filters.push(_this.newFilter(fieldSearch, exports.Operator.contain, value));
+                        for (var _c = __values(_this.fieldSearchText), _d = _c.next(); !_d.done; _d = _c.next()) {
+                            var fieldSearch = _d.value;
+                            result.filters.push(_this.newFilter(fieldSearch, operator, value));
                         }
                     }
                     catch (e_1_1) { e_1 = { error: e_1_1 }; }
                     finally {
                         try {
-                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                            if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
                         }
                         finally { if (e_1) throw e_1.error; }
                     }
@@ -43889,14 +43931,14 @@
         };
         AutoCompletePickerComponent.prototype.showPickForm = function () {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             if (!this.control.modifyInitSearchData) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.control.modifyInitSearchData(this)];
                         case 1:
-                            _a.sent();
-                            _a.label = 2;
+                            _b.sent();
+                            _b.label = 2;
                         case 2:
                             this.dirty = false;
                             this.showFormPicker = true;
@@ -43908,8 +43950,8 @@
         AutoCompletePickerComponent.prototype.getData = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var filters, allow, dataSource;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             filters = [];
                             if (this.control.multiple) {
@@ -43924,22 +43966,22 @@
                             }
                             return [4 /*yield*/, appendDefaultFilter(filters, this.control.defaultFilters)];
                         case 1:
-                            _a.sent();
+                            _b.sent();
                             if (this.keyword && this.keyword.length > 0) {
                                 filters.push(this.getFilterOnSearch(this.keyword));
                             }
                             if (!this.control.modifyFilter) return [3 /*break*/, 3];
                             return [4 /*yield*/, this.control.modifyFilter(filters, this, this.currentNode)];
                         case 2:
-                            allow = _a.sent();
+                            allow = _b.sent();
                             if (allow === false) {
                                 this.results = [];
                                 return [2 /*return*/];
                             }
-                            _a.label = 3;
+                            _b.label = 3;
                         case 3: return [4 /*yield*/, this.control.baseService.getDataDropdownByFilter(filters, this.getDropdownOptions())];
                         case 4:
-                            dataSource = _a.sent();
+                            dataSource = _b.sent();
                             this.fireEventAfterGetDataDropDown(dataSource);
                             this.reStructureDataSource(dataSource);
                             this.results = this.dataSource;
@@ -44131,8 +44173,8 @@
         AutoCompletePickerComponent.prototype.handleHide = function (evt) {
             return __awaiter(this, void 0, void 0, function () {
                 var dataSource, dataSource;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             this.showFormPicker = false;
                             if (!this.dirty) return [3 /*break*/, 7];
@@ -44143,9 +44185,9 @@
                                     this.newFilter(this.control.valueField, exports.Operator.in, this.value)
                                 ], this.getDropdownOptions(this.value.length))];
                         case 1:
-                            dataSource = _a.sent();
+                            dataSource = _b.sent();
                             this.fireEventAfterGetDataDropDown(dataSource);
-                            _a.label = 2;
+                            _b.label = 2;
                         case 2:
                             this.reStructureDataSource(dataSource);
                             this.selectedValueObject = this.dataSource;
@@ -44157,9 +44199,9 @@
                                     this.newFilter(this.control.valueField, exports.Operator.equal, this.value)
                                 ], this.getDropdownOptions(1))];
                         case 4:
-                            dataSource = _a.sent();
+                            dataSource = _b.sent();
                             this.fireEventAfterGetDataDropDown(dataSource);
-                            _a.label = 5;
+                            _b.label = 5;
                         case 5:
                             this.reStructureDataSource(dataSource);
                             if (this.dataSource.length > 0) {
@@ -44168,10 +44210,10 @@
                             else {
                                 this.selectedValueObject = null;
                             }
-                            _a.label = 6;
+                            _b.label = 6;
                         case 6:
                             this.updateSelectedValue();
-                            _a.label = 7;
+                            _b.label = 7;
                         case 7: return [2 /*return*/];
                     }
                 });
@@ -44189,7 +44231,7 @@
             }
         };
         AutoCompletePickerComponent.prototype.reStructureDataSource = function (sources) {
-            var e_2, _a;
+            var e_2, _b;
             if (sources != null && sources.length > 0) {
                 var arr = [];
                 try {
@@ -44202,7 +44244,7 @@
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (sources_1_1 && !sources_1_1.done && (_a = sources_1.return)) _a.call(sources_1);
+                        if (sources_1_1 && !sources_1_1.done && (_b = sources_1.return)) _b.call(sources_1);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
@@ -44228,8 +44270,8 @@
             return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
                 var filters;
                 var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             if (!this.control.multiple) return [3 /*break*/, 4];
                             if (!(obj != null && obj.length > 0)) return [3 /*break*/, 2];
@@ -44237,7 +44279,7 @@
                             filters.push(this.newFilter(this.control.valueField, exports.Operator.in, obj));
                             return [4 /*yield*/, appendDefaultFilter(filters, this.control.defaultFilters)];
                         case 1:
-                            _a.sent();
+                            _b.sent();
                             this.control.baseService.getDataDropdownByFilter(filters, this.getDropdownOptions(obj.length)).then(function (res) {
                                 _this.fireEventAfterGetDataDropDown(res);
                                 _this.reStructureDataSource(res);
@@ -44250,7 +44292,7 @@
                             this.results = [];
                             this.selectedValueObject = [];
                             resolve(this.selectedValueObject);
-                            _a.label = 3;
+                            _b.label = 3;
                         case 3: return [3 /*break*/, 5];
                         case 4:
                             if (obj != null) {
@@ -44272,7 +44314,7 @@
                                 this.selectedValueObject = null;
                                 resolve(this.selectedValueObject);
                             }
-                            _a.label = 5;
+                            _b.label = 5;
                         case 5: return [2 /*return*/];
                     }
                 });
@@ -45955,6 +45997,7 @@
                         funcSetValueRow: column.funcSetValueRow,
                         dataSource: column.dataSource,
                         groupCode: column.groupCode,
+                        isOverrideFilter: column.isOverrideFilter,
                         order: column.order
                     });
                     if (column.dataType == 'custom') {
@@ -46210,6 +46253,7 @@
                         funcSetValueRow: column.funcSetValueRow,
                         dataSource: column.dataSource,
                         groupCode: column.groupCode,
+                        isOverrideFilter: column.isOverrideFilter,
                         order: column.order
                     });
                     if (column.dataType == 'custom') {