Sfoglia il codice sorgente

HUE-1481 [hbase] Improve autocomplete

Kevin Wang 12 anni fa
parent
commit
cde7ccb

+ 1 - 1
apps/hbase/src/hbase/templates/app.mako

@@ -199,7 +199,6 @@ ${ commonheader(None, "hbase", user) | n,unicode }
           <div id="searchbar-main" class="span5" data-bind="click: search.clickTagBar">
             <div id="search-tags" contenteditable="true" data-bind="editableText: search.cur_input, hasfocus: search.focused, css: { 'active': search.cur_input() != '' }, event: { 'keydown': search.onKeyDown, click: search.updateMenu.bind(null) }" data-placeholder="${_('row_key, row_key_prefix* + scan_length, row_key [family:col1, family2:col2, family3:]')}">
             </div>
-            <a class="search-remove" data-bind="visible: search.cur_input() != '', click: function(){ app.search.cur_input(''); }"><i class="icon-remove-sign"></i></a>
           </div>
           <ul id="search-typeahead" data-bind="visible: search.focused() && !search.submitted()">
             <!-- ko if: search.mode() != 'idle' -->
@@ -213,6 +212,7 @@ ${ commonheader(None, "hbase", user) | n,unicode }
             <li class="search-suggestion" data-bind="event: { mousedown: app.search.replaceFocusNode.bind(null, $data) }, css: {active: app.search.activeSuggestion() == $index()}"><a><span data-bind="text: $data"></span></a></li>
             <!-- /ko -->
           </ul>
+          <a class="search-remove" data-bind="visible: search.cur_input() != '', click: function(){ app.search.cur_input(''); }"><i class="icon-remove-sign"></i></a>
           <button class="btn btn-primary add-on" data-bind="enabled: !search.submitted(), click: search.evaluate.bind(null)"><i class="icon-search"></i></button>
           <span id="column-family-selectors">
             <!-- ko foreach: views.tabledata.columnFamilies() -->

+ 8 - 3
apps/hbase/static/css/hbase.css

@@ -565,12 +565,17 @@ textarea {
 
 .search-remove
 {
-	position: absolute;
-	right: 10px;
-	top: 5px;
+	position: relative;
+	right: 25px;
+	top: 3px;
 	text-decoration: none;
 	cursor: pointer;
 	color: #ccc;
+	z-index: 100;
+	width: 0px;
+	height: 0px;
+	overflow: visible;
+	display: block;
 }
 
 .search-remove:hover

+ 1 - 1
apps/hbase/static/js/controls.js

@@ -831,7 +831,7 @@ var tagsearch = function() {
       case 'filter':
         var focus = val.replace(/\{|\}|\s|&[^;]+?;/g,"").split(/(AND|OR|SKIP|WHILE)/).slice(-1)[0];
         self.activeSuggestions(self.filters.filter(function(a) {
-          return a.replace(" ","").indexOf(focus) != -1;
+          return a.toLowerCase().replace(" ","").indexOf(focus.toLowerCase()) != -1;
         }));
         return;
       case 'rowkey':