From f2bda7578eed27294a561dc75ac6f52e3b7a394d Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 26 Oct 2022 10:29:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=93=8D=E4=BD=9C=E9=9D=A2=E6=9D=BF=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4#3442?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/components/Editor/DeEditor.vue  |  8 ++++----
 .../components/canvas/components/Editor/Preview.vue   |  2 +-
 frontend/src/components/dataease/DeOutWidget.vue      |  2 +-
 frontend/src/store/index.js                           |  4 ++--
 frontend/src/views/chart/view/ChartStyle.vue          | 11 ++++++++++-
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/DeEditor.vue b/frontend/src/components/canvas/components/Editor/DeEditor.vue
index 570bacde68..eccbc53c7c 100644
--- a/frontend/src/components/canvas/components/Editor/DeEditor.vue
+++ b/frontend/src/components/canvas/components/Editor/DeEditor.vue
@@ -65,8 +65,8 @@
       <de-out-widget
         v-if="renderOk && item.type==='custom'"
         :id="'component' + item.id"
-        :canvas-id="canvasId"
         ref="wrapperChild"
+        :canvas-id="canvasId"
         class="component"
         :style="getComponentStyleDefault(item.style)"
         :prop-value="item.propValue"
@@ -80,8 +80,8 @@
         :is="item.component"
         v-else-if="renderOk && item.type==='other'"
         :id="'component' + item.id"
-        :canvas-id="canvasId"
         ref="wrapperChild"
+        :canvas-id="canvasId"
         class="component"
         :style="getComponentStyle(item.style)"
         :prop-value="item.propValue"
@@ -93,8 +93,8 @@
         :is="item.component"
         v-else-if="renderOk"
         :id="'component' + item.id"
-        :canvas-id="canvasId"
         ref="wrapperChild"
+        :canvas-id="canvasId"
         class="component"
         :filters="filterMap[item.propValue && item.propValue.viewId]"
         :style="getComponentStyleDefault(item.style)"
@@ -1436,7 +1436,7 @@ export default {
             matrixStyleOriginWidth: this.matrixStyle.originWidth,
             matrixStyleOriginHeight: this.matrixStyle.originHeight
           })
-        if(this.canvasId === 'canvas-main'){
+        if (this.canvasId === 'canvas-main') {
           this.$store.commit('setPreviewCanvasScale', {
             scaleWidth: this.scalePointWidth,
             scaleHeight: this.scalePointHeight
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index c9433d67e4..3f36a04261 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -439,7 +439,7 @@ export default {
       } else {
         this.scaleHeight = canvasHeight * 100 / this.canvasStyleData.height// 获取高度比
       }
-      if(this.canvasId === 'canvas-main'){
+      if (this.canvasId === 'canvas-main') {
         this.$store.commit('setPreviewCanvasScale', { scaleWidth: (this.scaleWidth / 100), scaleHeight: (this.scaleHeight / 100) })
       }
       this.handleScaleChange()
diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue
index 3b6290e05f..ceec98763f 100644
--- a/frontend/src/components/dataease/DeOutWidget.vue
+++ b/frontend/src/components/dataease/DeOutWidget.vue
@@ -39,8 +39,8 @@
                 :is="element.component"
                 v-if="element.type==='custom'"
                 :id="'component' + element.id"
-                :canvas-id="canvasId"
                 ref="deOutWidget"
+                :canvas-id="canvasId"
                 class="component-custom"
                 :out-style="element.style"
                 :is-relation="isRelation"
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 5b220ff0d7..f75bc770f1 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -290,7 +290,7 @@ const data = {
       const filterComponentId = condition.componentId
       const canvasId = data.canvasId
 
-      //过滤时 主画布的过滤组件可以过滤所有的视图
+      // 过滤时 主画布的过滤组件可以过滤所有的视图
       const canvasViewIds = state.componentData.filter(item => item.type === 'view' && (canvasId === 'canvas-main' || item.canvasId === canvasId)).map((itemView) => {
         return itemView.propValue.viewId
       })
@@ -492,7 +492,7 @@ const data = {
       }
     },
     deleteComponent(state) {
-      this.commit('deleteComponentWithId',state.curComponent.id)
+      this.commit('deleteComponentWithId', state.curComponent.id)
     },
     setLinkageInfo(state, targetLinkageInfo) {
       state.linkageSettingStatus = true
diff --git a/frontend/src/views/chart/view/ChartStyle.vue b/frontend/src/views/chart/view/ChartStyle.vue
index 236fa547ff..3a752184a0 100644
--- a/frontend/src/views/chart/view/ChartStyle.vue
+++ b/frontend/src/views/chart/view/ChartStyle.vue
@@ -18,7 +18,7 @@
       style="overflow:auto;border-right: 1px solid #e6e6e6;height: 100%;width: 100%;padding-right: 6px"
       class="attr-style theme-border-class"
     >
-      <el-row>
+      <el-row class="de-collapse-style">
         <span class="padding-lr">{{ $t('chart.shape_attr') }}</span>
         <el-collapse
           v-model="attrActiveNames"
@@ -475,6 +475,15 @@ export default {
 </script>
 
 <style lang='scss' scoped>
+.de-collapse-style {
+  .el-collapse-item__header {
+    height: 34px !important;
+    line-height: 34px !important;
+    padding: 0 0 0 6px !important;
+    font-size: 12px !important;
+    font-weight: 400 !important;
+  }
+}
   .padding-lr {
     padding: 0 6px;
   }