", '');
sbforName.appendFormatLine("{0}", 'for');
sbforName.appendLine("
");
@@ -387,31 +418,37 @@ define([
var sbforVariable = new sb.StringBuilder();
sbforVariable.appendFormatLine("", VP_CLASS_STYLE_FLEX_ROW_BETWEEN
, VP_CLASS_STYLE_WIDTH_80PERCENT);
+
+ /** For arg4 - Index */
+ if (arg3 == FOR_BLOCK_ARG3_TYPE.VARIABLE
+ || arg3 == FOR_BLOCK_ARG3_TYPE.TYPING) {
+ var sbforParamArg1Input4 = MakeVpSuggestInputText_apiblock(VP_ID_APIBLOCK_OPTION_FOR_ARG_4 + uuid
+ , arg4
+ , loadedVariableNameList_arg4
+ , VP_CLASS_STYLE_WIDTH_100PERCENT
+ , 'Index'
+ , function(selectedValue) {
+ bindSelectValueEventFunc_for(selectedValue,
+ FOR_BLOCK_SELECT_VALUE_ARG_TYPE.ARG4);
+ });
+ sbforVariable.appendLine(sbforParamArg1Input4);
+ }
+
/** For arg1 */
var sbforParamArg1Input = MakeVpSuggestInputText_apiblock(VP_ID_APIBLOCK_OPTION_FOR_ARG_1 + uuid
,arg1
,loadedVariableNameList_arg1
, VP_CLASS_STYLE_WIDTH_100PERCENT
- , STR_VARIABLE
+ , 'Item'
, function(selectedValue) {
bindSelectValueEventFunc_for(selectedValue,
FOR_BLOCK_SELECT_VALUE_ARG_TYPE.ARG1);
});
sbforVariable.appendLine(sbforParamArg1Input);
- var sbforParamArg1Input4 = MakeVpSuggestInputText_apiblock(VP_ID_APIBLOCK_OPTION_FOR_ARG_4 + uuid
- ,arg4
- ,loadedVariableNameList_arg4
- , VP_CLASS_STYLE_WIDTH_100PERCENT
- , STR_VARIABLE
- , function(selectedValue) {
- bindSelectValueEventFunc_for(selectedValue,
- FOR_BLOCK_SELECT_VALUE_ARG_TYPE.ARG4);
- });
-
- sbforVariable.appendLine(sbforParamArg1Input4);
sbforVariable.appendLine("
");
$sbforParamDom1.append(sbforVariable.toString());
+
var sbforParam2 = new sb.StringBuilder();
sbforParam2.appendFormatLine("", VP_CLASS_STYLE_FLEX_ROW_BETWEEN,
@@ -422,7 +459,7 @@ define([
/** For in */
var sbforParamIn = new sb.StringBuilder();
- sbforParamIn.appendFormatLine("
", 'width: 5%;','');
sbforParamIn.appendFormatLine("{0}", 'in');
sbforParamIn.appendLine("
");
@@ -432,72 +469,137 @@ define([
var sbforArgContainer = new sb.StringBuilder();
sbforArgContainer.appendFormatLine("", VP_CLASS_STYLE_FLEX_ROW_BETWEEN
, VP_CLASS_STYLE_WIDTH_80PERCENT);
- var sbforParamArg3 = MakeVpSuggestInputText_apiblock(VP_ID_APIBLOCK_OPTION_FOR_ARG_3 + uuid
- , arg3
- , loadedVariableNameList_arg3
- , VP_CLASS_STYLE_WIDTH_40PERCENT
- , 'Method'
- , function(selectedValue) {
- bindSelectValueEventFunc_for(selectedValue,
- FOR_BLOCK_SELECT_VALUE_ARG_TYPE.ARG3);
- });
-
- sbforArgContainer.appendLine(sbforParamArg3);
+ // var sbforParamArg3 = MakeVpSuggestInputText_apiblock(VP_ID_APIBLOCK_OPTION_FOR_ARG_3 + uuid
+ // , arg3
+ // , loadedVariableNameList_arg3
+ // , VP_CLASS_STYLE_WIDTH_40PERCENT
+ // , 'Method'
+ // , function(selectedValue) {
+ // bindSelectValueEventFunc_for(selectedValue,
+ // FOR_BLOCK_SELECT_VALUE_ARG_TYPE.ARG3);
+ // });
+ var sbforParamArg3 = MakeOptionSelectBox(VP_ID_APIBLOCK_OPTION_FOR_ARG_3 + uuid
+ , VP_CLASS_STYLE_WIDTH_100PERCENT
+ , arg3
+ , loadedVariableNameList_arg3);
+
+ sbforArgContainer.appendLine(sbforParamArg3);
+ $sbforParamDom2.append(sbforArgContainer.toString());
+
+ // next line div
+ var sbforParam3 = new sb.StringBuilder();
+ sbforParam3.appendFormatLine("
+ ", VP_CLASS_STYLE_FLEX_ROW_BETWEEN,
+ 'margin-top: 5px;');
+ sbforParam3.appendLine("
");
+ var sbforParamDom3 = sbforParam3.toString();
+ var $sbforParamDom3 = $(sbforParamDom3);
+
+ var sbforParamLine = new sb.StringBuilder();
+ sbforParamLine.appendFormatLine("", 'width: 5%;','');
+ sbforParamLine.appendLine("
");
+ $sbforParamDom3.append(sbforParamLine.toString());
+
+ sbforArgContainer.clear();
+ sbforArgContainer.appendFormatLine("", VP_CLASS_STYLE_FLEX_ROW_BETWEEN
+ , VP_CLASS_STYLE_WIDTH_80PERCENT);
+
+ // argContainer header
+ if (arg3 == FOR_BLOCK_ARG3_TYPE.RANGE) {
+ sbforArgContainer.appendFormatLine("
");
+ $sbforParamDom3.append(sbforArgContainer.toString());
+
+ // next line div
+ var sbforParam4 = new sb.StringBuilder();
+ sbforParam4.appendFormatLine("{3}
", VP_CLASS_STYLE_FLEX_COLUMN_CENTER
+ , VP_CLASS_STYLE_WIDTH_100PERCENT, 'vp-orange-text'
+ , 'Start');
+ sbforArgContainer.appendFormatLine("{3}
", VP_CLASS_STYLE_FLEX_COLUMN_CENTER
+ , VP_CLASS_STYLE_WIDTH_100PERCENT, ''
+ , 'Stop');
+ sbforArgContainer.appendFormatLine("{3}
", VP_CLASS_STYLE_FLEX_COLUMN_CENTER
+ , VP_CLASS_STYLE_WIDTH_100PERCENT, ''
+ , 'Step');
+ }
+ if (arg3 == FOR_BLOCK_ARG3_TYPE.VARIABLE) {
+ sbforArgContainer.appendFormatLine("{3}
", VP_CLASS_STYLE_FLEX_COLUMN_CENTER
+ , VP_CLASS_STYLE_WIDTH_50PERCENT, 'vp-orange-text'
+ , 'Data Type');
+ sbforArgContainer.appendFormatLine("{3}
", VP_CLASS_STYLE_FLEX_COLUMN_CENTER
+ , VP_CLASS_STYLE_WIDTH_50PERCENT, 'vp-orange-text'
+ , 'Data');
+ }
+ sbforArgContainer.appendLine("", VP_CLASS_STYLE_FLEX_ROW_BETWEEN,
+ 'margin-top: 5px;');
+ sbforParam4.appendLine("
");
+ var sbforParamDom4 = sbforParam4.toString();
+ var $sbforParamDom4 = $(sbforParamDom4);
+ $sbforParamDom4.append(sbforParamLine.toString());
+
+ sbforArgContainer.clear();
+ sbforArgContainer.appendFormatLine("", VP_CLASS_STYLE_FLEX_ROW_BETWEEN
+ , VP_CLASS_STYLE_WIDTH_80PERCENT);
+ // argContainer inputs
if (arg3 == FOR_BLOCK_ARG3_TYPE.RANGE) {
var sbforParamArg5 = MakeVpSuggestInputText_apiblock(VP_ID_APIBLOCK_OPTION_FOR_ARG_5 + uuid
,arg5
,loadedVariableNameList_arg5
- , VP_CLASS_STYLE_WIDTH_20PERCENT
+ , VP_CLASS_STYLE_WIDTH_100PERCENT
, STR_VALUE
, function(selectedValue) {
bindSelectValueEventFunc_for(selectedValue,
FOR_BLOCK_SELECT_VALUE_ARG_TYPE.ARG5);
- });
+ });
sbforArgContainer.appendLine(sbforParamArg5);
- }
- if (arg3 == STR_EMPTY
- || arg3 == FOR_BLOCK_ARG3_TYPE.ZIP
- || arg3 == FOR_BLOCK_ARG3_TYPE.RANGE
- || arg3 == FOR_BLOCK_ARG3_TYPE.ENUMERATE) {
var sbforParamArg2 = MakeVpSuggestInputText_apiblock(VP_ID_APIBLOCK_OPTION_FOR_ARG_2 + uuid
,arg2
,loadedVariableNameList_arg2
- , VP_CLASS_STYLE_WIDTH_20PERCENT
+ , VP_CLASS_STYLE_WIDTH_100PERCENT
, STR_VALUE
, function(selectedValue) {
bindSelectValueEventFunc_for(selectedValue,
FOR_BLOCK_SELECT_VALUE_ARG_TYPE.ARG2);
- });
+ });
sbforArgContainer.appendLine(sbforParamArg2);
+
+ var sbforParamArg6 = MakeVpSuggestInputText_apiblock(VP_ID_APIBLOCK_OPTION_FOR_ARG_6 + uuid
+ , arg6
+ , loadedVariableNameList_arg6
+ , VP_CLASS_STYLE_WIDTH_100PERCENT
+ , STR_VALUE
+ , function(selectedValue) {
+ bindSelectValueEventFunc_for(selectedValue,
+ FOR_BLOCK_SELECT_VALUE_ARG_TYPE.ARG6);
+ });
+ sbforArgContainer.appendLine(sbforParamArg6);
+ }
+
+ if (arg3 == FOR_BLOCK_ARG3_TYPE.VARIABLE) {
+ var dataTypes = ['DataFrame', 'Series', 'nparray', 'list', 'str'];
+ var varSelector = new vpVarSelector(dataTypes, 'DataFrame', true, true);
+ varSelector.setComponentId(VP_ID_APIBLOCK_OPTION_FOR_ARG_8 + uuid);
+ varSelector.addBoxClass(VP_CLASS_STYLE_WIDTH_100PERCENT);
+ varSelector.addBoxClass(VP_CLASS_STYLE_FLEX_ROW_BETWEEN);
+ varSelector.addTypeClass(VP_CLASS_STYLE_WIDTH_50PERCENT);
+ varSelector.addVarClass(VP_CLASS_STYLE_WIDTH_50PERCENT);
+ varSelector.setValue(arg8);
+ sbforArgContainer.appendLine(varSelector.render());
}
- if (arg3 == FOR_BLOCK_ARG3_TYPE.ZIP) {
+ if (arg3 == FOR_BLOCK_ARG3_TYPE.TYPING) {
var sbforParamArg7 = MakeVpSuggestInputText_apiblock(VP_ID_APIBLOCK_OPTION_FOR_ARG_7 + uuid
,arg7
,loadedVariableNameList_arg7
- , VP_CLASS_STYLE_WIDTH_20PERCENT
- , STR_VALUE
+ , VP_CLASS_STYLE_WIDTH_100PERCENT
+ , 'User Input'
, function(selectedValue) {
bindSelectValueEventFunc_for(selectedValue,
FOR_BLOCK_SELECT_VALUE_ARG_TYPE.ARG7);
});
sbforArgContainer.appendLine(sbforParamArg7);
- }
-
- if (arg3 == FOR_BLOCK_ARG3_TYPE.RANGE) {
- var sbforParamArg6 = MakeVpSuggestInputText_apiblock(VP_ID_APIBLOCK_OPTION_FOR_ARG_6 + uuid
- , arg6
- , loadedVariableNameList_arg6
- , VP_CLASS_STYLE_WIDTH_20PERCENT
- , STR_VALUE
- , function(selectedValue) {
- bindSelectValueEventFunc_for(selectedValue,
- FOR_BLOCK_SELECT_VALUE_ARG_TYPE.ARG6);
- });
- sbforArgContainer.appendLine(sbforParamArg6);
- }
+ }
if (arg3 == FOR_BLOCK_ARG3_TYPE.DEFAULT) {
var sbforParamArg7 = MakeVpSuggestInputText_apiblock(VP_ID_APIBLOCK_OPTION_FOR_ARG_3_DEFAULT + uuid
@@ -513,33 +615,33 @@ define([
}
sbforArgContainer.appendLine("
");
- $sbforParamDom2.append(sbforArgContainer.toString());
+ $sbforParamDom4.append(sbforArgContainer.toString());
optionContainerDom.append($sbforParamDom1);
optionContainerDom.append($sbforParamDom2);
+ optionContainerDom.append($sbforParamDom3);
+ optionContainerDom.append($sbforParamDom4);
+
/** bottom block option 탭에 렌더링된 dom객체 생성 */
$(optionPageSelector).append(optionContainerDom);
$(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_1 + uuid).val(arg1);
$(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_2 + uuid).val(arg2);
- if (arg3 == FOR_BLOCK_ARG3_TYPE.INPUT_STR) {
- $(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_3 + uuid).val(STR_EMPTY);
- } else {
- $(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_3 + uuid).val(arg3);
- }
+ $(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_3 + uuid).val(arg3);
$(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_4 + uuid).val(arg4);
/** For arg4 */
- if (arg3 == FOR_BLOCK_ARG3_TYPE.ENUMERATE) {
- $(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_4 + uuid).addClass(VP_CLASS_STYLE_OPACITY_1);
- $(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_4 + uuid).css(STR_MARGIN_LEFT,'5px');
- } else {
- $(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_4 + uuid).addClass(VP_CLASS_STYLE_OPACITY_0);
- }
+ // if (arg3 == FOR_BLOCK_ARG3_TYPE.ENUMERATE) {
+ // $(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_4 + uuid).addClass(VP_CLASS_STYLE_OPACITY_1);
+ // $(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_4 + uuid).css(STR_MARGIN_LEFT,'5px');
+ // } else {
+ // $(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_4 + uuid).addClass(VP_CLASS_STYLE_OPACITY_0);
+ // }
$(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_5 + uuid).val(arg5);
$(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_6 + uuid).val(arg6);
$(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_7 + uuid).val(arg7);
+ $(VP_ID_PREFIX + VP_ID_APIBLOCK_OPTION_FOR_ARG_8 + uuid).val(arg8);
return optionContainerDom;
}
diff --git a/src/api_block/constData.js b/src/api_block/constData.js
index d2a79de2..f7f64c93 100644
--- a/src/api_block/constData.js
+++ b/src/api_block/constData.js
@@ -121,9 +121,13 @@ define([
}
const FOR_BLOCK_ARG3_TYPE = {
- ZIP: 'zip'
- , RANGE: 'range'
- , ENUMERATE: 'enumerate'
+ // ZIP: 'zip'
+ // , RANGE: 'range'
+ // , ENUMERATE: 'enumerate'
+ // edit for block types
+ RANGE: 'Range'
+ , VARIABLE: 'Variable'
+ , TYPING: 'Typing'
}
const FOR_BLOCK_SELECT_VALUE_ARG_TYPE = {
diff --git a/src/api_block/index.html b/src/api_block/index.html
index db04f1d9..e2de9fb2 100644
--- a/src/api_block/index.html
+++ b/src/api_block/index.html
@@ -13,6 +13,39 @@
+ 
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+