Skip to content

Commit 769d49e

Browse files
AdamyuanyuanAdamyuanyuan
authored
Merge pull request #180 from det101/master
DataSphere Studio0.9.0 workspace frontend.
2 parents 231b756 + 2c05000 commit 769d49e

File tree

18 files changed

+1207
-289
lines changed

18 files changed

+1207
-289
lines changed

‎web/src/assets/iconfont/font-dws-icon.svg‎

100644100755
Lines changed: 95 additions & 77 deletions
Loading

‎web/src/assets/iconfont/font-dws-icon.ttf‎

100644100755
444 Bytes
Binary file not shown.

‎web/src/assets/iconfont/font-dws-icon.woff‎

100644100755
444 Bytes
Binary file not shown.

‎web/src/assets/styles/iconfonts.scss‎

Lines changed: 107 additions & 27 deletions
Large diffs are not rendered by default.

‎web/src/assets/styles/workspace.scss‎

Lines changed: 277 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,277 @@
1+
/*!
2+
* Copyright 2019 WeBank
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
*/
17+
@import './variables.scss';
18+
19+
.page-bgc {
20+
background: rgb(245, 245, 245);
21+
height: 100%;
22+
margin: 0;
23+
display: flex;
24+
flex-direction: column;
25+
//竖轴方向
26+
27+
.page-bgc-header {
28+
padding: 10px 25px 0;
29+
}
30+
31+
.header-title {
32+
font-size: 14px;
33+
font-weight: bold;
34+
padding-left: 5px;
35+
border-left: 3px solid $primary-color;
36+
}
37+
38+
.header-info {
39+
padding: 10px 0 10px 20px;
40+
41+
p {
42+
line-height: 24px;
43+
}
44+
}
45+
46+
}
47+
48+
.app-icon {
49+
font-size: 14px;
50+
height: 30px;
51+
line-height: 30px;
52+
color: #39f;
53+
}
54+
55+
.workspace-main {
56+
padding: 10px 25px;
57+
display: -webkit-box;
58+
display: flex;
59+
-webkit-box-pack: start;
60+
justify-content: flex-start;
61+
-webkit-box-align: start;
62+
align-items: flex-start;
63+
64+
.item-header {
65+
font-size: 14px;
66+
font-weight: bold;
67+
padding-left: 23px;
68+
border-left: 2px solid $primary-color;
69+
70+
}
71+
72+
.left {
73+
flex: 1;
74+
min-height: 137px;
75+
// box-shadow: 0 1px 6px rgba(0,0,0,.2);
76+
border-color: rgba(0,0,0,0);
77+
padding: 0;
78+
}
79+
80+
.right {
81+
// flex: 1;
82+
margin-left: 25px;
83+
min-height: 137px;
84+
width: 500px;
85+
// box-shadow: 0 1px 6px rgba(0,0,0,.2);
86+
border-color: rgba(0,0,0,0);
87+
padding: 0;
88+
}
89+
90+
.setting-bt-wrap {
91+
position: absolute;
92+
right: 20px;
93+
top: 10px;
94+
font-size: 24px;
95+
96+
&.ivu-btn-text {
97+
outline: none;
98+
border: none;
99+
box-shadow: 0 0 0 2px transparent;
100+
}
101+
}
102+
103+
.app-list {
104+
display: flex;
105+
flex-wrap: wrap;
106+
align-items: center;
107+
108+
.app-item-add {
109+
display: flex;
110+
margin: 20px 10px 10px 25px;
111+
padding: 10px;
112+
cursor: pointer;
113+
font-size: 24px;
114+
transition: color .2s linear,background-color .2s linear,border .2s linear,box-shadow .2s linear;
115+
116+
&:hover {
117+
transition: color .2s linear,background-color .2s linear,border .2s linear,box-shadow .2s linear;
118+
color: #39f;
119+
120+
box-shadow: 0 2px 12px 0 rgba(0,0,0,.2);
121+
border-radius: 4px;
122+
}
123+
}
124+
125+
.shadow {
126+
box-shadow: 0 2px 12px 0 rgba(0,0,0,.2);
127+
border-radius: 4px;
128+
}
129+
130+
.app-item-wrap {
131+
display: flex;
132+
position: relative;
133+
margin: 20px 10px 10px 25px;
134+
padding: 10px 30px;
135+
cursor: pointer;
136+
border: 1px solid rgb(245, 245, 245);
137+
border-radius: 3px;
138+
139+
.close-wrap {
140+
position: absolute;
141+
right: -5px;
142+
top: -5px;
143+
color: #39f;
144+
}
145+
146+
&:hover {
147+
box-shadow: 0 2px 12px 0 rgba(0,0,0,.2);
148+
border-radius: 4px;
149+
}
150+
151+
.label {
152+
margin-left: 10px;
153+
// width: 110px;
154+
// font-weight: 700;
155+
font-size: 12px;
156+
overflow: hidden;
157+
text-overflow: ellipsis;
158+
white-space: nowrap;
159+
line-height: 30px;
160+
height: 30px;
161+
}
162+
}
163+
}
164+
}
165+
166+
.app-list-main {
167+
padding: 0 25px 10px;
168+
// bottom: 0;
169+
flex: auto;
170+
171+
.app-list-tabs {
172+
padding: 20px 20px 20px 22px;
173+
174+
border-radius: 6px;
175+
height: 100%;
176+
position: relative;
177+
-webkit-transition: all .2s ease-in-out;
178+
transition: all .2s ease-in-out;
179+
background-color: #fff;
180+
181+
&:hover {
182+
box-shadow: 0 2px 7px rgba(0,0,0,.15);
183+
border-color: transparent;
184+
position: relative;
185+
}
186+
187+
.pane-wrap {
188+
display: flex;
189+
flex-wrap: wrap;
190+
191+
.pane-item {
192+
float: left;
193+
margin: 10px 100px 0 0;
194+
width: 450px;
195+
}
196+
197+
.app-entrance {
198+
display: flex;
199+
200+
.app-title-wrap {
201+
flex: 1;
202+
font-size: 12px;
203+
204+
.app-title {
205+
display: flex;
206+
align-items: center;
207+
margin-top: -10px;
208+
209+
.title-sub {
210+
margin-right: 10px;
211+
}
212+
213+
.app-tag {
214+
color: #07C1E0;
215+
border: 1px solid transparent;
216+
background: #07C1E0;
217+
}
218+
219+
}
220+
221+
}
222+
223+
.app-status-wrap-active {
224+
position: absolute;
225+
right: 0;
226+
top: 6px;
227+
width: 70px;
228+
font-size: 12px;
229+
230+
color: #0c6;
231+
232+
span {
233+
color: #515a6e;
234+
}
235+
}
236+
237+
.app-status-wrap-disable {
238+
239+
position: absolute;
240+
right: 0;
241+
top: 6px;
242+
width: 70px;
243+
font-size: 12px;
244+
color: #ccc;
245+
246+
span {
247+
color: #515a6e;
248+
}
249+
}
250+
251+
}
252+
253+
.button-wrap {
254+
display: flex;
255+
margin-top: 20px;
256+
// justify-content: center;
257+
258+
.entrace-btn {
259+
margin-right: 10px;
260+
}
261+
}
262+
263+
}
264+
}
265+
266+
}
267+
268+
.input-wrap {
269+
position: absolute;
270+
right: 20px;
271+
top: 20px;
272+
width: 200px;
273+
}
274+
275+
.radio-box .ivu-radio .ivu-radio-inner {
276+
border: 1px solid #2d8cf0;
277+
}

