Merge branch 'fix/Query.view_search_execption' into 'develop'

Merge of fix/【数据中心】修复视图搜索和高级搜索切换显示的数据未切换的问题 to develop

See merge request o2oa/o2oa!763

o2web/source/x_component_query_Query/Viewer.js

@@ -796,6 +796,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
 
                 this.createViewNode({"filterList": filterData});
             }else{
+                this.filterItems = [];
                 this.createViewNode();
             }
         }
@@ -813,6 +814,11 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
         }
     },
     loadCustomSearch: function(){
+        if( this.lastFilterItems ){
+            this.filterItems = this.lastFilterItems;
+        }else{
+            this.filterItems = [];
+        }
         debugger;
         this.viewSearchIconNode.setStyle("display", "none");
         this.viewSearchInputBoxNode.setStyle("display", "none");
@@ -1074,6 +1080,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
 
                 if(this.setContentHeightFun)this.setContentHeightFun();
             }.bind(this));
+            this.lastFilterItems = this.filterItems;
             this.createViewNode({"filterList": this.json.filter ? this.json.filter.clone() : null});
         }
     },