diff --git a/frontend/src/components/GradientColorSelector/base.js b/frontend/src/components/GradientColorSelector/base.js
index bf88a65f75..e5b98d9fc2 100644
--- a/frontend/src/components/GradientColorSelector/base.js
+++ b/frontend/src/components/GradientColorSelector/base.js
@@ -39,7 +39,7 @@ export const colorCases = [
   {
     name: i18n.t('chart.color_gentle'),
     value: 'gentle',
-    colors: ['#5b9bd5', '#ed7d31', '#70ad47', '#ffc000', '#4472c4', '#91d024', '#b235e6', '#02ae75', '#5b9bd5']
+    colors: ['#5b9bd5', '#ed7d31', '#70ad47', '#ffc000', '#4472c4', '#91d024', '#b235e6', '#02ae75', '#003F78']
   },
   {
     name: i18n.t('chart.color_technology'),
@@ -59,7 +59,7 @@ export const colorCases = [
   {
     name: i18n.t('chart.color_fresh'),
     value: 'fresh',
-    colors: ['#5f9b3c', '#75c24b', '#83d65f', '#aacf53', '#c7dc68', '#d8e698', '#e0ebaf', '#bbc8e6', '#e5e5e5']
+    colors: ['#e5e5e5', '#bbc8e6', '#e0ebaf', '#d8e698', '#c7dc68', '#aacf53', '#83d65f', '#75c24b', '#5f9b3c']
   },
   {
     name: i18n.t('chart.color_energy'),
@@ -79,7 +79,7 @@ export const colorCases = [
   {
     name: i18n.t('chart.color_spiritual'),
     value: 'spiritual',
-    colors: ['#00a3af', '#4da798', '#57baaa', '#62d0bd', '#6ee4d0', '#86e7d6', '#aeede1', '#bde1e6', '#e5e5e5']
+    colors: ['#e5e5e5', '#bde1e6', '#aeede1', '#86e7d6', '#6ee4d0', '#62d0bd', '#57baaa', '#4da798', '#00a3af']
   }
 ]
 
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 50407a9c93..827e3d692b 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -10,6 +10,7 @@
       :source-element="sourceConfig"
       :terminal="terminal"
       :element="config"
+      :canvas-id="canvasId"
       :show-position="showPosition"
       @showViewDetails="showViewDetails"
     />
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 3f36a04261..ef6cba429d 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -27,7 +27,7 @@
         v-else-if="componentDataShow && componentDataShow.length===0"
         class="custom-position"
       >
-        {{ $t('panel.panelNull') }}
+        <span v-show="isMainCanvas()">{{ $t('panel.panelNull') }}</span>
       </el-row>
       <div
         v-else
@@ -214,7 +214,7 @@ export default {
       let style = {
         width: '100%'
       }
-      if (this.canvasStyleData.openCommonStyle) {
+      if (this.canvasStyleData.openCommonStyle && this.isMainCanvas()) {
         if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) {
           style = {
             background: `url(${imgUrlTrans(this.canvasStyleData.panel.imageUrl)}) no-repeat`,
@@ -308,6 +308,9 @@ export default {
     bus.$off('trigger-reset-button', this.triggerResetButton)
   },
   methods: {
+    isMainCanvas() {
+      return this.canvasId === 'canvas-main'
+    },
     triggerResetButton() {
       this.triggerSearchButton(true)
     },
@@ -439,7 +442,7 @@ export default {
       } else {
         this.scaleHeight = canvasHeight * 100 / this.canvasStyleData.height// 获取高度比
       }
-      if (this.canvasId === 'canvas-main') {
+      if (this.isMainCanvas()) {
         this.$store.commit('setPreviewCanvasScale', { scaleWidth: (this.scaleWidth / 100), scaleHeight: (this.scaleHeight / 100) })
       }
       this.handleScaleChange()
diff --git a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue b/frontend/src/components/canvas/components/Editor/PreviewMobile.vue
index 5a5eac8c9d..7305826280 100644
--- a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue
+++ b/frontend/src/components/canvas/components/Editor/PreviewMobile.vue
@@ -27,6 +27,7 @@
         <ComponentWrapper
           v-for="(item, index) in componentDataInfo"
           :key="index"
+          :canvas-id="canvasId"
           :config="item"
           :search-count="searchCount"
           :canvas-style-data="canvasStyleData"
@@ -55,6 +56,10 @@ export default {
     event: 'change'
   },
   props: {
+    canvasId: {
+      type: String,
+      required: true
+    },
     screenShot: {
       type: Boolean,
       default: false
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index a01641835f..2540e3bff7 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -263,6 +263,7 @@ const data = {
       } else {
         state.componentData.push(component)
       }
+      this.commit('setCurComponent', { component: component, index: index ? index : state.componentData.length - 1 })
     },
     removeViewFilter(state, componentId) {
       state.componentData = state.componentData.map(item => {
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index c79e0ae12d..1a9a2cd68a 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -889,7 +889,9 @@ export const BASE_MAP = {
 
         },
         emphasis: {
-
+          label: {
+            show: false
+          }
         }
       }
     }
diff --git a/frontend/src/views/chart/chart/map/map.js b/frontend/src/views/chart/chart/map/map.js
index ead8013c8f..65ae8ff0d9 100644
--- a/frontend/src/views/chart/chart/map/map.js
+++ b/frontend/src/views/chart/chart/map/map.js
@@ -95,6 +95,7 @@ export function baseMapOption(chart_option, chart, themeStyle, curAreaCode) {
           chart_option.series[0].label.shadowBlur = 2
           chart_option.series[0].label.showdowColor = customAttr.label.shadowColor
         }
+        chart_option.series[0].itemStyle.emphasis.label.show = customAttr.label.show
       }
       const valueArr = chart.data.series[0].data
       // visualMap
diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue
index 6765a686eb..7902435789 100644
--- a/frontend/src/views/login/index.vue
+++ b/frontend/src/views/login/index.vue
@@ -79,7 +79,7 @@
                       v-if="loginTypes.includes(7)"
                       :label="7"
                       size="mini"
-                    >Larksuite</el-radio>
+                    >Lark</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item prop="username">
diff --git a/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue b/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
index 9e78ec1d31..d9a08df6d4 100644
--- a/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
+++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
@@ -32,7 +32,7 @@
       </el-col>
       <el-col
         v-show="panel.backgroundType==='image'"
-        span="10"
+        :span="10"
       >
         <el-upload
           action=""
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index dc79ab3d56..94544d3db5 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -174,6 +174,7 @@
           v-if="!previewVisible&&!mobileLayoutStatus"
           ref="canvasMainRef"
           class="canvas_main_content"
+          :style="customCanvasStyle"
           :canvas-style-data="canvasStyleData"
           :component-data="mainCanvasComponentData"
           :canvas-id="canvasId"
diff --git a/frontend/src/views/panel/list/EditPanel/index.vue b/frontend/src/views/panel/list/EditPanel/index.vue
index a6daca3789..03a5e89aee 100644
--- a/frontend/src/views/panel/list/EditPanel/index.vue
+++ b/frontend/src/views/panel/list/EditPanel/index.vue
@@ -8,16 +8,19 @@
         <el-radio
           v-model="inputType"
           label="new"
-        > {{ $t('panel.custom') }}</el-radio>
+        > {{ $t('panel.custom') }}
+        </el-radio>
         <el-radio
           v-model="inputType"
           label="new_outer_template"
-        >{{ $t('panel.import_template') }}  </el-radio>
+        >{{ $t('panel.import_template') }}
+        </el-radio>
         <el-radio
           v-model="inputType"
           label="new_inner_template"
           @click.native="getTree"
-        >{{ $t('panel.copy_template') }}  </el-radio>
+        >{{ $t('panel.copy_template') }}
+        </el-radio>
       </el-col>
       <el-col
         v-if="inputType==='new_outer_template'"
@@ -28,7 +31,8 @@
           size="small"
           type="primary"
           @click="goFile"
-        >{{ $t('panel.upload_template') }}</el-button>
+        >{{ $t('panel.upload_template') }}
+        </el-button>
         <input
           id="input"
           ref="files"
@@ -77,13 +81,15 @@
       <el-button
         size="mini"
         @click="cancel()"
-      >{{ $t('commons.cancel') }}</el-button>
+      >{{ $t('commons.cancel') }}
+      </el-button>
       <el-button
         type="primary"
         size="mini"
         :disabled="!saveStatus"
         @click="save()"
-      >{{ $t('commons.confirm') }}</el-button>
+      >{{ $t('commons.confirm') }}
+      </el-button>
     </el-row>
   </el-row>
 </template>
@@ -234,7 +240,7 @@ export default {
             showClose: true
           })
           this.loading = false
-          this.$emit('closeEditPanelDialog', response.data)
+          this.$emit('closeEditPanelDialog', { id: response.data, name: this.editPanel.panelInfo.name })
         }).catch(() => {
           this.loading = false
         })
@@ -265,34 +271,38 @@ export default {
 
 <style scoped>
 
-.my_table ::v-deep .el-table__row>td{
+.my_table ::v-deep .el-table__row > td {
   /* 去除表格线 */
   border: none;
   padding: 0 0;
 }
+
 .my_table ::v-deep .el-table th.is-leaf {
   /* 去除上边框 */
-    border: none;
+  border: none;
 }
-.my_table ::v-deep .el-table::before{
+
+.my_table ::v-deep .el-table::before {
   /* 去除下边框 */
   height: 0;
 }
 
-  .root-class {
-    margin: 15px 0px 5px;
-    text-align: center;
-  }
-  .preview {
-    margin-top: 5px;
-    border:1px solid #E6E6E6;
-    height:250px !important;
-    overflow:hidden;
-    background-size: 100% 100% !important;
-  }
-  .preview-show {
-    border-left:1px solid #E6E6E6;
-    height:250px;
-    background-size: 100% 100% !important;
-  }
+.root-class {
+  margin: 15px 0px 5px;
+  text-align: center;
+}
+
+.preview {
+  margin-top: 5px;
+  border: 1px solid #E6E6E6;
+  height: 250px !important;
+  overflow: hidden;
+  background-size: 100% 100% !important;
+}
+
+.preview-show {
+  border-left: 1px solid #E6E6E6;
+  height: 250px;
+  background-size: 100% 100% !important;
+}
 </style>
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 671f996f94..1ff274d29f 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -645,6 +645,9 @@ export default {
       if (panelInfo) {
         this.defaultTree()
         this.tree()
+        if (this.editPanel.optType === 'rename' && panelInfo.id === this.$store.state.panel.panelInfo.id) {
+          this.$store.state.panel.panelInfo.name = panelInfo.name
+        }
         // 默认展开 同时点击 新增的节点
         if (
           panelInfo &&
diff --git a/frontend/src/views/panel/list/common/PanelDetailInfo.vue b/frontend/src/views/panel/list/common/PanelDetailInfo.vue
index 97b73fc60e..c9c9ccab8e 100644
--- a/frontend/src/views/panel/list/common/PanelDetailInfo.vue
+++ b/frontend/src/views/panel/list/common/PanelDetailInfo.vue
@@ -29,20 +29,6 @@
 <script>
 export default {
   name: 'PanelDetailInfo',
-  props: {
-    type: {
-      type: String,
-      required: true
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    tabStatus: {
-      type: Boolean,
-      required: true
-    }
-  },
   data() {
     return {
       tabActive: 'chart',