You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ga...@apache.org on 2020/09/14 10:23:52 UTC
[incubator-dolphinscheduler] branch alert_plugin_design updated
(19d35d7 -> 5ee12d9)
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a change to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
discard 19d35d7 Merge branch 'alert_plugin_design' of https://github.com/apache/incubator-dolphinscheduler into alert_plugin_design
omit 8bed226 [Feature-3682][ui]Add form-create plug-in and alarm group management add sample demo (#3683)
discard 10eacae Merge branch 'break60-alert_plugin_design' into alert_plugin_design
omit e15d83c fix
omit 71b5853 fix
omit 7e7103e Modify node version
omit dac1b78 Add form-create plug-in and alarm group management add sample demo
omit 9f498fb [feature-3665][ui]Add element-ui (#3666)
add 0345823 [Feture-2753][ui]batch copy or move process
add cbb1ee7 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 06ab654 Merge pull request #3596 from break60/dev
add 4387c8a [Fix][ui] Fix version control release process definition editable
add 5e2a8be Merge pull request #3609 from yangyichao-mango/fix-versioncontroleditable
add bc766aa [Improvement][docs] Fix typo in CONTRIBUTING.md (#3624)
add 908dba4 [Improvement][install,start-all,stop-all] start- all.sh and stop- all.sh After execution, you can view the running status of each node and service. #3619 (#3627)
add fbeadfd [FIX][UI]add button disabeld when isDetails (#3611)
add 632d52c [refactor][server-test] refactor RoundRobinHostManagerTest (#3511)
add ac4ed94 [Improvement][common] Add UnsupportedOperationException for utils construct (#3381)
add 69201ac [Improvement][ALL] Remove some un-used code and code review #3639 (#3640)
add feec629 [Improvement][server] unit test for SubProcessTask with PowerMockRunner (#3632)
add 417de13 [improvement][remote]use EpollServerSocketChannel when system is linux (#3657)
add d280820 [Improvement][remote] linux platform default use epoll (#3667)
add 86bcc05 [Test][remote]update netty util test and fix init channel error (#3671)
add 6dc8b4f add 4lw.commands.whitelist for ds monitor (#3664)
add 7d49fbb [Improvement][remote] set connect time out (#3670)
add ba3adbd [FIXBUG][common]fix yarn applications status cause NPE(#3645) (#3648)
add 68bc588 [Improvement][server] Refactor code for getTaskLogPath to reduce NPE log during UT (#3629)
add c7a2f92 [Improvement-3612][ui] Workflow version control ui optimize (#3622)
add 21a90f2 [Feature][API] process definition delete api add check process instance is already running. #3581 (#3582)
add c42e769 [Fix] fix bug #3487 Create folder duplicate name under multithreading (#3697)
add 1e8fe73 [Feature-3701][ui] Shortcut connection action for node in same flow (#3699)
add 4ed3638 [Bug][server] fix 3629 pull request (#3706)
add 7af20ca [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
add 94247d8 [Bug-3722][ui]fix cannot change password on dev branch. (#3724)
add 3a2663e [Improvement][DAO] druid The lower version is not compatible with LocalDateTime(DRUID 低版本不支持LocalDateTime) (#3716)
add 565b8d3 [Improvement-3690][common] Get the native IP policy problem (获取本机ip策略问题 ) (#3695)
add fad2852 [Improvement][server] WATERDROP task plug-in optimization in switch case code cleaning. (#3652)
new 63a0ba5 [feature-3665][ui]Add element-ui (#3666)
new d96a063 Add form-create plug-in and alarm group management add sample demo
new 95a5572 Modify node version
new 715f1f3 fix
new 5ee12d9 fix
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (19d35d7)
\
N -- N -- N refs/heads/alert_plugin_design (5ee12d9)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/ci_e2e.yml | 2 +-
CONTRIBUTING.md | 2 +-
docker/build/conf/zookeeper/zoo.cfg | 2 +
.../ServiceModelToSwagger2MapperImpl.java | 6 +-
.../api/dto/resources/filter/ResourceFilter.java | 3 +-
.../apache/dolphinscheduler/api/enums/Status.java | 4 +-
.../api/service/DataSourceService.java | 5 +-
.../api/service/ProcessInstanceService.java | 21 +-
.../api/service/ResourcesService.java | 10 +-
.../api/service/UdfFuncService.java | 5 +-
.../api/service/impl/AccessTokenServiceImpl.java | 2 +-
.../service/impl/ProcessDefinitionServiceImpl.java | 37 +-
.../api/controller/ResourcesControllerTest.java | 23 -
.../dto/resources/filter/ResourceFilterTest.java | 3 +-
.../api/service/ProcessDefinitionServiceTest.java | 5 +-
.../apache/dolphinscheduler/common/Constants.java | 8 +-
.../common/utils/CollectionUtils.java | 32 +-
.../dolphinscheduler/common/utils/CommonUtils.java | 205 +++---
.../common/utils/ConnectionUtils.java | 43 +-
.../dolphinscheduler/common/utils/DateUtils.java | 4 +
.../common/utils/DependentUtils.java | 41 +-
.../common/utils/EncryptionUtils.java | 7 +-
.../dolphinscheduler/common/utils/EnumUtils.java | 7 +-
.../dolphinscheduler/common/utils/FileUtils.java | 96 +--
.../dolphinscheduler/common/utils/HadoopUtils.java | 79 +-
.../dolphinscheduler/common/utils/HttpUtils.java | 224 +++---
.../dolphinscheduler/common/utils/IOUtils.java | 10 +-
.../dolphinscheduler/common/utils/IpUtils.java | 72 +-
.../dolphinscheduler/common/utils/JSONUtils.java | 62 +-
.../dolphinscheduler/common/utils/LoggerUtils.java | 32 +-
.../dolphinscheduler/common/utils/NetUtils.java | 144 +++-
.../dolphinscheduler/common/utils/OSUtils.java | 818 +++++++++++----------
.../common/utils/ParameterUtils.java | 406 +++++-----
.../common/utils/Preconditions.java | 19 +-
.../common/utils/PropertyUtils.java | 48 +-
.../common/utils/RetryerUtils.java | 14 +-
.../dolphinscheduler/common/utils/SchemaUtils.java | 222 +++---
.../common/utils/SensitiveLogUtils.java | 10 +-
.../dolphinscheduler/common/utils/StreamUtils.java | 5 +-
.../dolphinscheduler/common/utils/StringUtils.java | 12 +-
.../common/utils/TaskParametersUtils.java | 99 +--
.../src/main/resources/common.properties | 3 +
.../dao/mapper/ProcessInstanceMapper.java | 22 +-
.../dao/mapper/ProcessInstanceMapper.xml | 12 +-
.../remote/NettyRemotingClient.java | 4 +-
.../remote/NettyRemotingServer.java | 36 +-
.../remote/config/NettyClientConfig.java | 23 +-
.../dolphinscheduler/remote/utils/Constants.java | 9 +-
.../dolphinscheduler/remote/utils/NettyUtils.java | 20 +
.../dolphinscheduler/remote/NettyUtilTest.java | 12 +-
.../server/master/future/TaskFuture.java | 2 +-
.../master/runner/ConditionsTaskExecThread.java | 4 +-
.../master/runner/DependentTaskExecThread.java | 20 +-
.../master/runner/MasterBaseTaskExecThread.java | 62 +-
.../dolphinscheduler/server/utils/LogUtils.java | 76 ++
.../worker/processor/TaskExecuteProcessor.java | 30 +-
.../server/worker/task/TaskManager.java | 74 +-
...itionsTaskTest.java => SubProcessTaskTest.java} | 124 ++--
.../dispatch/host/RoundRobinHostManagerTest.java | 46 +-
.../master/runner/MasterTaskExecThreadTest.java | 7 +-
.../server/utils/LogUtilsTest.java | 66 ++
.../server/worker/task/TaskManagerTest.java | 103 +++
.../src/js/conf/home/pages/dag/_source/dag.vue | 3 +-
.../home/pages/dag/_source/formModel/formModel.vue | 71 +-
.../dag/_source/formModel/tasks/pre_tasks.vue | 108 +++
.../src/js/conf/home/pages/dag/_source/udp/udp.vue | 2 +-
.../pages/definition/pages/list/_source/list.vue | 85 ++-
.../definition/pages/list/_source/relatedItems.vue | 94 +++
.../definition/pages/list/_source/versions.vue | 59 +-
.../pages/user/pages/password/_source/info.vue | 3 +-
.../src/js/conf/home/store/dag/actions.js | 32 +-
.../src/js/module/i18n/locale/en_US.js | 7 +-
.../src/js/module/i18n/locale/zh_CN.js | 7 +-
install.sh | 4 -
pom.xml | 6 +-
script/dolphinscheduler-daemon.sh | 19 +-
script/start-all.sh | 6 +-
script/status-all.sh | 59 +-
script/stop-all.sh | 6 +-
sql/dolphinscheduler-postgre.sql | 3 +-
sql/dolphinscheduler_mysql.sql | 3 +-
.../1.3.3_schema/mysql/dolphinscheduler_ddl.sql | 26 +
.../postgresql/dolphinscheduler_ddl.sql | 28 +-
tools/dependencies/known-dependencies.txt | 2 +-
84 files changed, 2574 insertions(+), 1663 deletions(-)
create mode 100644 dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/LogUtils.java
copy dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/{ConditionsTaskTest.java => SubProcessTaskTest.java} (57%)
create mode 100644 dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/LogUtilsTest.java
create mode 100644 dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/TaskManagerTest.java
create mode 100644 dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pre_tasks.vue
create mode 100644 dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/relatedItems.vue
[incubator-dolphinscheduler] 02/05: Add form-create plug-in and
alarm group management add sample demo
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit d96a06357ae5b082ad4e946019d5f6c987131854
Author: break60 <79...@qq.com>
AuthorDate: Mon Sep 7 15:06:08 2020 +0800
Add form-create plug-in and alarm group management add sample demo
---
dolphinscheduler-dist/release-docs/LICENSE | 1 +
.../ui-licenses/LICENSE-@form-create-element-ui | 21 +++++++++
dolphinscheduler-ui/package.json | 5 ++-
dolphinscheduler-ui/src/js/conf/home/index.js | 4 ++
.../security/pages/warningGroups/_source/list.vue | 51 +++++++++++++++++++++-
dolphinscheduler-ui/src/js/conf/login/index.js | 4 ++
6 files changed, 83 insertions(+), 3 deletions(-)
diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE
index 9f5a9f4..88e7ed8 100644
--- a/dolphinscheduler-dist/release-docs/LICENSE
+++ b/dolphinscheduler-dist/release-docs/LICENSE
@@ -484,6 +484,7 @@ The text of each license is also included at licenses/ui-licenses/LICENSE-[proje
========================================
MIT licenses
========================================
+ @form-create/element-ui 1.0.18: https://github.com/xaboy/form-create MIT
ans-UI 1.1.7: https://github.com/analysys/ans-ui MIT
axios 0.16.2: https://github.com/axios/axios MIT
bootstrap 3.3.7: https://github.com/twbs/bootstrap MIT
diff --git a/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@form-create-element-ui b/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@form-create-element-ui
new file mode 100644
index 0000000..5609421
--- /dev/null
+++ b/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@form-create-element-ui
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 xaboy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json
index 5030ac2..fd479f2 100644
--- a/dolphinscheduler-ui/package.json
+++ b/dolphinscheduler-ui/package.json
@@ -12,6 +12,7 @@
"build:release": "npm run clean && cross-env NODE_ENV=production PUBLIC_PATH=/dolphinscheduler/ui webpack --config ./build/webpack.config.release.js"
},
"dependencies": {
+ "@form-create/element-ui": "^1.0.18",
"@riophae/vue-treeselect": "^0.4.0",
"ans-ui": "1.1.9",
"axios": "^0.16.2",
@@ -21,8 +22,8 @@
"codemirror": "^5.43.0",
"d3": "^3.5.17",
"dayjs": "^1.7.8",
- "element-ui": "2.13.2",
"echarts": "4.1.0",
+ "element-ui": "2.13.2",
"html2canvas": "^0.5.0-beta4",
"jquery": "3.3.1",
"jquery-ui": "^1.12.1",
@@ -31,7 +32,7 @@
"lodash": "^4.17.11",
"normalize.css": "^8.0.1",
"vue": "^2.5.17",
- "vue-router": "2.7.0",
+ "vue-router": "^2.7.0",
"vuex": "^3.0.0",
"vuex-router-sync": "^5.0.0"
},
diff --git a/dolphinscheduler-ui/src/js/conf/home/index.js b/dolphinscheduler-ui/src/js/conf/home/index.js
index bfa786c..d62ac47 100644
--- a/dolphinscheduler-ui/src/js/conf/home/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/index.js
@@ -38,6 +38,8 @@ import 'bootstrap/dist/css/bootstrap.min.css'
import 'bootstrap/dist/js/bootstrap.min.js'
import 'canvg/dist/browser/canvg.min.js'
+import formCreate, {maker} from '@form-create/element-ui'
+
// Component internationalization
const useOpt = i18n.globalScope.LOCALE === 'en_US' ? { locale: en_US } : {}
@@ -46,6 +48,8 @@ Vue.use(ElementUI)
// Vue.use(ans)
Vue.use(ans, useOpt)
+Vue.use(formCreate)
+
sync(store, router)
Vue.config.devtools = true
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
index 528693a..71e6aa5 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
@@ -16,6 +16,9 @@
*/
<template>
<div class="list-model">
+ <div>
+ <form-create v-model="fApi" :rule="rule" :option="option"></form-create>
+ </div>
<div class="table-box">
<table>
<tr>
@@ -97,7 +100,53 @@
name: 'user-list',
data () {
return {
- list: []
+ list: [],
+ fApi: {},
+ rule: [
+ {
+ type: "input", // 生成组件的名称(就是表单的名称：如input，radio，checkbox，select，slider等)
+ field: "userName", // 表单组件的字段名称(就是表单的name属性，注：该必须唯一),自定义组件可以不配置
+ className: "user-name-dom", // 设置组件的class属性
+ title: "用户名称：", // 组件的名称, 选填
+ value: "", // 表单组件的字段值(就是表单的value值),自定义组件可以不用设置
+ props: {
+ placeholder: "请输入用户名称！",
+ disabled: false,
+ readonly: false,
+ clearable: true // 是否显示清空按钮
+ },
+ validate: [
+ {
+ trigger: "blur",
+ required: true,
+ message: "用户名称不能为空！"
+ }
+ ],
+ col: {
+ md: { span: 12 }
+ }
+ }
+ ],
+ option: {
+ // 显示重置表单按扭
+ resetBtn: true,
+
+ // 表单提交按扭事件
+ onSubmit: formData => {
+ alert(JSON.stringify(formData));
+
+ console.log("获取表单中的数据：", formData);
+
+ //按钮进入提交状态
+ // this.fApi.btn.loading();
+
+ //重置按钮禁用
+ // this.fApi.resetBtn.disabled();
+
+ //按钮进入可点击状态
+ // this.fApi.btn.finish();
+ }
+ }
}
},
props: {
diff --git a/dolphinscheduler-ui/src/js/conf/login/index.js b/dolphinscheduler-ui/src/js/conf/login/index.js
index 55ca0d4..7e94ddf 100644
--- a/dolphinscheduler-ui/src/js/conf/login/index.js
+++ b/dolphinscheduler-ui/src/js/conf/login/index.js
@@ -29,10 +29,14 @@ import ans from 'ans-ui/lib/ans-ui.min'
import 'sass/conf/login/index.scss'
import 'bootstrap/dist/js/bootstrap.min.js'
+import formCreate, {maker} from '@form-create/element-ui'
+
Vue.use(ElementUI)
Vue.use(ans)
+Vue.use(formCreate)
+
Vue.config.devtools = true
Vue.config.productionTip = true
Vue.config.silent = true
[incubator-dolphinscheduler] 03/05: Modify node version
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 95a5572271b7c91dac3af1d18662fc085b038b63
Author: break60 <79...@qq.com>
AuthorDate: Mon Sep 7 15:32:20 2020 +0800
Modify node version
---
dolphinscheduler-ui/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 13644ba..2aaf946 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -29,7 +29,7 @@
<name>${project.artifactId}</name>
<properties>
- <node.version>v12.12.0</node.version>
+ <node.version>v10.16.0</node.version>
<npm.version>6.11.3</npm.version>
<sonar.sources>src</sonar.sources>
</properties>
[incubator-dolphinscheduler] 01/05: [feature-3665][ui]Add
element-ui (#3666)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 63a0ba5750549a862278b219ca5f9ee272319912
Author: break60 <79...@qq.com>
AuthorDate: Fri Sep 4 14:06:04 2020 +0800
[feature-3665][ui]Add element-ui (#3666)
* [feature-3665][ui]Add element-ui
* add license
---
dolphinscheduler-dist/release-docs/LICENSE | 1 +
.../licenses/ui-licenses/LICENSE-element-ui | 21 +++++++++++++++++++++
dolphinscheduler-ui/build/config.js | 2 +-
dolphinscheduler-ui/package.json | 1 +
dolphinscheduler-ui/src/js/conf/home/index.js | 4 ++++
dolphinscheduler-ui/src/js/conf/login/index.js | 4 ++++
6 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE
index 59da274..9f5a9f4 100644
--- a/dolphinscheduler-dist/release-docs/LICENSE
+++ b/dolphinscheduler-dist/release-docs/LICENSE
@@ -491,6 +491,7 @@ MIT licenses
clipboard 2.0.1: https://github.com/zenorocha/clipboard.js MIT
codemirror 5.43.0: https://github.com/codemirror/CodeMirror MIT
dayjs 1.7.8: https://github.com/iamkun/dayjs MIT
+ element-ui 2.13.2: https://github.com/ElemeFE/element MIT
html2canvas 0.5.0-beta4: https://github.com/niklasvh/html2canvas MIT
jquery 3.3.1: https://github.com/jquery/jquery MIT
jquery-ui 1.12.1: https://github.com/jquery/jquery-ui MIT
diff --git a/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-element-ui b/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-element-ui
new file mode 100644
index 0000000..d4462f3
--- /dev/null
+++ b/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-element-ui
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016-present ElemeFE
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/dolphinscheduler-ui/build/config.js b/dolphinscheduler-ui/build/config.js
index 2800115..11bbec5 100644
--- a/dolphinscheduler-ui/build/config.js
+++ b/dolphinscheduler-ui/build/config.js
@@ -207,7 +207,7 @@ const baseConfig = {
'jquery':'jquery/dist/jquery.min.js',
'jquery-ui': 'jquery-ui'
},
- extensions: ['.js', 'json', '.vue', '.scss']
+ extensions: ['*', '.js', 'json', '.vue', '.scss']
},
plugins: [
new VueLoaderPlugin(),
diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json
index a5642c8..5030ac2 100644
--- a/dolphinscheduler-ui/package.json
+++ b/dolphinscheduler-ui/package.json
@@ -21,6 +21,7 @@
"codemirror": "^5.43.0",
"d3": "^3.5.17",
"dayjs": "^1.7.8",
+ "element-ui": "2.13.2",
"echarts": "4.1.0",
"html2canvas": "^0.5.0-beta4",
"jquery": "3.3.1",
diff --git a/dolphinscheduler-ui/src/js/conf/home/index.js b/dolphinscheduler-ui/src/js/conf/home/index.js
index efec218..bfa786c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/index.js
@@ -18,6 +18,8 @@
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from 'vue'
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css'
import App from './App'
import router from './router'
import store from './store'
@@ -39,6 +41,8 @@ import 'canvg/dist/browser/canvg.min.js'
// Component internationalization
const useOpt = i18n.globalScope.LOCALE === 'en_US' ? { locale: en_US } : {}
+Vue.use(ElementUI)
+
// Vue.use(ans)
Vue.use(ans, useOpt)
diff --git a/dolphinscheduler-ui/src/js/conf/login/index.js b/dolphinscheduler-ui/src/js/conf/login/index.js
index d9b9353..55ca0d4 100644
--- a/dolphinscheduler-ui/src/js/conf/login/index.js
+++ b/dolphinscheduler-ui/src/js/conf/login/index.js
@@ -19,6 +19,8 @@
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
// import $ from 'jquery'
import Vue from 'vue'
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css'
import App from './App'
import i18n from '@/module/i18n'
import 'ans-ui/lib/ans-ui.min.css'
@@ -27,6 +29,8 @@ import ans from 'ans-ui/lib/ans-ui.min'
import 'sass/conf/login/index.scss'
import 'bootstrap/dist/js/bootstrap.min.js'
+Vue.use(ElementUI)
+
Vue.use(ans)
Vue.config.devtools = true
[incubator-dolphinscheduler] 04/05: fix
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 715f1f3c065b2514753f7e599b2c262040a42408
Author: break60 <79...@qq.com>
AuthorDate: Mon Sep 7 15:34:51 2020 +0800
fix
---
dolphinscheduler-ui/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 2aaf946..7aaa69a 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -29,7 +29,7 @@
<name>${project.artifactId}</name>
<properties>
- <node.version>v10.16.0</node.version>
+ <node.version>v10.16.2</node.version>
<npm.version>6.11.3</npm.version>
<sonar.sources>src</sonar.sources>
</properties>
[incubator-dolphinscheduler] 05/05: fix
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 5ee12d9851b12424569aaafc3e1a03bd2c17e9a9
Author: break60 <79...@qq.com>
AuthorDate: Mon Sep 7 15:37:54 2020 +0800
fix
---
dolphinscheduler-ui/pom.xml | 2 +-
dolphinscheduler-ui/src/js/conf/home/index.js | 2 +-
dolphinscheduler-ui/src/js/conf/login/index.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 7aaa69a..13644ba 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -29,7 +29,7 @@
<name>${project.artifactId}</name>
<properties>
- <node.version>v10.16.2</node.version>
+ <node.version>v12.12.0</node.version>
<npm.version>6.11.3</npm.version>
<sonar.sources>src</sonar.sources>
</properties>
diff --git a/dolphinscheduler-ui/src/js/conf/home/index.js b/dolphinscheduler-ui/src/js/conf/home/index.js
index d62ac47..6d76554 100644
--- a/dolphinscheduler-ui/src/js/conf/home/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/index.js
@@ -48,7 +48,7 @@ Vue.use(ElementUI)
// Vue.use(ans)
Vue.use(ans, useOpt)
-Vue.use(formCreate)
+Vue.use(formCreate, {maker})
sync(store, router)
diff --git a/dolphinscheduler-ui/src/js/conf/login/index.js b/dolphinscheduler-ui/src/js/conf/login/index.js
index 7e94ddf..ab721a7 100644
--- a/dolphinscheduler-ui/src/js/conf/login/index.js
+++ b/dolphinscheduler-ui/src/js/conf/login/index.js
@@ -35,7 +35,7 @@ Vue.use(ElementUI)
Vue.use(ans)
-Vue.use(formCreate)
+Vue.use(formCreate, {maker})
Vue.config.devtools = true
Vue.config.productionTip = true