Skip to content

Devops #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 14, 2021
Merged

Devops #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b732be9
#13 - logic > class option page design change
minjk-bl May 11, 2021
d5e9ff8
#13 - logic > def option page design change, makeoptionplusbutton mod…
minjk-bl May 11, 2021
6c63759
#13 - logic > return option page design change, #13 closed
minjk-bl May 11, 2021
83548bc
Merge pull request #18 from minjk-bl/devops
minjk-bl May 11, 2021
48b2d58
#12 - instance design changed
minjk-bl May 13, 2021
73a8795
#12 - instance first page added, variable creation added
minjk-bl May 14, 2021
67508fb
#12 - instance search box icon changed
minjk-bl May 14, 2021
c5d6276
#12 - instance undo with backspace. This closed #12
minjk-bl May 14, 2021
aad32d8
Merge pull request #19 from minjk-bl/devops
minjk-bl May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions css/api_block/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,11 @@
flex-direction: column;
justify-content: center;
}
.vp-apiblock-style-flex-column-between {
display: flex;
flex-direction: column;
justify-content: space-between;
}

.vp-apiblock-style-flex-row-around {
display: flex;
Expand All @@ -606,11 +611,6 @@
flex-direction: row;
justify-content: space-evenly;
}
.vp-apiblock-style-flex-row-between {
display: flex;
flex-direction: row;
justify-content: space-between;
}
.vp-apiblock-style-flex-row-end {
display: flex;
flex-direction: row;
Expand Down Expand Up @@ -1021,6 +1021,11 @@
background-color: white;
}

.vp-apiblock-param-box-btn {
width: 100px;
margin: 10px 0px;
}

.vp-apiblock-option-plus-button {
min-width: 80px;
height: 30px;
Expand Down
42 changes: 35 additions & 7 deletions css/common/instanceEditor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,32 @@
display: grid;
grid-template-columns: 50% 50%;
grid-gap: 10px;
padding: 5px 14px 0px 14px;
/* padding: 5px 14px 0px 14px; */
padding-right: 14px;
}
.vp-ins-select-container {

}
.vp-ins-select-title {
font-weight: bold;
font-weight: 700;
color: var(--hightlight-color);
padding: 5px 5px 5px 0px;
}
#vp-wrapper .vp-ins-select-container input.vp-ins-search {
width: 100%;
}
#vp-wrapper .vp-ins-select-container .vp-ins-search-icon {
position: absolute;
color: #C4C4C4;
right: 5px;
top: 5px;
}
.vp-ins-select-box {
margin-top: 5px;
border: 0.25px solid #C4C4C4;
}
.vp-ins-select-list {
height: 200px;
height: 145px;
width: 100%;

list-style: none;
Expand All @@ -45,9 +53,14 @@
background: #b0b0b0;
}
.vp-ins-select-item {
margin-top: 3px;
margin-bottom: 3px;
padding-top: 3px;
padding-bottom: 3px;
cursor: pointer;
border-bottom: 0.25px solid var(--light-gray-color);
}
.vp-ins-select-item.selected {
color : var(--hightlight-color);
background: var(--light-gray-color);
}
.vp-ins-select-item span {
background: #e0e0e0;
Expand All @@ -56,10 +69,10 @@
margin-right: 5px;
}
.vp-ins-select-item:hover {
color: #F37704;
background: var(--light-gray-color);
}
.vp-ins-select-item:hover span {
background: #F37704;
background: var(--hightlight-color);
color: #FFFFFF;
}
.vp-ins-option-box.api {
Expand All @@ -71,4 +84,19 @@
}
.vp-ins-parameter {
width: 100% !important;
}

.vp-create-var-box {
position: relative;
margin-top: 5px;
}
#vp-wrapper .vp-ins-select-container .vp-create-var {
width: 100%;
}
#vp-wrapper .vp-ins-select-container .vp-create-var-btn {
position: absolute;
color: #C4C4C4;
right: 5px;
top: 5px;
cursor: pointer;
}
4 changes: 4 additions & 0 deletions css/common/subsetEditor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
background-color: rgba(0,0,0,.4);
}

.vp-ds-button {
width: 45px;
}

.vp-ds-container {
position: relative;
left: 50%;
Expand Down
18 changes: 14 additions & 4 deletions css/file_io/instance.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
vertical-align: top;
}
.vp-instance-toolbar {
/* display: none; */
grid-column: 2/3;
}
.vp-instance-toolbar .vp-toolbar-button {
Expand All @@ -20,9 +21,15 @@
border-radius: 2px;
}


