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

Merge pull request #2498 from dataease/pr@dev@style_scroll

Browse Source 
style: 仪表板编辑滚动条显示优化
This commit is contained in:
王嘉豪 2022-06-24 11:41:39 +08:00 committed by GitHub
commit b1b1e0f58e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2664,12 +2664,12 @@ export default {
background-color: #f7f8fa; background-color: #f7f8fa;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
height: calc(100vh - 75px); height: calc(100vh - 96px);
} }
.view-panel-Mask { .view-panel-Mask {
display: flex; display: flex;
height: calc(100vh - 60px); height: calc(100vh - 80px);
background-color: rgba(92,94,97, 0.7); background-color: rgba(92,94,97, 0.7);
position:absolute; position:absolute;
top:0px; top:0px;
@ -2828,7 +2828,7 @@ span {
} }
.attr-style { .attr-style {
height: calc(100vh - 56px - 60px - 40px - 40px); height: calc(100vh - 76px - 60px - 40px - 40px);
} }
.blackTheme .attr-style { .blackTheme .attr-style {

4
frontend/src/views/chart/view/ChartStyleBatchSet.vue
View File

@ -121,11 +121,11 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
height: calc(100vh - 35px); height: calc(100vh - 56px);
} }
.batch-opt-main{ .batch-opt-main{
height: calc(100vh - 35px); height: calc(100vh - 56px);
overflow-y: hidden; overflow-y: hidden;
width: 100%; width: 100%;
border-left: 1px solid #E6E6E6 border-left: 1px solid #E6E6E6

46
frontend/src/views/panel/SubjectSetting/index.vue
View File

@ -9,28 +9,30 @@
</div> </div>
<!--折叠面板--> <!--折叠面板-->
<div v-if="collapseShow" style="margin: 10px;overflow-y: auto"> <div v-if="collapseShow" style="margin: 10px;overflow-y: auto">
<el-collapse v-model="activeNames" @change="handleChange"> <div>
<el-collapse-item :title="'整体配置'" name="panel"> <el-collapse v-model="activeNames" @change="handleChange">
<el-row class="selector-div"> <el-collapse-item :title="'整体配置'" name="panel">
<overall-setting /> <el-row class="selector-div">
</el-row> <overall-setting />
</el-collapse-item> </el-row>
<el-collapse-item :title="'仪表板背景'" name="panelBackground"> </el-collapse-item>
<background-selector /> <el-collapse-item :title="'仪表板背景'" name="panelBackground">
</el-collapse-item> <background-selector />
<el-collapse-item :title="'组件样式'" name="componentStyle"> </el-collapse-item>
<component-style /> <el-collapse-item :title="'组件样式'" name="componentStyle">
</el-collapse-item> <component-style />
<el-collapse-item :title="'组件配色'" name="graphical"> </el-collapse-item>
<panel-color-selector @onColorChange="onColorChange" /> <el-collapse-item :title="'组件配色'" name="graphical">
</el-collapse-item> <panel-color-selector @onColorChange="onColorChange" />
<el-collapse-item :title="'图表标题'" name="table"> </el-collapse-item>
<view-title @onTextChange="onTextChange" /> <el-collapse-item :title="'图表标题'" name="table">
</el-collapse-item> <view-title @onTextChange="onTextChange" />
<el-collapse-item :title="'过滤组件'" name="filterComponent"> </el-collapse-item>
<FilterStyleSelector /> <el-collapse-item :title="'过滤组件'" name="filterComponent">
</el-collapse-item> <FilterStyleSelector />
</el-collapse> </el-collapse-item>
</el-collapse>
</div>
</div> </div>
</el-row> </el-row>
</template> </template>

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

@ -126,7 +126,6 @@
</div> </div>
</div> </div>
</de-aside-container> </de-aside-container>
<!--画布区域--> <!--画布区域-->
<de-main-container id="canvasInfo-main"> <de-main-container id="canvasInfo-main">
<!--左侧抽屉--> <!--左侧抽屉-->
@ -141,12 +140,12 @@
:close-on-press-escape="false" :close-on-press-escape="false"
:modal-append-to-body="true" :modal-append-to-body="true"
> >
<!-- <view-select v-show=" show && showIndex===0" @newChart="newChart" />--> <div style="width: 295px">
<filter-group v-show=" show &&showIndex===1" /> <filter-group v-show=" show &&showIndex===1" />
<subject-setting v-show=" show &&showIndex===2" /> <subject-setting v-show=" show &&showIndex===2" />
<assist-component v-show=" show &&showIndex===3" /> <assist-component v-show=" show &&showIndex===3" />
</div>
</el-drawer> </el-drawer>
<!--PC端画布区域--> <!--PC端画布区域-->
<div <div
v-if="!previewVisible&&!mobileLayoutStatus" v-if="!previewVisible&&!mobileLayoutStatus"

3
frontend/src/views/panel/filter/index.vue
View File

@ -1,12 +1,9 @@
<template> <template>
<div class="filter-container" @dragstart="handleDragStart" @dragend="handleDragEnd()"> <div class="filter-container" @dragstart="handleDragStart" @dragend="handleDragEnd()">
<div v-for="(item, key) in widgetSubjects" :key="key" class="widget-subject"> <div v-for="(item, key) in widgetSubjects" :key="key" class="widget-subject">
<div class="filter-header"> <div class="filter-header">
<div class="filter-header-text"> {{ key }} </div> <div class="filter-header-text"> {{ key }} </div>
</div> </div>
<div class="filter-widget-content"> <div class="filter-widget-content">
<div <div
v-for="(widget, index) in item" v-for="(widget, index) in item"