Merge branch 'dev' into v1.18

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -3122,9 +3122,15 @@ public class NoModelDataListener extends AnalysisEventListener<Map<Integer, Stri
         for (Integer key : dataMap.keySet()) {
             String value = dataMap.get(key);
             if (StringUtils.isEmpty(value)) {
-                value = "none";
+                value = "";
             }
             line.add(value);
+        };
+        int size = line.size();
+        if(size < header.size()){
+            for (int i = 0; i < header.size() - size; i++) {
+                line.add("");
+            }
         }
         data.add(line);
     }

frontend/src/views/panel/list/PanelViewShow.vue

@@ -249,6 +249,7 @@
             <Preview
               v-if="showMainFlag"
               ref="paneViewPreviewRef"
+              :class="fullscreen && 'fullscreen-visual-selects'"
               :component-data="mainCanvasComponentData"
               :canvas-style-data="canvasStyleData"
               :active-tab="activeTab"
@@ -923,5 +924,12 @@ export default {
   color: inherit;
   margin-right: 5px;
 }
+
+.fullscreen-visual-selects {
+  .VisualSelects {
+    top: inherit !important;
+    left: inherit !important;
+  }
+}
 </style>