From 136e6cd040f1a2bc74a830f7e94f91c6a5680609 Mon Sep 17 00:00:00 2001 From: FairyEver <1711467488@qq.com> Date: Mon, 30 Nov 2020 14:51:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20:package:=20lodash-es=20to=20lodash=20(l?= =?UTF-8?q?owdb=E5=AD=98=E5=9C=A8=E5=AF=BC=E8=87=B4lodash=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=A7=BB=E9=99=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies-cdn.js | 1 + package-lock.json | 7 +------ package.json | 2 +- src/api/index.js | 2 +- src/api/modules/demo.api.js | 2 +- src/api/modules/sys.user.api.js | 2 +- src/api/service.js | 2 +- src/components/d2-container/components/d2-source.vue | 2 +- src/components/d2-container/components/mixins/normal.js | 2 +- src/layout/header-aside/components/menu-header/index.js | 2 +- src/libs/util.db.js | 2 +- src/menu/index.js | 2 +- src/plugin/error/index.js | 2 +- src/store/modules/d2admin/modules/color.js | 2 +- src/store/modules/d2admin/modules/db.js | 2 +- src/store/modules/d2admin/modules/log.js | 2 +- src/store/modules/d2admin/modules/page.js | 2 +- src/store/modules/d2admin/modules/theme.js | 2 +- src/views/demo/playground/add-routes/routes.vue | 2 +- src/views/demo/playground/db/page-public/index.vue | 2 +- src/views/demo/playground/db/page-user/index.vue | 2 +- src/views/demo/playground/db/public/index.vue | 2 +- src/views/demo/playground/db/user/index.vue | 2 +- src/views/demo/playground/store/menu/index.vue | 2 +- src/views/system/log/index.vue | 2 +- 25 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dependencies-cdn.js b/dependencies-cdn.js index d12e1b17c..77a070327 100644 --- a/dependencies-cdn.js +++ b/dependencies-cdn.js @@ -7,6 +7,7 @@ module.exports = [ { name: 'better-scroll', library: 'BScroll', js: 'https://cdn.jsdelivr.net/npm/better-scroll@1.15.2/dist/bscroll.min.js', css: '' }, { name: 'element-ui', library: 'ELEMENT', js: 'https://cdn.jsdelivr.net/npm/element-ui@2.13.1/lib/index.js', css: 'https://cdn.jsdelivr.net/npm/element-ui@2.13.0/lib/theme-chalk/index.css' }, { name: 'axios-mock-adapter', library: 'AxiosMockAdapter', js: 'https://cdn.jsdelivr.net/npm/axios-mock-adapter@1.18.1/dist/axios-mock-adapter.min.js', css: '' }, + { name: 'lodash', library: '_', js: 'https://cdn.jsdelivr.net/npm/lodash@4.17.15/lodash.min.js', css: '' }, { name: 'ua-parser-js', library: 'UAParser', js: 'https://cdn.jsdelivr.net/npm/ua-parser-js@0.7.20/dist/ua-parser.min.js', css: '' }, { name: 'js-cookie', library: 'Cookies', js: 'https://cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js', css: '' }, { name: 'nprogress', library: 'NProgress', js: 'https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js', css: 'https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.css' }, diff --git a/package-lock.json b/package-lock.json index 3759e51b2..776dde465 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10706,14 +10706,9 @@ }, "lodash": { "version": "4.17.20", - "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.20.tgz?cache=0&sync_timestamp=1597336001963&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.20.tgz", + "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.20.tgz?cache=0&sync_timestamp=1597336097104&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.20.tgz", "integrity": "sha1-tEqbYpe8tpjxxRo1RaKzs2jVnFI=" }, - "lodash-es": { - "version": "4.17.15", - "resolved": "https://registry.npm.taobao.org/lodash-es/download/lodash-es-4.17.15.tgz", - "integrity": "sha1-Ib2Wg5NUQS8j16EDQOXqxu5FXXg=" - }, "lodash.defaultsdeep": { "version": "4.6.1", "resolved": "https://registry.npm.taobao.org/lodash.defaultsdeep/download/lodash.defaultsdeep-4.6.1.tgz", diff --git a/package.json b/package.json index 2e8e1c2a7..c1c1304ba 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "highlight.js": "^10.0.2", "hotkeys-js": "^3.7.3", "js-cookie": "^2.2.1", - "lodash-es": "^4.17.15", + "lodash": "^4.17.20", "lowdb": "^1.0.0", "marked": "^1.0.0", "nprogress": "^0.2.0", diff --git a/src/api/index.js b/src/api/index.js index e68d4dd4b..a713ffdc7 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,4 +1,4 @@ -import { assign, map } from 'lodash-es' +import { assign, map } from 'lodash' import faker from 'faker/locale/zh_CN' import { service, request, serviceForMock, requestForMock, mock } from './service' import * as tools from './tools' diff --git a/src/api/modules/demo.api.js b/src/api/modules/demo.api.js index 3aac6f23c..446a54874 100644 --- a/src/api/modules/demo.api.js +++ b/src/api/modules/demo.api.js @@ -1,4 +1,4 @@ -import { find, map, random } from 'lodash-es' +import { find, map, random } from 'lodash' const businessIssue142Db = [ { id: '1', name: '用户 1', address: '上海市普陀区金沙江路 1518 弄' }, diff --git a/src/api/modules/sys.user.api.js b/src/api/modules/sys.user.api.js index 019d24cd1..bcea5ba4a 100644 --- a/src/api/modules/sys.user.api.js +++ b/src/api/modules/sys.user.api.js @@ -1,4 +1,4 @@ -import { find, assign } from 'lodash-es' +import { find, assign } from 'lodash' const users = [ { username: 'admin', password: 'admin', uuid: 'admin-uuid', name: 'Admin' }, diff --git a/src/api/service.js b/src/api/service.js index 8fa6465b8..47e34359d 100644 --- a/src/api/service.js +++ b/src/api/service.js @@ -1,7 +1,7 @@ import { Message } from 'element-ui' import axios from 'axios' import Adapter from 'axios-mock-adapter' -import { get, isEmpty } from 'lodash-es' +import { get, isEmpty } from 'lodash' import qs from 'qs' import util from '@/libs/util' import store from '@/store' diff --git a/src/components/d2-container/components/d2-source.vue b/src/components/d2-container/components/d2-source.vue index 0e42a8903..2c85d5a88 100644 --- a/src/components/d2-container/components/d2-source.vue +++ b/src/components/d2-container/components/d2-source.vue @@ -9,7 +9,7 @@