From 464405f48009e104ea9beacba4b8bb3c1fc047e7 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Tue, 9 Jun 2020 16:56:57 +0800 Subject: [PATCH] Python, sql, sqoop,datax task node editor adds zoom function #2929 (#2933) * Python, sql, sqoop task node editor adds zoom function * fix --- .../dag/_source/formModel/tasks/datax.vue | 70 +++++++++++++++++++ .../dag/_source/formModel/tasks/python.vue | 37 ++++++++++ .../pages/dag/_source/formModel/tasks/sql.vue | 37 ++++++++++ .../dag/_source/formModel/tasks/sqoop.vue | 38 +++++++++- 4 files changed, 181 insertions(+), 1 deletion(-) 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 9347b34dd0..6ced1ad0e6 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 @@ -47,6 +47,9 @@ name="code-sql-mirror" style="opacity: 0;"> + + + @@ -123,6 +126,9 @@ name="code-json-mirror" style="opacity: 0;"> + + + @@ -144,6 +150,7 @@ import _ from 'lodash' import i18n from '@/module/i18n' import mListBox from './_source/listBox' + import mScriptBox from './_source/scriptBox' import mDatasource from './_source/datasource' import mLocalParams from './_source/localParams' import mStatementList from './_source/statementList' @@ -197,6 +204,62 @@ createNodeId: Number }, methods: { + setEditorVal() { + let self = this + let modal = self.$modal.dialog({ + className: 'scriptModal', + closable: false, + showMask: true, + maskClosable: true, + onClose: function() { + + }, + render (h) { + return h(mScriptBox, { + on: { + getSriptBoxValue (val) { + editor.setValue(val) + }, + closeAble () { + // this.$modal.destroy() + modal.remove() + } + }, + props: { + item: editor.getValue() + } + }) + } + }) + }, + setJsonEditorVal() { + let self = this + let modal = self.$modal.dialog({ + className: 'scriptModal', + closable: false, + showMask: true, + maskClosable: true, + onClose: function() { + + }, + render (h) { + return h(mScriptBox, { + on: { + getSriptBoxValue (val) { + jsonEditor.setValue(val) + }, + closeAble () { + // this.$modal.destroy() + modal.remove() + } + }, + props: { + item: jsonEditor.getValue() + } + }) + } + }) + }, _onSwitch (is) { if(is) { this.customConfig = 1 @@ -475,3 +538,10 @@ components: { mListBox, mDatasource, mLocalParams, mStatementList, mSelectInput } } + \ No newline at end of file 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 851f8bee8a..30b9f7f79c 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 @@ -22,6 +22,9 @@
+ + +
@@ -57,6 +60,7 @@ import _ from 'lodash' import i18n from '@/module/i18n' import mListBox from './_source/listBox' + import mScriptBox from './_source/scriptBox' import mResources from './_source/resources' import mLocalParams from './_source/localParams' import Treeselect from '@riophae/vue-treeselect' @@ -100,6 +104,34 @@ _onLocalParams (a) { this.localParams = a }, + setEditorVal() { + let self = this + let modal = self.$modal.dialog({ + className: 'scriptModal', + closable: false, + showMask: true, + maskClosable: true, + onClose: function() { + + }, + render (h) { + return h(mScriptBox, { + on: { + getSriptBoxValue (val) { + editor.setValue(val) + }, + closeAble () { + // this.$modal.destroy() + modal.remove() + } + }, + props: { + item: editor.getValue() + } + }) + } + }) + }, /** * return resourceList */ @@ -342,4 +374,9 @@ } } } + .ans-modal-box-max { + position: absolute; + right: -12px; + top: -16px; + } \ No newline at end of file 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 9e7f3305e5..94ddaf8c5d 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 @@ -89,6 +89,9 @@ name="code-sql-mirror" style="opacity: 0;"> + + + @@ -140,6 +143,7 @@ import i18n from '@/module/i18n' import mUdfs from './_source/udfs' import mListBox from './_source/listBox' + import mScriptBox from './_source/scriptBox' import mSqlType from './_source/sqlType' import mDatasource from './_source/datasource' import mLocalParams from './_source/localParams' @@ -190,6 +194,34 @@ createNodeId: Number }, methods: { + setEditorVal() { + let self = this + let modal = self.$modal.dialog({ + className: 'scriptModal', + closable: false, + showMask: true, + maskClosable: true, + onClose: function() { + + }, + render (h) { + return h(mScriptBox, { + on: { + getSriptBoxValue (val) { + editor.setValue(val) + }, + closeAble () { + // this.$modal.destroy() + modal.remove() + } + }, + props: { + item: editor.getValue() + } + }) + } + }) + }, /** * return sqlType */ @@ -495,5 +527,10 @@ color: #ff0000; padding-right: 4px; } + .ans-modal-box-max { + position: absolute; + right: -12px; + top: -16px; + } 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 6594ffcf74..894377e7a6 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 @@ -190,6 +190,9 @@ name="code-sqoop-mirror" style="opacity: 0;"> + + + @@ -492,6 +495,7 @@ import _ from 'lodash' import i18n from '@/module/i18n' import mListBox from './_source/listBox' + import mScriptBox from './_source/scriptBox' import mDatasource from './_source/datasource' import mLocalParams from './_source/localParams' import disabledState from '@/module/mixin/disabledState' @@ -619,7 +623,34 @@ backfillItem: Object }, methods: { - + setEditorVal() { + let self = this + let modal = self.$modal.dialog({ + className: 'scriptModal', + closable: false, + showMask: true, + maskClosable: true, + onClose: function() { + + }, + render (h) { + return h(mScriptBox, { + on: { + getSriptBoxValue (val) { + editor.setValue(val) + }, + closeAble () { + // this.$modal.destroy() + modal.remove() + } + }, + props: { + item: editor.getValue() + } + }) + } + }) + }, _handleQueryType(o){ this.sourceMysqlParams.srcQueryType = this.srcQueryType }, @@ -1028,5 +1059,10 @@ color: #ff0000; padding-right: 4px; } + .ans-modal-box-max { + position: absolute; + right: -12px; + top: -16px; + }