', 'vp-popup-replace-table');
+ content.appendLine('');
content.appendLine(this.renderReplaceInput(0));
content.appendFormatLine('
');
+ content.appendLine('
');
return content.toString();
}
@@ -1170,7 +1174,7 @@ define([
return code.toString();
}
- FrameEditor.prototype.loadCode = function(codeStr) {
+ FrameEditor.prototype.loadCode = function(codeStr, more=false) {
if (this.loading) {
return;
}
@@ -1178,10 +1182,16 @@ define([
var that = this;
var tempObj = this.state.tempObj;
var lines = this.state.lines;
+ var prevLines = 0;
+ var scrollPos = -1;
+ if (more) {
+ prevLines = that.state.indexList.length;
+ scrollPos = $(this.wrapSelector('.vp-fe-table')).scrollTop();
+ }
var code = new sb.StringBuilder();
code.appendLine(codeStr);
- code.appendFormat("{0}.head({1}).to_json(orient='{2}')", tempObj, lines, 'split');
+ code.appendFormat("{0}[{1}:{2}].to_json(orient='{3}')", tempObj, prevLines, lines, 'split');
this.loading = true;
kernelApi.executePython(code.toString(), function(result) {
@@ -1193,62 +1203,101 @@ define([
// var columnList = data.columns;
var indexList = data.index;
var dataList = data.data;
+
+ columnList = columnList.map(col => { return { label: col.label, type: col.dtype, code: col.value } });
+ indexList = indexList.map(idx => { return { label: idx, code: idx } });
- that.state.columnList = columnList.map(col => { return { label: col.label, type: col.dtype, code: col.value } });
- that.state.indexList = indexList.map(idx => { return { label: idx, code: idx } });
-
- // table
- var table = new sb.StringBuilder();
- // table.appendFormatLine('| '); - that.state.columnList && that.state.columnList.forEach(col => { - var colCode = col.code; - var colClass = ''; - if (that.state.axis == FRAME_AXIS.COLUMN && that.state.selected.map(col=>col.code).includes(colCode)) { - colClass = 'selected'; - } - table.appendFormatLine(' | {5} | ' - , colCode, FRAME_AXIS.COLUMN, col.type, VP_FE_TABLE_COLUMN, colClass, col.label); - }); - // add column - table.appendFormatLine('||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {4} | ', idxLabel, FRAME_AXIS.ROW, VP_FE_TABLE_ROW, idxClass, idxName); - row.forEach((cell, colIdx) => { - if (cell == null) { - cell = 'NaN'; + if (!more) { + // table + var table = new sb.StringBuilder(); + // table.appendFormatLine('
| '); + columnList && columnList.forEach(col => { + var colCode = col.code; + var colClass = ''; + if (that.state.axis == FRAME_AXIS.COLUMN && that.state.selected.map(col=>col.code).includes(colCode)) { + colClass = 'selected'; } - var cellType = that.state.columnList[colIdx].type; - if (cellType.includes('datetime')) { - cell = new Date(parseInt(cell)).toLocaleDateString(); + table.appendFormatLine(' | {5} | ' + , colCode, FRAME_AXIS.COLUMN, col.type, VP_FE_TABLE_COLUMN, colClass, col.label); + }); + // add column + table.appendFormatLine('||
|---|---|---|---|
| {0} | ', cell); + table.appendFormatLine('{4} | ', idxLabel, FRAME_AXIS.ROW, VP_FE_TABLE_ROW, idxClass, idxName); + row.forEach((cell, colIdx) => { + if (cell == null) { + cell = 'NaN'; + } + var cellType = columnList[colIdx].type; + if (cellType.includes('datetime')) { + cell = new Date(parseInt(cell)).toLocaleString(); + } + table.appendFormatLine('{0} | ', cell); + }); + // empty data + // table.appendLine(''); + table.appendLine(' | '); + // add row + table.appendLine(' |
| {4} | ', idxLabel, FRAME_AXIS.ROW, VP_FE_TABLE_ROW, idxClass, idxName); + row.forEach((cell, colIdx) => { + if (cell == null) { + cell = 'NaN'; + } + var cellType = columnList[colIdx].type; + if (cellType.includes('datetime')) { + cell = new Date(parseInt(cell)).toLocaleString(); + } + table.appendFormatLine('{0} | ', cell); + }); + // empty data + // table.appendLine(''); + table.appendLine(' |
Variable Name |
- Data Type | -
|---|---|
|
+ Variable Name
+
+ |
+ + Data Type + | +
diff --git a/src/file_io/variables.js b/src/file_io/variables.js index bc71d8f8..d74a9455 100644 --- a/src/file_io/variables.js +++ b/src/file_io/variables.js @@ -63,8 +63,6 @@ define([ this.package = libPandas._PANDAS_FUNCTION[funcOptProp.libID]; } - - /** * Extend vpFuncJS */ @@ -135,13 +133,13 @@ define([ , 'str', 'int', 'float', 'bool', 'dict', 'list', 'tuple' ]; - var tagTable = this.wrapSelector('#vp_var_variableBox table'); + var tagTable = this.wrapSelector('#vp_var_variableBox table tbody'); // variable list table var tagDetailTable = this.wrapSelector("#vp_varDetailTable"); // initialize tags - $(tagTable).find('tr:not(:first)').remove(); + $(tagTable).find('tr').remove(); $(tagDetailTable).html(''); // HTML rendering diff --git a/src/pandas/common/commonPandas.js b/src/pandas/common/commonPandas.js index 760473dd..ba3391fc 100644 --- a/src/pandas/common/commonPandas.js +++ b/src/pandas/common/commonPandas.js @@ -151,6 +151,11 @@ define([ } ], variable: [ + { + name: 'encoding', + type: 'text', + label: 'Encoding' + }, { name:'names', type:'list', diff --git a/src/pandas/common/pandasGenerator.js b/src/pandas/common/pandasGenerator.js index 32a447cd..5aad281c 100644 --- a/src/pandas/common/pandasGenerator.js +++ b/src/pandas/common/pandasGenerator.js @@ -108,10 +108,10 @@ define([ var requiredFontStyle = required? vpConst.COLOR_FONT_ORANGE : ''; $(lbl).attr({ 'for': obj.name, - 'class': requiredFontStyle + 'class': requiredFontStyle, + 'title': '(' + obj.name + ')' }); - // lbl.innerText = (required? '* ':'') + obj.label + (showKey?' ('+obj.name+')':''); - lbl.innerText = obj.label + (showKey?' ('+obj.name+')':''); + lbl.innerText = obj.label; tblLabel.appendChild(lbl); // 명시된 component에 맞는 태그 구성해서 붙여주기 diff --git a/src/pandas/fileNavigation/index.html b/src/pandas/fileNavigation/index.html index d3ecef42..7da1df5e 100644 --- a/src/pandas/fileNavigation/index.html +++ b/src/pandas/fileNavigation/index.html @@ -13,7 +13,7 @@
-
-
+
+
