Skip to content

Commit 982cc47

Browse files
author
minjk-bl
committed
merged styles & operations
1 parent a6651b4 commit 982cc47

21 files changed

Lines changed: 1267 additions & 345 deletions

File tree

‎css/api_block/index.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
bottom: 35px;
301301
right: 1px;
302302
width: 84px;
303-
height: 30px;
303+
height: 62px;
304304
text-align: center;
305305
line-height: 30px;
306306
}

‎css/common/frameEditor.css‎

Lines changed: 45 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@
5151
padding: 10px;
5252
display: grid;
5353
grid-row-gap: 5px;
54-
grid-template-rows: 35px 30px calc(100% - 80px);
5554
/* grid-template-rows: 35px 30px 60% calc(40% - 80px); */
55+
/* grid-template-rows: 35px 30px calc(100% - 80px); */
56+
grid-template-rows: 35px 65px calc(100% - 110px);
57+
grid-template-columns: 100%;
5658
}
5759

5860
/* Code Preview */
@@ -72,20 +74,24 @@
7274
.vp-fe-preview .CodeMirror-code .cm-string {
7375
background-color: rgba(246, 173, 85, 0.2);
7476
}
77+
.vp-fe-df-box {
78+
display: grid;
79+
grid-template-rows: 30px;
80+
grid-row-gap: 5px;
81+
}
82+
.vp-fe-df-box label {
83+
width: 70px;
84+
}
7585
.vp-fe #vp_feVariable {
7686
width: 125px;
77-
margin-left: 5px;
87+
/* margin-left: 5px; */
7888
}
7989
.vp-fe-df-refresh {
8090
cursor: pointer;
8191
}
82-
.vp-fe-df-showinfo {
83-
cursor: pointer;
84-
float: right;
85-
width: fit-content;
86-
}
8792
.vp-fe-menu-box {
88-
position: fixed;
93+
/* position: fixed; */
94+
position: absolute;
8995
top: 0;
9096
left: 0;
9197
background: #FFFFFF;
@@ -151,14 +157,23 @@
151157
.vp-fe-table {
152158
height: 100%;
153159
background: var(--border-gray-color);
154-
padding: 5px;
160+
border: 5px solid var(--border-gray-color);
155161
overflow: auto;
156162
}
157163
.vp-fe-table table {
158164
border-collapse: separate;
159165
margin-top: 0px;
160166
margin-left: 0px;
161167
}
168+
.vp-fe-table table th {
169+
/* no-selection for th */
170+
-webkit-touch-callout: none;
171+
-webkit-user-select: none;
172+
-khtml-user-select: none;
173+
-moz-user-select: none;
174+
-ms-user-select: none;
175+
user-select: none;
176+
}
162177
.vp-fe-table thead th {
163178
position: sticky;
164179
top: 0;
@@ -203,19 +218,15 @@
203218
}
204219
.vp-fe-info {
205220
display: none;
206-
/* width: 100%;
207-
height: 100%;
208-
margin: 0px; */
209221
position: absolute;
210-
width: 70%;
211-
height: 70%;
212-
margin: 0px;
213-
top: 20%;
214-
right: 10px;
215-
background: #FFFFFF;
216-
border: 0.25px solid #C4C4C4;
217-
box-shadow: 1px 1px 2px rgb(0 0 0 / 10%);
222+
width: 100%;
223+
height: 300px;
224+
bottom: 50px;
225+
background: #F7F7F7;
226+
border: 0.25px solid #E4E4E4;
227+
padding: 10px;
218228
}
229+
219230
.vp-fe-info-title {
220231
width: 100%;
221232
height: 20px;
@@ -284,6 +295,10 @@
284295
left: 15px;
285296
top: 4px;
286297
}
298+
.vp-fe-btn-dataview {
299+
left: 105px;
300+
top: 4px;
301+
}
287302
.vp-fe-btn-cancel {
288303
top: 4px;
289304
right: 105px;
@@ -316,7 +331,7 @@
316331
bottom: 34px;
317332
right: 1px;
318333
width: 84px;
319-
height: 30px;
334+
height: 62px;
320335
font-size: 13px;
321336
text-align: center;
322337
line-height: 30px;
@@ -328,38 +343,12 @@
328343
color: var(--font-hightlight);
329344
background: var(--light-gray-color);
330345
}
331-
/* .vp-fe-btn-box {
332-
position: absolute;
333-
bottom: 10px;
334-
right: 10px;
335-
}
336-
.vp-fe-btn-apply
337-
, .vp-fe-popup-ok {
338-
width: 80px;
339-
height: 30px;
340-
background: #F37704;
341-
border: 0.25px solid #C4C4C4;
342-
box-sizing: border-box;
343-
border-radius: 2px;
344-
text-align: center;
345-
color: #FFFFFF;
346-
}
347-
.vp-fe-btn-apply:hover
348-
, .vp-fe-popup-ok:hover {
349-
background: var(--hightlight-color);
350-
}
351-
.vp-fe-btn-cancel
352-
, .vp-fe-popup-cancel {
353-
width: 80px;
354-
height: 30px;
355-
background: #E5E5E5;
356-
border: 0.25px solid #C4C4C4;
357-
box-sizing: border-box;
358-
border-radius: 2px;
359-
text-align: center;
360-
color: #696969;
361-
}
362-
.vp-fe-btn-cancel:hover
363-
, .vp-fe-popup-cancel:hover {
364-
background: #ccc;
365-
} */
346+
347+
/* popup page */
348+
/* add page */
349+
.vp-popup-addpage {
350+
height: 300px;
351+
}
352+
.vp-popup-addpage .vp-popup-tab.replace {
353+
height: calc(100% - 50px);
354+
}

‎css/common/popupPage.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
bottom: 35px;
110110
right: 1px;
111111
width: 84px;
112-
height: 30px;
112+
height: 62px;
113113
text-align: center;
114114
line-height: 30px;
115115
}

