forked from github/dataease
Merge pull request #3292 from dataease/pr@dev@fix_map_zoom_color
fix(视图-地图): 缩放按钮背景色跟随主题色变化
This commit is contained in:
commit
64681d22bd
@ -52,7 +52,7 @@
|
|||||||
<svg-icon icon-class="ds-excel" class="ds-icon-excel" />{{ $t('chart.export') }}Excel
|
<svg-icon icon-class="ds-excel" class="ds-icon-excel" />{{ $t('chart.export') }}Excel
|
||||||
</el-button>
|
</el-button>
|
||||||
</span>
|
</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>
|
</el-dialog>
|
||||||
|
|
||||||
<!--手机视图详情-->
|
<!--手机视图详情-->
|
||||||
@ -62,7 +62,7 @@
|
|||||||
class="mobile-dialog-css"
|
class="mobile-dialog-css"
|
||||||
:destroy-on-close="true"
|
: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>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
:key="index"
|
:key="index"
|
||||||
:config="item"
|
:config="item"
|
||||||
:search-count="searchCount"
|
:search-count="searchCount"
|
||||||
|
:canvas-style-data="canvasStyleData"
|
||||||
:in-screen="inScreen"
|
:in-screen="inScreen"
|
||||||
/>
|
/>
|
||||||
<!--视图详情-->
|
<!--视图详情-->
|
||||||
@ -33,7 +34,7 @@
|
|||||||
{{ $t('chart.export_details') }}
|
{{ $t('chart.export_details') }}
|
||||||
</el-button>
|
</el-button>
|
||||||
</span>
|
</span>
|
||||||
<UserViewDialog ref="userViewDialog" :chart="showChartInfo" :chart-table="showChartTableInfo" />
|
<UserViewDialog ref="userViewDialog" :canvas-style-data="canvasStyleData" :chart="showChartInfo" :chart-table="showChartTableInfo" />
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -153,6 +153,7 @@
|
|||||||
ref="userViewDialog"
|
ref="userViewDialog"
|
||||||
:chart="showChartInfo"
|
:chart="showChartInfo"
|
||||||
:chart-table="showChartTableInfo"
|
:chart-table="showChartTableInfo"
|
||||||
|
:canvas-style-data="canvasStyleData"
|
||||||
:open-type="showChartInfoType"
|
:open-type="showChartInfoType"
|
||||||
/>
|
/>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
@ -36,6 +36,7 @@
|
|||||||
:terminal-type="scaleCoefficientType"
|
:terminal-type="scaleCoefficientType"
|
||||||
:scale="scale"
|
:scale="scale"
|
||||||
:theme-style="element.commonBackground"
|
:theme-style="element.commonBackground"
|
||||||
|
:canvas-style-data="canvasStyleData"
|
||||||
class="chart-class"
|
class="chart-class"
|
||||||
@onChartClick="chartClick"
|
@onChartClick="chartClick"
|
||||||
@onJumpClick="jumpClick"
|
@onJumpClick="jumpClick"
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
:obj="{chart: mapChart || chart}"
|
:obj="{chart: mapChart || chart}"
|
||||||
:chart="mapChart || chart"
|
:chart="mapChart || chart"
|
||||||
:theme-style="element.commonBackground"
|
:theme-style="element.commonBackground"
|
||||||
|
:canvas-style-data="canvasStyleData"
|
||||||
class="chart-class"
|
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" />
|
<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,
|
type: String,
|
||||||
default: 'details'
|
default: 'details'
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
:obj="{chart: mapChart || chart}"
|
:obj="{chart: mapChart || chart}"
|
||||||
:chart="mapChart || chart"
|
:chart="mapChart || chart"
|
||||||
:theme-style="element.commonBackground"
|
:theme-style="element.commonBackground"
|
||||||
|
:canvas-style-data="canvasStyleData"
|
||||||
class="chart-class"
|
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" />
|
<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,
|
type: Object,
|
||||||
default: null
|
default: null
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
Loading…
Reference in New Issue
Block a user