Merge pull request #833 from dataease/pr@dev@refactor_panel-text

refactor:仪表板矩形,文字组件,间隙等默认样式调整
This commit is contained in:
王嘉豪 2021-09-17 11:26:43 +08:00 committed by GitHub
commit 0ba2a80bbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 10 deletions

View File

@ -32,7 +32,7 @@
> >
<slot :name="handlei" /> <slot :name="handlei" />
</div> </div>
<div :style="mainSlotStyle"> <div :style="mainSlotStyle" :class="{'gap_class':canvasStyleData.panel.gap==='yes'}">
<slot /> <slot />
</div> </div>
</div> </div>
@ -1712,6 +1712,10 @@ export default {
opacity: 0.5; opacity: 0.5;
} }
.gap_class{
padding:5px;
}
/*.mouseOn >>> .icon-shezhi{*/ /*.mouseOn >>> .icon-shezhi{*/
/* z-index: 2;*/ /* z-index: 2;*/
/* display:block!important;*/ /* display:block!important;*/

View File

@ -127,7 +127,7 @@ export default {
box-shadow:0px 0px 7px #0a7be0; box-shadow:0px 0px 7px #0a7be0;
} }
.gap_class{ .gap_class{
padding:3px; padding:5px;
} }
.component-custom { .component-custom {
outline: none; outline: none;

View File

@ -259,7 +259,7 @@ export default {
color: #9ea6b2; color: #9ea6b2;
} }
.gap_class{ .gap_class{
padding:3px; padding:5px;
} }
.dialog-css>>>.el-dialog__title { .dialog-css>>>.el-dialog__title {
font-size: 14px; font-size: 14px;

View File

@ -32,7 +32,6 @@
:active="item === curComponent" :active="item === curComponent"
:element="item" :element="item"
class-name-active="de-drag-active" class-name-active="de-drag-active"
:class="{'gap_class':canvasStyleData.panel.gap==='yes'}"
:snap="true" :snap="true"
:snap-tolerance="2" :snap-tolerance="2"
:change-style="customStyle" :change-style="customStyle"
@ -671,7 +670,7 @@ export default {
} }
.gap_class{ .gap_class{
padding:3px; padding:5px;
} }
// //

View File

@ -51,9 +51,9 @@ const list = [
icon: 'wenben', icon: 'wenben',
type: 'v-text', type: 'v-text',
style: { style: {
width: 300, width: 400,
height: 100, height: 100,
fontSize: 18, fontSize: 22,
fontWeight: 400, fontWeight: 400,
lineHeight: '', lineHeight: '',
letterSpacing: 0, letterSpacing: 0,
@ -120,10 +120,10 @@ const list = [
icon: 'juxing', icon: 'juxing',
type: 'rect-shape', type: 'rect-shape',
style: { style: {
width: 200, width: 400,
height: 200, height: 300,
borderStyle: 'solid', borderStyle: 'solid',
borderWidth: 1, borderWidth: 0,
borderColor: '#000000', borderColor: '#000000',
backgroundColor: '#ffffff', backgroundColor: '#ffffff',
borderRadius: 0 borderRadius: 0