From 24589b12aa3254591fce2729a39a01abfa444aff Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 17 Sep 2021 11:25:15 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=9F=A9?=
=?UTF-8?q?=E5=BD=A2=EF=BC=8C=E6=96=87=E5=AD=97=E7=BB=84=E4=BB=B6=EF=BC=8C?=
=?UTF-8?q?=E9=97=B4=E9=9A=99=E7=AD=89=E9=BB=98=E8=AE=A4=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/components/DeDrag/index.vue | 6 +++++-
.../canvas/components/Editor/ComponentWrapper.vue | 2 +-
.../components/canvas/components/Editor/Preview.vue | 2 +-
.../src/components/canvas/components/Editor/index.vue | 3 +--
.../canvas/custom-component/component-list.js | 10 +++++-----
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index 9c31fc37b3..5828cae258 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -32,7 +32,7 @@
>
-
@@ -1712,6 +1712,10 @@ export default {
opacity: 0.5;
}
+.gap_class{
+ padding:5px;
+}
+
/*.mouseOn >>> .icon-shezhi{*/
/* z-index: 2;*/
/* display:block!important;*/
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 51bc67d471..508622ff35 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -127,7 +127,7 @@ export default {
box-shadow:0px 0px 7px #0a7be0;
}
.gap_class{
- padding:3px;
+ padding:5px;
}
.component-custom {
outline: none;
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index e73b426c00..1a36d8fc36 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -259,7 +259,7 @@ export default {
color: #9ea6b2;
}
.gap_class{
- padding:3px;
+ padding:5px;
}
.dialog-css>>>.el-dialog__title {
font-size: 14px;
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 00fe06832b..eb7655680a 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -32,7 +32,6 @@
:active="item === curComponent"
:element="item"
class-name-active="de-drag-active"
- :class="{'gap_class':canvasStyleData.panel.gap==='yes'}"
:snap="true"
:snap-tolerance="2"
:change-style="customStyle"
@@ -671,7 +670,7 @@ export default {
}
.gap_class{
- padding:3px;
+ padding:5px;
}
// 拖拽组件样式
diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js
index 9a3ecfd7fc..391d1590ba 100644
--- a/frontend/src/components/canvas/custom-component/component-list.js
+++ b/frontend/src/components/canvas/custom-component/component-list.js
@@ -51,9 +51,9 @@ const list = [
icon: 'wenben',
type: 'v-text',
style: {
- width: 300,
+ width: 400,
height: 100,
- fontSize: 18,
+ fontSize: 22,
fontWeight: 400,
lineHeight: '',
letterSpacing: 0,
@@ -120,10 +120,10 @@ const list = [
icon: 'juxing',
type: 'rect-shape',
style: {
- width: 200,
- height: 200,
+ width: 400,
+ height: 300,
borderStyle: 'solid',
- borderWidth: 1,
+ borderWidth: 0,
borderColor: '#000000',
backgroundColor: '#ffffff',
borderRadius: 0