Merge branch 'dev' into pr@dev_memory_component

backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java

@@ -1121,7 +1121,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
                     String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
                     whereValue = String.format(SqlServerSQLConstants.WHERE_BETWEEN, startTime, endTime);

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

@@ -413,7 +413,8 @@ export default {
     }
   },
   created() {
-    if (this.canvasId === 'canvas-main') {
+    // 防止编辑界面销毁键盘事件监听
+    if (this.canvasId === 'canvas-main' && !this.showPosition.includes('multiplexing')) {
       listenGlobalKeyDownPreview()
     }
     // 取消视图请求

frontend/src/components/canvas/utils/shortcutKey.js

@@ -74,6 +74,8 @@ export function listenGlobalKeyDown() {
 export function listenGlobalKeyDownPreview() {
   window.onkeydown = (e) => {
     const { keyCode } = e
+    e.preventDefault()
+    e.stopPropagation()
     if (keyCode === ctrlKey || keyCode === commandKey) {
       isCtrlOrCommandDown = true
     } else if (isCtrlOrCommandDown) {