From f0d7c0e0c8b9075b721e3d6009b0d7f651d2a8ec Mon Sep 17 00:00:00 2001 From: star7th Date: Tue, 24 Dec 2019 20:50:20 +0800 Subject: [PATCH] update vue and element-ui --- web_src/build/utils.js | 3 +- web_src/package-lock.json | 48 +++++++++++++++++---------- web_src/package.json | 6 ++-- web_src/src/components/team/Index.vue | 2 ++ 4 files changed, 37 insertions(+), 22 deletions(-) diff --git a/web_src/build/utils.js b/web_src/build/utils.js index e534fb0fd..38cb0d93f 100644 --- a/web_src/build/utils.js +++ b/web_src/build/utils.js @@ -47,7 +47,8 @@ exports.cssLoaders = function (options) { if (options.extract) { return ExtractTextPlugin.extract({ use: loaders, - fallback: 'vue-style-loader' + fallback: 'vue-style-loader', + publicPath:'../../' }) } else { return ['vue-style-loader'].concat(loaders) diff --git a/web_src/package-lock.json b/web_src/package-lock.json index f528c03ac..dec05d30c 100644 --- a/web_src/package-lock.json +++ b/web_src/package-lock.json @@ -371,9 +371,9 @@ "dev": true }, "async-validator": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.2.tgz", - "integrity": "sha1-t3WXIm6WJC+NUxwNRq4pX2JCK6Q=", + "version": "1.8.5", + "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz", + "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=", "requires": { "babel-runtime": "6.x" } @@ -3222,7 +3222,7 @@ }, "de-indent": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", + "resolved": "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz", "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=", "dev": true }, @@ -3269,8 +3269,8 @@ }, "deepmerge": { "version": "1.5.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", - "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" + "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz", + "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=" }, "default-require-extensions": { "version": "1.0.0", @@ -3671,13 +3671,15 @@ } }, "element-ui": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.0.8.tgz", - "integrity": "sha512-Y0eiOhJZl4lgrGaGK6z02YtLsWljochxKud6IX4q2ju/NraZfexTah3GH+6x8D0IhplVP+QxHZ1+gSqnIbnmmQ==", + "version": "2.13.0", + "resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.13.0.tgz", + "integrity": "sha1-9rsE5bCnbqX2JGYES3dEB7pOvS0=", "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" } }, @@ -8249,6 +8251,11 @@ "sort-keys": "^1.0.0" } }, + "normalize-wheel": { + "version": "1.0.1", + "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz", + "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -11563,6 +11570,11 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=" + }, "resolve": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", @@ -12902,9 +12914,9 @@ "dev": true }, "throttle-debounce": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.0.1.tgz", - "integrity": "sha1-2tD+Ew+drzcZ/eoz3Dao5rp/MLU=" + "version": "1.1.0", + "resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz", + "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0=" }, "through": { "version": "2.3.8", @@ -13455,9 +13467,9 @@ } }, "vue": { - "version": "2.5.13", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.13.tgz", - "integrity": "sha512-3D+lY7HTkKbtswDM4BBHgqyq+qo8IAEE8lz8va1dz3LLmttjgo0FxairO4r1iN2OBqk8o1FyL4hvzzTFEdQSEw==" + "version": "2.6.11", + "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.11.tgz", + "integrity": "sha1-dllNh31LEiNEBuhONSdcbVFBJcU=" }, "vue-axios": { "version": "2.0.2", @@ -13546,9 +13558,9 @@ } }, "vue-template-compiler": { - "version": "2.5.13", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz", - "integrity": "sha512-15HWSgIxrGUcV0v7QRen2Y3fQsbgxXwMvjT/5XKMO0ANmaCcNh7y2OeIDTAuSGeosjb9+E1Pn2PHZ61VQWEgBQ==", + "version": "2.6.11", + "resolved": "https://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.6.11.tgz", + "integrity": "sha1-wEcE749JixUxMAGJk+VjCdRpgIA=", "dev": true, "requires": { "de-indent": "^1.0.2", diff --git a/web_src/package.json b/web_src/package.json index caaae58f8..ee2d66eaa 100644 --- a/web_src/package.json +++ b/web_src/package.json @@ -18,10 +18,10 @@ "axios": "^0.17.1", "babel-polyfill": "^6.26.0", "babel-preset-es2015": "^6.24.1", - "element-ui": "^2.0.8", + "element-ui": "^2.13.0", "scriptjs": "^2.5.8", "url-search-params-polyfill": "^2.0.3", - "vue": "^2.5.2", + "vue": "^2.6.0", "vue-axios": "^2.0.2", "vue-clipboard2": "^0.2.1", "vue-i18n": "5.0.3", @@ -81,7 +81,7 @@ "vue-jest": "^1.0.2", "vue-loader": "^13.3.0", "vue-style-loader": "^3.0.1", - "vue-template-compiler": "^2.5.2", + "vue-template-compiler": "^2.6.0", "webpack": "^3.6.0", "webpack-bundle-analyzer": "^2.9.0", "webpack-dev-server": "^2.9.1", diff --git a/web_src/src/components/team/Index.vue b/web_src/src/components/team/Index.vue index 5e1f65b7c..c692405af 100644 --- a/web_src/src/components/team/Index.vue +++ b/web_src/src/components/team/Index.vue @@ -197,6 +197,8 @@ export default { .el-table__empty-text{ text-align: left; + line-height: 30px; + margin-top: 20px; }