diff --git a/package.json b/package.json index fd1bd482b..63d72d5ba 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "deepmerge": "^4.2.2", "dompurify": "^3.1.6", "echarts": "4.7.0", - "element-ui": "2.15.14", + "elementui-lts": "^2.16.0", "eslint-plugin-html": "^6.0.0", "highlight.js": "^11.9.0", "install": "^0.13.0", @@ -103,7 +103,6 @@ "compression-webpack-plugin": "^6.1.1", "connect": "3.6.6", "deasync": "^0.1.29", - "element-theme-chalk": "^2.13.1", "eslint": "^5.15.3", "eslint-plugin-vue": "5.2.2", "eslint-plugin-vue-i18n": "^0.3.0", diff --git a/src/i18n/i18n.js b/src/i18n/i18n.js index f5f9ed8c5..eaab74e79 100644 --- a/src/i18n/i18n.js +++ b/src/i18n/i18n.js @@ -1,6 +1,6 @@ // i18n.js import Vue from 'vue' -import locale from 'element-ui/lib/locale' +import locale from 'elementui-lts/lib/locale' import VueI18n from 'vue-i18n' import messages from './langs' import date from './date' diff --git a/src/i18n/langs/index.js b/src/i18n/langs/index.js index ef5a65907..b530c1e9c 100644 --- a/src/i18n/langs/index.js +++ b/src/i18n/langs/index.js @@ -1,11 +1,11 @@ -import zhLocale from 'element-ui/lib/locale/lang/zh-CN' -import zhTWLocale from 'element-ui/lib/locale/lang/zh-TW' -import enLocale from 'element-ui/lib/locale/lang/en' -import jaLocale from 'element-ui/lib/locale/lang/ja' -import ptBrLocale from 'element-ui/lib/locale/lang/pt-br' -import esLocale from 'element-ui/lib/locale/lang/es' -import ruLocale from 'element-ui/lib/locale/lang/ru-RU' -import koLocale from 'element-ui/lib/locale/lang/ko' +import zhLocale from 'elementui-lts/lib/locale/lang/zh-CN' +import zhTWLocale from 'elementui-lts/lib/locale/lang/zh-TW' +import enLocale from 'elementui-lts/lib/locale/lang/en' +import jaLocale from 'elementui-lts/lib/locale/lang/ja' +import ptBrLocale from 'elementui-lts/lib/locale/lang/pt-br' +import esLocale from 'elementui-lts/lib/locale/lang/es' +import ruLocale from 'elementui-lts/lib/locale/lang/ru-RU' +import koLocale from 'elementui-lts/lib/locale/lang/ko' import zh from './zh.json' import zhHant from './zh_hant.json' import en from './en.json' diff --git a/src/main.js b/src/main.js index 8f1c84c76..a9805ba5b 100644 --- a/src/main.js +++ b/src/main.js @@ -1,5 +1,5 @@ import Vue from 'vue' -import ElementUI from 'element-ui' +import ElementUI from 'elementui-lts' import locale from 'elementLocale' import '@/styles/index.scss' // global css import App from './App' diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index f08a70d8a..1942b91f8 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -993,5 +993,5 @@ $--breakpoints-spec: ( 'xl-only' : (min-width: $--xl), ); -$--font-path: '~element-ui/lib/theme-chalk/fonts'; -@import "~element-ui/packages/theme-chalk/src/index"; +$--font-path: '~elementui-lts/lib/theme-chalk/fonts'; +@import "~elementui-lts/packages/theme-chalk/src/index"; diff --git a/src/utils/elTableTooltipPatch.js b/src/utils/elTableTooltipPatch.js index fed1444df..397b25cf9 100644 --- a/src/utils/elTableTooltipPatch.js +++ b/src/utils/elTableTooltipPatch.js @@ -1,7 +1,7 @@ // 鼠标可移入tooltip功能 -import { Table } from 'element-ui' -import { getCell, getColumnByCell } from 'element-ui/packages/table/src/util' -import { getStyle, hasClass } from 'element-ui/src/utils/dom' +import { Table } from 'elementui-lts' +import { getCell, getColumnByCell } from 'elementui-lts/packages/table/src/util' +import { getStyle, hasClass } from 'elementui-lts/src/utils/dom' import { copy } from './common' Object.assign(Table.components.TableBody.methods, { diff --git a/src/utils/message.js b/src/utils/message.js index 34e7c3f29..912b45edf 100644 --- a/src/utils/message.js +++ b/src/utils/message.js @@ -1,5 +1,5 @@ // 重置message,防止重复点击重复弹出message弹框 -import { Message as elMessage } from 'element-ui' +import { Message as elMessage } from 'elementui-lts' import { toSentenceCase } from '@/utils/common' let messageDom = null diff --git a/src/utils/request.js b/src/utils/request.js index f0ebccef0..8033b90d6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,7 +3,7 @@ import i18n from '@/i18n/i18n' import { eventBus } from '@/utils/const' import { getTokenFromCookie } from '@/utils/auth' import { getErrorResponseMsg } from '@/utils/common' -import { MessageBox } from 'element-ui' +import { MessageBox } from 'elementui-lts' import { message } from '@/utils/message' import store from '@/store' import axiosRetry from 'axios-retry' diff --git a/tests/unit/components/Breadcrumb.spec.js b/tests/unit/components/Breadcrumb.spec.js index 87ddd9d51..442ead8ad 100644 --- a/tests/unit/components/Breadcrumb.spec.js +++ b/tests/unit/components/Breadcrumb.spec.js @@ -1,6 +1,6 @@ import { createLocalVue, mount } from '@vue/test-utils' import VueRouter from 'vue-router' -import ElementUI from 'element-ui' +import ElementUI from 'elementui-lts' import Breadcrumb from '@/components/Widgets/Breadcrumb/index.vue' const localVue = createLocalVue() diff --git a/vue.config.js b/vue.config.js index a0a08b025..c1078a019 100644 --- a/vue.config.js +++ b/vue.config.js @@ -98,8 +98,8 @@ module.exports = { alias: { '@': resolve('src'), elementCss: resolve( - 'node_modules/element-ui/lib/theme-chalk/index.css'), - elementLocale: resolve('node_modules/element-ui/lib/locale/lang/en.js') + 'node_modules/elementui-lts/lib/theme-chalk/index.css'), + elementLocale: resolve('node_modules/elementui-lts/lib/locale/lang/en.js') }, extensions: ['.vue', '.js', '.json'] } diff --git a/yarn.lock b/yarn.lock index a4d2e6be8..f9cbcbf32 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4448,19 +4448,15 @@ electron-to-chromium@^1.4.601: resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.611.tgz" integrity sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw== -element-theme-chalk@^2.13.1: - version "2.15.14" - resolved "https://registry.npmmirror.com/element-theme-chalk/-/element-theme-chalk-2.15.14.tgz" - integrity sha512-jgMTD6Qg6UPRDjBzARl42xit7lfCg+gE8x+QaUmmrhWv2TsnFoerhOupn0smxKTfO0Oh9Kh53Q+thXeZO7/0rQ== - -element-ui@2.15.14: - version "2.15.14" - resolved "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.14.tgz" - integrity sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA== +elementui-lts@^2.16.0: + version "2.16.0" + resolved "https://registry.npmmirror.com/elementui-lts/-/elementui-lts-2.16.0.tgz#2add8f3625ada83d553b7862b75a986f6eaca993" + integrity sha512-HFezWcsZTJN4HIGg5WUggte8XEhg2KQ2rR6covLwjY56cMkPkdv2s5Q4ww28dO+RauJC1daldOMp8wXSir7M8w== dependencies: async-validator "~1.8.1" babel-helper-vue-jsx-merge-props "^2.0.0" deepmerge "^1.2.0" + lodash-es "^4.17.21" normalize-wheel "^1.0.1" resize-observer-polyfill "^1.5.0" throttle-debounce "^1.0.1" @@ -8139,6 +8135,11 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" +lodash-es@^4.17.21: + version "4.17.21" + resolved "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== + lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz" @@ -12075,7 +12076,7 @@ string-length@^2.0.0: astral-regex "^1.0.0" strip-ansi "^4.0.0" -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -12093,15 +12094,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.npmmirror.com/string-width/-/string-width-2.1.1.tgz" @@ -12202,7 +12194,7 @@ stringify-package@^1.0.1: resolved "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz" integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg== -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -12230,13 +12222,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz"