Merge remote-tracking branch 'origin/dev' into dev

src/themes/light/playground.scss

@@ -3,26 +3,27 @@
   width: 750px;
   margin: 10px auto;
   height: 1200px;
-  max-height: 1200px;
+  // max-height: 1200px;
   background-color: transparent;
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.4);
-  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: auto;
   /*transform: scale(.5, .5);
   transform-origin: 50% 0%;*/
   zoom: 0.5;
-}
-.zero-playground-draw-panel{
-  height: 1200px;
   background: url(data:image/jpeg;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAiUlEQVQ4jZ1TSxLFIAhLOp7C+19NjyFvlQ7lUUvLRgXzgVGOMQyb6L3/5cwMJAEAxw6sy3FP8tw/EkhJqp7klQMBtKpWcpC1oVp7IoiqviXg4xBFRPL7EM/6WsviYDxwzrkVaBHsz5U4MlWfKxHEySpXIdk6qLRzcXBHVnKQfZRKCy1Ty979XfwApOBe0rB0KiIAAAAASUVORK5CYII=);
   background-repeat: repeat;
-  /*overflow-y: auto;
-  overflow-x: hidden;*/
 }
+// .zero-playground-draw-panel{
+//   min-height: 1200px;
+//   height: 100%;
+//   /*overflow-y: auto;
+//   overflow-x: hidden;*/
+// }
 .zero-draw-panel-container {
   position: relative;
-  // border: 5px #000 solid;
-  width: 100%; // 谨慎修改，要和drawPanel宽度保持一致
-  min-height: 1200px;
+  width: 100%; 
+  height: 100%;
 }
 .zero-draw-panel-container.scroll {
   height: 1200px;

src/views/Editor/Playground.vue

 <template>
 	<pane icon="el-icon-s-open" class="pane-playground" :title="$t('panes.Playground')">
 		<div class="zero-playground-body-center">
-			<div class="zero-playground-draw-panel">
+			<!-- <div class="zero-playground-draw-panel"> -->
 				<draw-panel></draw-panel>
-			</div>
+			<!-- </div> -->
 		</div>
 	</pane>
 </template>