@farris/ui-list-filter 0.1.5 → 0.1.9

package/bundles/farris-ui-list-filter.umd.js

@@ -605,39 +605,27 @@
             if (value === void 0) {
                 value = { startTime: '', endTime: '' };
             }
+            this.clear$ = new i0.EventEmitter();
             this.startTime = value.startTime;
             this.endTime = value.endTime;
         }
-        // getControlType(): ControlType {
-        //     return ControlType.DateRange;
-        // }
-        // // startTime:string;
-        // // endTime:string;
-        // startTime:Date;
-        // endTime:Date;
-        // getControlType(): ControlType {
-        //     return ControlType.DateRange;
-        // }
-        // // startTime:string;
-        // // endTime:string;
-        // startTime:Date;
-        // endTime:Date;
+        /**
+         * @return {?}
+         */
+        DateRangeValue.prototype.isEmpty = /**
+         * @return {?}
+         */
+            function () {
+                return !this.startTime || !this.endTime;
+            };
         /**
          * @param {?} value
          * @return {?}
          */
-        DateRangeValue.prototype.setOriginalValue =
-            // getControlType(): ControlType {
-            //     return ControlType.DateRange;
-            // }
-            // // startTime:string;
-            // // endTime:string;
-            // startTime:Date;
-            // endTime:Date;
-            /**
-             * @param {?} value
-             * @return {?}
-             */
+        DateRangeValue.prototype.setOriginalValue = /**
+         * @param {?} value
+         * @return {?}
+         */
             function (value) {
                 if (value.formatted) {
                     this.startTime = value.formatted.split(value.delimiter)[0];
@@ -674,15 +662,7 @@
             function () {
                 this.startTime = undefined;
                 this.endTime = undefined;
-            };
-        /**
-         * @return {?}
-         */
-        DateRangeValue.prototype.isEmpty = /**
-         * @return {?}
-         */
-            function () {
-                return !this.startTime || !this.endTime;
+                this.clear$.emit();
             };
         return DateRangeValue;
     }());
@@ -696,6 +676,7 @@
             if (data === void 0) {
                 data = '';
             }
+            this.clear$ = new i0.EventEmitter();
             this.value = data;
         }
         /**
@@ -715,6 +696,7 @@
          */
             function () {
                 this.value = undefined;
+                this.clear$.emit();
             };
         /**
          * @param {?} value
@@ -757,6 +739,7 @@
             if (data === void 0) {
                 data = '';
             }
+            this.clear$ = new i0.EventEmitter();
             this.value = data;
         }
         /**
@@ -776,6 +759,7 @@
          */
             function () {
                 this.value = undefined;
+                this.clear$.emit();
             };
         /**
          * @param {?} value
@@ -818,29 +802,17 @@
             if (date === void 0) {
                 date = '';
             }
+            this.clear$ = new i0.EventEmitter();
             this.value = date;
         }
-        // getControlType(): ControlType {
-        //     return ControlType.Date;
-        // }
-        // value:Date;
-        // getControlType(): ControlType {
-        //     return ControlType.Date;
-        // }
-        // value:Date;
         /**
          * @param {?} value
          * @return {?}
          */
-        DateValue.prototype.setOriginalValue =
-            // getControlType(): ControlType {
-            //     return ControlType.Date;
-            // }
-            // value:Date;
-            /**
-             * @param {?} value
-             * @return {?}
-             */
+        DateValue.prototype.setOriginalValue = /**
+         * @param {?} value
+         * @return {?}
+         */
             function (value) {
                 this.value = value.formatted;
             };
@@ -879,6 +851,7 @@
          */
             function () {
                 this.value = undefined;
+                this.clear$.emit();
             };
         return DateValue;
     }());
@@ -892,26 +865,27 @@
             if (data === void 0) {
                 data = { startValue: '', endValue: '' };
             }
+            this.clear$ = new i0.EventEmitter();
             this.startValue = data.startValue ? parseFloat(data.startValue) : null;
             this.endValue = data.endValue ? parseFloat(data.endValue) : null;
         }
         /**
          * @return {?}
          */
-        NumberRangeValue.prototype.getControlType = /**
+        NumberRangeValue.prototype.isEmpty = /**
          * @return {?}
          */
             function () {
-                return ControlType.NumberRange;
+                return (this.startValue == null && this.endValue == null);
             };
         /**
          * @return {?}
          */
