This is an automated email from the ASF dual-hosted git repository.
zhongjiajie pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 3c10bbe [FIX-7514] press Enter key get "true" not new line (#7596)
3c10bbe is described below
commit 3c10bbe1571573257c855667d99590c6aa87b423
Author: Devosend <[email protected]>
AuthorDate: Fri Jan 28 18:25:25 2022 +0800
[FIX-7514] press Enter key get "true" not new line (#7596)
---
.../home/pages/dag/_source/formModel/tasks/_source/jsonBox.vue | 5 ++++-
.../pages/dag/_source/formModel/tasks/_source/scriptBox.vue | 5 ++++-
.../js/conf/home/pages/dag/_source/formModel/tasks/datax.vue | 10 ++++++++--
.../js/conf/home/pages/dag/_source/formModel/tasks/python.vue | 5 ++++-
.../js/conf/home/pages/dag/_source/formModel/tasks/shell.vue | 5 ++++-
.../src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue | 5 ++++-
.../js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue | 10 ++++++++--
.../js/conf/home/pages/dag/_source/formModel/tasks/switch.vue | 5 ++++-
.../conf/home/pages/resource/pages/file/pages/create/index.vue | 5 ++++-
.../conf/home/pages/resource/pages/file/pages/edit/index.vue | 5 ++++-
.../home/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 9b7f53e..a8f7951 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 19b88c0..f503e8b 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 a469b42..fa6c40e 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 85892f4..cfe8119 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 8f0b85a..de1693e 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 3df9ee6..f8bf9ed 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 36bc124..6159210 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 30fecad..9f7bc66 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 ef526e5..d6b2db4 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 0156747..a362906 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 7e4e009..13b5388 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: ''
+ }
})
}
}
