Merge branch 'fix/Query.view_search' into 'wrdp'

Merge of fix/Query.view_search 修复this.view.filter和视图默认搜索之间的冲突 to wrdp

See merge request o2oa/o2oa!6250

o2web/source/x_component_query_Query/Viewer.js

@@ -1028,7 +1028,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
         if (this.viewJson.customFilterList) {
             var key = this.viewSearchInputNode.get("value");
             if (key && key !== this.lp.searchKeywork) {
-                var filterData = this.json.filter ? this.json.filter.clone() : [];
+                var filterData = [];
                 this.filterItems = [];
                 this.viewJson.customFilterList.each(function (entry) {
                     if (entry.formatType === "textValue") {
@@ -1058,6 +1058,12 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
                     }
                 }.bind(this));
 
+                if( this.json.filter ){
+                    this.json.filter.clone().each(function(f){
+                        filterData.push(f);
+                    })
+                }
+
                 this.createViewNode({"filterList": filterData});
             }else{
                 this.filterItems = [];