From 3c10bbe1571573257c855667d99590c6aa87b423 Mon Sep 17 00:00:00 2001 From: Devosend Date: Fri, 28 Jan 2022 18:25:25 +0800 Subject: [PATCH] [FIX-7514] press Enter key get "true" not new line (#7596) --- .../dag/_source/formModel/tasks/_source/jsonBox.vue | 5 ++++- .../dag/_source/formModel/tasks/_source/scriptBox.vue | 5 ++++- .../home/pages/dag/_source/formModel/tasks/datax.vue | 10 ++++++++-- .../home/pages/dag/_source/formModel/tasks/python.vue | 5 ++++- .../home/pages/dag/_source/formModel/tasks/shell.vue | 5 ++++- .../home/pages/dag/_source/formModel/tasks/sql.vue | 5 ++++- .../home/pages/dag/_source/formModel/tasks/sqoop.vue | 10 ++++++++-- .../home/pages/dag/_source/formModel/tasks/switch.vue | 5 ++++- .../pages/resource/pages/file/pages/create/index.vue | 5 ++++- .../pages/resource/pages/file/pages/edit/index.vue | 5 ++++- .../pages/resource/pages/file/pages/subFile/index.vue | 5 ++++- 11 files changed, 52 insertions(+), 13 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/jsonBox.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/jsonBox.vue index 9b7f53e0cf..a8f7951fb2 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/jsonBox.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/jsonBox.vue @@ -67,7 +67,10 @@ this.keypress = () => { if (!editor.getOption('readOnly')) { editor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue index 19b88c06c2..f503e8bf7c 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue @@ -67,7 +67,10 @@ this.keypress = () => { if (!editor.getOption('readOnly')) { editor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue index a469b42b0a..fa6c40e5a4 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue @@ -367,7 +367,10 @@ this.keypress = () => { if (!editor.getOption('readOnly')) { editor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } } @@ -395,7 +398,10 @@ this.keypress = () => { if (!jsonEditor.getOption('readOnly')) { jsonEditor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue index 85892f4c60..cfe81192a8 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue @@ -188,7 +188,10 @@ this.keypress = () => { if (!editor.getOption('readOnly')) { editor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue index 8f0b85a1e1..de1693e9bd 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue @@ -199,7 +199,10 @@ this.keypress = () => { if (!editor.getOption('readOnly')) { editor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue index 3df9ee6c78..f8bf9ede60 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue @@ -317,7 +317,10 @@ this.keypress = () => { if (!editor.getOption('readOnly')) { editor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue index 36bc124021..615921072d 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue @@ -1094,7 +1094,10 @@ this.keypress = () => { if (!editor.getOption('readOnly')) { editor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } } @@ -1128,7 +1131,10 @@ this.keypress = () => { if (!shellEditor.getOption('readOnly')) { shellEditor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/switch.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/switch.vue index 30fecad9c9..9f7bc66eaa 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/switch.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/switch.vue @@ -101,7 +101,10 @@ this.keypress = () => { if (!editor.getOption('readOnly')) { editor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue index ef526e5f5a..d6b2db4049 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue @@ -155,7 +155,10 @@ this.keypress = () => { if (!editor.getOption('readOnly')) { editor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue index 0156747d3b..a3629067a7 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue @@ -143,7 +143,10 @@ this.keypress = () => { if (!editor.getOption('readOnly')) { editor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFile/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFile/index.vue index 7e4e00973f..13b538876f 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFile/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFile/index.vue @@ -156,7 +156,10 @@ this.keypress = () => { if (!editor.getOption('readOnly')) { editor.showHint({ - completeSingle: false + completeSingle: false, + extraKeys: { + Enter: '' + } }) } }