diff --git a/css/api_block/index.css b/css/api_block/index.css index 4360fab4..daa6f6a7 100644 --- a/css/api_block/index.css +++ b/css/api_block/index.css @@ -324,6 +324,7 @@ } .vp-block { position: relative; + min-width: 205px; min-height: 25px; z-index: 1; text-align: left; diff --git a/css/common/frameEditor.css b/css/common/frameEditor.css index fb3f5cc1..d4d67a18 100644 --- a/css/common/frameEditor.css +++ b/css/common/frameEditor.css @@ -53,7 +53,8 @@ grid-row-gap: 5px; /* grid-template-rows: 35px 30px 60% calc(40% - 80px); */ /* grid-template-rows: 35px 30px calc(100% - 80px); */ - grid-template-rows: 35px 65px calc(100% - 110px); + /* grid-template-rows: 35px 65px calc(100% - 110px); */ + grid-template-rows: 35px 65px 35px calc(100% - 145px); grid-template-columns: 100%; } @@ -93,6 +94,13 @@ cursor: pointer; margin-left: 5px; } +.vp-fe-toolbar { + border-top: 1px solid var(--border-gray-color); + padding-top: 5px; +} +.vp-fe-toolbar-item { + width: fit-content; +} .vp-fe-menu-box { position: absolute; top: 0; @@ -141,7 +149,7 @@ transform: translate(-50%, -50%); min-width: 400px; min-height: 150px; - width: 30%; + width: fit-content; height: fit-content; background-color: white; z-index: 200; diff --git a/src/api/functions/fileNaviCommand.py b/src/api/functions/fileNaviCommand.py index c538b376..52858a8d 100644 --- a/src/api/functions/fileNaviCommand.py +++ b/src/api/functions/fileNaviCommand.py @@ -56,7 +56,7 @@ def _vp_get_documents_path(): def _vp_sizeof_fmt(num, suffix='B'): """ - 파일크기 보기 좋게 변환해서 반환 + Return resized image """ for unit in ['','K','M','G','T','P','E','Z']: if abs(num) < 1024.0: @@ -66,7 +66,7 @@ def _vp_sizeof_fmt(num, suffix='B'): def _vp_search_path(path): """ - 경로 하위 폴더, 파일 조회 + Search child folder and file list under the given path """ import datetime as _dt _current = _vp_os.path.abspath(path) @@ -94,8 +94,20 @@ def _vp_search_path(path): def _vp_get_image_by_path(path): """ - 경로로 이미지 파일 받아오기 + Get image file by path """ from PIL import Image img = Image.open(path) - return img \ No newline at end of file + return img + +def _vp_get_relative_path(start, path): + """ + Get relative path using start path and current path + start: str + start path + path: str + current path + returns: str + current relative path + """ + return _vp_os.path.relpath(path, start) \ No newline at end of file diff --git a/src/common/component/vpMultiSelector.js b/src/common/component/vpMultiSelector.js index b01916fe..636e25da 100644 --- a/src/common/component/vpMultiSelector.js +++ b/src/common/component/vpMultiSelector.js @@ -233,8 +233,8 @@ define([ dataList && dataList.forEach((data, idx) => { // for column : data.array parsing var info = vpCommon.safeString(data.array); - if (info) { - info = data.value + ':\n'; + if (info && info != 'undefined') { + info = data.value + ':\n' + info; } else { info = ''; } diff --git a/src/common/vpBind.js b/src/common/vpBind.js index 2c7a0482..46499646 100644 --- a/src/common/vpBind.js +++ b/src/common/vpBind.js @@ -342,14 +342,14 @@ define([ page.appendFormatLine('