fix: 📦 lodash-es to lodash (lowdb存在导致lodash无法移除)

FairyEver · FairyEver · commit 136e6cd040f1 · 2020-11-30T14:51:31.000+08:00
diff --git a/dependencies-cdn.js b/dependencies-cdn.js
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import { last, get } from 'lodash-es'
+import { last, get } from 'lodash'
 export default {
   data () {
     return {
diff --git a/src/components/d2-container/components/mixins/normal.js b/src/components/d2-container/components/mixins/normal.js
@@ -1,7 +1,7 @@
 // 提供滚动方面的功能
 // 非滚动优化模式通用
 
-import { throttle } from 'lodash-es'
+import { throttle } from 'lodash'
 
 // 生成滚动事件的 handler
 function handleMaker (wait) {
diff --git a/src/layout/header-aside/components/menu-header/index.js b/src/layout/header-aside/components/menu-header/index.js
@@ -1,4 +1,4 @@
-import { throttle } from 'lodash-es'
+import { throttle } from 'lodash'
 import { mapState } from 'vuex'
 import menuMixin from '../mixin/menu'
 import { createMenu } from '../libs/util.menu'
diff --git a/src/libs/util.db.js b/src/libs/util.db.js
@@ -1,7 +1,7 @@
 import low from 'lowdb'
 import LocalStorage from 'lowdb/adapters/LocalStorage'
 import util from '@/libs/util'
-import { cloneDeep } from 'lodash-es'
+import { cloneDeep } from 'lodash'
 
 const adapter = new LocalStorage(`d2admin-${process.env.VUE_APP_VERSION}`)
 const db = low(adapter)
diff --git a/src/menu/index.js b/src/menu/index.js
@@ -1,4 +1,4 @@
-import { uniqueId } from 'lodash-es'
+import { uniqueId } from 'lodash'
 
 // 插件
 import demoPlugins from './modules/demo-plugins'
diff --git a/src/plugin/error/index.js b/src/plugin/error/index.js
@@ -1,4 +1,4 @@
-import { get, isObject } from 'lodash-es'
+import { get, isObject } from 'lodash'
 import store from '@/store'
 import util from '@/libs/util'
 
diff --git a/src/store/modules/d2admin/modules/color.js b/src/store/modules/d2admin/modules/color.js
@@ -1,4 +1,4 @@
-import { cloneDeep } from 'lodash-es'
+import { cloneDeep } from 'lodash'
 import client from 'webpack-theme-color-replacer/client'
 import forElementUI from 'webpack-theme-color-replacer/forElementUI'
 
diff --git a/src/store/modules/d2admin/modules/db.js b/src/store/modules/d2admin/modules/db.js
@@ -1,5 +1,5 @@
 import router from '@/router'
-import { cloneDeep } from 'lodash-es'
+import { cloneDeep } from 'lodash'
 import { database as getDatabase, dbGet, dbSet } from '@/libs/util.db'
 
 export default {
diff --git a/src/store/modules/d2admin/modules/log.js b/src/store/modules/d2admin/modules/log.js
@@ -1,5 +1,5 @@
 import dayjs from 'dayjs'
-import { get } from 'lodash-es'
+import { get } from 'lodash'
 import util from '@/libs/util.js'
 
 export default {
diff --git a/src/store/modules/d2admin/modules/page.js b/src/store/modules/d2admin/modules/page.js
@@ -1,4 +1,4 @@
-import { cloneDeep, uniq, get } from 'lodash-es'
+import { cloneDeep, uniq, get } from 'lodash'
 import router from '@/router'
 import setting from '@/setting.js'
 
diff --git a/src/store/modules/d2admin/modules/theme.js b/src/store/modules/d2admin/modules/theme.js
@@ -1,4 +1,4 @@
-import { get } from 'lodash-es'
+import { get } from 'lodash'
 import setting from '@/setting.js'
 
 export default {
diff --git a/src/views/demo/playground/add-routes/routes.vue b/src/views/demo/playground/add-routes/routes.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { cloneDeep } from 'lodash-es'
+import { cloneDeep } from 'lodash'
 import { mapState, mapMutations } from 'vuex'
 import { frameInRoutes } from '@/router/routes'
 import layoutHeaderAside from '@/layout/header-aside'
diff --git a/src/views/demo/playground/db/page-public/index.vue b/src/views/demo/playground/db/page-public/index.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { uniqueId } from 'lodash-es'
+import { uniqueId } from 'lodash'
 import { mapActions } from 'vuex'
 export default {
   data () {
diff --git a/src/views/demo/playground/db/page-user/index.vue b/src/views/demo/playground/db/page-user/index.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import { uniqueId } from 'lodash-es'
+import { uniqueId } from 'lodash'
 import { mapActions } from 'vuex'
 export default {
   data () {
diff --git a/src/views/demo/playground/db/public/index.vue b/src/views/demo/playground/db/public/index.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import { uniqueId } from 'lodash-es'
+import { uniqueId } from 'lodash'
 import { mapActions } from 'vuex'
 export default {
   data () {
diff --git a/src/views/demo/playground/db/user/index.vue b/src/views/demo/playground/db/user/index.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { uniqueId } from 'lodash-es'
+import { uniqueId } from 'lodash'
 import { mapActions } from 'vuex'
 export default {
   data () {
diff --git a/src/views/demo/playground/store/menu/index.vue b/src/views/demo/playground/store/menu/index.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { cloneDeep } from 'lodash-es'
+import { cloneDeep } from 'lodash'
 import { mapState, mapMutations, mapActions } from 'vuex'
 export default {
   data () {
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
@@ -70,7 +70,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import { get } from 'lodash-es'
+import { get } from 'lodash'
 export default {
   data () {
     return {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { assign, map } from 'lodash-es'`
	`1`	`+import { assign, map } from 'lodash'`
`2`	`2`	`import faker from 'faker/locale/zh_CN'`
`3`	`3`	`import { service, request, serviceForMock, requestForMock, mock } from './service'`
`4`	`4`	`import * as tools from './tools'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { find, map, random } from 'lodash-es'`
	`1`	`+import { find, map, random } from 'lodash'`
`2`	`2`
`3`	`3`	`const businessIssue142Db = [`
`4`	`4`	`{ id: '1', name: '用户 1', address: '上海市普陀区金沙江路 1518 弄' },`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { find, assign } from 'lodash-es'`
	`1`	`+import { find, assign } from 'lodash'`
`2`	`2`
`3`	`3`	`const users = [`
`4`	`4`	`{ username: 'admin', password: 'admin', uuid: 'admin-uuid', name: 'Admin' },`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { throttle } from 'lodash-es'`
	`1`	`+import { throttle } from 'lodash'`
`2`	`2`	`import { mapState } from 'vuex'`
`3`	`3`	`import menuMixin from '../mixin/menu'`
`4`	`4`	`import { createMenu } from '../libs/util.menu'`