From 20efcd7277a08504560a4060b9b6cc723b59e32d Mon Sep 17 00:00:00 2001 From: dailidong Date: Sat, 25 Apr 2020 11:23:14 +0800 Subject: [PATCH 001/122] add DolphinScheduler slack channel --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 84f9ccfa66..626cc5d04e 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,7 @@ It is because of the shoulders of these open source projects that the birth of t ### Get Help 1. Submit an issue 1. Subscribe the mail list : https://dolphinscheduler.apache.org/en-us/docs/development/subscribe.html. then send mail to dev@dolphinscheduler.apache.org +1. Slack channel: [Slack channel](https://join.slack.com/share/zt-do3gvfhj-UUhrAX2GxkVX_~JJt1jpKA) 1. Contact WeChat(dailidong66). This is just for Mandarin(CN) discussion. ### License From df220c9e5335a7604dab00dd9c601be91d4a3e92 Mon Sep 17 00:00:00 2001 From: dailidong Date: Sat, 25 Apr 2020 23:04:09 +0800 Subject: [PATCH 002/122] Update README.md Co-Authored-By: Jiajie Zhong --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 626cc5d04e..b88fdbed53 100644 --- a/README.md +++ b/README.md @@ -99,10 +99,9 @@ It is because of the shoulders of these open source projects that the birth of t ### Get Help 1. Submit an issue 1. Subscribe the mail list : https://dolphinscheduler.apache.org/en-us/docs/development/subscribe.html. then send mail to dev@dolphinscheduler.apache.org -1. Slack channel: [Slack channel](https://join.slack.com/share/zt-do3gvfhj-UUhrAX2GxkVX_~JJt1jpKA) +1. Slack channel: [![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://join.slack.com/share/zt-do3gvfhj-UUhrAX2GxkVX_~JJt1jpKA) 1. Contact WeChat(dailidong66). This is just for Mandarin(CN) discussion. ### License Please refer to [LICENSE](https://github.com/apache/incubator-dolphinscheduler/blob/dev/LICENSE) file. - From 80a4a445d90d10aef61ece30a6d77110476fc70e Mon Sep 17 00:00:00 2001 From: chenxingchun <438044805@qq.com> Date: Fri, 8 May 2020 18:30:36 +0800 Subject: [PATCH 003/122] modify soft_version 1.2.2 to 1.3.0 --- sql/soft_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/soft_version b/sql/soft_version index d2d61a7e8e..589268e6fe 100644 --- a/sql/soft_version +++ b/sql/soft_version @@ -1 +1 @@ -1.2.2 \ No newline at end of file +1.3.0 \ No newline at end of file From 8583b60df514c6c5a31cdb8ea70639d6ff026e77 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Sat, 9 May 2020 11:44:42 +0800 Subject: [PATCH 004/122] Repair worklist cannot be deleted --- .../definition/pages/list/_source/list.vue | 22 ++--------------- .../instance/pages/list/_source/list.vue | 24 +++---------------- 2 files changed, 5 insertions(+), 41 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue index 1a07fae037..d0f9983f6f 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue @@ -86,7 +86,7 @@ {{$t('online')}} - - + @@ -122,20 +122,6 @@ - -

{{$t('Delete?')}}

-
- {{$t('Cancel')}} - {{$t('Confirm')}} -
- - + \ 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; + }