提交 bf59e607 编写于 作者: 蔡祥熠

Merge branch 'fix/ftserach' into 'develop'

Merge of fix/ftserach ftsearch关键字为空,不再执行搜索 to develop

See merge request o2oa/o2oa!1282
...@@ -287,7 +287,7 @@ ul { ...@@ -287,7 +287,7 @@ ul {
width: 100%; width: 100%;
} }
.listNoData-ftsearch{ .listNoData-ftsearch{
max-width: 900px; max-width: 750px;
text-align: center; text-align: center;
padding-top:50px; padding-top:50px;
padding-bottom:50px; padding-bottom:50px;
......
...@@ -81,7 +81,7 @@ MWF.xApplication.ftsearch.FTSearchView = new Class({ ...@@ -81,7 +81,7 @@ MWF.xApplication.ftsearch.FTSearchView = new Class({
pageNum = o2.typeOf(pageNum) === "number" ? pageNum : null; pageNum = o2.typeOf(pageNum) === "number" ? pageNum : null;
this.docPageNum = pageNum || 1; this.docPageNum = pageNum || 1;
this.currentKey = query || this.searchInput.get("value") || ""; this.currentKey = query || this.searchInput.get("value") || "";
// if( this.currentKey ){ if( this.currentKey ){
var startDate = new Date(); var startDate = new Date();
...@@ -126,16 +126,15 @@ MWF.xApplication.ftsearch.FTSearchView = new Class({ ...@@ -126,16 +126,15 @@ MWF.xApplication.ftsearch.FTSearchView = new Class({
this.loadDocPagination(); this.loadDocPagination();
} }
}.bind(this)); }.bind(this));
// }else{ }else{
// this.docList = []; this.docList = [];
// this.docTotal = 0; this.docTotal = 0;
// this.docTotalNode.set("text", ""); this.docTotalNode.set("text", "");
// this.loadSelectedCondition(); this.loadSelectedCondition();
// this.loadCondition( []); this.loadCondition( []);
// this.loadDocList(); this.loadDocList();
// this.loadDocPagination(); this.loadDocPagination();
// }
// }
}, },
orderFacet: function(facetList){ orderFacet: function(facetList){
facetList.sort(function (a, b) { facetList.sort(function (a, b) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册