-        NumberRangeValue.prototype.isEmpty = /**
+        NumberRangeValue.prototype.getControlType = /**
          * @return {?}
          */
             function () {
-                return (this.startValue == null && this.endValue == null);
+                return ControlType.NumberRange;
             };
         /**
          * @return {?}
@@ -922,6 +896,7 @@
             function () {
                 this.startValue = undefined;
                 this.endValue = undefined;
+                this.clear$.emit();
             };
         /**
          * @param {?} value
@@ -999,30 +974,18 @@
             if (data === void 0) {
                 data = '';
             }
+            this.clear$ = new i0.EventEmitter();
             this.value = data;
         }
-        // getControlType(): ControlType {
-        //     return ControlType.DropDown;
-        // }
-        // value:IEnumValue;
-        // getControlType(): ControlType {
-        //     return ControlType.DropDown;
-        // }
-        // value:IEnumValue;
         /**
          * @return {?}
          */
-        DropDownListValue.prototype.clearValue =
-            // getControlType(): ControlType {
-            //     return ControlType.DropDown;
-            // }
-            // value:IEnumValue;
-            /**
-             * @return {?}
-             */
+        DropDownListValue.prototype.clearValue = /**
+         * @return {?}
+         */
             function () {
                 this.value = undefined;
-                // this.key = undefined;
+                this.clear$.emit();
             };
         /**
          * @param {?} value
@@ -1033,7 +996,7 @@
          * @return {?}
          */
             function (value) {
-                throw new Error("Method not implemented.");
+                this.value = value;
             };
         /**
          * @return {?}
@@ -1119,6 +1082,7 @@
             if (data === void 0) {
                 data = { value: [], valueField: undefined, textValue: undefined };
             }
+            this.clear$ = new i0.EventEmitter();
             if (data.hasOwnProperty('textValue')) { // 新结构，value是数组
                 this.valueField = data.valueField;
                 this.value = data.value;
@@ -1158,6 +1122,7 @@
                 this.value = [];
                 this.valueField = undefined;
                 this.textValue = undefined;
+                this.clear$.emit();
             };
         /**
          * @param {?} value
@@ -1234,29 +1199,28 @@
             if (value === void 0) {
                 value = [];
             }
+            this.clear$ = new i0.EventEmitter();
+            this.valueChanged = new i0.EventEmitter();
             this.value = value;
         }
-        // getControlType(): ControlType {
-        //     return ControlType.CheckboxGroup;
-        // }
-        // value:CheckboxIEnumValue[];
-        // getControlType(): ControlType {
-        //     return ControlType.CheckboxGroup;
-        // }
-        // value:CheckboxIEnumValue[];
         /**
          * @return {?}
          */
-        CheckboxGroupValue.prototype.clearValue =
-            // getControlType(): ControlType {
-            //     return ControlType.CheckboxGroup;
-            // }
-            // value:CheckboxIEnumValue[];
-            /**
-             * @return {?}
-             */
+        CheckboxGroupValue.prototype.isEmpty = /**
+         * @return {?}
+         */
+            function () {
+                return this.value.length == 0;
+            };
+        /**
+         * @return {?}
+         */
+        CheckboxGroupValue.prototype.clearValue = /**
+         * @return {?}
+         */
             function () {
                 this.value = [];
+                this.clear$.emit();
             };
         /**
          * @param {?} value
@@ -1270,31 +1234,34 @@
                 this.value = value;
             };
         /**
+         * @param {?} value
          * @return {?}
          */
-        CheckboxGroupValue.prototype.getOriginalValue = /**
+        CheckboxGroupValue.prototype.setValue = /**
+         * @param {?} value
          * @return {?}
          */
-            function () {
-                return this.value;
+            function (value) {
+                this.value = value;
+                this.valueChanged.emit(this.value);
             };
         /**
          * @return {?}
          */
-        CheckboxGroupValue.prototype.getControlType = /**
+        CheckboxGroupValue.prototype.getOriginalValue = /**
          * @return {?}
          */
             function () {
-                return ControlType.CheckboxGroup;
+                return this.value;
             };
         /**
          * @return {?}
          */
-        CheckboxGroupValue.prototype.isEmpty = /**
+        CheckboxGroupValue.prototype.getControlType = /**
          * @return {?}
          */
             function () {
-                return this.value.length == 0;
+                return ControlType.CheckboxGroup;
             };
         return CheckboxGroupValue;
     }());
@@ -1308,39 +1275,27 @@
             if (value === void 0) {
                 value = { startTime: '', endTime: '' };
             }
+            this.clear$ = new i0.EventEmitter();
             this.startTime = value.startTime;
             this.endTime = value.endTime;
         }
