Skip to content

Commit 80a2247

Browse files
author
minjk-bl
committed
Change Frame's submenu alignment
1 parent b1ea326 commit 80a2247

File tree

2 files changed

+31
-17
lines changed

2 files changed

+31
-17
lines changed

‎html/m_apps/frame.html

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
<body>
22
<div class="vp-fe-container">
33
<div class="vp-fe-menu-box vp-close-on-blur" style="display:none;">
4-
<div class="vp-fe-menu-item vp-fe-menu-drop" data-type="3">Drop<i class="fa fa-caret-right"
5-
style="padding-left: 5px;"></i>
6-
<div class="vp-fe-menu-sub-box" style="top: 0px;">
7-
<div class="vp-fe-menu-item vp-fe-menu-drop" data-type="3" data-axis="col">Drop Columns</div>
8-
<div class="vp-fe-menu-item vp-fe-menu-drop" data-type="3" data-axis="row">Drop Rows</div>
9-
<div class="vp-fe-menu-item vp-fe-menu-drop-na" data-type="4">Drop NA</div>
10-
<div class="vp-fe-menu-item vp-fe-menu-drop-duplicate" data-type="5" data-axis="col">Drop Duplicates</div>
11-
<div class="vp-fe-menu-item vp-fe-menu-drop-outlier" data-type="11" data-axis="col">Drop Outlier</div>
12-
</div>
13-
</div>
4+
<div class="vp-fe-menu-item vp-fe-menu-drop" data-type="3">Delete</div>
145
<div class="vp-fe-menu-item vp-fe-menu-rename" data-type="2">Rename</div>
15-
<div class="vp-fe-menu-item vp-fe-menu-ohe" data-type="6" data-axis="col">One-Hot Encoding</div>
166
<div class="vp-fe-menu-item vp-fe-menu-set-index" data-type="7" data-axis="col">Set Index</div>
177
<div class="vp-fe-menu-item vp-fe-menu-reset-index" data-type="8" data-axis="row">Reset Index</div>
188
<div class="vp-fe-menu-item vp-fe-menu-replace" data-type="9" data-axis="col">Replace</div>
199
<div class="vp-fe-menu-item vp-fe-menu-astype" data-type="10" data-axis="col">As Type</div>
10+
<div class="vp-fe-menu-item vp-fe-menu-drop" data-axis="col">Encoding<i class="fa fa-caret-right"
11+
style="float: right; margin-top: 7.5px; margin-right: 2px; margin-left: 5px;"></i>
12+
<div class="vp-fe-menu-sub-box vp-fe-sub-encoding" style="top: 150px;">
13+
<div class="vp-fe-menu-item vp-fe-menu-ohe" data-type="6" data-axis="col">One-Hot Encoding</div>
14+
</div>
15+
</div>
16+
<div class="vp-fe-menu-item vp-fe-menu-drop">Data Cleaning<i class="fa fa-caret-right"
17+
style="float: right; margin-top: 7.5px; margin-right: 2px; margin-left: 5px;"></i>
18+
<div class="vp-fe-menu-sub-box vp-fe-sub-cleaning" style="top: 120px;">
19+
<div class="vp-fe-menu-item vp-fe-menu-drop-na" data-type="4">Drop NA</div>
20+
<div class="vp-fe-menu-item vp-fe-menu-drop-outlier" data-type="11" data-axis="col">Drop Outlier</div>
21+
<div class="vp-fe-menu-item vp-fe-menu-drop-duplicate" data-type="5" data-axis="col">Drop Duplicates</div>
22+
</div>
23+
</div>
24+
25+
26+
2027
</div>
2128
<div class="vp-fe-body">
2229
<div class="vp-fe-preview"><textarea id="vp_fePreviewCode" name="code"># Code preview</textarea></div>

‎js/m_apps/Frame.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,15 +1151,15 @@ define([
11511151
code.appendFormat("{0}.drop([{1}], axis={2}, inplace=True)", tempObj, selectedName, axis);
11521152
break;
11531153
case FRAME_EDIT_TYPE.RENAME:
1154-
var renameStr = new com_String();
1154+
var renameList = [];
11551155
Object.keys(content).forEach((key, idx) => {
1156-
if (idx == 0) {
1157-
renameStr.appendFormat("{0}: {1}", content[key].label, com_util.convertToStr(content[key].value, content[key].istext));
1158-
} else {
1159-
renameStr.appendFormat(", {0}: {1}", content[key].label, com_util.convertToStr(content[key].value, content[key].istext));
1156+
if (content[key].value != '') {
1157+
renameList.push(com_util.formatString("{0}: {1}", content[key].label, com_util.convertToStr(content[key].value, content[key].istext)));
11601158
}
11611159
});
1162-
code.appendFormat("{0}.rename({1}={{2}}, inplace=True)", tempObj, axis==FRAME_AXIS.ROW?'index':'columns', renameStr.toString());
1160+
if (renameList.length > 0) {
1161+
code.appendFormat("{0}.rename({1}={{2}}, inplace=True)", tempObj, axis==FRAME_AXIS.ROW?'index':'columns', renameList.join(', '));
1162+
}
11631163
break;
11641164
case FRAME_EDIT_TYPE.DROP_NA:
11651165
var locObj = '';
@@ -1439,10 +1439,16 @@ define([
14391439
// row
14401440
$(this.wrapSelector(com_util.formatString('.{0}', VP_FE_MENU_BOX))).find('div[data-axis="col"]').hide();
14411441
$(this.wrapSelector(com_util.formatString('.{0}', VP_FE_MENU_BOX))).find('div[data-axis="row"]').show();
1442+
1443+
// change sub-box style
1444+
$(this.wrapSelector(com_util.formatString('.{0}.vp-fe-sub-cleaning', VP_FE_MENU_SUB_BOX))).css({ 'top': '90px'});
14421445
} else if (this.state.axis == 1) {
14431446
// column
14441447
$(this.wrapSelector(com_util.formatString('.{0}', VP_FE_MENU_BOX))).find('div[data-axis="row"]').hide();
14451448
$(this.wrapSelector(com_util.formatString('.{0}', VP_FE_MENU_BOX))).find('div[data-axis="col"]').show();
1449+
1450+
// change sub-box style
1451+
$(this.wrapSelector(com_util.formatString('.{0}.vp-fe-sub-cleaning', VP_FE_MENU_SUB_BOX))).css({ 'top': '120px'});
14461452
}
14471453
$(this.wrapSelector(com_util.formatString('.{0}', VP_FE_MENU_BOX))).css({ top: top, left: left })
14481454
$(this.wrapSelector(com_util.formatString('.{0}', VP_FE_MENU_BOX))).show();
@@ -1474,6 +1480,7 @@ define([
14741480
const VP_FE_TITLE = 'vp-fe-title';
14751481

14761482
const VP_FE_MENU_BOX = 'vp-fe-menu-box';
1483+
const VP_FE_MENU_SUB_BOX = 'vp-fe-menu-sub-box';
14771484
const VP_FE_MENU_ITEM = 'vp-fe-menu-item';
14781485

14791486
const VP_FE_POPUP_BOX = 'vp-fe-popup-box';

0 commit comments

Comments
 (0)