Fix Original SuggestInput's hover item styles

minjk-bl · minjk-bl · commit 8377148c2fed · 2022-06-07T17:40:03.000+09:00
diff --git a/css/component/dataSelector.css b/css/component/dataSelector.css
@@ -19,11 +19,6 @@
 .vp-ds-box input.vp-ds-target:disabled + .vp-ds-filter {
     cursor: not-allowed;
 }
-.vp-ds-item:hover {
-    background: var(--light-gray-color);
-    color: var(--font-highlight);
-    cursor: pointer;
-}
 /* DataSelector popup */
 .vp-dataselector {
     display: none;
diff --git a/css/root.css b/css/root.css
@@ -513,4 +513,10 @@ hr.vp-extra-menu-line {
     background: #eeeeee;
     margin: 0px;
     padding: 7px;
+}
+/* suggest input hover items */
+.vp-sg-item:hover {
+    background: var(--light-gray-color);
+    color: var(--font-highlight);
+    cursor: pointer;
 }
diff --git a/js/com/com_generator.js b/js/com/com_generator.js
@@ -290,7 +290,7 @@ define([
             let { result, type, msg } = resultObj;
             var varList = JSON.parse(result);
             varList = varList.map(function(v) {
-                return { label: v.varName + ' (' + v.varType + ')', value: v.varName, dtype: v.varType };
+                return { label: v.varName, value: v.varName, dtype: v.varType };
             });
             // 1. Target Variable
             var suggestInput = new SuggestInput();
diff --git a/js/com/com_generatorV2.js b/js/com/com_generatorV2.js
@@ -460,7 +460,7 @@ define([
             let { result, type, msg } = resultObj;
             var varList = JSON.parse(result);
             varList = varList.map(function(v) {
-                return { label: v.varName + ' (' + v.varType + ')', value: v.varName, dtype: v.varType };
+                return { label: v.varName, value: v.varName, dtype: v.varType };
             });
             // 1. Target Variable
             var suggestInput = new SuggestInput();
diff --git a/js/com/component/DataSelector.js b/js/com/component/DataSelector.js
@@ -211,7 +211,7 @@ define([
                 $(this).autocomplete('search', $(this).val());
             }).autocomplete('instance')._renderItem = function(ul, item) {
                 return $('<li>').attr('data-value', item.value)
-                        .append(`<div class="vp-ds-item">${item.label}<label class="vp-gray-text vp-cursor">&nbsp;| ${item.dtype}</label></div>`)
+                        .append(`<div class="vp-sg-item">${item.label}<label class="vp-gray-text vp-cursor">&nbsp;| ${item.dtype}</label></div>`)
                         .appendTo(ul);
             };
         }
diff --git a/js/com/component/SuggestInput.js b/js/com/component/SuggestInput.js
@@ -159,7 +159,16 @@ define([
                 }).click(function() {
                     $(this).val('');
                     $(com_util.formatString(".{0}", that.uuid)).autocomplete('search', $(com_util.formatString(".{0}", that.uuid)).val());
-                });
+                }).autocomplete('instance')._renderItem = function(ul, item) {
+                    if (item.dtype != undefined) {
+                        return $('<li>').attr('data-value', item.value)
+                            .append(`<div class="vp-sg-item">${item.label}<label class="vp-gray-text vp-cursor">&nbsp;| ${item.dtype}</label></div>`)
+                            .appendTo(ul);
+                    }
+                    return $('<li>').attr('data-value', item.value)
+                            .append(`<div class="vp-sg-item">${item.label}</div>`)
+                            .appendTo(ul);
+                };;
             });
 
             return sbTagString.toString();
diff --git a/js/m_apps/Subset.js b/js/m_apps/Subset.js
@@ -659,7 +659,7 @@ define([
                     let { result } = resultObj;
                     var varList = JSON.parse(result);
                     varList = varList.map(function (v) {
-                        return { label: v.varName + ' (' + v.varType + ')', value: v.varName, dtype: v.varType };
+                        return { label: v.varName, value: v.varName, dtype: v.varType };
                     });
 
                     that.state.dataList = varList;

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ define([`
`211`	`211`	`$(this).autocomplete('search', $(this).val());`
`212`	`212`	`}).autocomplete('instance')._renderItem = function(ul, item) {`
`213`	`213`	`return $('<li>').attr('data-value', item.value)`
`214`		- .append(`<div class="vp-ds-item">${item.label}<label class="vp-gray-text vp-cursor"> \| ${item.dtype}</label></div>`)
	`214`	+ .append(`<div class="vp-sg-item">${item.label}<label class="vp-gray-text vp-cursor"> \| ${item.dtype}</label></div>`)
`215`	`215`	`.appendTo(ul);`
`216`	`216`	`};`
`217`	`217`	`}`