From dd4cd96c69061da3ff80cbfb87237b16cda8abc3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 26 九月 2025 18:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/main.js | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/admin/src/main.js b/admin/src/main.js
index ee5cfea..83b2a5e 100644
--- a/admin/src/main.js
+++ b/admin/src/main.js
@@ -4,16 +4,26 @@
import store from './store'
import ElementUI from 'element-ui'
import './assets/style/element-variables.scss'
+import { ElementTiptapPlugin } from 'element-tiptap'
+import 'element-tiptap/lib/index.css'
import VueClipboard from 'vue-clipboard2'
import directives from './directives'
import filters from './filters'
import plugins from './plugins'
import { mapState, mapMutations } from 'vuex'
import { fetchMenuTree } from './api/system/menu'
+import preventReClick from '@/directives/directive'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+Vue.component('treeselect', Treeselect)
+Vue.use(preventReClick)
Vue.config.productionTip = false
Vue.use(ElementUI, {
size: 'small'
+})
+Vue.use(ElementTiptapPlugin, {
+ lang: 'zh'
})
Vue.use(VueClipboard)
Vue.use(directives)
@@ -27,7 +37,7 @@
router,
store,
computed: {
- ...mapState(['userInfo', 'homePage'])
+ ...mapState(['userInfo', 'homePage','topMenuCurrent','menuData'])
},
watch: {
async userInfo () {
@@ -38,7 +48,7 @@
}
},
methods: {
- ...mapMutations(['switchCollapseMenu', 'setHomePage']),
+ ...mapMutations(['switchCollapseMenu', 'setHomePage', 'setTopMenuCurrent', 'setTopMenuCurrent']),
// 鍒濆鍖栨湰鍦伴厤缃�
initLocalConfig () {
// 鑿滃崟鐘舵�侀厤缃�
@@ -57,13 +67,34 @@
this.$store.commit('resetMenus')
// 鑾峰彇鑿滃崟
const storeMenus = this.$store.state.menuData.list
+ const storeTopMenus = this.$store.state.topMenuList.list
if (storeMenus.length > 0 && this.homePage == null) {
this.setHomePage(storeMenus[0])
}
await fetchMenuTree()
- .then(menus => {
+ .then(allmenus => {
// 娣诲姞鑿滃崟
- storeMenus.push.apply(storeMenus, menus)
+ var topList = allmenus.filter(item => {
+ return item.type === 1
+ })
+ storeTopMenus.push.apply(storeTopMenus, topList)
+ var topCurrent = null
+ topList.forEach(item => {
+ if (item.linkType === 0 && topCurrent == null) {
+ topCurrent = item
+ }
+ })
+ this.setTopMenuCurrent(topCurrent)
+ // console.log(topList)
+ // var menus = []
+ // topList.forEach(item => {
+ // console.log(topCurrent.id, item.id)
+ // if (item.id == this.topMenuCurrent.id) {
+ // menus = item.children
+ // }
+ // })
+ console.log('menus', this.menuData.list)
+ storeMenus.push.apply(storeMenus, this.menuData.list)
// 娣诲姞璺敱
this.__addRouters(storeMenus)
// 404
--
Gitblit v1.9.3