-        // getControlType(): ControlType {
-        //     return ControlType.DateRangeTime;
-        // }
-        // // startTime:string;
-        // // endTime:string;
-        // startTime:Date;
-        // endTime:Date;
-        // getControlType(): ControlType {
-        //     return ControlType.DateRangeTime;
-        // }
-        // // startTime:string;
-        // // endTime:string;
-        // startTime:Date;
-        // endTime:Date;
+        /**
+         * @return {?}
+         */
+        DateRangeTimeValue.prototype.isEmpty = /**
+         * @return {?}
+         */
+            function () {
+                return !this.startTime || !this.endTime;
+            };
         /**
          * @param {?} value
          * @return {?}
          */
-        DateRangeTimeValue.prototype.setOriginalValue =
-            // getControlType(): ControlType {
-            //     return ControlType.DateRangeTime;
-            // }
-            // // startTime:string;
-            // // endTime:string;
-            // startTime:Date;
-            // endTime:Date;
-            /**
-             * @param {?} value
-             * @return {?}
-             */
+        DateRangeTimeValue.prototype.setOriginalValue = /**
+         * @param {?} value
+         * @return {?}
+         */
             function (value) {
                 if (value.formatted) {
                     this.startTime = value.formatted.split(value.delimiter)[0];
@@ -1377,15 +1332,7 @@
             function () {
                 this.startTime = undefined;
                 this.endTime = undefined;
-            };
-        /**
-         * @return {?}
-         */
-        DateRangeTimeValue.prototype.isEmpty = /**
-         * @return {?}
-         */
-            function () {
-                return !this.startTime || !this.endTime;
+                this.clear$.emit();
             };
         return DateRangeTimeValue;
     }());
@@ -1428,29 +1375,18 @@
             if (data === void 0) {
                 data = '';
             }
+            this.clear$ = new i0.EventEmitter();
             this.value = data;
         }
-        // getControlType(): ControlType {
-        //     return ControlType.DropDown;
-        // }
-        // value:IEnumValue;
-        // getControlType(): ControlType {
-        //     return ControlType.DropDown;
-        // }
-        // value:IEnumValue;
         /**
          * @return {?}
          */
-        RadioGroupValue.prototype.clearValue =
-            // getControlType(): ControlType {
-            //     return ControlType.DropDown;
-            // }
-            // value:IEnumValue;
-            /**
-             * @return {?}
-             */
+        RadioGroupValue.prototype.clearValue = /**
+         * @return {?}
+         */
             function () {
                 this.value = undefined;
+                this.clear$.emit();
             };
         /**
          * @param {?} value
@@ -1540,29 +1476,17 @@
             if (date === void 0) {
                 date = '';
             }
+            this.clear$ = new i0.EventEmitter();
             this.value = date;
         }
-        // getControlType(): ControlType {
-        //     return ControlType.Date;
-        // }
-        // value:Date;
-        // getControlType(): ControlType {
-        //     return ControlType.Date;
-        // }
-        // value:Date;
         /**
          * @param {?} value
          * @return {?}
          */
-        YearValue.prototype.setOriginalValue =
-            // getControlType(): ControlType {
-            //     return ControlType.Date;
-            // }
-            // value:Date;
-            /**
-             * @param {?} value
-             * @return {?}
-             */
+        YearValue.prototype.setOriginalValue = /**
+         * @param {?} value
+         * @return {?}
+         */
             function (value) {
                 this.value = value.formatted;
             };
@@ -1601,6 +1525,7 @@
          */
             function () {
                 this.value = undefined;
+                this.clear$.emit();
             };
         return YearValue;
     }());
@@ -1643,29 +1568,17 @@
             if (date === void 0) {
                 date = '';
             }
+            this.clear$ = new i0.EventEmitter();
             this.value = date;
         }
-        // getControlType(): ControlType {
-        //     return ControlType.Date;
-        // }
-        // value:Date;
-        // getControlType(): ControlType {
-        //     return ControlType.Date;
-        // }
-        // value:Date;
         /**
          * @param {?} value
          * @return {?}
          */
-        MonthValue.prototype.setOriginalValue =
-            // getControlType(): ControlType {
-            //     return ControlType.Date;
-            // }
-            // value:Date;
-            /**
-             * @param {?} value
-             * @return {?}
-             */
+        MonthValue.prototype.setOriginalValue = /**
+         * @param {?} value
+         * @return {?}
+         */
             function (value) {
                 this.value = value.formatted;
             };
@@ -1704,6 +1617,7 @@
          */
             function () {
                 this.value = undefined;
+                this.clear$.emit();
             };
         return MonthValue;
     }());
@@ -1717,6 +1631,7 @@
             if (value === void 0) {
                 value = { startTime: '', endTime: '' };
             }
