dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(frontend):1.操作button样式修改；2.数据源文字fix；3.仪表盘样式fix，先看看，再调整

Browse Source
This commit is contained in:
junjie 2021-05-27 12:04:11 +08:00
parent 5cfc7b0cac
commit d4daade0d3
11 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/lang/tw.js
View File

@ -704,7 +704,7 @@ export default {
custom_data: '自助數據集',
pls_slc_tbl_left: '請從左側選擇表',
add_db_table: '添加數據庫表',
pls_slc_data_source: '選擇數據源鏈接',
pls_slc_data_source: '請選擇數據源',
table: '表',
edit: '編輯',
create_view: '創建視圖',

10
frontend/src/lang/zh.js
View File

@ -277,7 +277,7 @@ export default {
select_module: '选择模块',
default_module: '默认模块'
},
datasource: '数据连接',
datasource: '数据源',
char_can_not_more_50: '名称不能超过50字符',
share_success: '分享成功'
},
@ -531,7 +531,7 @@ export default {
custom_data: '自助数据集',
pls_slc_tbl_left: '请从左侧选视图',
add_db_table: '添加数据库表',
pls_slc_data_source: '请选择数据库连接',
pls_slc_data_source: '请选择数据源',
table: '表',
edit: '编辑',
create_view: '创建试图',
@ -705,7 +705,7 @@ export default {
custom_data: '自助数据集',
pls_slc_tbl_left: '请从左侧选择表',
add_db_table: '添加数据库表',
pls_slc_data_source: '请选择数据库连接',
pls_slc_data_source: '请选择数据源',
table: '表',
edit: '编辑',
create_view: '创建视图',
@ -795,7 +795,7 @@ export default {
},
datasource: {
datasource: '数据源',
create: '新建数据连接',
create: '新建数据源',
type: '类型',
please_choose_type: '请选择数据源类型',
data_base: '数据库名称',
@ -808,7 +808,7 @@ export default {
please_input_password: '请输入密码',
please_input_host: '请输入主机',
please_input_port: '请输入端口',
modify: '编辑数据连接',
modify: '编辑数据源',
validate_success: '校验成功',
validate: '校验',
search_by_name: '根据名称搜索',

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

@ -205,8 +205,9 @@ div:focus {
color: #37b4aa;
}
.ds-icon-scene{
width: 14px;
height: 14px;
width: 13px;
height: 13px;
margin-right: 5px;
color: #0a7be0;
}
.ds-icon-db{

6
frontend/src/views/panel/list/PanelList.vue
View File

@ -85,10 +85,12 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeClickEdit('folder','new',data,node)">
<i class="el-icon-folder" /> &nbsp; <span>{{ $t('panel.groupAdd') }}</span>
<i class="el-icon-folder" />
<span>{{ $t('panel.groupAdd') }}</span>
</el-dropdown-item>
<el-dropdown-item :command="beforeClickEdit('panel','new',data,node)">
<svg-icon icon-class="panel" class="ds-icon-scene" /> &nbsp; <span>{{ $t('panel.panelAdd') }}</span>
<svg-icon icon-class="panel" class="ds-icon-scene" />
<span>{{ $t('panel.panelAdd') }}</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>

16
frontend/src/views/panel/list/PanelMain.vue
View File

@ -1,7 +1,7 @@
<template>
<de-container>
<de-aside-container>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="activeName" class="tab-header" @tab-click="handleClick" type="card" :stretch="true">
<el-tab-pane name="PanelList">
<span slot="label"><i class="el-icon-document" />{{ $t('panel.panel_list') }}</span>
<panel-list />
@ -83,4 +83,18 @@ export default {
padding: 0px;
}
.tab-header>>>.el-tabs__item{
font-size: 13px;
background-color: #E8EAED;
padding: 0 15px;
}
.tab-header>>>.is-active{
background-color: #ffffff;
border-bottom-color: #ffffff!important;
}
.tab-header>>>.el-tabs__nav-scroll{
padding-left: 0!important;
}
</style>

2
frontend/src/views/panel/list/PanelViewShow.vue
View File

@ -3,7 +3,7 @@
<el-col v-if="panelInfo.name.length>0" class="panel-design">
<el-row class="panel-design-head">
<!--TODO 仪表盘头部区域-->
<el-col :span="12" style="text-overflow:ellipsis;overflow: hidden;white-space: nowrap;color: #606266;font-size: 16px">
<el-col :span="12" style="text-overflow:ellipsis;overflow: hidden;white-space: nowrap;font-size: 14px">
<span>{{ panelInfo.name || '测试仪表板' }}</span>
</el-col>
<el-col :span="12">

2
frontend/src/views/system/datasource/index.vue
View File

@ -123,7 +123,7 @@ export default {
columns: [],
buttons: [
{
label: this.$t('commons.edit'), icon: 'el-icon-edit', click: this.edit,
label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit,
show: checkPermission(['datasource:edit'])
}, {
label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this._handleDelete,

2
frontend/src/views/system/dept/index.vue
View File

@ -140,7 +140,7 @@ export default {
columns: [],
buttons: [
{
label: this.$t('commons.edit'), icon: 'el-icon-edit', click: this.edit,
label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit,
show: checkPermission(['dept:edit'])
}, {
label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this._handleDelete,

2
frontend/src/views/system/menu/index.vue
View File

@ -159,7 +159,7 @@ export default {
columns: [],
buttons: [
{
label: this.$t('commons.edit'), icon: 'el-icon-edit', click: this.edit,
label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit,
show: checkPermission(['menu:edit'])
}, {
label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this._handleDelete,

2
frontend/src/views/system/role/index.vue
View File

@ -118,7 +118,7 @@ export default {
columns: [],
buttons: [
{
label: this.$t('commons.edit'), icon: 'el-icon-edit', click: this.edit
label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit
}, {
label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.handleDelete
}

4
frontend/src/views/system/user/index.vue
View File

@ -164,13 +164,13 @@ export default {
columns: [],
buttons: [
{
label: this.$t('commons.edit'), icon: 'el-icon-edit', click: this.edit,
label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit,
show: checkPermission(['user:edit'])
}, {
label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.del,
show: checkPermission(['user:del'])
}, {
label: this.$t('member.edit_password'), icon: 'el-icon-s-tools', type: 'danger', click: this.editPassword,
label: this.$t('member.edit_password'), icon: 'el-icon-s-tools', type: 'success', click: this.editPassword,
show: checkPermission(['user:editPwd'])
}
],