From 0643af9bd9c00ca1d751467f168723c18039892a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 10 Mar 2019 09:28:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E4=B8=80=E4=BA=9B=E9=9D=9E=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E6=8F=92=E4=BB=B6=E6=94=BE=E5=88=B0=20main.js=20?=
 =?UTF-8?q?=E4=B8=AD=E5=B9=B6=E5=A2=9E=E5=8A=A0=E9=9D=9E=E5=BF=85=E9=A1=BB?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 3d3bbb3867b56fef731e85b7f34c05cd3c1f9f2f [formerly 3d3bbb3867b56fef731e85b7f34c05cd3c1f9f2f [formerly 3d3bbb3867b56fef731e85b7f34c05cd3c1f9f2f [formerly 3d3bbb3867b56fef731e85b7f34c05cd3c1f9f2f [formerly 659bfdc76bdc868d9f1ccd442e86058a2441259e [formerly b2bd85b4f001050101b22face8e71cf3f7f1f0b3]]]]]
Former-commit-id: 9e43b0bdaf4d6ad3bf640a94d5cb1e57fe30cafe
Former-commit-id: b0456a3d80af98496360a76d108aa0850bcbc655
Former-commit-id: cc3d5045c61823c61c05416c120cbb17e018a3e6 [formerly e2e027f9a021f7a4a262c5962b073bde95d578ce]
Former-commit-id: e8078373088e719af1ca1fb3400603499d39a839
Former-commit-id: 068151d33bca59d85448fabcac249125b42f1525
Former-commit-id: d9f9e267a039960e6ac09663ee91faa201f9591c
Former-commit-id: 92b920fd47c600f529404236e714f63227565e44
Former-commit-id: 16a9ae85f8f625aaf6cf06d7e63344cb2787c398
---
 src/main.js                 | 26 +++++++++++++++++---------
 src/plugin/d2admin/index.js |  9 +--------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main.js b/src/main.js
index 10f3de53..088a81e0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,28 +1,33 @@
 // Vue
 import Vue from 'vue'
 import App from './App'
+// 核心插件
+import d2Admin from '@/plugin/d2admin'
 // store
 import store from '@/store/index'
 // 多国语
 import i18n from './i18n'
-// 核心插件
-import d2Admin from '@/plugin/d2admin'
 
-// [ 可选插件组件 ]D2-Crud
+// [ 可选组件 ]D2-Crud
 import D2Crud from '@d2-projects/d2-crud'
-// [ 可选插件组件 ] 图表
+// [ 可选组件 ] 图表
 import VCharts from 'v-charts'
-// [ 可选插件组件 ] 右键菜单
+// [ 可选组件 ] 右键菜单
 import contentmenu from 'v-contextmenu'
 import 'v-contextmenu/dist/index.css'
-// [ 可选插件组件 ] JSON 树状视图
+// [ 可选组件 ] JSON 树状视图
 import vueJsonTreeView from 'vue-json-tree-view'
-// [ 可选插件组件 ] 网格布局组件
+// [ 可选组件 ] 网格布局
 import { GridLayout, GridItem } from 'vue-grid-layout'
-// [ 可选插件组件 ] 区域划分组件
+// [ 可选组件 ] 区域划分
 import SplitPane from 'vue-splitpane'
-// [ 可选插件组件 ] UEditor
+// [ 可选组件 ] UEditor
 import VueUeditorWrap from 'vue-ueditor-wrap'
+// [ 可选插件 ] 数据导入导出
+import pluginExport from '@d2-projects/vue-table-export'
+import pluginImport from '@d2-projects/vue-table-import'
+// [ 可选过滤器 ] 日期相关过滤器
+import d2VueFiltersDate from '@d2-projects/vue-filters-date'
 
 // 菜单和路由设置
 import router from './router'
@@ -37,6 +42,9 @@ Vue.use(D2Crud)
 Vue.use(VCharts)
 Vue.use(contentmenu)
 Vue.use(vueJsonTreeView)
+Vue.use(pluginExport)
+Vue.use(pluginImport)
+Vue.use(d2VueFiltersDate)
 Vue.component('d2-grid-layout', GridLayout)
 Vue.component('d2-grid-item', GridItem)
 Vue.component('SplitPane', SplitPane)
diff --git a/src/plugin/d2admin/index.js b/src/plugin/d2admin/index.js
index 329d2ebf..24b46cad 100644
--- a/src/plugin/d2admin/index.js
+++ b/src/plugin/d2admin/index.js
@@ -7,12 +7,9 @@ import 'flex.css'
 import '@/components'
 // svg 图标
 import '@/assets/svg-icons'
-// 过滤器
-import d2VueFiltersDate from '@d2-projects/vue-filters-date'
+
 // 功能插件
 import pluginError from '@/plugin/error'
-import pluginExport from '@d2-projects/vue-table-export'
-import pluginImport from '@d2-projects/vue-table-import'
 import pluginLog from '@/plugin/log'
 import pluginOpen from '@/plugin/open'
 
@@ -31,12 +28,8 @@ export default {
     Vue.prototype.$buildTime = process.env.VUE_APP_BUILD_TIME
     // Element
     Vue.use(ElementUI)
-    // 过滤器 日期模块
-    Vue.use(d2VueFiltersDate)
     // 插件
     Vue.use(pluginError)
-    Vue.use(pluginExport)
-    Vue.use(pluginImport)
     Vue.use(pluginLog)
     Vue.use(pluginOpen)
   }