From 9dd6906fcb90780581847c2221ce65d2f0686639 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 26 Dec 2022 16:31:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E8=BF=87=E6=BB=A4=E5=99=A8):=20sqlserv?=
 =?UTF-8?q?er=E6=9F=A5=E8=AF=A2=E7=B2=BE=E7=A1=AE=E5=88=B0=E6=AF=AB?=
 =?UTF-8?q?=E7=A7=92=E7=9A=84=E6=BA=90=E6=95=B0=E6=8D=AE=E6=9C=89=E8=AF=AF?=
 =?UTF-8?q?=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/query/sqlserver/SqlserverQueryProvider.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
index 1f0dd528ee..8819b4da72 100644
--- a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
+++ b/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);

From 4d06f82349067f37086414fe7d62ad91cf7dc909 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 26 Dec 2022 16:46:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BD=E9=94=AE=E7=9B=98=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=85=B3=E9=97=AD=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=AF=BC=E8=87=B4=E9=94=AE=E7=9B=98=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC=E4=BA=8B=E4=BB=B6=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/editor/Preview.vue | 3 ++-
 frontend/src/components/canvas/utils/shortcutKey.js          | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue
index 05a8e141af..a94c23d16a 100644
--- a/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/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()
     }
     // 取消视图请求
diff --git a/frontend/src/components/canvas/utils/shortcutKey.js b/frontend/src/components/canvas/utils/shortcutKey.js
index 1c0688e91e..02f61cc7ae 100644
--- a/frontend/src/components/canvas/utils/shortcutKey.js
+++ b/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) {