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

Merge pull request #278 from dataease/pr@dev@refactor_界面样式调整

Browse Source 
refactor: 界面样式调整
This commit is contained in:
XiaJunjie2020 2021-07-22 10:50:14 +08:00 committed by GitHub
commit 2d7b9abc11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,6 +243,7 @@ div:focus {
font-size: 10px; font-size: 10px;
@extend %field-icon; @extend %field-icon;
color: #999999; color: #999999;
margin: 0 2px 1px 0;
} }
.ds-icon-scene{ .ds-icon-scene{
width: 13px; width: 13px;

4
frontend/src/views/chart/components/drag-item/QuotaItem.vue
View File

@ -218,7 +218,9 @@ export default {
.summary-span{ .summary-span{
margin-left: 4px; margin-left: 4px;
color: #878d9f;; color: #878d9f;
position: absolute;
right: 30px;
} }
.inner-dropdown-menu{ .inner-dropdown-menu{

35
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -217,9 +217,8 @@
</div> </div>
<div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style"> <div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style">
<el-row style="height: 100%;"> <el-row style="height: 100%;">
<el-row v-if="chart.type ==='map'" class="padding-lr"> <el-row v-if="view.type ==='map'" class="padding-lr">
<span style="width: 80px;text-align: right;"> <span style="width: 80px;text-align: right;">
<span>{{ $t('chart.map_range') }}</span> <span>{{ $t('chart.map_range') }}</span>
</span> </span>
<span class="tree-select-span"> <span class="tree-select-span">
@ -234,14 +233,14 @@
/> />
</span> </span>
</el-row> </el-row>
<el-row v-if="chart.type !=='text' && chart.type !== 'gauge'" class="padding-lr"> <el-row v-if="view.type !=='text' && view.type !== 'gauge'" class="padding-lr">
<span style="width: 80px;text-align: right;"> <span style="width: 80px;text-align: right;">
<span v-if="chart.type && chart.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span> <span v-if="view.type && view.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span>
<span v-else-if="chart.type && (chart.type.includes('bar') || chart.type.includes('line'))">{{ $t('chart.drag_block_type_axis') }}</span> <span v-else-if="view.type && (view.type.includes('bar') || view.type.includes('line'))">{{ $t('chart.drag_block_type_axis') }}</span>
<span v-else-if="chart.type && chart.type.includes('pie')">{{ $t('chart.drag_block_pie_label') }}</span> <span v-else-if="view.type && view.type.includes('pie')">{{ $t('chart.drag_block_pie_label') }}</span>
<span v-else-if="chart.type && chart.type.includes('funnel')">{{ $t('chart.drag_block_funnel_split') }}</span> <span v-else-if="view.type && view.type.includes('funnel')">{{ $t('chart.drag_block_funnel_split') }}</span>
<span v-else-if="chart.type && chart.type.includes('radar')">{{ $t('chart.drag_block_radar_label') }}</span> <span v-else-if="view.type && view.type.includes('radar')">{{ $t('chart.drag_block_radar_label') }}</span>
<span v-else-if="chart.type && chart.type.includes('map')">{{ $t('chart.area') }}</span> <span v-else-if="view.type && view.type.includes('map')">{{ $t('chart.area') }}</span>
/ /
<span>{{ $t('chart.dimension') }}</span> <span>{{ $t('chart.dimension') }}</span>
</span> </span>
@ -261,14 +260,14 @@
</el-row> </el-row>
<el-row class="padding-lr" style="margin-top: 6px;"> <el-row class="padding-lr" style="margin-top: 6px;">
<span style="width: 80px;text-align: right;"> <span style="width: 80px;text-align: right;">
<span v-if="chart.type && chart.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span> <span v-if="view.type && view.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span>
<span v-else-if="chart.type && (chart.type.includes('bar') || chart.type.includes('line'))">{{ $t('chart.drag_block_value_axis') }}</span> <span v-else-if="view.type && (view.type.includes('bar') || view.type.includes('line'))">{{ $t('chart.drag_block_value_axis') }}</span>
<span v-else-if="chart.type && chart.type.includes('pie')">{{ $t('chart.drag_block_pie_angel') }}</span> <span v-else-if="view.type && view.type.includes('pie')">{{ $t('chart.drag_block_pie_angel') }}</span>
<span v-else-if="chart.type && chart.type.includes('funnel')">{{ $t('chart.drag_block_funnel_width') }}</span> <span v-else-if="view.type && view.type.includes('funnel')">{{ $t('chart.drag_block_funnel_width') }}</span>
<span v-else-if="chart.type && chart.type.includes('radar')">{{ $t('chart.drag_block_radar_length') }}</span> <span v-else-if="view.type && view.type.includes('radar')">{{ $t('chart.drag_block_radar_length') }}</span>
<span v-else-if="chart.type && chart.type.includes('gauge')">{{ $t('chart.drag_block_gauge_angel') }}</span> <span v-else-if="view.type && view.type.includes('gauge')">{{ $t('chart.drag_block_gauge_angel') }}</span>
<span v-else-if="chart.type && chart.type.includes('text')">{{ $t('chart.drag_block_label_value') }}</span> <span v-else-if="view.type && view.type.includes('text')">{{ $t('chart.drag_block_label_value') }}</span>
<span v-else-if="chart.type && chart.type.includes('map')">{{ $t('chart.chart_data') }}</span> <span v-else-if="view.type && view.type.includes('map')">{{ $t('chart.chart_data') }}</span>
/ /
<span>{{ $t('chart.quota') }}</span> <span>{{ $t('chart.quota') }}</span>
</span> </span>
@ -286,7 +285,7 @@
</transition-group> </transition-group>
</draggable> </draggable>
</el-row> </el-row>
<el-row v-if="chart.type && chart.type.includes('stack')" class="padding-lr" style="margin-top: 6px;"> <el-row v-if="view.type && view.type.includes('stack')" class="padding-lr" style="margin-top: 6px;">
<span style="width: 80px;text-align: right;"> <span style="width: 80px;text-align: right;">
<span>{{ $t('chart.stack_item') }}</span> <span>{{ $t('chart.stack_item') }}</span>
/ /