Browse Source

[feature-3665][ui]Add element-ui (#3666)

* [feature-3665][ui]Add element-ui

* add license
pull/3/MERGE
break60 4 years ago committed by gaojun2048
parent
commit
543aac5951
  1. 1
      dolphinscheduler-dist/release-docs/LICENSE
  2. 21
      dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-element-ui
  3. 2
      dolphinscheduler-ui/build/config.js
  4. 1
      dolphinscheduler-ui/package.json
  5. 4
      dolphinscheduler-ui/src/js/conf/home/index.js
  6. 4
      dolphinscheduler-ui/src/js/conf/login/index.js

1
dolphinscheduler-dist/release-docs/LICENSE vendored

@ -491,6 +491,7 @@ MIT licenses
clipboard 2.0.1: https://github.com/zenorocha/clipboard.js MIT clipboard 2.0.1: https://github.com/zenorocha/clipboard.js MIT
codemirror 5.43.0: https://github.com/codemirror/CodeMirror MIT codemirror 5.43.0: https://github.com/codemirror/CodeMirror MIT
dayjs 1.7.8: https://github.com/iamkun/dayjs 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 html2canvas 0.5.0-beta4: https://github.com/niklasvh/html2canvas MIT
jquery 3.3.1: https://github.com/jquery/jquery MIT jquery 3.3.1: https://github.com/jquery/jquery MIT
jquery-ui 1.12.1: https://github.com/jquery/jquery-ui MIT jquery-ui 1.12.1: https://github.com/jquery/jquery-ui MIT

21
dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-element-ui vendored

@ -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.

2
dolphinscheduler-ui/build/config.js

@ -207,7 +207,7 @@ const baseConfig = {
'jquery':'jquery/dist/jquery.min.js', 'jquery':'jquery/dist/jquery.min.js',
'jquery-ui': 'jquery-ui' 'jquery-ui': 'jquery-ui'
}, },
extensions: ['.js', 'json', '.vue', '.scss'] extensions: ['*', '.js', 'json', '.vue', '.scss']
}, },
plugins: [ plugins: [
new VueLoaderPlugin(), new VueLoaderPlugin(),

1
dolphinscheduler-ui/package.json

@ -22,6 +22,7 @@
"d3": "^3.5.17", "d3": "^3.5.17",
"dagre": "^0.8.5", "dagre": "^0.8.5",
"dayjs": "^1.7.8", "dayjs": "^1.7.8",
"element-ui": "2.13.2",
"echarts": "4.1.0", "echarts": "4.1.0",
"html2canvas": "^0.5.0-beta4", "html2canvas": "^0.5.0-beta4",
"jquery": "3.3.1", "jquery": "3.3.1",

4
dolphinscheduler-ui/src/js/conf/home/index.js

@ -18,6 +18,8 @@
// The Vue build version to load with the `import` command // The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias. // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from 'vue' import Vue from 'vue'
import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'
import App from './App' import App from './App'
import router from './router' import router from './router'
import store from './store' import store from './store'
@ -39,6 +41,8 @@ import 'canvg/dist/browser/canvg.min.js'
// Component internationalization // Component internationalization
const useOpt = i18n.globalScope.LOCALE === 'en_US' ? { locale: en_US } : {} const useOpt = i18n.globalScope.LOCALE === 'en_US' ? { locale: en_US } : {}
Vue.use(ElementUI)
// Vue.use(ans) // Vue.use(ans)
Vue.use(ans, useOpt) Vue.use(ans, useOpt)

4
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. // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
// import $ from 'jquery' // import $ from 'jquery'
import Vue from 'vue' import Vue from 'vue'
import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'
import App from './App' import App from './App'
import i18n from '@/module/i18n' import i18n from '@/module/i18n'
import 'ans-ui/lib/ans-ui.min.css' 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 'sass/conf/login/index.scss'
import 'bootstrap/dist/js/bootstrap.min.js' import 'bootstrap/dist/js/bootstrap.min.js'
Vue.use(ElementUI)
Vue.use(ans) Vue.use(ans)
Vue.config.devtools = true Vue.config.devtools = true

Loading…
Cancel
Save