@lambo-design/pro-layout 1.0.0-beta.114 → 1.0.0-beta.116

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.114",
+  "version": "1.0.0-beta.116",
   "description": "",
   "main": "index.js",
   "scripts": {},

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

@@ -104,6 +104,7 @@ export default {
       })
     },
     acceptAppId(val) {
+      console.log('监听成功')
       this.selectApp(val)
     }
   },

package/src/components/pro-layout-other-menu.vue

@@ -26,7 +26,7 @@
             placement="left"
     >
       <div v-if="drawer.type=='history'" class="other-menu-history">
-        <div v-for="(item,index) in list" :key="index" class="other-menu-history-item">
+        <div v-for="item in list" class="other-menu-history-item">
           <div class="content" @click="handleClick(item)">
             <Icon :type="item.icon"></Icon>
             <span> {{ item.label }}</span>
@@ -37,10 +37,11 @@
         </div>
       </div>
       <div v-if="drawer.type=='collect'" class="other-menu-collect">
-        <div v-for="(item,index) in list"  :key="index" class="other-menu-collect-item" @click="handleClick(item)">
-          <div class="content" @click="handleClick(item)">
-            <Icon :type="item.icon"></Icon>
-            <span> {{ item.label }}</span>
+        <div v-for="item in list" class="other-menu-collect-item" @click="handleClick(item)">
+          <div class="content">
+            <Tooltip :content="item.label" :delay="1000">
+              <Icon :size="40" :type="item.icon"></Icon>
+            </Tooltip>
           </div>
           <div class="delete">
             <Icon type="ios-close" @click.native.stop="handleCollectDelete(item)"></Icon>
