由于cdn坏了，决定不再使用cdn

CaesarLsky · Dec 20, 2021 · df8136c · df8136c
1 parent effea15
commit df8136c
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 56 deletions.
diff --git a/public/index.html b/public/index.html
@@ -6,10 +6,10 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.png" >
     <!-- CDN文件，配置在config/index.js下 -->
-    <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.css) { %><link href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" rel="stylesheet">
+<!--     <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.css) { %><link href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" rel="stylesheet">
     <% } %>
     <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.js) { %>
-    <script src="<%= htmlWebpackPlugin.options.cdn.js[i] %>"></script><% } %>
+    <script src="<%= htmlWebpackPlugin.options.cdn.js[i] %>"></script><% } %> -->
     <title></title>
   </head>
   <body>

diff --git a/src/components/main/components/side-menu/side-menu.less b/src/components/main/components/side-menu/side-menu.less
@@ -3,7 +3,7 @@
   .ivu-menu-vertical{
     &.ivu-menu-dark, &.ivu-menu-light{
       .ivu-menu-item-active:not(.ivu-menu-submenu){
-        color: #fff;
+        // color: #fff;
       }
     }
   }

diff --git a/src/components/main/components/side-menu/side-menu.vue b/src/components/main/components/side-menu/side-menu.vue
@@ -48,7 +48,7 @@ export default {
     },
     theme: {
       type: String,
-      default: 'dark'
+      default: 'light'
     },
     rootIconSize: {
       type: Number,

diff --git a/src/components/main/main.less b/src/components/main/main.less
@@ -35,7 +35,7 @@
   .left-sider{
     .ivu-layout-sider-children{
       overflow-y: scroll;
-      margin-right: -18px;
+      // margin-right: -18px;
     }
   }
 }

diff --git a/src/components/main/main.vue b/src/components/main/main.vue
@@ -1,6 +1,6 @@
 <template>
   <Layout style="height: 100%" class="main">
-    <Sider hide-trigger collapsible :width="200" :collapsed-width="64" v-model="collapsed" class="left-sider" :style="{overflow: 'hidden'}">
+    <Sider hide-trigger collapsible :width="240" :collapsed-width="64" v-model="collapsed" class="left-sider">
       <side-menu accordion ref="sideMenu" :active-name="$route.name" :collapsed="collapsed" @on-select="turnToPage" :menu-list="menuList">
         <!-- 需要放在菜单上面的内容，如Logo，写在side-menu标签内部，如下 -->
 <!--         <div class="logo-con">

diff --git a/src/index.less b/src/index.less
@@ -1,6 +1,6 @@
-// @import '~iview/src/styles/index.less';
+@import '~view-design/src/styles/index.less';
 
-@menu-dark-title: #3367D6;
-@menu-dark-active-bg: #3367D6;
-@layout-sider-background: #3367D6;
+@menu-light-title: #fff;
+@menu-light-active-bg: #3D6;
+@layout-sider-background: #fff;
 @layout-body-background: #f8f9fa;
diff --git a/src/main.js b/src/main.js
@@ -10,6 +10,7 @@ import config from '@/config'
 // import importDirective from '@/directive'
 // import { directive as clickOutside } from 'v-click-outside-x'
 // import installPlugin from '@/plugin'
+import './index.less'
 import './scrollbar.css'
 // require('babel-polyfill')
 // import '@/assets/icons/iconfont.css'
@@ -25,12 +26,12 @@ import clipboard from 'clipboard'
 Vue.prototype.Clipboard = clipboard
 
 import VueCodemirror from 'vue-codemirror'
-// import 'codemirror/lib/codemirror.css'
+import 'codemirror/lib/codemirror.css'
 
-// import 'codemirror/mode/javascript/javascript.js'
+import 'codemirror/mode/javascript/javascript.js'
 // theme css
 // active-line.js
-// import 'codemirror/addon/selection/active-line.js'
+import 'codemirror/addon/selection/active-line.js'
 // styleSelectedText
 // import 'codemirror/addon/selection/mark-selection.js'
 // import 'codemirror/keymap/sublime.js'

diff --git a/vue.config.js b/vue.config.js
@@ -20,48 +20,48 @@ const BASE_URL = process.env.NODE_ENV === 'production'
 
 let configureWebpack = {}
 
