From d1b1f06fc4843b17d669742645c396c16edab66a Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期六, 11 三月 2023 23:40:58 +0800 Subject: [PATCH] fix 修复 超管切换租户后 点击个人中心报错 --- ruoyi-ui/src/main.js | 50 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 18 deletions(-) diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index 7d0ac8d..caf30d7 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -10,22 +10,38 @@ import App from './App' import store from './store' import router from './router' -import permission from './directive/permission' +import directive from './directive' // directive +import plugins from './plugins' // plugins +import { download } from '@/utils/request' import './assets/icons' // icon import './permission' // permission control import { getDicts } from "@/api/system/dict/data"; -import { getConfigKey } from "@/api/system/config"; -import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi"; +import { getConfigKey, updateConfigByKey } from "@/api/system/config"; +import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; +// 鍒嗛〉缁勪欢 import Pagination from "@/components/Pagination"; -// 鑷畾涔夎〃鏍煎伐鍏锋墿灞� +// 鑷畾涔夎〃鏍煎伐鍏风粍浠� import RightToolbar from "@/components/RightToolbar" -// 澶撮儴鏍囩鎻掍欢 +// 瀵屾枃鏈粍浠� +import Editor from "@/components/Editor" +// 鏂囦欢涓婁紶缁勪欢 +import FileUpload from "@/components/FileUpload" +// 鍥剧墖涓婁紶缁勪欢 +import ImageUpload from "@/components/ImageUpload" +// 鍥剧墖棰勮缁勪欢 +import ImagePreview from "@/components/ImagePreview" +// 瀛楀吀鏍囩缁勪欢 +import DictTag from '@/components/DictTag' +// 澶撮儴鏍囩缁勪欢 import VueMeta from 'vue-meta' +// 瀛楀吀鏁版嵁缁勪欢 +import DictData from '@/components/DictData' // 鍏ㄥ眬鏂规硶鎸傝浇 Vue.prototype.getDicts = getDicts Vue.prototype.getConfigKey = getConfigKey +Vue.prototype.updateConfigByKey = updateConfigByKey Vue.prototype.parseTime = parseTime Vue.prototype.resetForm = resetForm Vue.prototype.addDateRange = addDateRange @@ -34,24 +50,19 @@ Vue.prototype.download = download Vue.prototype.handleTree = handleTree -Vue.prototype.msgSuccess = function (msg) { - this.$message({ showClose: true, message: msg, type: "success" }); -} - -Vue.prototype.msgError = function (msg) { - this.$message({ showClose: true, message: msg, type: "error" }); -} - -Vue.prototype.msgInfo = function (msg) { - this.$message.info(msg); -} - // 鍏ㄥ眬缁勪欢鎸傝浇 +Vue.component('DictTag', DictTag) Vue.component('Pagination', Pagination) Vue.component('RightToolbar', RightToolbar) +Vue.component('Editor', Editor) +Vue.component('FileUpload', FileUpload) +Vue.component('ImageUpload', ImageUpload) +Vue.component('ImagePreview', ImagePreview) -Vue.use(permission) +Vue.use(directive) +Vue.use(plugins) Vue.use(VueMeta) +DictData.install() /** * If you don't want to use mock-server @@ -62,6 +73,9 @@ * please remove it before going online! ! ! */ +// 淇敼 el-dialog 榛樿鐐瑰嚮閬収涓轰笉鍏抽棴 +Element.Dialog.props.closeOnClickModal.default = false + Vue.use(Element, { size: Cookies.get('size') || 'medium' // set element-ui default size }) -- Gitblit v1.9.3