Browse Source

:sparkles: Introducing new features.npm管理element和vue版本

lishangbu 6 years ago
parent
commit
1ec2b983a0

+ 1 - 1
package.json

@@ -16,7 +16,7 @@
     "clipboard": "^2.0.4",
     "clipboard": "^2.0.4",
     "crypto-js": "^3.1.9-1",
     "crypto-js": "^3.1.9-1",
     "echarts": "^4.2.1",
     "echarts": "^4.2.1",
-    "element-ui": "^2.9.1",
+    "element-ui": "~2.8.2",
     "js-cookie": "^2.2.0",
     "js-cookie": "^2.2.0",
     "net": "^1.0.2",
     "net": "^1.0.2",
     "nprogress": "^0.2.0",
     "nprogress": "^0.2.0",

File diff suppressed because it is too large
+ 0 - 1
public/cdn/element-ui/2.4.11/index.js


BIN
public/cdn/element-ui/2.4.11/theme-chalk/fonts/element-icons.ttf


BIN
public/cdn/element-ui/2.4.11/theme-chalk/fonts/element-icons.woff


File diff suppressed because it is too large
+ 0 - 1
public/cdn/element-ui/2.4.11/theme-chalk/index.css


File diff suppressed because it is too large
+ 0 - 6
public/cdn/vue-router/3.0.2/vue-router.min.js


File diff suppressed because it is too large
+ 0 - 10552
public/cdn/vue/2.5.2/vue.min.js


File diff suppressed because it is too large
+ 0 - 6
public/cdn/vuex/2.4.1/vuex.min.js


+ 0 - 5
public/index.html

@@ -9,7 +9,6 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="format-detection" content="telephone=no">
     <meta name="format-detection" content="telephone=no">
     <meta http-equiv="X-UA-Compatible" content="chrome=1" />
     <meta http-equiv="X-UA-Compatible" content="chrome=1" />
-    <link rel="stylesheet" href="<%= BASE_URL %>cdn/element-ui/2.4.11/theme-chalk/index.css">
     <link rel="stylesheet" href="<%= BASE_URL %>cdn/animate/3.5.2/animate.css">
     <link rel="stylesheet" href="<%= BASE_URL %>cdn/animate/3.5.2/animate.css">
     <link rel="stylesheet" href="<%= BASE_URL %>cdn/iconfont/1.0.0/index.css">
     <link rel="stylesheet" href="<%= BASE_URL %>cdn/iconfont/1.0.0/index.css">
     <link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/avue.css">
     <link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/avue.css">
@@ -40,11 +39,7 @@
         </div>
         </div>
     </div>
     </div>
     <!-- built files will be auto injected -->
     <!-- built files will be auto injected -->
-    <script src="<%= BASE_URL %>cdn/vue/2.5.2/vue.min.js" charset="utf-8"></script>
-    <script src="<%= BASE_URL %>cdn/vuex/2.4.1/vuex.min.js" charset="utf-8"></script>
-    <script src="<%= BASE_URL %>cdn/vue-router/3.0.2/vue-router.min.js" charset="utf-8"></script>
     <script src="<%= BASE_URL %>cdn/axios/1.0.0/axios.min.js" charset="utf-8"></script>
     <script src="<%= BASE_URL %>cdn/axios/1.0.0/axios.min.js" charset="utf-8"></script>
-    <script src="<%= BASE_URL %>cdn/element-ui/2.4.11/index.js" charset="utf-8"></script>
     <script src="<%= BASE_URL %>cdn/avue/index.js" charset="utf-8"></script>
     <script src="<%= BASE_URL %>cdn/avue/index.js" charset="utf-8"></script>
 </body>
 </body>
 
 

+ 12 - 0
src/main.js

@@ -12,6 +12,8 @@ import { filterForm, loadStyle, vaildData } from './util/util'
 import * as urls from '@/config/env'
 import * as urls from '@/config/env'
 import { iconfontUrl, iconfontVersion } from '@/config/env'
 import { iconfontUrl, iconfontVersion } from '@/config/env'
 import * as filters from './filters' // 全局filter
 import * as filters from './filters' // 全局filter
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css'
 import './styles/common.scss'
 import './styles/common.scss'
 import basicContainer from './components/basic-container/main'
 import basicContainer from './components/basic-container/main'
 // 插件 json 展示
 // 插件 json 展示
@@ -29,6 +31,16 @@ Vue.use(vueJsonTreeView)
 
 
 Vue.use(VueAxios, axios)
 Vue.use(VueAxios, axios)
 
 
+Vue.use(ElementUI,{
+  size: 'mini',
+  menuType: 'text'
+})
+
+Vue.use(window.AVUE, {
+  size: 'mini',
+  menuType: 'text'
+})
+
 // 注册全局容器
 // 注册全局容器
 Vue.component('basicContainer', basicContainer)
 Vue.component('basicContainer', basicContainer)
 
 

+ 2 - 0
src/router/router.js

@@ -1,8 +1,10 @@
+import Vue from 'vue'
 import VueRouter from 'vue-router'
 import VueRouter from 'vue-router'
 import PageRouter from './page/'
 import PageRouter from './page/'
 import ViewsRouter from './views/'
 import ViewsRouter from './views/'
 import AvueRouter from './avue-router'
 import AvueRouter from './avue-router'
 import Store from '../store/'
 import Store from '../store/'
+Vue.use(VueRouter)
 const Router = new VueRouter({
 const Router = new VueRouter({
   scrollBehavior(to, from, savedPosition) {
   scrollBehavior(to, from, savedPosition) {
     if (savedPosition) {
     if (savedPosition) {

+ 1 - 5
vue.config.js

@@ -9,11 +9,7 @@ module.exports = {
   chainWebpack: config => {
   chainWebpack: config => {
     // 忽略的打包文件
     // 忽略的打包文件
     config.externals({
     config.externals({
-      'vue': 'Vue',
-      'vue-router': 'VueRouter',
-      'vuex': 'Vuex',
-      'axios': 'axios',
-      'element-ui': 'ELEMENT'
+      'axios': 'axios'
     })
     })
     const entry = config.entry('app')
     const entry = config.entry('app')
     entry
     entry