Forráskód Böngészése

feat: 替换element-ui

Howie 1 éve
szülő
commit
763b867117
7 módosított fájl, 47 hozzáadás és 49 törlés
  1. 36 38
      package-lock.json
  2. 1 2
      package.json
  3. 4 4
      src/main.js
  4. 1 1
      src/permission.js
  5. 1 1
      src/utils/common.js
  6. 1 1
      src/utils/request.js
  7. 3 2
      vue.config.js

+ 36 - 38
package-lock.json

@@ -10,12 +10,11 @@
       "license": "MIT",
       "dependencies": {
         "@zjlib/element-plugins": "^2.8.6",
+        "@zjlib/element-ui2": "^1.0.2",
         "axios": "0.18.1",
         "clipboard": "^2.0.8",
         "concurrent-tasks": "^1.0.7",
-        "core-js": "^3.6.5",
         "echarts": "^5.1.1",
-        "element-ui": "2.13.2",
         "file-saver": "^2.0.5",
         "js-cookie": "2.2.0",
         "normalize.css": "7.0.0",
@@ -5627,6 +5626,22 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/@zjlib/element-ui2": {
+      "version": "1.0.2",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-ui2/-/element-ui2-1.0.2.tgz",
+      "integrity": "sha512-Hxlkv35v+t17rTZrXswuvcFhSHbjWnmiD2gQBftiI2IRmoyw04kjIMNv1Y/wQjSxp3OlF82VcM16VBd2UlOtjw==",
+      "dependencies": {
+        "async-validator": "~1.8.1",
+        "babel-helper-vue-jsx-merge-props": "^2.0.0",
+        "deepmerge": "^1.2.0",
+        "normalize-wheel": "^1.0.1",
+        "resize-observer-polyfill": "^1.5.0",
+        "throttle-debounce": "^1.0.1"
+      },
+      "peerDependencies": {
+        "vue": "^2.5.17"
+      }
+    },
     "node_modules/abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmmirror.com/abab/-/abab-2.0.6.tgz",
@@ -9299,10 +9314,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.6.5.tgz",
-      "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "version": "3.32.2",
+      "resolved": "http://121.41.110.30:4873/core-js/-/core-js-3.32.2.tgz",
+      "integrity": "sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -10607,22 +10621,6 @@
       "integrity": "sha512-g/e18Yv0fBdN2c2Z8hWV9jOXxOxOByyG8uGufrJWUym+LHMYa5K2oR9C+D8Bvh0slUTarBwBBZFi41ImQjEZIA==",
       "dev": true
     },
-    "node_modules/element-ui": {
-      "version": "2.13.2",
-      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.13.2.tgz",
-      "integrity": "sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==",
-      "dependencies": {
-        "async-validator": "~1.8.1",
-        "babel-helper-vue-jsx-merge-props": "^2.0.0",
-        "deepmerge": "^1.2.0",
-        "normalize-wheel": "^1.0.1",
-        "resize-observer-polyfill": "^1.5.0",
-        "throttle-debounce": "^1.0.1"
-      },
-      "peerDependencies": {
-        "vue": "^2.5.17"
-      }
-    },
     "node_modules/elliptic": {
       "version": "6.5.4",
       "resolved": "https://registry.npmmirror.com/elliptic/-/elliptic-6.5.4.tgz",
@@ -31630,6 +31628,19 @@
         }
       }
     },
+    "@zjlib/element-ui2": {
+      "version": "1.0.2",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-ui2/-/element-ui2-1.0.2.tgz",
+      "integrity": "sha512-Hxlkv35v+t17rTZrXswuvcFhSHbjWnmiD2gQBftiI2IRmoyw04kjIMNv1Y/wQjSxp3OlF82VcM16VBd2UlOtjw==",
+      "requires": {
+        "async-validator": "~1.8.1",
+        "babel-helper-vue-jsx-merge-props": "^2.0.0",
+        "deepmerge": "^1.2.0",
+        "normalize-wheel": "^1.0.1",
+        "resize-observer-polyfill": "^1.5.0",
+        "throttle-debounce": "^1.0.1"
+      }
+    },
     "abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmmirror.com/abab/-/abab-2.0.6.tgz",
