@lambo-design/pro-layout 1.0.0-beta.206 → 1.0.0-beta.207

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.206",
+  "version": "1.0.0-beta.207",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,8 +10,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@lambo-design/core": "^4.7.1-beta.118",
-    "@lambo-design/shared": "^1.0.0-beta.115"
+    "@lambo-design/shared": "^1.0.0-beta.115",
+    "@lambo-design/core": "^4.7.1-beta.118"
   },
   "scripts": {}
 }

package/src/components/pro-layout-header.vue

@@ -7,7 +7,7 @@
       <LamboProLogo @clickLogo="handleClick"></LamboProLogo>
     </div>
     <div class="nav-box">
-      <LamboProNav :accept-app-id="acceptAppId"></LamboProNav>
+      <LamboProNav></LamboProNav>
     </div>
     <div class="tools-box">
       <LamboProTools></LamboProTools>
@@ -66,7 +66,6 @@ export default {
     FastSearch
   },
   methods:{
-
     handleClick(){
       this.$emit('clickLogo')
     },
@@ -94,19 +93,18 @@ export default {
       });
     },
     destroyListener(){
+      Bus.$off('system-info')
       Bus.$off('nav-list')
       Bus.$off('menu-list')
       Bus.$off('trigger-change')
       Bus.$off('change-app')
       Bus.$off('tag-list')
       Bus.$off('menu-click')
-      Bus.$off('system-info')
     },
     initSystem(data){
       if (data) {
         this.systemInfo = data;
         if (data.isShowSearch) {
-         // console.log('head中的isShowSearch',data.isShowSearch)
           this.isShowSearch = data.isShowSearch;
         }
       }
@@ -118,7 +116,6 @@ export default {
       this.navList = data;
     },
     handleSelect(name,uri,pid){
-      //console.log('head中的handleSelect',name,uri,pid)
       let menu = null;
       if (name.indexOf("isTurnByHref_") > -1) {
         name = name.replace("isTurnByHref_","");
@@ -135,7 +132,6 @@ export default {
       }
       if (menu.meta && Array.isArray(menu.meta.crumbs)) {
         let parentMenu = menu.meta.crumbs[0]
-       // console.log('parentMenu',parentMenu)
         this.$set(this, 'selectedTopParent', parentMenu.name);
       } else {
         // 处理没有父菜单的情况
@@ -156,12 +152,9 @@ export default {
           this.activeName = menu.name; // 设置当前菜单为激活状态
         }
       }
-     // console.log("nextTick之前，openedNames:", this.openedNames);
-
     },
 
     getTopParent(menu) {
-      //console.log('menu',menu)
       return menu.parent ? this.getTopParent(menu.parent) : menu.name;
     },
     initMenu(data){
@@ -188,7 +181,6 @@ export default {
       this.openedNames = this.getOpenedNamesByActiveName();
     },
     activeIconBackground(item) {
-      // console.log('activeBack')
       // 如果当前菜单项是激活的，返回一个颜色值，否则返回空
       return this.selectedMenuParent=== item.parent ? '#ff0000' : '';
     },
@@ -229,7 +221,6 @@ export default {
         }
       }
       return openNames
-      //console.log('side中getOpenedNamesByActiveNameopenedNames:',openNames)
     },
     updateOpened () {
       const items = findComponentsDownward(this, 'Submenu');
@@ -244,24 +235,17 @@ export default {
       if (this.currentActiveName === undefined) {
         this.currentActiveName = -1;
       }
-      //   this.broadcast('Submenu', 'on-update-active-name', false);
-      //   this.broadcast('MenuItem', 'on-update-active-name', this.currentActiveName);
     }
   },
   watch:{
     activeName(){
       this.openedNames = this.getOpenedNamesByActiveName();
-      // console.log("head中的gqz1activeName:", this.activeName);
-      // console.log("head中的gqz1openedNames:", this.openedNames);
     },
     openedNames() {
-      // console.log("head中的gqz3openedNames:", this.openedNames);
       this.$nextTick(() => {
         this.updateOpened()
         this.updateActiveName()
       })
-      // console.log("head中的gqz2activeName:", this.activeName);
-      // console.log("head中的gqz2openedNames:", this.openedNames);
     }
   },
   created(){

package/src/components/pro-layout-nav.vue

@@ -24,10 +24,7 @@ import { deepCopy } from '@lambo-design/shared/utils/assist'
 export default {
   name: 'pro-layout-',
   props: {
-    acceptAppId: {
-      type: String,
-      default: ''
-    }
+
   },
   data() {
     return {
@@ -37,13 +34,14 @@ export default {
       activeName: '',
       topMenuNum: 4,
       lastTopMenuNum:-1,
+      acceptAppId: '',
       originMenuList: []
     }
   },
   methods: {
     initListener() {
-      Bus.$on('top-menu-num', (data) => {
-        this.initTopMenuNum(data)
+      Bus.$on('system-info',(data) => {
+        this.initSystemInfo();
       })
       Bus.$on('nav-list', (data) => {
         this.initNav(data)
@@ -57,13 +55,14 @@ export default {
 
     },
     destroyListener() {
+      Bus.$off('system-info')
       Bus.$off('nav-list')
       Bus.$off('menu-list')
       Bus.$off('change-app')
-      Bus.$off('top-menu-num')
     },
-    initTopMenuNum(data) {
-      this.topMenuNum = data
+    initSystemInfo(data) {
+      this.topMenuNum = data.topMenu ? data.topMenu : 4;
+      this.acceptAppId = data.acceptAppId ? data.acceptAppId : '';
       this.initNav(this.navList)
     },
     initNav(data) {
@@ -94,7 +93,6 @@ export default {
     },
     initMenu(data) {
       this.originMenuList = deepCopy(data)
-      //console.log('nav-list',this.originMenuList)
     },
     selectApp(appId) {
       this.activeName = appId

package/src/components/pro-layout-tools-user.vue

@@ -36,13 +36,12 @@ export default {
   name: 'pro-layout-tools-user',
   data() {
     return {
+      menuList: [],
+      currentName: '',
+      currentItem: {},
       isFullScreen:false,
-      serverContext: config.upmsServerContext,
       isCollected:false,
-      rightTopOptButtonList: [],
-      collectedMenus:[],
-      currentItem:{},
-      currentName:'',
+      rightTopOptButtonList: ['collect','fullScreen'],
       userInfo: {
         userName: '管理员',
         dropList: [
@@ -52,96 +51,77 @@ export default {
       }
     }
   },
+  watch: {
+    collectMenuList(){
+      this.changeCollectMenu();
+    },
+    currentName(){
+      this.changeCollectMenu();
+    }
+  },
   methods: {
     initListener() {
+      Bus.$on('system-info',(data) => {
+        this.initSystemInfo();
+      })
       Bus.$on('user-info', (data) => {
         this.handleUser(data)
       })
-      Bus.$on('right-top-opt-button-list',(data) => {
-        this.initButtonList(data)
+      Bus.$on('menu-list', (data) => {
+        this.initMenu(data);
       })
       Bus.$on('menu-click',(name,item) => {
         this.initMenuClick(name, item)
       })
-      Bus.$on('server-context',(data) => {
-        this.initserverContext(data)
-      })
-      Bus.$on('change-top-collect', (data) => {
-        this.changeTopCollect(data)
-      })
+      Bus.$on('collect-menu-list',(data)=>{
+        this.initCollectMenu(data)
+      });
     },
     destroyListener() {
+      Bus.$off('system-info')
       Bus.$off('user-info')
-      Bus.$off('right-top-opt-button-list')
+      Bus.$off('menu-list')
       Bus.$off('menu-click')
-      Bus.$off('server-context')
-      Bus.$off('change-top-collect')
+      Bus.$off('collect-menu-list')
     },
-    initserverContext(data){
-      this.serverContext = data
+    initSystemInfo(data){
+      if (data && data.rightTopOptButtonList) {
+        this.rightTopOptButtonList = deepCopy(data.rightTopOptButtonList)
+      }
+    },
+    handleUser(data) {
+      this.userInfo = Object.assign(this.userInfo, data)
     },
-    changeTopCollect(data){
-      this.isCollected = data ? true : false
+    initMenu(data){
+      this.menuList = deepCopy(data);
     },
     initMenuClick(name, item){
-      let self = this
       this.currentName = name
-      let list = self.$store.state.app.originalPermissionList
-      let item1 = list.find(item1 => item1.name == item.name)
-      this.currentItem = item1
-      if (!item1 || item1.type !== 2){
-        return
+      if(item) {
+        this.currentItem = item;
+      } else {
+        this.currentItem = this.menuList.find(menu => menu.name == name)
       }
-      ajax.get(this.serverContext + "/manage/upmsMenuCollect/queryIsCollected",{
-        params:{
-          appId: item1.appId,
-          permissionId: item1.permissionId
-        }
-      }).then(resp => {
-        if (resp.data && resp.data.code == 1){
-          self.isCollected = resp.data.data === null ? false : true
-        }
-      }).catch(err => {
-        console.error(err);
-      });
-
     },
-
-    initButtonList(data){
-      this.rightTopOptButtonList = deepCopy(data)
+    initCollectMenu(data){
+      this.collectMenuList = data;
     },
-    handleUser(data) {
-      this.userInfo = Object.assign(this.userInfo, data)
+    changeCollectMenu(){
+      this.isCollected = false
+      let collectMenu = this.collectMenuList.find(item => item.name == this.currentName)
+      this.isCollected = !!collectMenu;
     },
     handleClick(name) {
       Bus.$emit('user-action', name)
     },
     collectEvent(){
-      let self = this
-      const apiUrl = self.isCollected ?
-          self.serverContext + '/manage/upmsMenuCollect/remove' :
-          self.serverContext + '/manage/upmsMenuCollect/add'
-      const data = {
-        appId: this.currentItem.appId,
+      let data = {
+        meta: {
+          appId: this.currentItem.appId
+        },
         permissionId: this.currentItem.permissionId
       }
-      ajax.post(apiUrl, data).then(function (resp) {
-        if (resp.data.code == 1) {
-          self.isCollected = !self.isCollected
-          const message = self.isCollected ? '收藏成功' : '取消收藏成功'
-          Bus.$emit('change-side-collect',self.currentItem)
-          self.$Message.success(message)
-
-        } else {
-          const message = self.isCollected ? '取消收藏失败' : '收藏失败'
-          self.$Message.error(message + ', 请联系系统管理员')
-        }
-      }).catch(function (err) {
-        console.error('收藏操作失败:', err)
-        self.$Message.error('操作失败, 请联系系统管理员')
-      })
-
-
+      Bus.$emit('toggle-collect-menu',!this.isCollected,data)
     },
     handleKeyPress(event){
       // 按下 F11 键时触发全屏切换
@@ -150,7 +130,6 @@ export default {
         this.handleFullScreen();
       }
     },
-
     // 全屏事件
     handleFullScreen() {
       let element = document.documentElement;
@@ -219,12 +198,9 @@ export default {
       }, 0);
     });
   },
-
   beforeDestroy() {
     this.destroyListener()
     document.removeEventListener('keydown', this.handleKeyPress);
-    // window.removeEventListener('resize', this.handleResize)
-
   }
 }
 </script>

package/src/index.vue

@@ -1,7 +1,7 @@
 <template>
   <i-layout class="pro-layout" :class="layoutClass">
     <i-header class="pro-layout-header">
-      <LamboProLayoutHeader :accept-app-id="acceptAppId" @clickLogo="handleClick" @on-select="handleSelect"></LamboProLayoutHeader>
+      <LamboProLayoutHeader @clickLogo="handleClick" @on-select="handleSelect"></LamboProLayoutHeader>
     </i-header>
     <i-layout>
       <i-sider
@@ -40,14 +40,6 @@ import {
 import {deepCopy} from "@lambo-design/shared/utils/assist";
 export default {
   props:{
-    acceptAppId: {
-      type: String,
-      default:''
-    },
-    topMenuNum: {
-      type: Number,
-      default: 4
-    },
     systemInfo: {
       type: Object,
       default: () => {
@@ -55,14 +47,13 @@ export default {
           systemName: '后台管理系统',
           systemLogo: '',
           layoutSize: '',
+          acceptAppId: '',
           tabNum: 8,
+          topMenu: 4,
+          rightTopOptButtonList: []
         }
       }
     },
-    serverContext: {
-      type: String,
-      default: () => config.upmsServerContext // 设置默认值
-    },
     userInfo: {
       type: Object,
       default: () => {}
@@ -88,12 +79,7 @@ export default {
       default: () => {
         return config.homeRouter
       }
-    },
-    //右上角按钮列表
-    rightTopOptButtonList: {
-      type: Array,
-      default: () => []
-    },
+    }
   },
   data(){
     return {
@@ -190,10 +176,6 @@ export default {
       Bus.$emit('system-info',this.systemInfo)
       Bus.$emit('user-info',this.userInfo)
       Bus.$emit('nav-list',this.navList)
-      Bus.$emit('right-top-opt-button-list',this.rightTopOptButtonList)
-      Bus.$emit('top-menu-num',this.topMenuNum)
-      Bus.$emit('server-context',this.serverContext)
-
       this.menuList.map(item => {
         // 如果 uri 不以 '/' 开头，添加 '/'
         if (item.uri&&!item.uri.startsWith('/')&&!item.uri.startsWith('http')) {