+            this.clear$ = new i0.EventEmitter();
             this.startTime = value.startTime;
             this.endTime = value.endTime;
         }
@@ -1764,6 +1679,7 @@
             function () {
                 this.startTime = undefined;
                 this.endTime = undefined;
+                this.clear$.emit();
             };
         /**
          * @return {?}
@@ -1815,9 +1731,19 @@
             if (value === void 0) {
                 value = { startTime: '', endTime: '' };
             }
+            this.clear$ = new i0.EventEmitter();
             this.startTime = value.startTime;
             this.endTime = value.endTime;
         }
+        /**
+         * @return {?}
+         */
+        MonthRangeValue.prototype.isEmpty = /**
+         * @return {?}
+         */
+            function () {
+                return !this.startTime || !this.endTime;
+            };
         /**
          * @param {?} value
          * @return {?}
@@ -1862,15 +1788,7 @@
             function () {
                 this.startTime = undefined;
                 this.endTime = undefined;
-            };
-        /**
-         * @return {?}
-         */
-        MonthRangeValue.prototype.isEmpty = /**
-         * @return {?}
-         */
-            function () {
-                return !this.startTime || !this.endTime;
+                this.clear$.emit();
             };
         return MonthRangeValue;
     }());
@@ -1913,11 +1831,54 @@
             if (data === void 0) {
                 data = { value: [], textValue: undefined, textField: undefined, isInputText: undefined };
             }
+            this.clear$ = new i0.EventEmitter();
             this.value = data.value;
             this.textValue = data.textValue ? data.textValue.trim() : '';
             this.textField = data.textField;
             this.isInputText = data.isInputText;
         }
+        /**
+         * @param {?} targetField
+         * @return {?}
+         */
+        InputGroupValue.prototype.getTextValue = /**
+         * @param {?} targetField
+         * @return {?}
+         */
+            function (targetField) {
+                var _this = this;
+                /** @type {?} */
+                var args = targetField.split('.');
+                /** @type {?} */
+                var textArr = this.value.map(( /**
+                 * @param {?} item
+                 * @return {?}
+                 */function (item) { return _this.getPropValue(item, lodashEs.cloneDeep(args)); }));
+                return textArr && textArr.length ? textArr.join(',') : '';
+            };
+        /**
+         * @param {?} item
+         * @param {?} args
+         * @return {?}
+         */
+        InputGroupValue.prototype.getPropValue = /**
+         * @param {?} item
+         * @param {?} args
+         * @return {?}
+         */
+            function (item, args) {
+                if (args.length > 1) {
+                    /** @type {?} */
+                    var arg = args.shift();
+                    if (arg) {
+                        return item[arg] ? this.getPropValue(item[arg], args) : '';
+                    }
+                    else {
+                        return '';
+                    }
+                }
+                return item[args[0]];
+            };
         /**
          * @return {?}
          */
@@ -1966,6 +1927,7 @@
                 this.textValue = undefined;
                 this.textField = undefined;
                 this.isInputText = undefined;
+                this.clear$.emit();
             };
         /**
          * @return {?}
@@ -1976,48 +1938,6 @@
             function () {
                 return !this.textValue;
             };
-        /**
-         * @param {?} targetField
-         * @return {?}
-         */
-        InputGroupValue.prototype.getTextValue = /**
-         * @param {?} targetField
-         * @return {?}
-         */
-            function (targetField) {
-                var _this = this;
-                /** @type {?} */
-                var args = targetField.split('.');
-                /** @type {?} */
-                var textArr = this.value.map(( /**
-                 * @param {?} item
-                 * @return {?}
-                 */function (item) { return _this.getPropValue(item, lodashEs.cloneDeep(args)); }));
-                return textArr && textArr.length ? textArr.join(',') : '';
-            };
-        /**
-         * @param {?} item
-         * @param {?} args
-         * @return {?}
-         */
-        InputGroupValue.prototype.getPropValue = /**
-         * @param {?} item
-         * @param {?} args
-         * @return {?}
-         */
-            function (item, args) {
-                if (args.length > 1) {
-                    /** @type {?} */
-                    var arg = args.shift();
-                    if (arg) {
-                        return item[arg] ? this.getPropValue(item[arg], args) : '';
-                    }
-                    else {
-                        return '';
-                    }
-                }
-                return item[args[0]];
-            };
         return InputGroupValue;
     }());
 
@@ -4820,7 +4740,7 @@
                 if (this.disabled) {
                     return;
                 }
