From 89e1f2a53fbf99d8a48b7d12a41a862700a30015 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 13 Dec 2020 15:01:03 +0800
Subject: [PATCH] 修改Set可能导致嵌套的问题
---
ruoyi-ui/src/main.js | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index 037ecf9..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'
@@ -20,8 +18,11 @@
import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
import Pagination from "@/components/Pagination";
-//自定义表格工具扩展
-import TableToolsExt from "@/components/TableToolsExt"
+// 自定义表格工具扩展
+import RightToolbar from "@/components/RightToolbar"
+// 代码高亮插件
+import hljs from 'highlight.js'
+import 'highlight.js/styles/github-gist.css'
// 全局方法挂载
Vue.prototype.getDicts = getDicts
@@ -48,9 +49,10 @@
// 全局组件挂载
Vue.component('Pagination', Pagination)
-Vue.component('TableToolsExt', TableToolsExt)
+Vue.component('RightToolbar', RightToolbar)
Vue.use(permission)
+Vue.use(hljs.vuePlugin);
/**
* If you don't want to use mock-server
--
Gitblit v1.9.2