.vp-instance-label {
grid-column: 1/2;
font-weight: 700;
margin: 0px;
}

.vp-instance-box {
grid-column-start: 1;
grid-column-end: 3;
}

.vp-instance-base > hr {
Expand All @@ -31,15 +38,18 @@
grid-column: 1/3;
}

.vp-ins-container {
.vp-ins-container.variable {
grid-column: 1/3;
}

.vp-ins-container.allocate {
grid-column: 1/3;
grid-row: 5;
}

/* udf editor - CodeMirror */
#vp-wrapper .vp-option-page .vp-instance-box .CodeMirror {
display: inline-block;
width: calc(100% - 60px);
width: calc(100% - 55px);
height: 30px;
border: 1px solid silver;
overflow: hidden;
Expand Down
6 changes: 4 additions & 2 deletions src/api_block/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ define([

, FOR_BLOCK_ARG3_TYPE

, DEF_BLOCK_ARG6_TYPE

, STR_GRP_DEFINE
, STR_GRP_CONTROL
, STR_GRP_EXECUTE
Expand Down Expand Up @@ -369,9 +371,9 @@ define([
defInParamList.forEach(( defInParam, index ) => {
const { arg3, arg5 ,arg6 } = defInParam;

if (arg6 == '*args') {
if (arg6 == DEF_BLOCK_ARG6_TYPE.ARGS) {
defInParamStr += '*';
} else if (arg6 == '**kwargs') {
} else if (arg6 == DEF_BLOCK_ARG6_TYPE.KWARGS) {
defInParamStr += '**';
}

Expand Down
31 changes: 16 additions & 15 deletions src/api_block/component/option/class_option.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,22 @@ define([

idStr = `vp_apiblockClassOptionName${uuid}`;
classStr = `vp-apiblock-input-class-name-${uuid}`;
blockCodeName = 'Name';
inputStyleStr = 'width: 82%';
blockCodeName = 'Class Name';
inputStyleStr = 'width: 100%';

var nameDom = $(`<div class='vp-apiblock-blockoption-block
vp-apiblock-style-flex-row-between'
style='position:relative;'>
<span class='vp-block-optiontab-name
vp-apiblock-style-flex-column-center'>
vp-apiblock-style-flex-column-between'
style='position:relative; height: 50px; margin-bottom: 15px;'>
<div class='vp-block-optiontab-name
vp-apiblock-style-flex-column-center
vp-orange-text'>
${blockCodeName}
</span>
</div>
<input id='${idStr}'
class='vp-apiblock-blockoption-input ${classStr}'
style='${inputStyleStr}'
value="${name}"
placeholder='input code line' ></input>
placeholder='input class name' ></input>

</div>`);

Expand All @@ -90,21 +91,21 @@ define([
var uuid = thisBlock.getUUID();
var parentClassName = thisBlock.getState(STATE_parentClassName);

var name = 'Inheritance';
var name = 'Super Class Name';
var classStr = `vp-apiblock-input-param-${0}-${uuid}`;
var inputStyleStr = 'width:66%;';
var inputStyleStr = 'width:100%;';


var nameDom = $(`<div class='vp-apiblock-blockoption-block
vp-apiblock-style-flex-row-between'
style='position:relative;'>
<span class='vp-block-optiontab-name
vp-apiblock-style-flex-column-center'>${name}</span>
vp-apiblock-style-flex-column-between'
style='position:relative; height: 50px; '>
<div class='vp-block-optiontab-name
vp-apiblock-style-flex-column-center'>${name}</div>
<input class='vp-apiblock-blockoption-input
${classStr}'
style='${inputStyleStr}'
value="${parentClassName}"
placeholder='input parent class' ></input>
placeholder='input super class name' ></input>

</div>`);
return nameDom;
Expand Down
59 changes: 42 additions & 17 deletions src/api_block/component/option/def_option.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ define([
, VP_CLASS_STYLE_FLEX_ROW_BETWEEN


, VP_CLASS_STYLE_WIDTH_5PERCENT
, VP_CLASS_STYLE_WIDTH_20PERCENT
, VP_CLASS_STYLE_WIDTH_25PERCENT
, VP_CLASS_STYLE_WIDTH_30PERCENT
, VP_CLASS_STYLE_WIDTH_100PERCENT

, VP_CLASS_APIBLOCK_PARAM_DELETE_BTN
Expand Down Expand Up @@ -262,16 +264,17 @@ define([

idStr = `vp_apiblockDefOptionName${uuid}`;
classStr = `vp-apiblock-input-def-name-${uuid}`;
blockCodeName = 'Name';
inputStyleStr = 'width: 82%';
blockCodeName = 'Function Name';
inputStyleStr = 'width: 100%';

var nameDom = $(`<div class='vp-apiblock-blockoption-block
vp-apiblock-style-flex-row-between'
style='position:relative;'>
<span class='vp-block-optiontab-name
vp-apiblock-style-flex-column-center'>
vp-apiblock-style-flex-column-between'
style='position:relative; height: 50px; margin-bottom: 15px; '>
<div class='vp-block-optiontab-name
vp-apiblock-style-flex-column-center
vp-orange-text'>
${blockCodeName}
</span>
</div>
<input id='${idStr}'
class='vp-apiblock-blockoption-input ${classStr}'
style='${inputStyleStr}'
Expand Down Expand Up @@ -352,11 +355,33 @@ define([
var loadedVariableNameList_arg6 = [ ...Object.values( DEF_BLOCK_ARG6_TYPE ) ];

var inParamDom = $(`<div class='vp-apiblock-blockoption-block
vp-apiblock-style-flex-row-between'>
<span class='vp-block-optiontab-name
vp-apiblock-style-flex-column-center'>
In param
</span>
vp-apiblock-style-flex-row-between'
style="margin-bottom: 3px;">
<div class='vp-block-optiontab-name
vp-apiblock-style-flex-column-center
${VP_CLASS_STYLE_WIDTH_25PERCENT}
vp-orange-text'>
Parameter
</div>
<div class='vp-block-optiontab-name
vp-apiblock-style-flex-column-center
vp-orange-text' style="width: 20px;">
</div>
<div class='vp-block-optiontab-name
vp-apiblock-style-flex-column-center
${VP_CLASS_STYLE_WIDTH_25PERCENT}
vp-orange-text'>
Value
</div>
<div class='vp-block-optiontab-name
vp-apiblock-style-flex-column-center
${VP_CLASS_STYLE_WIDTH_25PERCENT}
vp-orange-text'>
Argument Type
</div>
<div class='vp-block-optiontab-name
vp-apiblock-style-flex-row-between' style="width: 15px;">
</div>
</div>`);

var defInParamContainer = $(`<div class='vp-apiblock-tab-navigation-node-block-title'>
Expand Down Expand Up @@ -385,7 +410,7 @@ define([

var sbDefVariable = new sb.StringBuilder();
sbDefVariable.appendFormatLine("<div class='{0} {1}'>", VP_CLASS_STYLE_FLEX_ROW_BETWEEN
, VP_CLASS_STYLE_WIDTH_25PERCENT);
, VP_CLASS_STYLE_WIDTH_20PERCENT);
// Deprecated: don't show this on ui
// if (arg6 == DEF_BLOCK_ARG6_TYPE.ARGS) {
// sbDefVariable.appendLine("<span class='vp-apiblock-style-flex-column-center'>*</span>");
Expand Down Expand Up @@ -413,16 +438,16 @@ define([
var suggestInputArg5 = MakeVpSuggestInputText_apiblock(VP_ID_APIBLOCK_OPTION_DEF_ARG_5 + index + uuid
, arg5
, loadedVariableNameList_arg5
, VP_CLASS_STYLE_WIDTH_20PERCENT
, 'Default Val'
, VP_CLASS_STYLE_WIDTH_25PERCENT
, 'Value'
, function(selectedValue) {
bindSelectValueEventFunc_def(selectedValue,
index,
DEF_BLOCK_SELECT_VALUE_ARG_TYPE.ARG5);
});
sbDefParam.appendLine(suggestInputArg5.toString());
var sbselectBoxArg6 = MakeOptionSelectBox(VP_ID_APIBLOCK_OPTION_DEF_ARG_6 + index + uuid
, VP_CLASS_STYLE_WIDTH_20PERCENT
, VP_CLASS_STYLE_WIDTH_25PERCENT
, arg6
, loadedVariableNameList_arg6);
sbDefParam.appendLine(sbselectBoxArg6.toString());
Expand All @@ -445,7 +470,7 @@ define([
defInParamContainer.append(defInParamBody);
defBlockOption.append(defInParamContainer);

var defPlusButton = MakeOptionPlusButton(VP_CLASS_APIBLOCK_PARAM_PLUS_BTN + uuid, '+ Param');
var defPlusButton = MakeOptionPlusButton(VP_CLASS_APIBLOCK_PARAM_PLUS_BTN + uuid, '+ Parameter', 'vp-apiblock-param-box-btn');
defBlockOption.append(defPlusButton);

/** bottom block option 탭에 렌더링된 dom객체 생성 */
Expand Down
Loading