@@ -61,9 +62,14 @@ export default {
   components: {},
   props: {
     collapsed: {
-      type: Boolean,
-      default:false
+      type: Boolean
     },
+    serverContext: {
+      type: String,
+      default: function() {  // 设置默认值
+        return config.upmsServerContext;
+      }
+    }
   },
   data() {
     return {
@@ -90,6 +96,7 @@ export default {
       if (value == 'history') {
         this.drawer.title = '历史菜单'
         this.drawer.url = '/manage/upmsMenuHistory/list'
+
       } else {
         this.drawer.title = '收藏菜单'
         this.drawer.url = '/manage/upmsMenuCollect/list'
@@ -100,11 +107,13 @@ export default {
     },
     getList() {
       this.list = []
-      ajax.get(config.upmsServerContext + this.drawer.url).then(resp => {
+      ajax.get(this.serverContext  + this.drawer.url).then(resp => {
         if (resp.data.code == 1) {
           this.list = resp.data.data
+          console.log("this.list:", this.list)
           if (this.drawer.type == 'collect') {
             this.$store.commit('setCollectMenuList', this.list)
+            console.log("this.list2:", this.list)
           }
         }
       })
@@ -114,14 +123,14 @@ export default {
       this.drawer.model = false
     },
     handleHistoryDelete(item) {
-      ajax.get(config.upmsServerContext + "/manage/upmsMenuHistory/delete/" + item.historyId).then(resp => {
+      ajax.get(this.serverContext  + "/manage/upmsMenuHistory/delete/" + item.historyId).then(resp => {
         if (resp.data.code == 1) {
           this.getList()
         }
       })
     },
     handleCollectDelete(item) {
-      ajax.get(config.upmsServerContext + "/manage/upmsMenuCollect/delete/" + item.collectId).then(resp => {
+      ajax.get(this.serverContext  + "/manage/upmsMenuCollect/delete/" + item.collectId).then(resp => {
         if (resp.data.code == 1) {
           this.getList()
         }

package/src/components/pro-layout-sider-menu-item.vue

@@ -49,6 +49,7 @@ export default {
     fetchCollectedMenus() {
       ajax.get(config.upmsServerContext + "/manage/upmsMenuCollect/list").then(resp => {
         const collectedMenus = resp.data.data;
+        // console.log('collectedMenus', collectedMenus)
         if (Array.isArray(collectedMenus)) {
           collectedMenus.forEach(menu => {
             // 使用 menu 的 name 属性作为键
@@ -61,6 +62,7 @@ export default {
       }).catch(err => {
         console.error("Error fetching collected menus:", err);
       });
+      // console.log('isCollected', this.isCollected)
     },
     toggleCollect(item) {
       const self = this;

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

@@ -28,8 +28,6 @@
         </template>
       </template>
     </Menu>
-    <ProLayoutOtherMenu @on-select="selectHandle"></ProLayoutOtherMenu>
-
     <div v-show="collapsed" :list="menuList" class="menu-collapsed">
       <template v-for="item in menuList">
         <ProLayoutSiderCollapsedMenu v-if="item.children && item.children.length > 1" :key="`drop-menu-${item.name}`"
@@ -53,7 +51,6 @@ import Bus from "@lambo-design/shared/utils/bus";
 import {deepCopy} from "@lambo-design/shared/utils/assist";
 import generatorMenuList from "@lambo-design/shared/utils/menu/index";
 import sider from '../utils/sider'
-import ProLayoutOtherMenu from "./pro-layout-other-menu";
 import ProLayoutSiderMenuItem from './pro-layout-sider-menu-item'
 import ProLayoutSiderCollapsedMenu from './pro-layout-sider-collapsed-menu'
 import {
@@ -66,8 +63,7 @@ export default {
   name: "pro-layout-sider",
   components: {
     ProLayoutSiderMenuItem,
-    ProLayoutSiderCollapsedMenu,
-    ProLayoutOtherMenu
+    ProLayoutSiderCollapsedMenu
   },
   data(){
     return {
@@ -122,6 +118,7 @@ export default {
     initMenu(data){
       if (data && data.length > 0) {
         let item = data[0];
+        // console.log("item:",item)
         if (item.appId && item.appId !== this.appId) {
           return;
         }
@@ -129,9 +126,6 @@ export default {
       this.originMenuList = deepCopy(data);
       this.changeMenu()
     },
-    selectHandle(name){
-      this.$emit('on-select', name)
-    },
     changeApp(appId,appInfo){
       this.appId = appId;
       this.changeMenu()
@@ -224,9 +218,6 @@ export default {
 <style scoped lang="less">
 @import "@lambo-design/core/src/styles/default";
 .pro-layout-sider-wrapper{
-  /deep/.ivu-menu{
-    margin-bottom: 50px;
-  }
   /deep/.ivu-menu-submenu{
     .ivu-menu{
       background: #1A1A1A;

package/src/index.vue

@@ -11,7 +11,7 @@
           :width="220"
           :collapsed-width="64"
           v-model="collapsed">
-        <LamboProLayoutSider ref="sider" @on-select="handleSelect"></LamboProLayoutSider>
+        <LamboProLayoutSider ref="sider"></LamboProLayoutSider>
       </i-sider>
       <i-content class="pro-layout-content">
         <i-layout class="pro-layout-content-layout">
@@ -123,9 +123,6 @@ export default {
     handleClick(){
       this.$emit('clickLogo')
     },
-    handleSelect(name){
-      this.$emit('on-select',name)
-    },
     initListener(){
       Bus.$on('trigger-change',(data)=>{
         this.triggerChange(data)

package/src/styles/other-menu.less

@@ -50,12 +50,11 @@
 
 
   .other-menu-item {
-    color: var(--menu-dark-subsidiary-color, rgba(255, 255, 255, 0.7));
-    //color: #F0F0F0;
+    color: #F0F0F0;
     text-align: center;
     line-height: 50px;
     height: 50px;
-    width: 50%;
+    width: 100px;
     display: inline-block;
     border-right: 2px solid #000000;
     cursor: pointer;
@@ -74,7 +73,7 @@
 
 
   .ivu-drawer {
-    left: 220px;
+    left: 256px;
     height: calc(100% - 110px);
     bottom: 0;
     top: auto;
@@ -112,13 +111,10 @@
 
     .other-menu-collect {
       .other-menu-collect-item {
-        //display: inline-block;
-        //margin: 8px;
-        //position: relative;
-        width: 100%;
-        height: 35px;
-        line-height: 35px;
+        display: inline-block;
+        margin: 8px;
         position: relative;
+
         .delete {
           display: none;
           position: absolute;