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

Merge pull request #3292 from dataease/pr@dev@fix_map_zoom_color

Browse Source 
fix(视图-地图): 缩放按钮背景色跟随主题色变化
This commit is contained in:
fit2cloud-chenyw 2022-10-06 16:23:01 +08:00 committed by GitHub
commit 64681d22bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/canvas/components/Editor/Preview.vue
View File

@ -52,7 +52,7 @@
<svg-icon icon-class="ds-excel" class="ds-icon-excel" />{{ $t('chart.export') }}Excel
</el-button>
</span>
<UserViewDialog v-if="chartDetailsVisible" ref="userViewDialog" :open-type="showChartInfoType" :chart="showChartInfo" :chart-table="showChartTableInfo" />
<UserViewDialog v-if="chartDetailsVisible" ref="userViewDialog" :canvas-style-data="canvasStyleData" :open-type="showChartInfoType" :chart="showChartInfo" :chart-table="showChartTableInfo" />
</el-dialog>
<!--手机视图详情-->
@ -62,7 +62,7 @@
class="mobile-dialog-css"
:destroy-on-close="true"
>
<UserViewMobileDialog v-if="mobileChartDetailsVisible" :chart="showChartInfo" :chart-table="showChartTableInfo" />
<UserViewMobileDialog v-if="mobileChartDetailsVisible" :canvas-style-data="canvasStyleData" :chart="showChartInfo" :chart-table="showChartTableInfo" />
</el-dialog>
</div>
</div>

3
frontend/src/components/canvas/components/Editor/PreviewMobile.vue
View File

@ -18,6 +18,7 @@
:key="index"
:config="item"
:search-count="searchCount"
:canvas-style-data="canvasStyleData"
:in-screen="inScreen"
/>
<!--视图详情-->
@ -33,7 +34,7 @@
{{ $t('chart.export_details') }}
</el-button>
</span>
<UserViewDialog ref="userViewDialog" :chart="showChartInfo" :chart-table="showChartTableInfo" />
<UserViewDialog ref="userViewDialog" :canvas-style-data="canvasStyleData" :chart="showChartInfo" :chart-table="showChartTableInfo" />
</el-dialog>
</div>
</div>

1
frontend/src/components/canvas/components/Editor/index.vue
View File

@ -153,6 +153,7 @@
ref="userViewDialog"
:chart="showChartInfo"
:chart-table="showChartTableInfo"
:canvas-style-data="canvasStyleData"
:open-type="showChartInfoType"
/>
</el-dialog>

1
frontend/src/components/canvas/custom-component/UserView.vue
View File

@ -36,6 +36,7 @@
:terminal-type="scaleCoefficientType"
:scale="scale"
:theme-style="element.commonBackground"
:canvas-style-data="canvasStyleData"
class="chart-class"
@onChartClick="chartClick"
@onJumpClick="jumpClick"

2
frontend/src/components/canvas/custom-component/UserViewDialog.vue
View File

@ -9,6 +9,7 @@
:obj="{chart: mapChart || chart}"
:chart="mapChart || chart"
:theme-style="element.commonBackground"
:canvas-style-data="canvasStyleData"
class="chart-class"
/>
<chart-component v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'" :theme-style="element.commonBackground" class="chart-class" :chart="mapChart || chart" />
@ -60,6 +61,7 @@ export default {
type: String,
default: 'details'
}
},
data() {
return {

2
frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue
View File

@ -8,6 +8,7 @@
:obj="{chart: mapChart || chart}"
:chart="mapChart || chart"
:theme-style="element.commonBackground"
:canvas-style-data="canvasStyleData"
class="chart-class"
/>
<chart-component v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'" :theme-style="element.commonBackground" class="chart-class" :chart="mapChart || chart" />
@ -49,6 +50,7 @@ export default {
type: Object,
default: null
}
},
data() {
return {