-                this.searchChange.emit(this.listFilterConditions);
+                this.searchChange.emit({ item: item, conditions: this.listFilterConditions, instance: this });
                 this.inSetCurrentFilterConditions();
                 this.canSubmit = this.canSubmitFilter(this.requiredListFilter);
                 if (item.control.isExtend || !this.canSubmit || !this.liveSearch) {
@@ -5134,6 +5054,9 @@
          */
             function (fields) {
                 if (fields && fields.length) {
+                    if (typeof fields === 'string') {
+                        fields = fields.split(',');
+                    }
                     fields = fields.map(( /**
                      * @param {?} n
                      * @return {?}
@@ -5144,12 +5067,40 @@
                      * @param {?} n
                      * @return {?}
                      */function (n) {
-                        if (fields.indexOf(n.fieldName.toLowerCase()) > -1) {
-                            n.value['value'] = '';
+                        if (fields.indexOf(n.fieldCode.toLowerCase()) > -1) {
+                            n.value.clearValue();
                         }
                     }));
                 }
             };
+        /**
+         * @param {?} values
+         * @return {?}
+         */
+        ListFilterComponent.prototype.updateValues = /**
+         * @param {?} values
+         * @return {?}
+         */
+            function (values) {
+                var _this = this;
+                if (values && Object.keys(values)) {
+                    /** @type {?} */
+                    var fields_1 = Object.keys(values);
+                    fields_1.forEach(( /**
+                     * @param {?} f
+                     * @return {?}
+                     */function (f) {
+                        _this.listFilterConditions.forEach(( /**
+                         * @param {?} n
+                         * @return {?}
+                         */function (n) {
+                            if (fields_1.indexOf(n.fieldCode.toLowerCase()) > -1) {
+                                n.value['value'] = values[f];
+                            }
+                        }));
+                    }));
+                }
+            };
         ListFilterComponent.decorators = [
             { type: i0.Component, args: [{
                         selector: 'farris-list-filter',
@@ -5191,9 +5142,9 @@
      * @fileoverview added by tsickle
      * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
-    // import { NotifyService, NotifyOptions } from '@farris/ui-notify';
     var SolutionService = /** @class */ (function () {
         function SolutionService() {
+            this.filterEditors = {};
         }
         /**
          * @return {?}
@@ -5216,9 +5167,9 @@
                 return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
             };
         /**
-        * 根据字段获取Lable控件的Title
-        * @param field
-        */
+         * 根据字段获取Lable控件的Title
+         * @param field
+         */
         /**
          * 根据字段获取Lable控件的Title
          * @param {?} field
@@ -5261,6 +5212,19 @@
                 }
                 return result;
             };
+        /**
+         * @param {?} fieldName
+         * @param {?} cmpIns
+         * @return {?}
+         */
+        SolutionService.prototype.addFilterEditorInstance = /**
+         * @param {?} fieldName
+         * @param {?} cmpIns
+         * @return {?}
+         */
+            function (fieldName, cmpIns) {
+                this.filterEditors[fieldName] = cmpIns;
+            };
         SolutionService.decorators = [
             { type: i0.Injectable }
         ];
@@ -5331,6 +5295,10 @@
                         this.showlabel = this.item.control.showLabel;
                     }
                 }
+                this.solutionService.addFilterEditorInstance(this.item.fieldCode, this);
+                // (this.item.value as HelpValue).clear$.subscribe(() => {
+                //     this.textValue = '';
+                // });
             };
         /**
          * @return {?}
@@ -5479,6 +5447,7 @@
                         this.showlabel = this.item.control.showLabel;
                     }
                 }
+                this.solutionService.addFilterEditorInstance(this.item.fieldCode, this);
             };
         /**
          * @return {?}
@@ -5526,7 +5495,7 @@
         SearchComponent.decorators = [
             { type: i0.Component, args: [{
                         selector: 'app-filter-search',
-                        template: "<label class=\"col-form-label\" *ngIf=\"item && showlabel\" title=\"{{getConditionItemTitle(item)}}\">\r\n    <span class=\"farris-label-info text-danger\" *ngIf=\"item.control.required\">*</span>\r\n    <span class=\"farris-label-text\">{{item.fieldName}}</span>\r\n</label>\r\n<div class=\"farris-input-wrap\" *ngIf=\"item\">\r\n    <input-group [groupText]=\"groupIcon\" [readonly]=\"disabled\" [(ngModel)]=\"item.value.value\" (clear)=\"onSearch($event)\" (blurHandle)=\"onSearch($event)\" (enterHandle)=\"onSearch($event)\" (clickHandle)=\"onSearch($event)\"  [placeholder]=\"placeholder\"></input-group>\r\n</div>"
+                        template: "<label class=\"col-form-label\" *ngIf=\"item && showlabel\" title=\"{{getConditionItemTitle(item)}}\">\r\n    <span class=\"farris-label-info text-danger\" *ngIf=\"item.control.required\">*</span>\r\n    <span class=\"farris-label-text\">{{item.fieldName}}</span>\r\n</label>\r\n<div class=\"farris-input-wrap\" *ngIf=\"item\">\r\n    <input-group [groupText]=\"groupIcon\" [readonly]=\"disabled\" [(ngModel)]=\"item.value.value\" \r\n    (clear)=\"onSearch($event)\" (enterHandle)=\"onSearch($event)\" \r\n    (clickHandle)=\"onSearch($event)\"  [placeholder]=\"placeholder\"></input-group>\r\n</div>"
                     }] }
         ];
         /** @nocollapse */
@@ -5598,6 +5567,7 @@
          * @return {?}
          */
             function () {
+                var _this = this;
                 if (this.item) {
                     /** @type {?} */
                     var type = Object.prototype.toString.call(this.item.placeHolder);
@@ -5617,6 +5587,12 @@
                         this.showlabel = this.item.control.showLabel;
                     }
                 }
+                this.solutionService.addFilterEditorInstance(this.item.fieldCode, this);
+                (( /** @type {?} */(this.item.value))).clear$.subscribe(( /**
+                 * @return {?}
+                 */function () {
+                    _this.textValue = '';
+                }));
             };
         /**
          * @return {?}
@@ -5709,6 +5685,7 @@
                     this.expandLevel = helpList_1.expandLevel;
                     this.enableCascade = helpList_1.enableCascade;
                     this.helpId = helpList_1.helpId;
+                    this.title = helpList_1.title;
                     /** @type {?} */
                     var helpValue = (( /** @type {?} */(this.item.value)));
                     // if (helpValue && helpValue.value) {
@@ -5760,7 +5737,7 @@
         HelpComponent.decorators = [
             { type: i0.Component, args: [{
                         selector: 'app-filter-help',
-                        template: "<label class=\"col-form-label\" *ngIf=\"item && showlabel\" title=\"{{getConditionItemTitle(item)}}\">\r\n    <span class=\"farris-label-info text-danger\" *ngIf=\"item.control.required\">*</span>\r\n    <span class=\"farris-label-text\">{{item.fieldName}}</span>\r\n</label>\r\n<div class=\"farris-input-wrap\" *ngIf=\"item\">\r\n    <farris-lookup-grid  \r\n        [uri]=\"uri\" \r\n        [idField]=\"idField\" \r\n        [textField]=\"textField\" \r\n        [valueField]=\"valueField\" \r\n        [(ngModel)]=\"textValue\"\r\n        [displayType]=\"displayType\"\r\n        [editable]=\"false\"\r\n        [readonly]=\"disabled\"\r\n        (clear)=\"clearData($event)\"\r\n        (selectedData)=\"selectedDataHandler($event)\"\r\n        [placeholder]=\"placeholder\"\r\n        [mapFields]=\"mapFields\"\r\n        [dictPicking]=\"preEventCmd\"\r\n        [dictPicked]=\"postEventCmd\"\r\n        [context]=\"context\"\r\n        [enableFullTree]=\"enableFullTree\"\r\n        [loadTreeDataType]=\"loadTreeDataType\"\r\n        [singleSelect]=\"singleSelect\"\r\n        [expandLevel]=\"expandLevel\"\r\n        [enableCascade]=\"enableCascade\"\r\n    >\r\n    </farris-lookup-grid>\r\n\r\n    <!-- [dictPicked]=\"onSearch\" -->\r\n    <!-- (selectedData)=\"selectedDataHandler($event)\" -->\r\n</div>"
+                        template: "<label class=\"col-form-label\" *ngIf=\"item && showlabel\" title=\"{{getConditionItemTitle(item)}}\">\r\n    <span class=\"farris-label-info text-danger\" *ngIf=\"item.control.required\">*</span>\r\n    <span class=\"farris-label-text\">{{item.fieldName}}</span>\r\n</label>\r\n<div class=\"farris-input-wrap\" *ngIf=\"item\">\r\n    <farris-lookup-grid  \r\n        [uri]=\"uri\"\r\n        [title]=\"title\"\r\n        [idField]=\"idField\" \r\n        [textField]=\"textField\" \r\n        [valueField]=\"valueField\" \r\n        [(ngModel)]=\"textValue\"\r\n        [displayType]=\"displayType\"\r\n        [editable]=\"false\"\r\n        [readonly]=\"disabled\"\r\n        (clear)=\"clearData($event)\"\r\n        (selectedData)=\"selectedDataHandler($event)\"\r\n        [placeholder]=\"placeholder\"\r\n        [mapFields]=\"mapFields\"\r\n        [dictPicking]=\"preEventCmd\"\r\n        [dictPicked]=\"postEventCmd\"\r\n        [context]=\"context\"\r\n        [enableFullTree]=\"enableFullTree\"\r\n        [loadTreeDataType]=\"loadTreeDataType\"\r\n        [singleSelect]=\"singleSelect\"\r\n        [expandLevel]=\"expandLevel\"\r\n        [enableCascade]=\"enableCascade\"\r\n    >\r\n    </farris-lookup-grid>\r\n\r\n    <!-- [dictPicked]=\"onSearch\" -->\r\n    <!-- (selectedData)=\"selectedDataHandler($event)\" -->\r\n</div>"
                         // providers: [{ provide: ServerSideToken, useClass: LookupHttpBeQueryService }]
                     }] }
         ];
@@ -5824,6 +5801,7 @@
          * @return {?}
          */
             function () {
+                var _this = this;
                 // console.log(this.showType);
                 this.initDate();
                 if (this.item) {
@@ -5844,6 +5822,12 @@
                         this.showlabel = this.item.control.showLabel;
                     }
                 }
+                this.solutionService.addFilterEditorInstance(this.item.fieldCode, this);
+                (( /** @type {?} */(this.item.value))).clear$.subscribe(( /**
+                 * @return {?}
+                 */function () {
+                    _this.date = '';
+                }));
             };
         /**
          * @return {?}
@@ -5957,7 +5941,7 @@
             autoLabel: [{ type: i0.Input }],
             disabled: [{ type: i0.Input }],
             showType: [{ type: i0.Input }],
-            searchHandle: [{ type: i0.Output, args: ['searchHandle',] }],
+            searchHandle: [{ type: i0.Output }],
             isExtend: [{ type: i0.HostBinding, args: ['class.filter-item-wrap',] }],
             hidenLabel: [{ type: i0.HostBinding, args: ['class.filter-item-hiddenlabel',] }]
         };
@@ -6007,6 +5991,7 @@
          * @return {?}
          */
             function () {
+                var _this = this;
                 // this.getDataSource();
                 // const initialValue = this.item.value as DropDownListValue;
                 // initialValue.value && (this.selectedItemId = initialValue.value.getEnumValue());
@@ -6032,6 +6017,12 @@
                         this.showlabel = this.item.control.showLabel;
                     }
                 }
+                this.solutionService.addFilterEditorInstance(this.item.fieldCode, this);
+                (( /** @type {?} */(this.item.value))).clear$.subscribe(( /**
+                 * @return {?}
+                 */function () {
+                    _this.selectedItemId = '';
+                }));
                 // this.testId = this.solutionService.getGuid();
             };
         /**
@@ -6236,6 +6227,7 @@
          * @return {?}
          */
             function () {
+                var _this = this;
                 if (this.item) {
                     /** @type {?} */
                     var type = Object.prototype.toString.call(this.item.placeHolder);
@@ -6268,12 +6260,13 @@
                         this.endPlaceHolder = this.item.endPlaceHolder;
                     }
                 }
-                // if(this._item && this._item.control && this._item.control.hasOwnProperty('isExtend')){
-                //     this.extend = this._item.control.isExtend;
-                //     if(!this.extend){
-                //         this.showlabel = this._item.control.showLabel;
-                //     }
-                // }
+                (( /** @type {?} */(this.item.value))).clear$.subscribe(( /**
+                 * @return {?}
+                 */function () {
+                    _this.beginValue = '';
+                    _this.endValue = '';
+                }));
+                this.solutionService.addFilterEditorInstance(this.item.fieldCode, this);
             };
         /**
          * @return {?}
@@ -6388,7 +6381,7 @@
         NumberComponent.decorators = [
             { type: i0.Component, args: [{
                         selector: 'app-filter-number',
-                        template: "<label class=\"col-form-label\" *ngIf=\"item && showlabel\" title=\"{{getConditionItemTitle(item)}}\">\r\n    <span class=\"farris-label-info text-danger\" *ngIf=\"item.control.required\">*</span>\r\n    <span class=\"farris-label-text\">{{item.fieldName}}</span>\r\n</label>\r\n<div class=\"farris-input-wrap d-flex\">\r\n    <farris-number-range class=\"f-utils-fill-flex-row\" [canNull]=\"canNull\" [disabled]=\"disabled\" [beginValue]=\"beginValue\" [endValue]=\"endValue\" (beginValueChange)=\"beginValueChange($event)\" (endValueChange)=\"endValueChange($event)\" (valueChange)=\"numberChange($event)\" [beginPlaceHolder]=\"beginPlaceHolder\" [endPlaceHolder]=\"endPlaceHolder\" [placeholder]=\"placeholder\" [precision]=\"precision\" [bigNumber]=\"bigNumber\"></farris-number-range>\r\n</div>",
+                        template: "<label class=\"col-form-label\" *ngIf=\"item && showlabel\" title=\"{{getConditionItemTitle(item)}}\">\r\n    <span class=\"farris-label-info text-danger\" *ngIf=\"item.control.required\">*</span>\r\n    <span class=\"farris-label-text\">{{item.fieldName}}</span>\r\n</label>\r\n<div class=\"farris-input-wrap d-flex\">\r\n    <farris-number-range class=\"f-utils-fill-flex-row\" [canNull]=\"canNull\" [disabled]=\"disabled\" [beginValue]=\"beginValue\" [endValue]=\"endValue\" \r\n    (beginValueChange)=\"beginValueChange($event)\" (endValueChange)=\"endValueChange($event)\" (valueChange)=\"numberChange($event)\" \r\n    [beginPlaceHolder]=\"beginPlaceHolder\" [endPlaceHolder]=\"endPlaceHolder\" [placeholder]=\"placeholder\" [precision]=\"precision\" [bigNumber]=\"bigNumber\"></farris-number-range>\r\n</div>",
                         styles: [""]
                     }] }
         ];
@@ -6497,6 +6490,7 @@
          * @return {?}
          */
             function () {
+                var _this = this;
                 this.getDataSource();
                 this.checkValue = this.item.value.getOriginalValue();
                 if (this.item && this.item.control && this.item.control.hasOwnProperty('isExtend')) {
@@ -6505,6 +6499,12 @@
                         this.showlabel = this.item.control.showLabel;
                     }
                 }
