Skip to content

Commit 723bd16

Browse files
det101det101
committed
add workspace featrue
1 parent 80c9dc1 commit 723bd16

File tree

16 files changed

+1009
-428
lines changed

16 files changed

+1009
-428
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: 170 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -16,86 +16,13 @@
1616
*/
1717
@import './variables.scss';
1818

19-
.entry {
20-
font-size: 16px;
21-
height: 120px;
22-
line-height: 120px;
23-
background: #515a6e;
24-
margin: 10px 30px 10px 10px;
25-
color: #FFF;
26-
text-align: center;
27-
cursor: pointer;
28-
29-
&:hover {
30-
font-weight: 600;
31-
32-
.icon-blod {
33-
font-weight: 600;
34-
}
35-
}
36-
}
37-
38-
.no-data-bgc {
39-
font-size: 14px;
40-
position: absolute;
41-
top: 0;
42-
bottom: 40px;
19+
.page-bgc {
20+
background: rgb(245, 245, 245);
21+
height: 100%;
22+
margin: 0;
4323
display: flex;
4424
flex-direction: column;
45-
align-items: center;
46-
justify-content: center;
47-
48-
.no-data-img {
49-
width: 200px;
50-
margin-top: 150px;
51-
}
52-
53-
.bg-text {
54-
width: 60%;
55-
text-align: left;
56-
display: block;
57-
line-height: 40px;
58-
59-
&.weight {
60-
margin-top: 10px;
61-
font-weight: bold;
62-
}
63-
64-
&.indent {
65-
text-indent: 2em;
66-
}
67-
}
68-
}
69-
70-
.icon-blod {
71-
margin-right: 2px;
72-
}
73-
74-
.sort-icon {
75-
margin-top: 10px;
76-
margin-right: 8%;
77-
float: right;
78-
color: #2d8cf0;
79-
cursor: pointer;
80-
}
81-
82-
.icon {
83-
margin-left: 5px;
84-
color: #2d8cf0;
85-
}
86-
87-
.header-search {
88-
padding: 0 35px;
89-
overflow: hidden;
90-
91-
.search-input {
92-
width: 200px;
93-
}
94-
}
95-
96-
.page-bgc {
97-
background-color: #f7f7f7;
98-
background: #fff;
25+
//竖轴方向
9926

10027
.page-bgc-header {
10128
padding: 10px 25px 0;
@@ -118,6 +45,13 @@
11845

11946
}
12047

48+
.app-icon {
49+
font-size: 14px;
50+
height: 30px;
51+
line-height: 30px;
52+
color: #39f;
53+
}
54+
12155
.workspace-main {
12256
padding: 10px 25px;
12357
display: -webkit-box;
@@ -130,33 +64,82 @@
13064
.item-header {
13165
font-size: 14px;
13266
font-weight: bold;
133-
padding-left: 5px;
134-
border-left: 3px solid $primary-color;
67+
padding-left: 23px;
68+
border-left: 2px solid $primary-color;
69+
13570
}
13671

13772
.left {
13873
flex: 1;
139-
box-shadow: 0 1px 6px rgba(0,0,0,.2);
140-
border-color: #eee;
74+
// box-shadow: 0 1px 6px rgba(0,0,0,.2);
75+
border-color: rgba(0,0,0,0);
14176
padding: 0;
14277
}
14378

14479
.right {
80+
// flex: 1;
14581
margin-left: 25px;
14682
width: 500px;
147-
box-shadow: 0 1px 6px rgba(0,0,0,.2);
148-
border-color: #eee;
83+
// box-shadow: 0 1px 6px rgba(0,0,0,.2);
84+
border-color: rgba(0,0,0,0);
14985
padding: 0;
15086
}
15187

88+
.setting-bt-wrap {
89+
position: absolute;
90+
right: 20px;
91+
top: 10px;
92+
font-size: 24px;
93+
94+
&.ivu-btn-text {
95+
outline: none;
96+
border: none;
97+
box-shadow: 0 0 0 2px transparent;
98+
}
99+
}
100+
152101
.app-list {
153102
display: flex;
103+
flex-wrap: wrap;
104+
align-items: center;
154105

155-
.app-item-wrap {
106+
.app-item-add {
156107
display: flex;
157-
margin: 20px 10px 10px 50px;
108+
margin: 20px 10px 10px 25px;
158109
padding: 10px;
159110
cursor: pointer;
111+
font-size: 24px;
112+
transition: color .2s linear,background-color .2s linear,border .2s linear,box-shadow .2s linear;
113+
114+
&:hover {
115+
transition: color .2s linear,background-color .2s linear,border .2s linear,box-shadow .2s linear;
116+
color: #39f;
117+
118+
box-shadow: 0 2px 12px 0 rgba(0,0,0,.2);
119+
border-radius: 4px;
120+
}
121+
}
122+
123+
.shadow {
124+
box-shadow: 0 2px 12px 0 rgba(0,0,0,.2);
125+
border-radius: 4px;
126+
}
127+
128+
.app-item-wrap {
129+
display: flex;
130+
position: relative;
131+
margin: 20px 10px 10px 25px;
132+
padding: 10px 30px;
133+
cursor: pointer;
134+
border: 1px solid rgb(245, 245, 245);
135+
border-radius: 3px;
136+
137+
.close-wrap {
138+
position: absolute;
139+
right: -5px;
140+
top: -5px;
141+
color: #39f;
142+
}
160143

161144
&:hover {
162145
box-shadow: 0 2px 12px 0 rgba(0,0,0,.2);
@@ -165,9 +148,9 @@
165148

166149
.label {
167150
margin-left: 10px;
168-
width: 110px;
169-
font-weight: 700;
170-
font-size: 14px;
151+
// width: 110px;
152+
// font-weight: 700;
153+
font-size: 12px;
171154
overflow: hidden;
172155
text-overflow: ellipsis;
173156
white-space: nowrap;
@@ -178,21 +161,106 @@
178161
}
179162
}
180163

181-
.app-list-tabs {
182-
flex: 1;
183-
// border: 1px solid #eee;
184-
padding: 20px;
185-
border-radius: 6px;
186-
margin-bottom: 20px;
187-
position: relative;
188-
-webkit-transition: all .2s ease-in-out;
189-
transition: all .2s ease-in-out;
190-
191-
&:hover {
192-
box-shadow: 0 2px 7px rgba(0,0,0,.15);
193-
border-color: transparent;
164+
.app-list-main {
165+
padding: 0 25px 10px;
166+
// bottom: 0;
167+
flex: auto;
168+
169+
.app-list-tabs {
170+
padding: 20px 20px 20px 22px;
171+
172+
border-radius: 6px;
173+
height: 100%;
194174
position: relative;
175+
-webkit-transition: all .2s ease-in-out;
176+
transition: all .2s ease-in-out;
177+
background-color: #fff;
178+
179+
&:hover {
180+
box-shadow: 0 2px 7px rgba(0,0,0,.15);
181+
border-color: transparent;
182+
position: relative;
183+
}
184+
185+
.pane-wrap {
186+
display: flex;
187+
flex-wrap: wrap;
188+
189+
.pane-item {
190+
float: left;
191+
margin: 10px 100px 20px 0;
192+
width: 450px;
193+
}
194+
195+
.app-entrance {
196+
display: flex;
197+
198+
.app-title-wrap {
199+
flex: 1;
200+
font-size: 12px;
201+
202+
.app-title {
203+
display: flex;
204+
align-items: center;
205+
margin-top: -10px;
206+
207+
.title-sub {
208+
margin-right: 10px;
209+
}
210+
211+
.app-tag {
212+
color: #07C1E0;
213+
border: 1px solid transparent;
214+
background: #07C1E0;
215+
}
216+
217+
}
218+
219+
}
220+
221+
.app-status-wrap-active {
222+
position: absolute;
223+
right: 0;
224+
top: 6px;
225+
width: 70px;
226+
font-size: 12px;
227+
228+
color: #0c6;
229+
230+
span {
231+
color: #515a6e;
232+
}
233+
}
234+
235+
.app-status-wrap-disable {
236+
237+
position: absolute;
238+
right: 0;
239+
top: 6px;
240+
width: 70px;
241+
font-size: 12px;
242+
color: #ccc;
243+
244+
span {
245+
color: #515a6e;
246+
}
247+
}
248+
249+
}
250+
251+
.button-wrap {
252+
display: flex;
253+
margin-top: 20px;
254+
// justify-content: center;
255+
256+
.entrace-btn {
257+
margin-right: 10px;
258+
}
259+
}
260+
261+
}
195262
}
263+
196264
}
197265

198266
.input-wrap {

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

Lines changed: 18 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,21 @@
10191018
},
10201019
"error": {
10211020
"fileExists": "该文件已经存在！"
1021+
},
1022+
"home": {
1023+
"adminArea": "管理员功能",
1024+
"welcome": "欢迎来到 {text} 的工作空间!",
1025+
"setting": "设置",
1026+
"exit": "退出设置",
1027+
"enter": "进入{text}",
1028+
"dlgTitle": "新增快速入口",
1029+
"selectType": "请选择分类",
1030+
"selectApp": "请选择系统",
1031+
"save": "保存",
1032+
"cancel": "取消",
1033+
"running": "运行中",
1034+
"stop": "不可用",
1035+
"searchPlaceholder": "搜索应用系统"
10221036
}
10231037
},
10241038
"database": {
@@ -1615,4 +1629,4 @@
16151629
}
16161630
}
16171631
}
1618-
}
1632+
}

0 commit comments

Comments
 (0)