Merge branch 'main' of github.com:dataease/dataease into main

frontend/src/components/canvas/components/Editor/Preview.vue

@@ -1,6 +1,5 @@
 <template>
-  <div v-if="show" class="bg">
-    <el-button class="close" @click="close">关闭</el-button>
+  <div class="bg">
     <div class="canvas-container">
       <div
         class="canvas"
@@ -57,33 +56,14 @@ export default {
 .bg {
     width: 100%;
     height: 100%;
-    top: 0;
-    left: 0;
-    position: fixed;
-    background: rgb(0, 0, 0, .5);
-    z-index: 10;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    overflow: auto;
-    padding: 20px;
-
     .canvas-container {
-        width: calc(100% - 40px);
-        height: calc(100% - 120px);
+        width: 100%;
+        height: 100%;
         overflow: auto;
-
-        .canvas {
-            background: #fff;
+      .canvas {
             position: relative;
             margin: auto;
         }
     }
-
-    .close {
-        position: absolute;
-        right: 20px;
-        top: 100px;
-    }
 }
 </style>

frontend/src/components/canvas/components/Toolbar.vue

@@ -34,7 +34,7 @@
     </div>
 
     <!-- 预览 -->
-    <Preview v-model="isShowPreview" @change="handlePreviewChange" />
+<!--    <Preview v-model="isShowPreview" @change="handlePreviewChange" />-->
   </div>
 </template>
 

frontend/src/components/canvas/custom-component/UserView.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rect-shape">
-    <chart-component :ref="element.propValue.id" class="chart-class" :chart-id="element.propValue.id" :chart="chart" />
+    <chart-component :ref="element.propValue.id" class="chart-class" :chart="chart" />
   </div>
 </template>
 
@@ -8,6 +8,7 @@
 
 import { post } from '@/api/panel/panel'
 import ChartComponent from '@/views/chart/components/ChartComponent.vue'
+
 export default {
   name: 'UserView',
   components: { ChartComponent },
@@ -22,12 +23,7 @@ export default {
     }
   },
   created() {
-    const id = this.element.propValue.viewId
-    debugger
-    this.$nextTick(() => {
-      // 获取eChar数据
-      this.getData(id)
-    })
+    this.getData(this.element.propValue.viewId)
   },
   mounted() {