-const externals = {
-  'vue': 'Vue',
-  'vue-router': 'VueRouter',
-  'vuex': 'Vuex',
-  'vue-i18n': 'VueI18n',
-  'axios': 'axios',
-  'js-beautify': 'beautifier',
-  'view-design': 'iview',
-  'codemirror': 'codemirror',
-  'vue-codemirror': 'VueCodemirror'
-}
+// const externals = {
+//   'vue': 'Vue',
+//   'vue-router': 'VueRouter',
+//   'vuex': 'Vuex',
+//   'vue-i18n': 'VueI18n',
+//   'axios': 'axios',
+//   'js-beautify': 'beautifier',
+//   'view-design': 'iview',
+//   'codemirror': 'codemirror',
+//   'vue-codemirror': 'VueCodemirror'
+// }
 
-if (process.env.NODE_ENV === 'production') {
-  configureWebpack.externals = externals
-}
-configureWebpack.externals = externals
+// if (process.env.NODE_ENV === 'production') {
+//   configureWebpack.externals = externals
+// }
+// configureWebpack.externals = externals
 
 configureWebpack.plugins = [
   new webpack.optimize.MinChunkSizePlugin({
     minChunkSize: 102400
   })
 ]
 
-const cdn = {
-  css: [
-    'https://cdn.jsdelivr.net/npm/view-design/dist/styles/iview.css',
-    'https://cdn.jsdelivr.net/npm/codemirror/lib/codemirror.css'
-  ],
-  js: [
-    'https://cdn.jsdelivr.net/npm/vue/dist/vue.min.js',
-    'https://cdn.jsdelivr.net/npm/vue-router/dist/vue-router.min.js',
-    'https://cdn.jsdelivr.net/npm/vuex/dist/vuex.min.js',
-    'https://cdn.jsdelivr.net/npm/vue-i18n/dist/vue-i18n.min.js',
-    'https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js',
-    'https://cdn.jsdelivr.net/npm/js-beautify/js/lib/beautifier.min.js',
-    'https://cdn.jsdelivr.net/npm/view-design/dist/iview.min.js',
-    'https://cdn.jsdelivr.net/npm/codemirror/lib/codemirror.js',
-    'https://cdn.jsdelivr.net/npm/codemirror/mode/javascript/javascript.js',
-    'https://cdn.jsdelivr.net/npm/codemirror/addon/selection/active-line.js',
-    'https://cdn.jsdelivr.net/npm/vue-codemirror/dist/vue-codemirror.min.js'
-  ]
-}
+// const cdn = {
+//   css: [
+//     'https://cdn.jsdelivr.net/npm/view-design/dist/styles/iview.css',
+//     'https://cdn.jsdelivr.net/npm/codemirror/lib/codemirror.css'
+//   ],
+//   js: [
+//     'https://cdn.jsdelivr.net/npm/vue/dist/vue.min.js',
+//     'https://cdn.jsdelivr.net/npm/vue-router/dist/vue-router.min.js',
+//     'https://cdn.jsdelivr.net/npm/vuex/dist/vuex.min.js',
+//     'https://cdn.jsdelivr.net/npm/vue-i18n/dist/vue-i18n.min.js',
+//     'https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js',
+//     'https://cdn.jsdelivr.net/npm/js-beautify/js/lib/beautifier.min.js',
+//     'https://cdn.jsdelivr.net/npm/view-design/dist/iview.min.js',
+//     'https://cdn.jsdelivr.net/npm/codemirror/lib/codemirror.js',
+//     'https://cdn.jsdelivr.net/npm/codemirror/mode/javascript/javascript.js',
+//     'https://cdn.jsdelivr.net/npm/codemirror/addon/selection/active-line.js',
+//     'https://cdn.jsdelivr.net/npm/vue-codemirror/dist/vue-codemirror.min.js'
+//   ]
+// }
 
 module.exports = {
   // Project deployment base
@@ -79,15 +79,15 @@ module.exports = {
   configureWebpack,
   chainWebpack: config => {
     config.optimization.delete('splitChunks')
-    config
-      .plugin('html')
-      .tap(args => {
-        if (process.env.NODE_ENV === 'production') {
-          args[0].cdn = cdn
-        }
-        args[0].cdn = cdn
-        return args
-      })
+    // config
+    //   .plugin('html')
+    //   .tap(args => {
+    //     if (process.env.NODE_ENV === 'production') {
+    //       args[0].cdn = cdn
+    //     }
+    //     args[0].cdn = cdn
+    //     return args
+    //   })
     config.resolve.alias
       .set('@', resolve('src')) // key,value自行定义，比如.set('@@', resolve('src/components'))
       .set('_c', resolve('src/components'))