@@ -34535,9 +34546,9 @@
       }
     },
     "core-js": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.6.5.tgz",
-      "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
+      "version": "3.32.2",
+      "resolved": "http://121.41.110.30:4873/core-js/-/core-js-3.32.2.tgz",
+      "integrity": "sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ=="
     },
     "core-js-compat": {
       "version": "3.22.5",
@@ -35592,19 +35603,6 @@
       "integrity": "sha512-g/e18Yv0fBdN2c2Z8hWV9jOXxOxOByyG8uGufrJWUym+LHMYa5K2oR9C+D8Bvh0slUTarBwBBZFi41ImQjEZIA==",
       "dev": true
     },
-    "element-ui": {
-      "version": "2.13.2",
-      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.13.2.tgz",
-      "integrity": "sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==",
-      "requires": {
-        "async-validator": "~1.8.1",
-        "babel-helper-vue-jsx-merge-props": "^2.0.0",
-        "deepmerge": "^1.2.0",
-        "normalize-wheel": "^1.0.1",
-        "resize-observer-polyfill": "^1.5.0",
-        "throttle-debounce": "^1.0.1"
-      }
-    },
     "elliptic": {
       "version": "6.5.4",
       "resolved": "https://registry.npmmirror.com/elliptic/-/elliptic-6.5.4.tgz",

+ 1 - 2
package.json

@@ -16,12 +16,11 @@
   },
   "dependencies": {
     "@zjlib/element-plugins": "^2.8.6",
+    "@zjlib/element-ui2": "^1.0.2",
     "axios": "0.18.1",
     "clipboard": "^2.0.8",
     "concurrent-tasks": "^1.0.7",
-    "core-js": "^3.6.5",
     "echarts": "^5.1.1",
-    "element-ui": "2.13.2",
     "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",

+ 4 - 4
src/main.js

@@ -1,10 +1,10 @@
 import Vue from 'vue'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 // import './plugins/jquery.hiwprint.js'
-import ElementUI from 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css'
-// import locale from 'element-ui/lib/locale/lang/en' // lang i18n
-import { Loading } from 'element-ui'
+import ElementUI from '@zjlib/element-ui2'
+import '@zjlib/element-ui2/lib/theme-chalk/index.css'
+// import locale from '@zjlib/element-ui2/lib/locale/lang/en' // lang i18n
+import { Loading } from '@zjlib/element-ui2'
 let loading
 function startLoading() {
   loading = Loading.service({

+ 1 - 1
src/permission.js

@@ -1,6 +1,6 @@
 import router from './router'
 import store from './store'
-import { Message } from 'element-ui'
+import { Message } from '@zjlib/element-ui2'
 import { getToken } from '@/utils/auth' // get token from cookie
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style

+ 1 - 1
src/utils/common.js

@@ -1,4 +1,4 @@
-import { MessageBox, Message, Notification } from 'element-ui'
+import { MessageBox, Message, Notification } from '@zjlib/element-ui2'
 
 export const successMsg = msg => {
   Message({

+ 1 - 1
src/utils/request.js

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
+import { MessageBox, Message } from '@zjlib/element-ui2'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 

+ 3 - 2
vue.config.js

@@ -75,7 +75,8 @@ module.exports = {
     plugins: [new webpack.ProvidePlugin({}), compress, chunkCount],
     resolve: {
       alias: {
-        '@': resolve('src')
+        '@': resolve('src'),
+        'element-ui':resolve('node_modules/@zjlib/element-ui2')
         // '@packages': resolve('../element-plugins/packages')
       },
       extensions: ['*', '.js', '.vue', '.json']
@@ -149,7 +150,7 @@ module.exports = {
           elementUI: {
             name: 'chunk-elementUI', // split elementUI into a single package
             priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-            test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+            test: /[\\/]node_modules[\\/]_?\/@zjlib\/element-ui2(.*)/ // in order to adapt to cnpm
           },
           commons: {
             name: 'chunk-commons',