Merge branch 'dev-v2' of github.com:dataease/dataease into dev-v2

core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java

@@ -54,14 +54,18 @@ public class CoreVisualizationExportManage {
         }
         if (CollectionUtils.isEmpty(chartViewDTOS)) return null;
         Map<String, ChartExtRequest> chartExtRequestMap = buildViewRequest(visualization, onlyDisplay);
-        List<ExcelSheetModel> sheets = chartViewDTOS.stream().map(view -> {
+        List<ExcelSheetModel> sheets = new ArrayList<>();
+        for (int i = 0; i < chartViewDTOS.size(); i++) {
+            ChartViewDTO view = chartViewDTOS.get(i);
             ChartExtRequest extRequest = chartExtRequestMap.get(view.getId().toString());
             if (ObjectUtils.isNotEmpty(extRequest)) {
                 view.setChartExtRequest(extRequest);
             }
             view.getChartExtRequest().setUser(AuthUtils.getUser().getUserId());
-            return exportViewData(view);
-        }).toList();
+            view.setTitle((i + 1) + "-" + view.getTitle());
+            sheets.add(exportViewData(view));
+        }
+
         return VisualizationExcelUtils.exportExcel(sheets, visualization.getName(), visualization.getId().toString());
     }
 

core/core-frontend/src/custom-component/de-frame/FrameLinks.vue

@@ -80,7 +80,7 @@ const onBlur = () => {
 }
 init()
 watch(
-  frameLinks.value,
+  () => frameLinks.value,
   () => {
     init()
   },

core/core-frontend/src/custom-component/de-stream-media/StreamMediaLinks.vue

@@ -112,7 +112,7 @@ const onChange = () => {
 init()
 
 watch(
-  linkInfo.value,
+  () => linkInfo.value,
   () => {
     init()
   },

core/core-frontend/src/custom-component/de-video/VideoLinks.vue

@@ -1,5 +1,6 @@
 <template>
   <el-row>
+    --{{ linkInfo }}
     <el-form @submit.prevent ref="form" size="small" style="width: 100%">
       <el-form-item :effect="themes" :label="t('visualization.auto_play')">
         <el-switch
@@ -105,7 +106,7 @@ const onBlur = () => {
 init()
 
 watch(
-  linkInfo.value,
+  () => linkInfo.value,
   () => {
     init()
   },

core/core-frontend/src/utils/DeShortcutKey.ts

@@ -11,7 +11,7 @@ const composeStore = composeStoreWithOut()
 const snapshotStore = snapshotStoreWithOut()
 const copyStore = copyStoreWithOut()
 const lockStore = lockStoreWithOut()
-const { curComponent, isInEditor } = storeToRefs(dvMainStore)
+const { curComponent, isInEditor, editMode } = storeToRefs(dvMainStore)
 const { areaData } = storeToRefs(composeStore)
 
 const ctrlKey = 17,
@@ -101,7 +101,7 @@ let isShiftDown = false
 // 全局监听按键操作并执行相应命令
 export function listenGlobalKeyDown() {
   window.onkeydown = e => {
-    if (!isInEditor || checkDialog()) return
+    if (!isInEditor.value || editMode.value === 'preview' || checkDialog()) return
     const { keyCode } = e
     if (positionMoveKey[keyCode] && curComponent.value) {
       positionMoveKey[keyCode](keyCode)