‎css/common/profiling.css‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
left: 50%;
1313
top: 50%;
1414
transform:translate(-50%, -50%);
15-
min-width: 400px;
15+
min-width: 420px;
1616
min-height: 400px;
1717
width: 50%;
1818
height: 60%;
@@ -54,7 +54,8 @@
5454
grid-row-gap: 5px;
5555
/* grid-template-rows: 60px calc(100% - 80px); */
5656
/* grid-template-rows: 80px calc(100% - 100px); */
57-
grid-template-rows: 80px min-content;
57+
/* grid-template-rows: 80px min-content; */
58+
grid-template-rows: 80px 120px 130px;
5859
}
5960
.vp-pf-prepare-box {
6061
display: grid;
@@ -103,6 +104,47 @@
103104
width: 120px !important;
104105
}
105106

107+
/** List box */
108+
.vp-pf-list-box {
109+
display: grid;
110+
grid-template-rows: 20px calc(100% - 30px);
111+
grid-row-gap: 10px;
112+
border: 1px solid #E4E4E4;
113+
box-sizing: border-box;
114+
box-shadow: 0px 2px 4px rgb(0 0 0 / 25%);
115+
padding: 10px;
116+
}
117+
.vp-pf-list-header {
118+
display: grid;
119+
grid-template-columns: 35% 35% 30%;
120+
padding: 0px 10px;
121+
}
122+
.vp-pf-list-header-item {
123+
font-weight: bold;
124+
}
125+
.vp-pf-list-body {
126+
display: grid;
127+
grid-template-rows: 30px;
128+
overflow: auto;
129+
}
130+
.vp-pf-list-item {
131+
display: grid;
132+
grid-template-columns: 35% 35% 30%;
133+
border: 0.25px solid var(--border-gray-color);
134+
line-height: 30px;
135+
padding: 0px 10px;
136+
}
137+
.vp-pf-list-item:hover {
138+
background: var(--light-gray-color);
139+
cursor: pointer;
140+
}
141+
.vp-pf-list-button-box {
142+
text-align: right;
143+
}
144+
.vp-pf-list-menu-item {
145+
display: inline-block;
146+
}
147+
106148
/** Buttons */
107149
.vp-pf-btn-box {
108150
position: absolute;

‎css/common/subsetEditor.css‎

Lines changed: 61 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@
108108
/* Tab Page */
109109
.vp-ds-tab-page {
110110
width: 100%;
111-
height: 360px;
111+
/* height: 360px; */
112+
height: calc(100% - 150px);
112113
}
113114
.vp-ds-tab-page.subset {
114115
display: grid;
@@ -121,10 +122,11 @@
121122
}
122123
.vp-ds-tab-page-box {
123124
display: grid;
124-
grid-template-rows: 40px calc(100% - 40px);
125+
grid-template-rows: 30px calc(100% - 35px);
126+
grid-row-gap: 5px;
125127
border: 0.25px solid #C4C4C4;
126-
border-top: 0.25px solid transparent;
127-
padding: 10px;
128+
/* border-top: 0.25px solid transparent; */
129+
padding: 5px;
128130
/* overflow: auto; */
129131
}
130132
.vp-ds-tab-page-box.subset-row {
@@ -139,10 +141,6 @@
139141
font-weight: bold;
140142
margin: 5px 0px 0px 5px;
141143
}
142-
.vp-ds-rowtype-box,
143-
.vp-ds-coltype-box {
144-
overflow: auto;
145-
}
146144
.vp-ds-rowtype-box.condition .vp-vs-box {
147145
padding-bottom: 5px;
148146
}
@@ -155,6 +153,9 @@
155153
.vp-ds-rowtype-box.condition .vp-del-col {
156154
float: right;
157155
}
156+
.vp-ds-rowtype-box.condition .vp-condition {
157+
width: 130px;
158+
}
158159
.vp-ds-rowtype-box.condition .vp-condition-use-text {
159160
float: right;
160161
margin-right: 75px;
@@ -189,7 +190,7 @@
189190
/* display: inline-block; */
190191
}
191192
.vp-ds-select-box.left {
192-
height: calc(100% - 25px);
193+
height: calc(100% - 30px);
193194
}
194195
.vp-ds-select-item {
195196
width: 100%;
@@ -257,7 +258,19 @@
257258
background-image: url(../../resource/close_big.svg);
258259
}
259260

260-
/** Buttons */
261+
.vp-ds-preview-box {
262+
display: none;
263+
width: 100%;
264+
height: 100px;
265+
position: absolute;
266+
bottom: 50px;
267+
268+
background: #F7F7F7;
269+
border: 0.25px solid #E4E4E4;
270+
padding: 10px;
271+
}
272+
273+
/** buttons */
261274
.vp-ds-btn-box {
262275
/* position: absolute;
263276
bottom: 25px;
@@ -271,7 +284,11 @@
271284
}
272285
.vp-ds-btn-preview {
273286
left: 15px;
274-
top: 11px;
287+
top: 4px;
288+
}
289+
.vp-ds-btn-dataview {
290+
left: 105px;
291+
top: 4px;
275292
}
276293
.vp-ds-btn-cancel {
277294
top: 4px;
@@ -286,6 +303,11 @@
286303
background: #F38504;
287304
border-radius: 2px;
288305
}
306+
.vp-ds-btn-apply {
307+
position: absolute;
308+
top: 4px;
309+
right: 15px;
310+
}
289311
.vp-ds-btn-run {
290312
display: inline-block;
291313
width: 60px;
@@ -305,7 +327,7 @@
305327
bottom: 35px;
306328
right: 1px;
307329
width: 84px;
308-
height: 30px;
330+
height: 62px;
309331
text-align: center;
310332
line-height: 30px;
311333
}
@@ -317,7 +339,33 @@
317339
background: var(--light-gray-color);
318340
}
319341

320-
/* Data Page */
342+
343+
/* data page */
344+
.vp-ds-data {
345+
display: none;
346+
position: absolute;
347+
width: 100%;
348+
height: 300px;
349+
bottom: 50px;
350+
background: #F7F7F7;
351+
border: 0.25px solid #E4E4E4;
352+
padding: 10px;
353+
}
354+
355+
.vp-ds-data-title {
356+
width: 100%;
357+
height: 20px;
358+
line-height: 20px;
359+
font-weight: bold;
360+
background: #F5F5F5;
361+
padding: 0px 10px;
362+
}
363+
364+
.vp-ds-data-content {
365+
width: 100%;
366+
height: calc(100% - 20px);
367+
overflow: auto;
368+
}
321369
.vp-ds-data-view-all-div {
322370
padding: 3px;
323371
}

0 commit comments

Comments
 (0)