Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7d2a2cd

Browse files
authored
Merge pull request#100 from minjk-bl/devops
Devops
2 parentsb119587 +0873089 commit7d2a2cd

File tree

11 files changed

+361
-246
lines changed

11 files changed

+361
-246
lines changed

‎css/api_block/index.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@
324324
}
325325
.vp-block {
326326
position: relative;
327+
min-width:205px;
327328
min-height:25px;
328329
z-index:1;
329330
text-align: left;

‎css/common/frameEditor.css‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
grid-row-gap:5px;
5454
/* grid-template-rows: 35px 30px 60% calc(40% - 80px); */
5555
/* grid-template-rows: 35px 30px calc(100% - 80px); */
56-
grid-template-rows:35px65pxcalc(100%-110px);
56+
/* grid-template-rows: 35px 65px calc(100% - 110px); */
57+
grid-template-rows:35px65px35pxcalc(100%-145px);
5758
grid-template-columns:100%;
5859
}
5960

@@ -93,6 +94,13 @@
9394
cursor: pointer;
9495
margin-left:5px;
9596
}
97+
.vp-fe-toolbar {
98+
border-top:1px solidvar(--border-gray-color);
99+
padding-top:5px;
100+
}
101+
.vp-fe-toolbar-item {
102+
width: fit-content;
103+
}
96104
.vp-fe-menu-box {
97105
position: absolute;
98106
top:0;
@@ -141,7 +149,7 @@
141149
transform:translate(-50%,-50%);
142150
min-width:400px;
143151
min-height:150px;
144-
width:30%;
152+
width:fit-content;
145153
height: fit-content;
146154
background-color: white;
147155
z-index:200;

‎src/api/functions/fileNaviCommand.py‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def _vp_get_documents_path():
5656

5757
def_vp_sizeof_fmt(num,suffix='B'):
5858
"""
59-
파일크기 보기 좋게 변환해서 반환
59+
Return resized image
6060
"""
6161
forunitin ['','K','M','G','T','P','E','Z']:
6262
ifabs(num)<1024.0:
@@ -66,7 +66,7 @@ def _vp_sizeof_fmt(num, suffix='B'):
6666

6767
def_vp_search_path(path):
6868
"""
69-
경로 하위 폴더, 파일 조회
69+
Search child folder and file list under the given path
7070
"""
7171
importdatetimeas_dt
7272
_current=_vp_os.path.abspath(path)
@@ -94,8 +94,20 @@ def _vp_search_path(path):
9494

9595
def_vp_get_image_by_path(path):
9696
"""
97-
경로로 이미지 파일 받아오기
97+
Get image file by path
9898
"""
9999
fromPILimportImage
100100
img=Image.open(path)
101-
returnimg
101+
returnimg
102+
103+
def_vp_get_relative_path(start,path):
104+
"""
105+
Get relative path using start path and current path
106+
start: str
107+
start path
108+
path: str
109+
current path
110+
returns: str
111+
current relative path
112+
"""
113+
return_vp_os.path.relpath(path,start)

‎src/common/component/vpMultiSelector.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ define([
233233
dataList&&dataList.forEach((data,idx)=>{
234234
// for column : data.array parsing
235235
varinfo=vpCommon.safeString(data.array);
236-
if(info){
237-
info=data.value+':\n';
236+
if(info&&info!='undefined'){
237+
info=data.value+':\n'+info;
238238
}else{
239239
info='';
240240
}

‎src/common/vpBind.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,14 +342,14 @@ define([
342342
page.appendFormatLine('<div class="{0} {1}" {2}>','vp-bd-type-box','merge',this.state.type=='merge'?'':'style="display: none;"');
343343
// left dataframe
344344
page.appendLine('<div>');
345-
page.appendFormatLine('<label for="{0}">{2}</label>','vp_bdLeftDataframe','vp-orange-text wp100','LeftDataframe');
345+
page.appendFormatLine('<label for="{0}">{2}</label>','vp_bdLeftDataframe','vp-orange-text wp100','LeftData');
346346
page.appendFormatLine('<select id="{0}">','vp_bdLeftDataframe');
347347
page.appendLine('</select>');
348348
page.appendFormatLine('<div class="{0}" title="{1}"><img src="{2}"/></div>','vp-bd-df-refresh','Refresh all dataframe list','/nbextensions/visualpython/resource/refresh.svg');
349349
page.appendLine('</div>');
350350
// right dataframe
351351
page.appendLine('<div>');
352-
page.appendFormatLine('<label for="{0}">{2}</label>','vp_bdRightDataframe','vp-orange-text wp100','RightDataframe');
352+
page.appendFormatLine('<label for="{0}">{2}</label>','vp_bdRightDataframe','vp-orange-text wp100','RightData');
353353
page.appendFormatLine('<select id="{0}">','vp_bdRightDataframe');
354354
page.appendLine('</select>');
355355
page.appendLine('</div>');

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp