Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DataSphere Studio0.9.0 #180

Merged
merged 11 commits into from
Jun 28, 2020
Merged
172 changes: 95 additions & 77 deletions web/src/assets/iconfont/font-dws-icon.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/src/assets/iconfont/font-dws-icon.ttf
100644 → 100755
Binary file not shown.
Binary file modified web/src/assets/iconfont/font-dws-icon.woff
100644 → 100755
Binary file not shown.
134 changes: 107 additions & 27 deletions web/src/assets/styles/iconfonts.scss

Large diffs are not rendered by default.

277 changes: 277 additions & 0 deletions web/src/assets/styles/workspace.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,277 @@
/*!
* Copyright 2019 WeBank
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
@import './variables.scss';

.page-bgc {
background: rgb(245, 245, 245);
height: 100%;
margin: 0;
display: flex;
flex-direction: column;
//竖轴方向

.page-bgc-header {
padding: 10px 25px 0;
}

.header-title {
font-size: 14px;
font-weight: bold;
padding-left: 5px;
border-left: 3px solid $primary-color;
}

.header-info {
padding: 10px 0 10px 20px;

p {
line-height: 24px;
}
}

}

.app-icon {
font-size: 14px;
height: 30px;
line-height: 30px;
color: #39f;
}

.workspace-main {
padding: 10px 25px;
display: -webkit-box;
display: flex;
-webkit-box-pack: start;
justify-content: flex-start;
-webkit-box-align: start;
align-items: flex-start;

.item-header {
font-size: 14px;
font-weight: bold;
padding-left: 23px;
border-left: 2px solid $primary-color;

}

.left {
flex: 1;
min-height: 137px;
// box-shadow: 0 1px 6px rgba(0,0,0,.2);
border-color: rgba(0,0,0,0);
padding: 0;
}

.right {
// flex: 1;
margin-left: 25px;
min-height: 137px;
width: 500px;
// box-shadow: 0 1px 6px rgba(0,0,0,.2);
border-color: rgba(0,0,0,0);
padding: 0;
}

.setting-bt-wrap {
position: absolute;
right: 20px;
top: 10px;
font-size: 24px;

&.ivu-btn-text {
outline: none;
border: none;
box-shadow: 0 0 0 2px transparent;
}
}

.app-list {
display: flex;
flex-wrap: wrap;
align-items: center;

.app-item-add {
display: flex;
margin: 20px 10px 10px 25px;
padding: 10px;
cursor: pointer;
font-size: 24px;
transition: color .2s linear,background-color .2s linear,border .2s linear,box-shadow .2s linear;

&:hover {
transition: color .2s linear,background-color .2s linear,border .2s linear,box-shadow .2s linear;
color: #39f;

box-shadow: 0 2px 12px 0 rgba(0,0,0,.2);
border-radius: 4px;
}
}

.shadow {
box-shadow: 0 2px 12px 0 rgba(0,0,0,.2);
border-radius: 4px;
}

.app-item-wrap {
display: flex;
position: relative;
margin: 20px 10px 10px 25px;
padding: 10px 30px;
cursor: pointer;
border: 1px solid rgb(245, 245, 245);
border-radius: 3px;

.close-wrap {
position: absolute;
right: -5px;
top: -5px;
color: #39f;
}

&:hover {
box-shadow: 0 2px 12px 0 rgba(0,0,0,.2);
border-radius: 4px;
}

.label {
margin-left: 10px;
// width: 110px;
// font-weight: 700;
font-size: 12px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
line-height: 30px;
height: 30px;
}
}
}
}

.app-list-main {
padding: 0 25px 10px;
// bottom: 0;
flex: auto;

.app-list-tabs {
padding: 20px 20px 20px 22px;

border-radius: 6px;
height: 100%;
position: relative;
-webkit-transition: all .2s ease-in-out;
transition: all .2s ease-in-out;
background-color: #fff;

&:hover {
box-shadow: 0 2px 7px rgba(0,0,0,.15);
border-color: transparent;
position: relative;
}

.pane-wrap {
display: flex;
flex-wrap: wrap;

.pane-item {
float: left;
margin: 10px 100px 0 0;
width: 450px;
}

.app-entrance {
display: flex;

.app-title-wrap {
flex: 1;
font-size: 12px;

.app-title {
display: flex;
align-items: center;
margin-top: -10px;

.title-sub {
margin-right: 10px;
}

.app-tag {
color: #07C1E0;
border: 1px solid transparent;
background: #07C1E0;
}

}

}

.app-status-wrap-active {
position: absolute;
right: 0;
top: 6px;
width: 70px;
font-size: 12px;

color: #0c6;

span {
color: #515a6e;
}
}

.app-status-wrap-disable {

position: absolute;
right: 0;
top: 6px;
width: 70px;
font-size: 12px;
color: #ccc;

span {
color: #515a6e;
}
}

}

.button-wrap {
display: flex;
margin-top: 20px;
// justify-content: center;

.entrace-btn {
margin-right: 10px;
}
}

}
}

}

.input-wrap {
position: absolute;
right: 20px;
top: 20px;
width: 200px;
}

.radio-box .ivu-radio .ivu-radio-inner {
border: 1px solid #2d8cf0;
}
18 changes: 16 additions & 2 deletions web/src/commonData/i18n/common/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@
"cancel": "Cancel",
"timeout": "Timeout on publishing project {name}!"
},
"tableDetails" : {
"tableDetails": {
"BZBSX": "Table basic attributes",
"BZDXX": "Table column information",
"BTJXX": "Table statistical information",
Expand Down Expand Up @@ -1018,6 +1018,20 @@
},
"error": {
"fileExists": "Duplicated file!"
},
"home": {
"welcome": "Welcome to the {text} workspace!",
"setting": "Seting",
"exit": "Exit",
"enter": "Enter {text}",
"dlgTitle": "New Fast entry",
"selectType": "Please select category",
"selectApp": "Please select Application",
"save": "Save",
"cancel": "Cancel",
"running": "running",
"stop": "disable",
"searchPlaceholder": "Search application"
}
},
"database": {
Expand Down Expand Up @@ -1614,4 +1628,4 @@
}
}
}
}
}
21 changes: 17 additions & 4 deletions web/src/commonData/i18n/common/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
"WJYCZ": "文件已存在,请选择其它文件或选择其它文件夹!",
"WJMCBHF": "文件名称不合法,仅支持以字母、数字、中文、下划线、中短线且带后缀的命名!",
"SCBCG100": "上传文件不超过100M!",
"SCCG": "文件 {name} 上传成功!",
"SCCG": "文件 {name} 上传成功!",
"WJCCXE": "文件大小超出限额!",
"WJBSC": "资源文件 {name} 已被成功删除!"
}
Expand Down Expand Up @@ -490,7 +490,7 @@
"cancel": "关闭",
"timeout": "工程{name}发布超时!"
},
"tableDetails" : {
"tableDetails": {
"BZBSX": "表基本属性",
"BZDXX": "表字段信息",
"BTJXX": "表统计信息",
Expand Down Expand Up @@ -534,7 +534,6 @@
"YES": "对",
"GSHJX": "进行格式化成",
"ZJXYGE": "组件需要的格式"

},
"logView": {
"taskId": "任务ID:",
Expand Down Expand Up @@ -1019,6 +1018,20 @@
},
"error": {
"fileExists": "该文件已经存在!"
},
"home": {
"welcome": "欢迎来到 {text} 的工作空间!",
"setting": "设置",
"exit": "退出设置",
"enter": "进入{text}",
"dlgTitle": "新增快速入口",
"selectType": "请选择分类",
"selectApp": "请选择系统",
"save": "保存",
"cancel": "取消",
"running": "运行中",
"stop": "不可用",
"searchPlaceholder": "搜索应用系统"
}
},
"database": {
Expand Down Expand Up @@ -1615,4 +1628,4 @@
}
}
}
}
}
9 changes: 9 additions & 0 deletions web/src/js/module/footer/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,12 @@
color: $text-color;
}
}
.footer-mask {
position: fixed;
top: -100vh;
left: -100vw;
width: 200vw;
height: 200vh;
background-color: #00000000;
}

1 change: 1 addition & 0 deletions web/src/js/module/footer/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
ref="resourceSimple"
@update-job="updateJob">
</resource-simple>
<div v-if="isMouseMove" class="footer-mask"></div>
<div
:title="msg"
class="footer-channel">
Expand Down
Loading