From e43ef558ce03ab163655e5a2c55080810bc1a02f Mon Sep 17 00:00:00 2001
From: silenceqi <silenceqi@hotmail.com>
Date: Sun, 24 Jan 2021 18:01:45 +0800
Subject: [PATCH] refactor es util file

---
 .../{utils/elasticsearch.js => lib/elasticsearch/util.js} | 0
 web/src/pages/DataManagement/Document.js                  | 7 +++++--
 web/src/pages/DataManagement/Index.js                     | 8 ++++++--
 web/src/pages/DataManagement/Rebuild.js                   | 2 +-
 web/src/pages/DataManagement/models/document.js           | 2 +-
 web/src/pages/DataManagement/models/rebuildlist.js        | 2 +-
 web/src/pages/SearchManage/models/dict.js                 | 2 +-
 7 files changed, 15 insertions(+), 8 deletions(-)
 rename web/src/{utils/elasticsearch.js => lib/elasticsearch/util.js} (100%)

diff --git a/web/src/utils/elasticsearch.js b/web/src/lib/elasticsearch/util.js
similarity index 100%
rename from web/src/utils/elasticsearch.js
rename to web/src/lib/elasticsearch/util.js
diff --git a/web/src/pages/DataManagement/Document.js b/web/src/pages/DataManagement/Document.js
index 8180ef0e..e5446f92 100644
--- a/web/src/pages/DataManagement/Document.js
+++ b/web/src/pages/DataManagement/Document.js
@@ -8,7 +8,7 @@ import Editor, {monaco} from '@monaco-editor/react';
 import moment from 'moment';
 import {createDependencyProposals} from './autocomplete';
 import InputSelect from '@/components/infini/InputSelect';
-import {getFields,getESAPI} from '@/utils/elasticsearch';
+import {getFields,getESAPI} from '@/lib/elasticsearch/util';
 
 function findParentIdentifier(textUntilPosition){
   let chars = textUntilPosition;
@@ -561,11 +561,14 @@ class Doucment extends React.Component {
           })
         }
         return newItem;
+      });
+      this.indexSelEl && this.indexSelEl.setState({
+        value: [indices[0].value]
       })
     }
     return (
       <div>
-        {(indices) ? (<Cascader ref={el=>{this.indexSelEl=el}} options={indices} style={{width: 200, marginRight:5}} placeholder="please select a index">
+        {(indices && indices.length>0) ? (<Cascader ref={el=>{this.indexSelEl=el}} defaultValue={[indices[0].value]} options={indices} style={{width: 200, marginRight:5}} placeholder="please select a index">
         </Cascader>) : ''}
         {/*{(indices) ? (<Select ref={el=>{this.indexSelEl=el}} style={{width: 200, marginRight:5}} placeholder="please select a index">*/}
         {/*  {indices.map(item=>{*/}
diff --git a/web/src/pages/DataManagement/Index.js b/web/src/pages/DataManagement/Index.js
index 44930e8b..3e27d1ae 100644
--- a/web/src/pages/DataManagement/Index.js
+++ b/web/src/pages/DataManagement/Index.js
@@ -46,7 +46,7 @@ class JSONWrapper extends PureComponent {
       　　return elemTop;
       
       }
-      console.log(getElementTop(this.refs.jsonw));
+     // console.log(getElementTop(this.refs.jsonw));
     this.setState({height: window.innerHeight - getElementTop(this.refs.jsonw) -50});
   }
   render(){
@@ -292,7 +292,11 @@ class Index extends PureComponent {
     };
     let newSettings = {};
     if(settings && settings[editingIndex.index]){
-      newSettings = transformSettingsForApi(settings[editingIndex.index], editingIndex.status === 'open')
+      if(settings[editingIndex.index].settings) {
+        newSettings = transformSettingsForApi(settings[editingIndex.index], editingIndex.status === 'open')
+      }else{
+        newSettings = settings[editingIndex.index];
+      }
     }
     const {form: { getFieldDecorator }} = this.props;
     
diff --git a/web/src/pages/DataManagement/Rebuild.js b/web/src/pages/DataManagement/Rebuild.js
index 7d65a7f1..4dcd807a 100644
--- a/web/src/pages/DataManagement/Rebuild.js
+++ b/web/src/pages/DataManagement/Rebuild.js
@@ -3,7 +3,7 @@ import { connect } from 'dva';
 import PageHeaderWrapper from '@/components/PageHeaderWrapper';
 import {Steps, Card, Form, Select, Input,Button, Divider,message, InputNumber} from 'antd';
 import InputSelect from '@/components/infini/InputSelect';
-import {getFields} from '@/utils/elasticsearch';
+import {getFields} from '@/lib/elasticsearch/util';
 
 const {Step} = Steps;
 const {Option} = Select;
diff --git a/web/src/pages/DataManagement/models/document.js b/web/src/pages/DataManagement/models/document.js
index a6cd791d..0db29ffa 100644
--- a/web/src/pages/DataManagement/models/document.js
+++ b/web/src/pages/DataManagement/models/document.js
@@ -1,6 +1,6 @@
 import {getDocList, saveDoc, deleteDoc, addDoc}  from '@/services/doc';
 import {getMappings, getIndices} from '@/services/indices';
-import {formatESSearchResult} from '@/utils/elasticsearch';
+import {formatESSearchResult} from '@/lib/elasticsearch/util';
 import { message } from 'antd';
 
 function encodeObjectField(doc){
diff --git a/web/src/pages/DataManagement/models/rebuildlist.js b/web/src/pages/DataManagement/models/rebuildlist.js
index df81397b..05809bca 100644
--- a/web/src/pages/DataManagement/models/rebuildlist.js
+++ b/web/src/pages/DataManagement/models/rebuildlist.js
@@ -1,6 +1,6 @@
 import {getRebuildList,reindex, deleteRebuild}  from '@/services/rebuild';
 import { message } from 'antd';
-import {formatESSearchResult} from '@/utils/elasticsearch';
+import {formatESSearchResult} from '@/lib/elasticsearch/util';
 
 
 const delay = (ms) => new Promise((resolve) => {
diff --git a/web/src/pages/SearchManage/models/dict.js b/web/src/pages/SearchManage/models/dict.js
index 3f689189..f386c48e 100644
--- a/web/src/pages/SearchManage/models/dict.js
+++ b/web/src/pages/SearchManage/models/dict.js
@@ -1,6 +1,6 @@
 import { message } from 'antd';
 import { getDictList, addDict, deleteDict,updateDict } from '@/services/search';
-import {formatESSearchResult} from '@/utils/elasticsearch';
+import {formatESSearchResult} from '@/lib/elasticsearch/util';
 
 const utf8 = {
     encode: function (string) {