From 140f47abc4cdcd1ae2db549da3788cb975f85935 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 12 Oct 2021 14:39:43 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E9=80=89=E9=A1=B9=E5=8D=A1=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/widget/DeWidget/DeTabs.vue   | 17 +----------------
 frontend/src/styles/index.scss                  | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue
index 26ffb9a7b2..900c979990 100644
--- a/frontend/src/components/widget/DeWidget/DeTabs.vue
+++ b/frontend/src/components/widget/DeWidget/DeTabs.vue
@@ -34,7 +34,7 @@
           </el-dropdown>
         </span>
 
-        <div class="de-tab-content">
+        <div v-if="activeTabName === item.name" class="de-tab-content">
           <user-view v-if="item.content" :ref="item.name" :element="item.content" :out-style="outStyle" />
         </div>
 
@@ -250,23 +250,8 @@ export default {
   }
   .de-tabs {
     height: 100%;
-    >>>div.el-tabs__content {
-        height: calc(100% - 55px);
-        .el-tab-pane {
-          height: 100%;
-        }
-    }
-  }
-  /* .de-tab-i {
-    transition: 0.1s;
-    opacity: 0;
-    transform:  translateY(100%);
   }
 
-  .de-tab-drop:hover .de-tab-i {
-    opacity: 1;
-    transform:  translateY(0);
-  } */
   .de-tab-content {
     width: 100%;
     height: 100%;
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 36e3cc149a..57d327ea2b 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -43,9 +43,6 @@ html {
   box-sizing: border-box;
 }
 
-#app {
-  //height: $contentHeight;
-}
 
 *,
 *:before,
@@ -151,6 +148,18 @@ div:focus {
   }
 }
 
