frame, subset optional input as black font

minjk-bl · minjk-bl · commit 8113008f328c · 2021-08-27T16:29:21.000+09:00
diff --git a/css/common/frameEditor.css b/css/common/frameEditor.css
@@ -74,13 +74,16 @@
 .vp-fe-preview .CodeMirror-code .cm-string {
     background-color: rgba(246, 173, 85, 0.2);
 }
+
+
 .vp-fe-df-box {
     display: grid;
     grid-template-rows: 30px;
     grid-row-gap: 5px;
 }
 .vp-fe-df-box label {
     width: 80px;
+    font-weight: bold;
 }
 .vp-fe #vp_feVariable { 
     width: 153px;
diff --git a/css/common/subsetEditor.css b/css/common/subsetEditor.css
@@ -75,7 +75,6 @@
     background-color: rgba(246, 173, 85, 0.2);
 }
 .vp-ds-label {
-    color: #F37704;
     font-weight: bold;
     margin-left: 20px;
 }
diff --git a/src/api/functions/pandasCommand.py b/src/api/functions/pandasCommand.py
@@ -33,7 +33,7 @@ def _vp_get_columns_list(df):
         # value
         if type(c).__name__ == 'str':
             cInfo['value'] = "'{}'".format(c)
-        elif type(r).__name__ == 'Timestamp':
+        elif type(c).__name__ == 'Timestamp':
             cInfo['value'] = str(c)
         # category - iopub data rate limit issue...
         if str(df[c].dtype) == 'object':
diff --git a/src/common/vpFrameEditor.js b/src/common/vpFrameEditor.js
@@ -303,7 +303,7 @@ define([
         page.appendFormatLine('<div class="{0}"><img src="{1}"/></div>', VP_FE_DF_REFRESH, '/nbextensions/visualpython/resource/refresh.svg');
         page.appendLine('</div>');
         page.appendLine('<div>');
-        page.appendFormatLine('<label for="{0}" class="{1}">{2}</label>', 'vp_feReturn', 'vp-orange-text', 'Allocate to');
+        page.appendFormatLine('<label for="{0}">{1}</label>', 'vp_feReturn', 'Allocate to');
         page.appendFormatLine('<input type="text" class="{0}" id="{1}" placeholder="{2}"/>', 'vp-input', 'vp_feReturn', 'Variable name');
         page.appendLine('</div>');
         page.appendLine('</div>');
diff --git a/src/common/vpSubsetEditor.js b/src/common/vpSubsetEditor.js
@@ -248,19 +248,10 @@ define([
         
         // pandasObject
         popupTag.appendLine('<tr>');
-        popupTag.appendFormatLine('<td><label class="{0}">{1}</label></td>'
-                                , VP_DS_LABEL, 'Variable');
+        popupTag.appendFormatLine('<td><label class="{0} {1}">{2}</label></td>'
+                                , VP_DS_LABEL, 'vp-orange-text', 'Variable');
 
         popupTag.appendLine('<td>');
-        // pandasObject - suggestInputText
-        // var vpDfSuggest = new vpSuggestInputText.vpSuggestInputText();
-        // vpDfSuggest.addClass(VP_DS_PANDAS_OBJECT);
-        // vpDfSuggest.addClass('vp-input');
-        // vpDfSuggest.setPlaceholder('Select Object');
-        // vpDfSuggest.setSuggestList(function() { return [] });
-        // vpDfSuggest.setNormalFilter(false);
-        // vpDfSuggest.setValue($(this.pageThis.wrapSelector('#' + this.targetId)).val());
-        // popupTag.appendFormatLine('<td>{0}', vpDfSuggest.toTagString());
         popupTag.appendFormatLine('<div style="display:inline-block" class="{0}"><input class="{1} {2}"/></div>'
                             , VP_DS_PANDAS_OBJECT_BOX, 'vp-input', VP_DS_PANDAS_OBJECT);
         
@@ -270,8 +261,8 @@ define([
 
         // subset type
         popupTag.appendLine('<tr>');
-        popupTag.appendFormatLine('<td><label class="{0}">{1}</label></td>'
-                                , VP_DS_LABEL, 'Method');
+        popupTag.appendFormatLine('<td><label class="{0} {1}">{2}</label></td>'
+                                , VP_DS_LABEL, 'vp-orange-text', 'Method');
         popupTag.appendLine('<td>');
         popupTag.appendLine(this.renderSubsetType(this.state.dataType));
         

Original file line number	Diff line number	Diff line change
`@@ -74,13 +74,16 @@`
`74`	`74`	`.vp-fe-preview .CodeMirror-code .cm-string {`
`75`	`75`	`background-color: rgba(246, 173, 85, 0.2);`
`76`	`76`	`}`
	`77`	`+`
	`78`	`+`
`77`	`79`	`.vp-fe-df-box {`
`78`	`80`	`display: grid;`
`79`	`81`	`grid-template-rows: 30px;`
`80`	`82`	`grid-row-gap: 5px;`
`81`	`83`	`}`
`82`	`84`	`.vp-fe-df-box label {`
`83`	`85`	`width: 80px;`
	`86`	`+ font-weight: bold;`
`84`	`87`	`}`
`85`	`88`	`.vp-fe #vp_feVariable {`
`86`	`89`	`width: 153px;`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@`
`75`	`75`	`background-color: rgba(246, 173, 85, 0.2);`
`76`	`76`	`}`
`77`	`77`	`.vp-ds-label {`
`78`		`- color: #F37704;`
`79`	`78`	`font-weight: bold;`
`80`	`79`	`margin-left: 20px;`
`81`	`80`	`}`