From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 15:14:47 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回
---
ruoyi-ui/src/main.js | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index 29c4022..caf30d7 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -17,7 +17,7 @@
import './assets/icons' // icon
import './permission' // permission control
import { getDicts } from "@/api/system/dict/data";
-import { getConfigKey } from "@/api/system/config";
+import { getConfigKey, updateConfigByKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
// 鍒嗛〉缁勪欢
import Pagination from "@/components/Pagination";
@@ -29,6 +29,8 @@
import FileUpload from "@/components/FileUpload"
// 鍥剧墖涓婁紶缁勪欢
import ImageUpload from "@/components/ImageUpload"
+// 鍥剧墖棰勮缁勪欢
+import ImagePreview from "@/components/ImagePreview"
// 瀛楀吀鏍囩缁勪欢
import DictTag from '@/components/DictTag'
// 澶撮儴鏍囩缁勪欢
@@ -39,6 +41,7 @@
// 鍏ㄥ眬鏂规硶鎸傝浇
Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey
+Vue.prototype.updateConfigByKey = updateConfigByKey
Vue.prototype.parseTime = parseTime
Vue.prototype.resetForm = resetForm
Vue.prototype.addDateRange = addDateRange
@@ -54,6 +57,7 @@
Vue.component('Editor', Editor)
Vue.component('FileUpload', FileUpload)
Vue.component('ImageUpload', ImageUpload)
+Vue.component('ImagePreview', ImagePreview)
Vue.use(directive)
Vue.use(plugins)
@@ -69,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