From 3f33219134d1d5e71c51756e7acf3b06d1a85cf8 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 29 十二月 2020 17:14:31 +0800
Subject: [PATCH] !156 修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空 Merge pull request !156 from li_oxen/N/A
---
ruoyi-ui/src/main.js | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index fbd3d6d..f8f3980 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -2,8 +2,6 @@
import Cookies from 'js-cookie'
-import 'normalize.css/normalize.css' // a modern alternative to CSS resets
-
import Element from 'element-ui'
import './assets/styles/element-variables.scss'
@@ -18,8 +16,13 @@
import './permission' // permission control
import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, download } from "@/utils/ruoyi";
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
import Pagination from "@/components/Pagination";
+// 鑷畾涔夎〃鏍煎伐鍏锋墿灞�
+import RightToolbar from "@/components/RightToolbar"
+// 浠ｇ爜楂樹寒鎻掍欢
+import hljs from 'highlight.js'
+import 'highlight.js/styles/github-gist.css'
// 鍏ㄥ眬鏂规硶鎸傝浇
Vue.prototype.getDicts = getDicts
@@ -28,7 +31,9 @@
Vue.prototype.resetForm = resetForm
Vue.prototype.addDateRange = addDateRange
Vue.prototype.selectDictLabel = selectDictLabel
+Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.download = download
+Vue.prototype.handleTree = handleTree
Vue.prototype.msgSuccess = function (msg) {
this.$message({ showClose: true, message: msg, type: "success" });
@@ -44,8 +49,10 @@
// 鍏ㄥ眬缁勪欢鎸傝浇
Vue.component('Pagination', Pagination)
+Vue.component('RightToolbar', RightToolbar)
Vue.use(permission)
+Vue.use(hljs.vuePlugin);
/**
* If you don't want to use mock-server
--
Gitblit v1.9.3