增加queryUI

qax-os · Jun 29, 2017 · 77a4323 · 77a4323
1 parent ed376eb
commit 77a4323
Show file tree

Hide file tree

Showing 23 changed files with 154 additions and 43 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html class=no-js lang=en><head><meta charset=utf-8><meta content="IE=edge,chrome=1" http-equiv=X-UA-Compatible><title>Elastic HD Dashboard</title><meta content=bibinbin name=author><meta content="elasticsearch go Edition head plugin" name=description><meta content=ElasticHD name=keywords><link href=/static/css/app.64c3c1953f23623e2fc954ac3bc5f0f6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5dad3417ef3e90fd40d9.js></script><script type=text/javascript src=/static/js/vendor.661d7e9a2eddc40ecf43.js></script><script type=text/javascript src=/static/js/app.674125cd6b07176e8730.js></script></body></html>
+<!DOCTYPE html><html class=no-js lang=en><head><meta charset=utf-8><meta content="IE=edge,chrome=1" http-equiv=X-UA-Compatible><title>Elastic HD Dashboard</title><meta content=bibinbin name=author><meta content="elasticsearch go Edition head plugin" name=description><meta content=ElasticHD name=keywords><link href=/static/css/app.ff12067c7a90148fbef795a571260723.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.1c2c32b0b2549f55b943.js></script><script type=text/javascript src=/static/js/vendor.6f5cbf6a122d00b60da1.js></script><script type=text/javascript src=/static/js/app.5a400aa3e4ff3f9b1a12.js></script></body></html>
diff --git a/dist/static/css/app.64c3c1953f23623e2fc954ac3bc5f0f6.css.map b/dist/static/css/app.64c3c1953f23623e2fc954ac3bc5f0f6.css.map
diff --git a/.../app.64c3c1953f23623e2fc954ac3bc5f0f6.css → .../app.ff12067c7a90148fbef795a571260723.css b/.../app.64c3c1953f23623e2fc954ac3bc5f0f6.css → .../app.ff12067c7a90148fbef795a571260723.css
diff --git a/dist/static/css/app.ff12067c7a90148fbef795a571260723.css.map b/dist/static/css/app.ff12067c7a90148fbef795a571260723.css.map
diff --git a/dist/static/js/app.5a400aa3e4ff3f9b1a12.js b/dist/static/js/app.5a400aa3e4ff3f9b1a12.js
diff --git a/dist/static/js/app.5a400aa3e4ff3f9b1a12.js.map b/dist/static/js/app.5a400aa3e4ff3f9b1a12.js.map
diff --git a/dist/static/js/app.674125cd6b07176e8730.js b/dist/static/js/app.674125cd6b07176e8730.js
diff --git a/dist/static/js/app.674125cd6b07176e8730.js.map b/dist/static/js/app.674125cd6b07176e8730.js.map
diff --git a/dist/static/js/manifest.1c2c32b0b2549f55b943.js b/dist/static/js/manifest.1c2c32b0b2549f55b943.js
diff --git a/...c/js/manifest.5dad3417ef3e90fd40d9.js.map → ...c/js/manifest.1c2c32b0b2549f55b943.js.map b/...c/js/manifest.5dad3417ef3e90fd40d9.js.map → ...c/js/manifest.1c2c32b0b2549f55b943.js.map
diff --git a/dist/static/js/manifest.5dad3417ef3e90fd40d9.js b/dist/static/js/manifest.5dad3417ef3e90fd40d9.js
diff --git a/.../static/js/vendor.661d7e9a2eddc40ecf43.js → .../static/js/vendor.6f5cbf6a122d00b60da1.js b/.../static/js/vendor.661d7e9a2eddc40ecf43.js → .../static/js/vendor.6f5cbf6a122d00b60da1.js
diff --git a/...tic/js/vendor.661d7e9a2eddc40ecf43.js.map → ...tic/js/vendor.6f5cbf6a122d00b60da1.js.map b/...tic/js/vendor.661d7e9a2eddc40ecf43.js.map → ...tic/js/vendor.6f5cbf6a122d00b60da1.js.map
diff --git a/main/search/search.go b/main/search/search.go
@@ -44,6 +44,7 @@ func (se *Search) RegHandler() {
 	se.mux.HandleFunc("/_template/handle", se.handleTemplate)
 	se.mux.HandleFunc("/_sql2dsl", se.sqlConvert)
 	se.mux.HandleFunc("/_indices/delete", se.indexDelete)
+	se.mux.HandleFunc("/_indices/mapping", se.getMapping)
 }
 
 func (se *Search) sqlConvert(w http.ResponseWriter, r *http.Request) {
@@ -338,7 +339,7 @@ func (se *Search) search(w http.ResponseWriter, r *http.Request) {
 	}
 	result, err := c.DoCommand(param.Method, url, nil, param.Body)
 	if err != nil {
-		w.Write(jsonEncode(0, map[string]interface{}{"info": err.Error()}))
+		w.Write(jsonEncode(1, map[string]interface{}{"info": err.Error()}))
 		return
 	}
 	var dBody interface{}
@@ -400,6 +401,61 @@ func (se *Search) uploadTemplate(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+// get mapping info
+func (se *Search) getMapping(w http.ResponseWriter, r *http.Request) {
+	param, err := getParams(r)
+	if err != nil {
+		w.Write(jsonEncode(1, map[string]interface{}{"info": err.Error()}))
+		return
+	}
+	u, err := url.Parse(param.Serverhost)
+	if err != nil {
+		w.Write(jsonEncode(1, map[string]interface{}{"info": err.Error()}))
+		return
+	}
+	c := elastigo.NewConn()
+	if u.User != nil {
+		c.Username = u.User.Username()
+		if pwd, bool := u.User.Password(); bool {
+			c.Password = pwd
+		}
+	}
+	c.Domain = strings.Split(u.Host, ":")[0]
+	c.Port = strings.Split(u.Host, ":")[1]
+	c.DecayDuration = 0
+
+	url := fmt.Sprintf(`/%s/_mapping`, strings.TrimSpace(param.Indices))
+	result, err := c.DoCommand(`GET`, url, nil, nil)
+	if err != nil {
+		w.Write(jsonEncode(1, map[string]interface{}{"info": err.Error()}))
+		return
+	}
+	var mapping map[string]struct {
+		Mappings map[string]struct {
+			Properties map[string]interface{} `json:"properties"`
+		} `json:"mappings"`
+	}
+	if err := json.Unmarshal(result, &mapping); err != nil {
+		w.Write(jsonEncode(1, map[string]interface{}{"info": err.Error()}))
+		return
+	}
+	var fields = make(map[string]string, 0)
+	for _, item := range mapping {
+		for _, types := range item.Mappings {
+			for field := range types.Properties {
+				if _, ok := fields[field]; !ok {
+					fields[field] = field
+				}
+			}
+		}
+	}
+	var mappingFields = make([]string, 0)
+	for key := range fields {
+		mappingFields = append(mappingFields, key)
+	}
+	w.Write(jsonEncode(0, mappingFields))
+}
+
 type indicesSort []Indices
 
 func (s indicesSort) Len() int      { return len(s) }
@@ -442,7 +498,7 @@ func (se *Search) indexDelete(w http.ResponseWriter, r *http.Request) {
 	url := fmt.Sprintf(`/%s`, strings.TrimSpace(param.Index))
 	result, err := c.DoCommand(`DELETE`, url, nil, nil)
 	if err != nil {
-		w.Write(jsonEncode(0, map[string]interface{}{"info": err.Error()}))
+		w.Write(jsonEncode(1, map[string]interface{}{"info": err.Error()}))
 		return
 	}
 	var dBody interface{}

diff --git a/main/search/struct.go b/main/search/struct.go
@@ -233,3 +233,10 @@ type ClusterStats struct {
 		} `json:"plugins"`
 	} `json:"nodes"`
 }
+
+// // Mapping 节本返回结构
+// type Mapping struct {
+// 	Mappings map[string]struct {
+// 		Properties map[string]interface{} `json:"properties"`
+// 	}Mapping
+// }
diff --git a/main/statik/statik.go b/main/statik/statik.go
diff --git a/src/components/Home.vue b/src/components/Home.vue
@@ -23,6 +23,12 @@
           <div v-else-if="activeIndex === 5">
             <Help></Help>
           </div>
+           <div v-else-if="activeIndex === 6">
+            <Monitor></Monitor>
+          </div>
+           <div v-else-if="activeIndex === 7">
+            <Queryui></Queryui>
+          </div>
         </div>
     </div>
   </div>
@@ -39,6 +45,8 @@ import Indices from './indices'
 import Mapping from './mapping'
 import Help from './help'
 import Tools from './tools'
+import Monitor from './monitor'
+import Queryui from './queryui'
 export default {
   name: 'home',
   components: {
@@ -50,7 +58,9 @@ export default {
     Indices,
     Mapping,
     Help,
-    Tools
+    Tools,
+    Monitor,
+    Queryui
   },
   computed: {
     ...mapGetters([

diff --git a/src/components/indices.vue b/src/components/indices.vue
@@ -5,14 +5,14 @@
   <el-input placeholder="请输入要查询的索引" icon="search" v-model="inputIndexName" :on-icon-click="handleIconClick">
   </el-input>
         <el-table :data="list.slice(0, showLen)" border style="width: 100%">
-            <el-table-column prop="index" label="Index"  sortable></el-table-column>
-            <el-table-column prop="docs" label="Docs" sortable></el-table-column>
-            <el-table-column prop="size" label="Size" sortable></el-table-column>
-            <el-table-column prop="prisize" label="主分片大小"></el-table-column>
-            <el-table-column prop="health" label="Status"></el-table-column>
-            <el-table-column prop="uuid" label="UUID"></el-table-column>
-            <el-table-column prop="delete" label="Del Docs"></el-table-column>
-            <el-table-column prop="status" label="Status"></el-table-column>
+            <el-table-column prop="index" label="Index"  sortable show-overflow-tooltip></el-table-column>
+            <el-table-column prop="docs" label="Docs" sortable show-overflow-tooltip></el-table-column>
+            <el-table-column prop="size" label="Size" sortable show-overflow-tooltip></el-table-column>
+            <el-table-column prop="prisize" label="主分片大小" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="health" label="Status" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="uuid" label="UUID" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="delete" label="Del Docs" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="status" label="Status" show-overflow-tooltip></el-table-column>
             <el-table-column label="操作">
               <template scope="scope">
                 <el-popover ref="popover{{$index}}" placement="top" width="160" v-model="scope.row.visible" trigger="click">
@@ -96,6 +96,12 @@
 </script>
 
 <style>
-
-
+.el-table .cell {
+    white-space: normal;
+    /*word-break: break-all;*/
+    line-height: 24px;
+    overflow:hidden !important;
+    white-space:nowrap !important;
+    text-overflow:ellipsis !important;
+}
 </style>
diff --git a/src/components/overview.vue b/src/components/overview.vue
@@ -83,10 +83,10 @@
                                     </el-form>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="index" label="Index" ></el-table-column>
-                            <el-table-column prop="docs" label="Docs" sortable ></el-table-column>
-                            <el-table-column prop="size" label="Size" sortable></el-table-column>
-                            <el-table-column prop="status" label="Status"></el-table-column>
+                            <el-table-column prop="index" label="Index" show-overflow-tooltip></el-table-column>
+                            <el-table-column prop="docs" label="Docs" sortable show-overflow-tooltip></el-table-column>
+                            <el-table-column prop="size" label="Size" sortable show-overflow-tooltip></el-table-column>
+                            <el-table-column prop="status" label="Status" show-overflow-tooltip></el-table-column>
                             <el-table-column label="操作">
                             <template scope="scope">
                                 <el-popover ref="popover{{$index}}" placement="top" width="160" v-model="scope.row.visible" trigger="click">
@@ -415,7 +415,14 @@ export default {
 </script>
 
 <style>
-
+.el-table .cell {
+    white-space: normal;
+    /*word-break: break-all;*/
+    line-height: 24px;
+    overflow:hidden !important;
+    white-space:nowrap !important;
+    text-overflow:ellipsis !important;
+}
 .panel-pad {
     padding-right: 40px;
 }

diff --git a/src/store/getters.js b/src/store/getters.js
@@ -18,6 +18,7 @@ const getters = {
   templateInfo: state => state.overviewx.templateInfo,
   options: state => state.searchx.options,
   result: state => state.searchx.result,
+  fields: state => state.searchx.fields,
   showSpinner: state => state.searchx.showSpinner,
   IndexTemplateList: state => state.overviewx.IndexTemplateList,
   toggleMapping: state => state.mappingx.toggleMapping,

diff --git a/src/store/modules/searchx.js b/src/store/modules/searchx.js
@@ -11,13 +11,17 @@ const searchx = {
      {'value': 'POST', 'label': 'POST'},
      {'value': 'HEAD', 'label': 'HEAD'}
     ],
+    fields: [],
     result: '{}',
     showSpinner: false
   },
   mutations: {
     SET_RESULT: (state, data) => {
       state.result = data
     },
+    SET_FIELDS: (state, data) => {
+      state.fields = data
+    },
     SET_SHOW_SPINNER: (state, flag) => {
       state.showSpinner = flag
     }
@@ -37,6 +41,19 @@ const searchx = {
         }
       )
     },
+    CURLSerachFields ({commit}, body) {
+      Vue.http.post(body.url, body)
+      .then(
+        response => {
+          if (response.body.result === 0) {
+            commit('SET_FIELDS', response.body.data)
+          }
+        },
+        error => {
+          console.log(error)
+        }
+      )
+    },
     SetShowSpinner ({commit}, flag) {
       commit('SET_SHOW_SPINNER', flag)
     }

diff --git a/src/store/modules/sidebarx.js b/src/store/modules/sidebarx.js
@@ -5,12 +5,13 @@ const sidebarx = {
     toggleShow: true,
     items: [
       {fontAwesome: 'fa fa-dashboard', value: 'Dashboard'},
-      {fontAwesome: 'fa fa-search', value: 'query'},
-      {fontAwesome: 'fa fa-list', value: 'indices'},
+      {fontAwesome: 'fa fa-search', value: 'Query'},
+      {fontAwesome: 'fa fa-list', value: 'Indices'},
       {fontAwesome: 'fa fa-table', value: 'Mapping'},
       {fontAwesome: 'fa fa-gears', value: 'Tools'},
       {fontAwesome: 'fa fa-comments-o', value: 'Help'},
-      {fontAwesome: 'fa fa-comments-o', value: 'Monitor'}
+      {fontAwesome: 'fa fa-eye', value: 'Monitor'},
+      {fontAwesome: 'fa fa-search-plus', value: 'QueryUI'}
     ]
   },
   mutations: {

diff --git a/src/store/modules/toolsbarx.js b/src/store/modules/toolsbarx.js
@@ -31,6 +31,12 @@ const toolsbarx = {
         case 5:
           commit('SET_TOGGLE_TITLE', "<i class='fa fa-comments'></i> Syntactic Sugar【语法糖】")
           break
+        case 6:
+          commit('SET_TOGGLE_TITLE', "<i class='fa fa-comments'></i> Monitor Eye【ES服务监控】")
+          break
+        case 7:
+          commit('SET_TOGGLE_TITLE', "<i class='fa fa-comments'></i> Query UI【通用查询】")
+          break
       }
     }
   }