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

Merge branch 'dev' of fit2cloud:dataease/dataease into dev

Browse Source
This commit is contained in:
fit2cloud-chenyw 2021-07-30 12:06:01 +08:00
commit ba3b212679
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,6 +215,7 @@ export default {
min-height: 300px; min-height: 300px;
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow-x: hidden;
/*border: 1px solid #E6E6E6;*/ /*border: 1px solid #E6E6E6;*/
background-size: 100% 100% !important; background-size: 100% 100% !important;
.canvas-container { .canvas-container {

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

@ -1245,10 +1245,12 @@ export default {
}, },
changeChart() { changeChart() {
this.view.tableId = this.changeTable.id if (this.view.tableId !== this.changeTable.id) {
this.view.xaxis = [] this.view.tableId = this.changeTable.id
this.view.yaxis = [] this.view.xaxis = []
this.view.customFilter = [] this.view.yaxis = []
this.view.customFilter = []
}
this.save(true, 'chart', false) this.save(true, 'chart', false)
}, },

2
frontend/src/views/chart/view/TableSelector.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<de-container> <de-container>
<de-aside-container> <de-aside-container>
<dataset-group-selector-tree @getTable="getTable" :privileges=privileges :mode=mode :type=type :customType=customType :showMode=showMode /> <dataset-group-selector-tree :privileges="privileges" :mode="mode" :type="type" :custom-type="customType" :show-mode="showMode" @getTable="getTable" />
</de-aside-container> </de-aside-container>
<de-main-container> <de-main-container>
<dataset-table-data :table="table" /> <dataset-table-data :table="table" />

4
frontend/src/views/panel/edit/index.vue
View File

@ -96,6 +96,7 @@
<div <div
id="canvasInfo" id="canvasInfo"
:class="{'style-hidden':canvasStyleData.selfAdaption}"
class="content this_canvas" class="content this_canvas"
:class="{'border-hidden':canvasStyleData.selfAdaption}" :class="{'border-hidden':canvasStyleData.selfAdaption}"
@drop="handleDrop" @drop="handleDrop"
@ -826,6 +827,9 @@ export default {
padding: 1px 15px !important; padding: 1px 15px !important;
} }
} }
.style-hidden{
overflow: hidden;
}
.border-hidden { .border-hidden {
overflow: hidden; overflow: hidden;