center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' into pr@dev_memory_component

Browse Source
This commit is contained in:
dataeaseShu 2022-12-26 17:40:38 +08:00
commit a1c49d2c54
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1121,7 +1121,7 @@ public class SqlserverQueryProvider extends QueryProvider {
whereValue = "'%" + value.get(0) + "%'"; whereValue = "'%" + value.get(0) + "%'";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) { } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) { 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 startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1)))); String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(SqlServerSQLConstants.WHERE_BETWEEN, startTime, endTime); whereValue = String.format(SqlServerSQLConstants.WHERE_BETWEEN, startTime, endTime);

3
frontend/src/components/canvas/components/editor/Preview.vue
View File

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

2
frontend/src/components/canvas/utils/shortcutKey.js
View File

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