center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat(frontend):UI fix

Browse Source
This commit is contained in:
junjie 2021-04-12 18:43:13 +08:00
parent 7787aa1c05
commit a11eb21c80
5 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/icons/svg/scene.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1618223542845" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6672" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M592 336H176c-52.928 0-96 43.072-96 96v416c0 52.928 43.072 96 96 96h416c52.928 0 96-43.072 96-96V432c0-52.928-43.072-96-96-96z m32 512a32 32 0 0 1-32 32H176c-17.632 0-32-14.336-32-32V432c0-17.632 14.368-32 32-32h416c17.664 0 32 14.368 32 32v416z" p-id="6673"></path><path d="M720 208H304a32 32 0 0 0 0 64h416c17.664 0 32 14.368 32 32v416a32 32 0 1 0 64 0V304c0-52.928-43.072-96-96-96zM528 752H240a32 32 0 1 0 0 64h288a32 32 0 1 0 0-64z" p-id="6674"></path><path d="M848 80H432a32 32 0 0 0 0 64h416c17.664 0 32 14.368 32 32v416a32 32 0 1 0 64 0V176c0-52.928-43.072-96-96-96z" p-id="6675"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 978 B

29
frontend/src/styles/index.scss
View File

@ -188,3 +188,32 @@ div:focus {
@extend %field-icon;
color: #37b4aa;
}
.ds-icon-scene{
width: 14px;
height: 14px;
color: #faaa39;
}
.ds-icon-db{
width: 14px;
height: 14px;
color: #3685f2;
margin: 0 2px 0 0;
}
.ds-icon-sql{
width: 14px;
height: 14px;
color: #faaa39;
margin: 0 2px 0 0;
}
.ds-icon-excel{
width: 14px;
height: 14px;
color: #13cd66;
margin: 0 2px 0 0;
}
.ds-icon-custom{
width: 14px;
height: 14px;
color: #23beef;
margin: 0 2px 0 0;
}

11
frontend/src/views/chart/group/Group.vue
View File

@ -44,11 +44,12 @@
<span slot-scope="{ node, data }" class="custom-tree-node">
<span>
<span v-if="data.type === 'scene'">
<el-button
icon="el-icon-folder"
type="text"
size="mini"
/>
<!-- <el-button-->
<!-- icon="el-icon-folder-opened"-->
<!-- type="text"-->
<!-- size="mini"-->
<!-- />-->
<svg-icon icon-class="scene" class="ds-icon-scene" />
</span>
<span style="margin-left: 6px">{{ data.name }}</span>
</span>

16
frontend/src/views/dataset/common/DatasetGroupSelector.vue
View File

@ -35,11 +35,12 @@
<span slot-scope="{ node, data }" class="custom-tree-node">
<span>
<span v-if="data.type === 'scene'">
<el-button
icon="el-icon-folder"
type="text"
size="mini"
/>
<!-- <el-button-->
<!-- icon="el-icon-folder-opened"-->
<!-- type="text"-->
<!-- size="mini"-->
<!-- />-->
<svg-icon icon-class="scene" class="ds-icon-scene" />
</span>
<span style="margin-left: 6px">{{ data.name }}</span>
</span>
@ -83,7 +84,10 @@
<span slot-scope="{ node, data }" class="custom-tree-node-list">
<span>
<span>
<svg-icon :icon-class="data.type" class="icon" />
<svg-icon v-if="data.type === 'db'" icon-class="ds-db" class="ds-icon-db" />
<svg-icon v-if="data.type === 'sql'" icon-class="ds-sql" class="ds-icon-sql" />
<svg-icon v-if="data.type === 'excel'" icon-class="ds-excel" class="ds-icon-excel" />
<svg-icon v-if="data.type === 'custom'" icon-class="ds-custom" class="ds-icon-custom" />
</span>
<span>
<span v-if="data.mode === 0" style="margin-left: 6px"><i class="el-icon-s-operation" /></span>

36
frontend/src/views/dataset/group/Group.vue
View File

@ -44,11 +44,12 @@
<span slot-scope="{ node, data }" class="custom-tree-node">
<span>
<span v-if="data.type === 'scene'">
<el-button
icon="el-icon-folder"
type="text"
size="mini"
/>
<!-- <el-button-->
<!-- icon="el-icon-folder-opened"-->
<!-- type="text"-->
<!-- size="mini"-->
<!-- />-->
<svg-icon icon-class="scene" class="ds-icon-scene" />
</span>
<span style="margin-left: 6px">{{ data.name }}</span>
</span>
@ -585,31 +586,6 @@ export default {
</script>
<style scoped>
.ds-icon-db{
width: 14px;
height: 14px;
color: #3685f2;
margin: 0 2px 0 0;
}
.ds-icon-sql{
width: 14px;
height: 14px;
color: #faaa39;
margin: 0 2px 0 0;
}
.ds-icon-excel{
width: 14px;
height: 14px;
color: #13cd66;
margin: 0 2px 0 0;
}
.ds-icon-custom{
width: 14px;
height: 14px;
color: #23beef;
margin: 0 2px 0 0;
}
.el-divider--horizontal {
margin: 12px 0
}