‎web/src/commonData/i18n/common/en.json‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@
490490
"cancel": "Cancel",
491491
"timeout": "Timeout on publishing project {name}!"
492492
},
493-
"tableDetails" : {
493+
"tableDetails": {
494494
"BZBSX": "Table basic attributes",
495495
"BZDXX": "Table column information",
496496
"BTJXX": "Table statistical information",
@@ -1018,6 +1018,20 @@
10181018
},
10191019
"error": {
10201020
"fileExists": "Duplicated file!"
1021+
},
1022+
"home": {
1023+
"welcome": "Welcome to the {text} workspace!",
1024+
"setting": "Seting",
1025+
"exit": "Exit",
1026+
"enter": "Enter {text}",
1027+
"dlgTitle": "New Fast entry",
1028+
"selectType": "Please select category",
1029+
"selectApp": "Please select Application",
1030+
"save": "Save",
1031+
"cancel": "Cancel",
1032+
"running": "running",
1033+
"stop": "disable",
1034+
"searchPlaceholder": "Search application"
10211035
}
10221036
},
10231037
"database": {
@@ -1614,4 +1628,4 @@
16141628
}
16151629
}
16161630
}
1617-
}
1631+
}

‎web/src/commonData/i18n/common/zh.json‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
"WJYCZ": "文件已存在，请选择其它文件或选择其它文件夹！",
294294
"WJMCBHF": "文件名称不合法，仅支持以字母、数字、中文、下划线、中短线且带后缀的命名！",
295295
"SCBCG100": "上传文件不超过100M！",
296-
"SCCG": "文件 {name} 上传成功！",
296+
"SCCG": "文件 {name} 上传成功！",
297297
"WJCCXE": "文件大小超出限额！",
298298
"WJBSC": "资源文件 {name} 已被成功删除！"
299299
}
@@ -490,7 +490,7 @@
490490
"cancel": "关闭",
491491
"timeout": "工程{name}发布超时！"
492492
},
493-
"tableDetails" : {
493+
"tableDetails": {
494494
"BZBSX": "表基本属性",
495495
"BZDXX": "表字段信息",
496496
"BTJXX": "表统计信息",
@@ -534,7 +534,6 @@
534534
"YES": "对",
535535
"GSHJX": "进行格式化成",
536536
"ZJXYGE": "组件需要的格式"
537-
538537
},
539538
"logView": {
540539
"taskId": "任务ID：",
@@ -1019,6 +1018,20 @@
10191018
},
10201019
"error": {
10211020
"fileExists": "该文件已经存在！"
1021+
},
1022+
"home": {
1023+
"welcome": "欢迎来到 {text} 的工作空间!",
1024+
"setting": "设置",
1025+
"exit": "退出设置",
1026+
"enter": "进入{text}",
1027+
"dlgTitle": "新增快速入口",
1028+
"selectType": "请选择分类",
1029+
"selectApp": "请选择系统",
1030+
"save": "保存",
1031+
"cancel": "取消",
1032+
"running": "运行中",
1033+
"stop": "不可用",
1034+
"searchPlaceholder": "搜索应用系统"
10221035
}
10231036
},
10241037
"database": {
@@ -1615,4 +1628,4 @@
16151628
}
16161629
}
16171630
}
1618-
}
1631+
}

‎web/src/js/module/footer/index.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,12 @@
5050
color: $text-color;
5151
}
5252
}
53+
.footer-mask {
54+
position: fixed;
55+
top: -100vh;
56+
left: -100vw;
57+
width: 200vw;
58+
height: 200vh;
59+
background-color: #00000000;
60+
}
61+

‎web/src/js/module/footer/index.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
ref="resourceSimple"
1010
@update-job="updateJob">
1111
</resource-simple>
12+
<div v-if="isMouseMove" class="footer-mask"></div>
1213
<div
1314
:title="msg"
1415
class="footer-channel">

0 commit comments

Comments
 (0)