diff --git a/api/index_management/document.go b/api/index_management/document.go index eb383a87..31b632e0 100644 --- a/api/index_management/document.go +++ b/api/index_management/document.go @@ -11,8 +11,8 @@ import ( ) type docReqBody struct { - PageIndex int `json:"pageIndex"` - PageSize int `json:"pageSize"` + From int `json:"from"` + Size int `json:"size"` Filter string `json:"filter"` Cluster string `json:"cluster"` Keyword string `json:"keyword"` @@ -111,17 +111,14 @@ func (handler APIHandler) HandleSearchDocumentAction(w http.ResponseWriter, req } indexName := ps.ByName("index") var ( - pageSize = 10 - pageIndex = 1 sort = "" ) - if reqBody.PageSize > 0 { - pageSize = reqBody.PageSize + if reqBody.From < 0 { + reqBody.From = 0 } - if reqBody.PageIndex > 0 { - pageIndex = reqBody.PageIndex + if reqBody.Size <= 0 { + reqBody.Size = 10 } - from := (pageIndex - 1) * pageSize filter := `{"match_all": {}}` if reqBody.Keyword != "" { filter = fmt.Sprintf(`{"query_string":{"query":"%s"}}`, reqBody.Keyword) @@ -136,7 +133,7 @@ func (handler APIHandler) HandleSearchDocumentAction(w http.ResponseWriter, req } sort = fmt.Sprintf(`"%s":{"order":"%s"}`, sortField, sortDirection) } - query := fmt.Sprintf(`{"from":%d, "size": %d, "query": %s, "sort": [{%s}]}`, from, pageSize, filter, sort) + query := fmt.Sprintf(`{"from":%d, "size": %d, "query": %s, "sort": [{%s}]}`, reqBody.From, reqBody.Size, filter, sort) //fmt.Println(indexName, query) var reqBytes = []byte(query) resp, err := client.SearchWithRawQueryDSL(indexName, reqBytes) diff --git a/web/src/pages/DataManagement/models/document.js b/web/src/pages/DataManagement/models/document.js index 0a13503d..1983b460 100644 --- a/web/src/pages/DataManagement/models/document.js +++ b/web/src/pages/DataManagement/models/document.js @@ -45,7 +45,7 @@ export default { isLoading: true, } }); - let res = yield call(getDocList, payload); + let res = yield call(getDocList, _.clone(payload)); if(res.status === false){ message.warn("加载数据失败") yield put({ diff --git a/web/src/services/doc.js b/web/src/services/doc.js index e55c7d66..420e2877 100644 --- a/web/src/services/doc.js +++ b/web/src/services/doc.js @@ -2,6 +2,10 @@ import request from '@/utils/request'; import {pathPrefix} from './common'; export async function getDocList(params) { + params.from = (params.pageIndex - 1) * params.pageSize; + params.size = params.pageSize; + delete params.pageSize; + delete params.pageIndex; return request(`${pathPrefix}/doc/${params.index}/_search`, { method: 'POST', body: params,