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

Merge pull request #5021 from dataease/pr@dev@refactor_style

Browse Source 
refactor(视图插件): 图表类型选择页面图标对齐
This commit is contained in:
wisonic-s 2023-04-13 14:55:51 +08:00 committed by GitHub
commit 7b9431231a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/canvas/customComponent/UserView.vue
View File

@ -141,7 +141,7 @@
style="position: absolute;right: 70px;top:15px" style="position: absolute;right: 70px;top:15px"
> >
<el-button <el-button
v-if="showChartInfoType==='enlarge' && hasDataPermission('export',panelInfo.privileges)&& showChartInfo && showChartInfo.type !== 'symbol-map'" v-if="showChartInfoType==='enlarge' && hasDataPermission('export',panelInfo.privileges)&& showChartInfo && !equalsAny(showChartInfo.type, 'symbol-map', 'flow-map')"
class="el-icon-picture-outline" class="el-icon-picture-outline"
size="mini" size="mini"
:disabled="imageDownloading" :disabled="imageDownloading"
@ -218,6 +218,7 @@ import Vue from 'vue'
import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter' import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog' import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog'
import UserViewMobileDialog from '@/components/canvas/customComponent/UserViewMobileDialog' import UserViewMobileDialog from '@/components/canvas/customComponent/UserViewMobileDialog'
import { equalsAny } from '@/utils/StringUtils'
export default { export default {
name: 'UserView', name: 'UserView',
@ -577,6 +578,7 @@ export default {
} }
}, },
methods: { methods: {
equalsAny,
tabSwitch(tabCanvasId) { tabSwitch(tabCanvasId) {
if (this.charViewS2ShowFlag && tabCanvasId === this.canvasId && this.$refs[this.element.propValue.id]) { if (this.charViewS2ShowFlag && tabCanvasId === this.canvasId && this.$refs[this.element.propValue.id]) {
this.$refs[this.element.propValue.id].chartResize() this.$refs[this.element.propValue.id].chartResize()

10
frontend/src/icons/svg/buddle-map.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 714 KiB

After

Width:  |  Height:  |  Size: 673 KiB

1
frontend/src/icons/svg/buddle-map_mini.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

8
frontend/src/icons/svg/map.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 712 KiB

After

Width:  |  Height:  |  Size: 672 KiB

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

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

2
frontend/src/views/chart/chart/util.js
View File

@ -3220,7 +3220,7 @@ export const TYPE_CONFIGS = [
category: 'chart.chart_type_space', category: 'chart.chart_type_space',
value: 'map', value: 'map',
title: 'chart.chart_map', title: 'chart.chart_map',
icon: 'map', icon: 'map_mini',
properties: [ properties: [
'color-selector', 'color-selector',
'label-selector', 'label-selector',

1
frontend/src/views/chart/view/ChartType.vue
View File

@ -19,7 +19,6 @@
v-for="(item, idx) in container" v-for="(item, idx) in container"
:key="idx" :key="idx"
style="position: relative;display: block;" style="position: relative;display: block;"
:style="{'top': item.isPlugin ? '5px' : '0'}"
> >
<el-radio <el-radio
v-if="item.placeholder" v-if="item.placeholder"