+                this.solutionService.addFilterEditorInstance(this.item.fieldCode, this);
+                (( /** @type {?} */(this.item.value))).clear$.subscribe(( /**
+                 * @return {?}
+                 */function () {
+                    _this.checkValue = [];
+                }));
             };
         /**
          * @return {?}
@@ -6606,7 +6606,7 @@
             item: [{ type: i0.Input }],
             autoLabel: [{ type: i0.Input }],
             disabled: [{ type: i0.Input }],
-            searchHandle: [{ type: i0.Output, args: ['searchHandle',] }],
+            searchHandle: [{ type: i0.Output }],
             isExtend: [{ type: i0.HostBinding, args: ['class.filter-item-wrap',] }],
             isCheckExtend: [{ type: i0.HostBinding, args: ['class.filter-item-checbox-wrap',] }],
             cla: [{ type: i0.HostBinding, args: ['class.filter-item-checkboxgroup',] }],
@@ -6668,6 +6668,7 @@
          * @return {?}
          */
             function () {
+                var _this = this;
                 this.initDate();
                 if (this.item) {
                     /** @type {?} */
@@ -6708,6 +6709,12 @@
                         this.showlabel = this.item.control.showLabel;
                     }
                 }
+                this.solutionService.addFilterEditorInstance(this.item.fieldCode, this);
+                (( /** @type {?} */(this.item.value))).clear$.subscribe(( /**
+                 * @return {?}
+                 */function () {
+                    _this.rangeDate = '';
+                }));
                 this.cdr.detectChanges();
             };
         /**
@@ -7003,6 +7010,7 @@
          * @return {?}
          */
             function () {
+                var _this = this;
                 this.getDataSource();
                 this.radioValue = this.item.value.getOriginalValue();
                 if (this.item && this.item.control && this.item.control.hasOwnProperty('isExtend')) {
@@ -7011,6 +7019,12 @@
                         this.showlabel = this.item.control.showLabel;
                     }
                 }
+                this.solutionService.addFilterEditorInstance(this.item.fieldCode, this);
+                (( /** @type {?} */(this.item.value))).clear$.subscribe(( /**
+                 * @return {?}
+                 */function () {
+                    _this.radioValue = [];
+                }));
             };
         /**
          * @return {?}
@@ -7194,6 +7208,7 @@
                         this.showlabel = this.item.control.showLabel;
                     }
                 }
+                this.solutionService.addFilterEditorInstance(this.item.fieldCode, this);
             };
         /**
          * @return {?}