From 1b555a0ab0527478cdf2b0c31c0ea8aea70f8adc Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 15 六月 2023 10:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into yxh01
---
src/main.js | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/main.js b/src/main.js
similarity index 86%
rename from ruoyi-ui/src/main.js
rename to src/main.js
index 13c6cf2..c95a818 100644
--- a/ruoyi-ui/src/main.js
+++ b/src/main.js
@@ -1,6 +1,7 @@
import Vue from 'vue'
import Cookies from 'js-cookie'
+import * as echarts from "echarts";
import Element from 'element-ui'
import './assets/styles/element-variables.scss'
@@ -37,8 +38,18 @@
import VueMeta from 'vue-meta'
// 瀛楀吀鏁版嵁缁勪欢
import DictData from '@/components/DictData'
+// 缁勪欢灏佽闆嗘垚
+import components from './components'
+// 娉ㄥ唽杩囨护鍣�
+// 鑷畾涔夋寚浠�
+import * as directives from './directives'
+import * as filters from './filters'
+for(let key in filters){
+Vue.filter(key, filters[key])
+}
// 鍏ㄥ眬鏂规硶鎸傝浇
+
Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey
Vue.prototype.parseTime = parseTime
@@ -48,7 +59,6 @@
Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
-
// 鍏ㄥ眬缁勪欢鎸傝浇
Vue.component('DictTag', DictTag)
Vue.component('Pagination', Pagination)
@@ -58,10 +68,15 @@
Vue.component('ImageUpload', ImageUpload)
Vue.component('ImagePreview', ImagePreview)
+
+// 灏佽鑷畾涔夋寚浠�
+for(let key in directives)
+Vue.directive(key, directives[key])
Vue.use(directive)
Vue.use(plugins)
Vue.use(VueMeta)
DictData.install()
+Vue.use(components)
/**
* If you don't want to use mock-server
--
Gitblit v1.9.3