+.de-tabs {
+  .el-tabs__header {
+    margin: 0 0 0 0 !important;
+  }
+  .el-tabs__content {
+    height: calc(100% - 55px) !important;
+    .el-tab-pane {
+        height: 100% !important;
+    }
+  }
+}
+
 .de-search-header {
   .el-tabs__header {
     display: none !important;;

From 95f790004ab81f014c41ace6c9b9dabcec6dcd24 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 12 Oct 2021 15:02:11 +0800
Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E9=80=89=E9=A1=B9=E5=8D=A1=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=AF=95=E5=9B=BE=E6=9C=89=E9=BB=98=E8=AE=A4=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/DeWidget/DeTabs.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue
index 900c979990..18fa38d54a 100644
--- a/frontend/src/components/widget/DeWidget/DeTabs.vue
+++ b/frontend/src/components/widget/DeWidget/DeTabs.vue
@@ -75,7 +75,7 @@
       center
     >
       <div style="width: 100%;min-height: 250px; max-height: 300px; overflow-y: auto;">
-        <view-select ref="viewSelect" :select-model="true" />
+        <view-select v-if="viewDialogVisible" ref="viewSelect" :select-model="true" />
       </div>
 
       <span slot="footer" class="dialog-footer">
@@ -161,6 +161,10 @@ export default {
     },
     sureViewSelector() {
       const nodes = this.$refs.viewSelect.getCurrentSelected()
+      if (!nodes || nodes.length === 0) {
+        this.viewDialogVisible = false
+        return
+      }
       const node = nodes[0]
 
       let component

From e3df9ec5c570e0967285ecb24cf32d10a8673ffe Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 12 Oct 2021 19:45:40 +0800
Subject: [PATCH 3/9] =?UTF-8?q?refactor:=20flyway=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/db/migration/V18__add_demo.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/resources/db/migration/V18__add_demo.sql b/backend/src/main/resources/db/migration/V18__add_demo.sql
index d700a2b67c..fb508a16c4 100644
--- a/backend/src/main/resources/db/migration/V18__add_demo.sql
+++ b/backend/src/main/resources/db/migration/V18__add_demo.sql
@@ -230,6 +230,7 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 -- Table structure for demo_new_trend_of_diagnosis
 -- ----------------------------
+DROP TABLE IF EXISTS `demo_new_trend_of_diagnosis`;
 CREATE TABLE `demo_new_trend_of_diagnosis` (
                                                `date` varchar(50) NOT NULL DEFAULT '' COMMENT '日期',
                                                `new_diagnosis` bigint(13) DEFAULT NULL COMMENT '新增确诊',

From e177c0d22078c9e504690bc2199ce51635e08a67 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 12 Oct 2021 19:46:19 +0800
Subject: [PATCH 4/9] =?UTF-8?q?refactor:=20flyway=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db/migration/V14__area_code.sql | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/backend/src/main/resources/db/migration/V14__area_code.sql b/backend/src/main/resources/db/migration/V14__area_code.sql
index e69de29bb2..75a739301b 100644
--- a/backend/src/main/resources/db/migration/V14__area_code.sql
+++ b/backend/src/main/resources/db/migration/V14__area_code.sql
@@ -0,0 +1,10 @@
+CREATE TABLE `area_mapping`  (
+  `id` bigint(20) NOT NULL COMMENT 'id',
+  `province_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省名称',
+  `province_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省代码',
+  `city_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '市名称',
+  `city_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '市代码',
+  `county_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '县名称',
+  `county_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '县代码',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci;

From 354afd5d7b15a01818ea745199f183337b6b8bc1 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 13 Oct 2021 10:36:45 +0800
Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E4=B8=BB=E9=A2=98=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA=E8=BE=B9=E7=95=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue b/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
index fe28255d0c..b70b739fa4 100644
--- a/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
+++ b/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
@@ -47,7 +47,7 @@
 
     </div>
     <div style="position: absolute; left: 0px; right: 0px; bottom: 0px; height: 30px;" @dblclick="setEdit">
-      <div style=" background-color:#f7f8fa;color:#3d4d66;font-size:12px;height: 30px; line-height: 30px; text-align: center; white-space: pre; text-overflow: ellipsis; margin-left: 1px; margin-right: 1px;">
+      <div style=" background-color:#f7f8fa;color:#3d4d66;font-size:12px;height: 30px; line-height: 30px; text-align: center; white-space: pre; text-overflow: ellipsis; margin-left: 1px; margin-right: 1px;overflow: hidden">
         <el-input
           v-if="canEdit"
           ref="nameInput"
@@ -55,7 +55,7 @@
           size="mini"
           @blur="loseFocus()"
         />
-        <span v-if="!canEdit" style="margin-top: 8px">{{ subjectItem.name }}</span>
+        <span v-if="!canEdit" style="margin-top: 8px" :title="subjectItem.name">{{ subjectItem.name }}</span>
       </div>
     </div>
   </div>

From e1a151a3cc972f6eadd8c927f06f2b19415b4b2a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 13 Oct 2021 11:30:02 +0800
Subject: [PATCH 6/9] =?UTF-8?q?feat:=20tab=E7=BB=84=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=B7=E5=BC=8F=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/edit/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index a19bf47284..b7496043bd 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -160,7 +160,7 @@
     <input id="input" ref="files" type="file" accept="image/*" hidden @click="e => {e.target.value = '';}" @change="handleFileChange">
 
     <!--矩形样式组件-->
-    <RectangleAttr v-if="curComponent&&curComponent.type==='rect-shape'" :scroll-left="scrollLeft" :scroll-top="scrollTop" />
+    <RectangleAttr v-if="curComponent&&(curComponent.type==='rect-shape'||curComponent.type==='de-tabs')" :scroll-left="scrollLeft" :scroll-top="scrollTop" />
     <TextAttr v-if="curComponent&&curComponent.type==='v-text'" :scroll-left="scrollLeft" :scroll-top="scrollTop" />
     <FilterTextAttr v-if="curComponent&&curComponent.type==='custom'&&curComponent.options.attrs.title" :scroll-left="scrollLeft" :scroll-top="scrollTop" />
     <!--复用ChartGroup组件 不做显示-->

From 0c02ffef0f0884d391411dcbd75f54f00b3fa4d0 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 13 Oct 2021 12:18:25 +0800
Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9C=AA=E5=8F=8A=E6=97=B6=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9B=E5=88=86=E4=BA=AB=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=94=B6=E8=97=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/widget/DeWidget/DeSelect.vue   | 17 ++++++++++++-
 .../widget/DeWidget/DeSelectGrid.vue          | 24 +++++++++++++++----
 frontend/src/layout/components/Topbar.vue     |  9 +++----
 .../src/views/panel/GrantAuth/shareTree.vue   |  2 ++
 .../src/views/panel/list/PanelViewShow.vue    | 10 +++++---
 5 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue
index 679a36074f..2c8470b6b6 100644
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-
+import { fieldValues } from '@/api/dataset/dataset'
 export default {
 
   props: {
@@ -68,6 +68,11 @@ export default {
   },
   created() {
     this.options = this.element.options
+    if (this.options.attrs.fieldId) {
+      fieldValues(this.options.attrs.fieldId).then(res => {
+        this.options.attrs.datas = this.optionDatas(res.data)
+      })
+    }
 
     // this.setCondition()
   },
@@ -105,9 +110,19 @@ export default {
     },
     styleChange() {
       this.$store.commit('recordStyleChange')
+    },
+    optionDatas(datas) {
+      if (!datas) return null
+      return datas.filter(item => !!item).map(item => {
+        return {
+          id: item,
+          text: item
+        }
+      })
     }
 
   }
+
 }
 </script>
 
diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
index bd665dd369..fd4899ab20 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-
+import { fieldValues } from '@/api/dataset/dataset'
 export default {
 
   props: {
@@ -114,9 +114,16 @@ export default {
   },
   created() {
     this.options = this.element.options
-    this.setMutiBox()
-    this.setRadioBox()
-    // this.setCondition()
+    if (this.options.attrs.fieldId) {
+      fieldValues(this.options.attrs.fieldId).then(res => {
+        this.options.attrs.datas = this.optionDatas(res.data)
+        this.setMutiBox()
+        this.setRadioBox()
+      })
+    } else {
+      this.setMutiBox()
+      this.setRadioBox()
+    }
   },
   mounted() {
     // this.$nextTick(() => {
@@ -212,6 +219,15 @@ export default {
     // },
     styleChange() {
       this.$store.commit('recordStyleChange')
+    },
+    optionDatas(datas) {
+      if (!datas) return null
+      return datas.filter(item => !!item).map(item => {
+        return {
+          id: item,
+          text: item
+        }
+      })
     }
 
   }
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue
index 07b4da208d..e3af872ac7 100644
--- a/frontend/src/layout/components/Topbar.vue
+++ b/frontend/src/layout/components/Topbar.vue
@@ -35,10 +35,11 @@
       </template>
 
       <el-dropdown class="top-dropdown" style="display: flex;align-items: center; width:100px;" trigger="click">
-        <span class="el-dropdown-link" style="color: var(--TopTextColor);font-size: 14px;max-width: 80px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-          {{ name }}
-          <i class="el-icon-arrow-down el-icon--right" />
-        </span>
+        <div class="el-dropdown-link" style="display: flex;color: var(--TopTextColor);font-size: 14px; width:100%;">
+
+          <span style="max-width:80px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;">{{ name }}</span>
+          <span><i class="el-icon-arrow-down el-icon--right" /></span>
+        </div>
         <el-dropdown-menu slot="dropdown">
           <router-link to="/person-info/index">
             <el-dropdown-item>{{ $t('commons.personal_info') }}</el-dropdown-item>
diff --git a/frontend/src/views/panel/GrantAuth/shareTree.vue b/frontend/src/views/panel/GrantAuth/shareTree.vue
index a4d44f2948..3bb4db66da 100644
--- a/frontend/src/views/panel/GrantAuth/shareTree.vue
+++ b/frontend/src/views/panel/GrantAuth/shareTree.vue
@@ -21,6 +21,7 @@
 import { loadTree } from '@/api/panel/share'
 import { uuid } from 'vue-uuid'
 import { get } from '@/api/panel/panel'
+import bus from '@/utils/bus'
 export default {
   name: 'ShareTree',
   props: {
@@ -59,6 +60,7 @@ export default {
         this.$store.commit('setCanvasStyle', JSON.parse(response.data.panelStyle))
 
         this.$store.dispatch('panel/setPanelInfo', data)
+        bus.$emit('set-panel-is-share')
       })
     },
     resetID(data) {
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index 6f717d70d8..623cdfd0d7 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -38,13 +38,13 @@
               </el-tooltip>
             </span>
 
-            <span v-if="!hasStar && panelInfo" style="float: right;margin-right: 10px">
+            <span v-if="!hasStar && panelInfo && !isShare" style="float: right;margin-right: 10px">
               <el-tooltip :content="$t('panel.store')">
                 <el-button class="el-icon-star-off" size="mini" circle @click="star" />
               </el-tooltip>
             </span>
 
-            <span v-if="hasStar && panelInfo" style="float: right;margin-right: 10px">
+            <span v-if="hasStar && panelInfo && !isShare" style="float: right;margin-right: 10px">
               <el-tooltip :content="$t('commons.cancel')">
                 <el-button class="el-icon-star-on" size="mini" circle @click="unstar" />
               </el-tooltip>
@@ -131,7 +131,8 @@ export default {
       hasStar: false,
       fullscreen: false,
       pdfExportShow: false,
-      snapshotInfo: ''
+      snapshotInfo: '',
+      isShare: false
     }
   },
   computed: {
@@ -162,6 +163,9 @@ export default {
     }
   },
   mounted() {
+    bus.$on('set-panel-is-share', () => {
+      this.isShare = true
+    })
     this.initPdfTemplate()
   },
   methods: {

From 1dda00c5a86468dfa94b92ac1a7cd5efc1a1be43 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 13 Oct 2021 12:20:12 +0800
Subject: [PATCH 8/9] =?UTF-8?q?refactor:=20=E9=98=B2=E6=AD=A2=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=8A=B6=E6=80=81=E5=85=A8=E5=B1=8F=E9=94=99=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/edit/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index b7496043bd..73bd7eb040 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -95,6 +95,7 @@
         </el-drawer>
 
         <div
+          v-if="!previewVisible"
           id="canvasInfo"
           :class="{'style-hidden':canvasStyleData.selfAdaption}"
           class="content this_canvas"
@@ -104,7 +105,7 @@
           @mousedown="handleMouseDown"
           @mouseup="deselectCurComponent"
         >
-          <Editor v-if="!previewVisible" ref="canvasEditor" :out-style="outStyle" @canvasScroll="canvasScroll" />
+          <Editor  ref="canvasEditor" :out-style="outStyle" @canvasScroll="canvasScroll" />
         </div>
       </de-main-container>
       <!--      <de-aside-container v-if="aidedButtonActive" :class="aidedButtonActive ? 'show' : 'hidden'" class="style-aside">-->

From 7a8198b7c790a5cacc44f53e740cabf0bd9e8a85 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 13 Oct 2021 14:19:17 +0800
Subject: [PATCH 9/9] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=B6=E5=85=A8=E5=B1=8F=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?scroll=E6=97=B6=20=E6=A0=B7=E5=BC=8F=E7=BB=84=E4=BB=B6=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8E=BB=E6=8E=89=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=89=8D=E6=AE=B5=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/index.vue |  2 +-
 frontend/src/views/panel/edit/index.vue  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/canvas/index.vue b/frontend/src/components/canvas/index.vue
index 201d42e639..d8c3d139af 100644
--- a/frontend/src/components/canvas/index.vue
+++ b/frontend/src/components/canvas/index.vue
@@ -35,7 +35,7 @@ import Toolbar from '@/components/Toolbar'
 import { deepCopy } from '@/utils/utils'
 import { mapState } from 'vuex'
 import generateID from '@/utils/generateID'
-import { listenGlobalKeyDown } from '@/utils/shortcutKey'
+// import { listenGlobalKeyDown } from '@/utils/shortcutKey'
 
 export default {
   // eslint-disable-next-line vue/no-unused-components
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 73bd7eb040..a96046c3fd 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -104,8 +104,9 @@
           @dragover="handleDragOver"
           @mousedown="handleMouseDown"
           @mouseup="deselectCurComponent"
+          @scroll="canvasScroll"
         >
-          <Editor  ref="canvasEditor" :out-style="outStyle" @canvasScroll="canvasScroll" />
+          <Editor ref="canvasEditor" :out-style="outStyle" />
         </div>
       </de-main-container>
       <!--      <de-aside-container v-if="aidedButtonActive" :class="aidedButtonActive ? 'show' : 'hidden'" class="style-aside">-->
@@ -188,7 +189,7 @@ import bus from '@/utils/bus'
 import Editor from '@/components/canvas/components/Editor/index'
 import { deepCopy } from '@/components/canvas/utils/utils'
 import componentList from '@/components/canvas/custom-component/component-list' // 左侧列表数据
-import { listenGlobalKeyDown } from '@/components/canvas/utils/shortcutKey'
+// import { listenGlobalKeyDown } from '@/components/canvas/utils/shortcutKey'
 import { mapState } from 'vuex'
 import { uuid } from 'vue-uuid'
 import Toolbar from '@/components/canvas/components/Toolbar'
@@ -345,7 +346,7 @@ export default {
     this.init(this.$store.state.panel.panelInfo.id)
     // this.restore()
     // 全局监听按键事件
-    listenGlobalKeyDown()
+    // listenGlobalKeyDown()
 
     this.$store.commit('setCurComponent', { component: null, index: null })
     this.$store.commit('clearLinkageSettingInfo', false)
@@ -654,7 +655,8 @@ export default {
           const canvasHeight = document.getElementById('canvasInfo').offsetHeight
           const canvasWidth = document.getElementById('canvasInfo').offsetWidth
           this.outStyle.height = canvasHeight
-          this.outStyle.width = canvasWidth
+          // 临时处理 确保每次restore 有会更新
+          this.outStyle.width = canvasWidth + (Math.random() * 0.000001)
           // console.log(canvasHeight + '--' + canvasWidth)
         })
       }