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
The following commit(s) were added to refs/heads/alert_plugin_design by this
push:
new 9f498fb [feature-3665][ui]Add element-ui (#3666)
9f498fb is described below
commit 9f498fbe3f17d157b643dd0a94f8eb39e8e8a31a
Author: break60 <790061...@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
