@lambo-design/pro-layout 1.0.0-beta.202 → 1.0.0-beta.203

package/package.json

@@ -1,17 +1,17 @@
-{
-  "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.202",
-  "description": "",
-  "main": "index.js",
-  "scripts": {},
-  "author": "lambo",
-  "license": "ISC",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "devDependencies": {
-    "@lambo-design/core": "workspace:^",
-    "@lambo-design/shared": "workspace:^"
-  }
-}
+{
+  "name": "@lambo-design/pro-layout",
+  "version": "1.0.0-beta.203",
+  "description": "",
+  "main": "index.js",
+  "author": "lambo",
+  "license": "ISC",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "devDependencies": {
+    "@lambo-design/shared": "^1.0.0-beta.114",
+    "@lambo-design/core": "^4.7.1-beta.118"
+  },
+  "scripts": {}
+}

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

@@ -12,18 +12,6 @@
     <div class="tools-box">
       <LamboProTools></LamboProTools>
     </div>
-    <!--<div class="search-box" v-if="isShowSearch === '1'" >-->
-    <!--        <FastSearch-->
-    <!--          style="margin-right: 10px"-->
-    <!--          :searchType="1"-->
-    <!--          @on-select="handleSelect"-->
-    <!--        ></FastSearch>-->
-    <!--  </div>-->
-    <!--    <Menu ref="menu"-->
-    <!--          :active-name="activeName"-->
-    <!--          :open-names="openedNames"-->
-    <!--          @on-select="handleSelect">-->
-    <!--    </Menu>-->
   </div>
 </template>
 

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

@@ -20,7 +20,6 @@
 <script>
 import Bus from '@lambo-design/shared/utils/bus'
 import { deepCopy } from '@lambo-design/shared/utils/assist'
-import config from '@lambo-design/shared/config/config'
 
 export default {
   name: 'pro-layout-',

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,index) in historyMenuList" :key="index" class="other-menu-history-item">
           <div class="content" @click="handleClick(item)">
             <Icon :type="item.icon"></Icon>
             <span> {{ item.label }}</span>
@@ -37,7 +37,7 @@
         </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 v-for="(item,index) in collectMenuList"  :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>
@@ -52,9 +52,7 @@
 </template>
 
 <script>
-import ajax from '@lambo-design/shared/utils/ajax';
-import config from "@lambo-design/shared/config/config";
-
+import Bus from "@lambo-design/shared/utils/bus";
 
 export default {
   name: "other-menu",
@@ -63,21 +61,17 @@ export default {
     collapsed: {
       type: Boolean,
       default:false
-    },
-    serverContext: {
-      type: String,
-      default: () => config.upmsServerContext // 设置默认值
     }
   },
   data() {
     return {
+      historyMenuList: [],
+      collectMenuList: [],
       drawer: {
         model: false,
-        url: '',
         title: '',
         type: '',
-      },
-      list: []
+      }
     }
   },
   computed: {
@@ -90,47 +84,49 @@ export default {
     }
   },
   methods: {
+    initListener(){
+      Bus.$on('history-menu-list',(data)=>{
+        this.initHistory(data)
+      });
+      Bus.$on('collect-menu-list', (data)=> {
+        this.initCollect(data)
+      })
+    },
+    destroyListener(){
+      Bus.$off('history-menu-list')
+      Bus.$off('collect-menu-list')
+    },
+    initHistory(historyMenuList){
+      this.historyMenuList = historyMenuList;
+    },
+    initCollect(collectMenuList){
+      this.collectMenuList = collectMenuList;
+    },
     onChange(value) {
       if (value == 'history') {
         this.drawer.title = '历史菜单'
-        this.drawer.url = '/manage/upmsMenuHistory/listByLimit'
       } else {
         this.drawer.title = '收藏菜单'
-        this.drawer.url = '/manage/upmsMenuCollect/list'
       }
-      this.getList()
       this.drawer.type = value
       this.drawer.model = !this.drawer.model
     },
-    getList() {
-      this.list = []
-      ajax.get(this.serverContext + this.drawer.url).then(resp => {
-        if (resp.data.code == 1) {
-          this.list = resp.data.data
-          if (this.drawer.type == 'collect') {
-            this.$store.commit('setCollectMenuList', this.list)
-          }
-        }
-      })
-    },
     handleClick(item) {
-      this.$emit('on-select', item.name)
       this.drawer.model = false
+      this.$emit('menu-click', item.name)
     },
     handleHistoryDelete(item) {
-      ajax.get(this.serverContext + "/manage/upmsMenuHistory/delete/" + item.historyId).then(resp => {
-        if (resp.data.code == 1) {
-          this.getList()
-        }
-      })
+      Bus.$emit('delete-history-menu',item)
     },
     handleCollectDelete(item) {
-      ajax.get(this.serverContext + "/manage/upmsMenuCollect/delete/" + item.collectId).then(resp => {
-        if (resp.data.code == 1) {
-          this.getList()
-        }
-      })
+      Bus.$emit('delete-collect-menu',item)
     }
+  },
+  created(){
+    this.initListener();
+  },
+  beforeDestroy(){
+    this.destroyListener();
   }
 }
 </script>
@@ -138,5 +134,4 @@ export default {
 
 <style lang="less">
 @import '../styles/other-menu.less';
-@import "@lambo-design/core/src/styles/default.less";
 </style>

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

@@ -33,7 +33,7 @@
       </template>
     </Menu>
 
-    <ProLayoutOtherMenu :collapsed="collapsed" @on-select="selectHandle" :server-context="serverContext"></ProLayoutOtherMenu>
+    <ProLayoutOtherMenu :collapsed="collapsed"></ProLayoutOtherMenu>
     <FastSearch
         v-show="!collapsed"
         style="margin-right: 35px; margin-left: 1px; padding-top: 1px"

package/src/index.vue

@@ -11,7 +11,7 @@
           :width="220"
           :collapsed-width="64"
           v-model="collapsed">
-        <LamboProLayoutSider ref="sider" @on-select="handleSelect" :server-context="serverContext"></LamboProLayoutSider>
+        <LamboProLayoutSider ref="sider"></LamboProLayoutSider>
       </i-sider>
       <i-content class="pro-layout-content">
         <i-layout class="pro-layout-content-layout">
@@ -75,6 +75,14 @@ export default {
       type: Array,
       default: () => []
     },
+    historyMenuList: {
+      type: Array,
+      default: () => []
+    },
+    collectMenuList: {
+      type: Array,
+      default: () => []
+    },
     homeRouter: {
       type: Object,
       default: () => {
@@ -102,12 +110,14 @@ export default {
   },
   computed: {
     allData(){
-      const { systemInfo, userInfo, navList, menuList, homeRouter} = this;
+      const { systemInfo, userInfo, navList, menuList, historyMenuList, collectMenuList, homeRouter} = this;
       return {
         systemInfo,
         userInfo,
         navList,
         menuList,
+        historyMenuList,
+        collectMenuList,
         homeRouter
       }
     },
@@ -155,7 +165,12 @@ export default {
       Bus.$on('tag-list',(data,current)=>{
         this.changeTabs(data,current)
       });
-
+      Bus.$on('delete-history-menu',(data) => {
+        this.deleteHistoryMenu(data)
+      })
+      Bus.$on('delete-collect-menu',(data) => {
+        this.deleteCollectMenu(data)
+      })
     },
     destroyListener(){
       Bus.$off('trigger-change')
@@ -163,6 +178,8 @@ export default {
       Bus.$off('user-action')
       Bus.$off('menu-click')
       Bus.$off('tag-list')
+      Bus.$off('delete-history-menu')
+      Bus.$off('delete-collect-menu')
     },
     initEmit(){
       //在这里改this.menuList
@@ -179,7 +196,9 @@ export default {
           item.uri = '/' + item.uri;
         }
       });
-      Bus.$emit('menu-list',this.menuList)
+      Bus.$emit('menu-list',this.menuList);
+      Bus.$emit('history-menu-list',this.historyMenuList);
+      Bus.$emit('collect-menu-list',this.collectMenuList);
     },
     initTags(){
       let tagList = getTagNavListFromLocalstorage(config.routerBase + '-tagNavList');
@@ -213,10 +232,6 @@ export default {
           item = res[0];
         }
       }
-      // if (item && item.uri === '') {
-      //   console.log('menuClick item uri is empty')
-      //   return;
-      // }
       if (!isOpenBlank(item)) {
         sessionStorage.setItem('activeName',name);
       }
@@ -254,6 +269,12 @@ export default {
 
         Bus.$emit('tag-list', tagList, name)
       }
+    },
+    deleteHistoryMenu(data){
+      this.$emit('delete-history-menu',data);
+    },
+    deleteCollectMenu(data){
+      this.$emit('delete-collect-menu',data);
     }
   },
   mounted(){

package/src/styles/other-menu.less

@@ -1,19 +1,11 @@
-//@import "@lambo-design/core/src/styles/default.less";
-@import "@lambo-design/shared/config/themes/blue/blue.less";
-@import "@lambo-design/shared/config/themes/default/default.less";
-@import "@lambo-design/shared/config/themes/gold/gold.less";
-@import "@lambo-design/shared/config/themes/atrovirens/atrovirens.less";
-@import "@lambo-design/shared/config/themes/eap/eap.less";
-@import "@lambo-design/shared/config/themes/lime/lime.less";
-@import "@lambo-design/shared/config/themes/orange/orange.less";
-@import "@lambo-design/shared/config/themes/red/red.less";
+@import "@lambo-design/core/src/styles/default.less";
 .other-menu {
   width: 99%;
   // border-top: 3px solid @_layout-sider-background;
   position: absolute;
   bottom: 0;
   z-index: 1000;
-  background: var(--menu-dark-active-bg ,@menu-dark-active-bg);
+  background: var(--menu-dark-active-bg ,@_menu-dark-active-bg);
 
 
 
@@ -59,8 +51,7 @@
 
 
   .other-menu-item {
-    color: var(--menu-dark-subsidiary-color, rgba(255, 255, 255, 0.7));
-    //color: #F0F0F0;
+    color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
     text-align: center;
     line-height: 50px;
     height: 48.6px;
@@ -71,7 +62,7 @@
 
     &:hover {
       color: #ffffff;
-      background: var(--primary-color,@primary-color);
+      background: var(--primary-color,@_primary-color);
     }
 
   }
@@ -108,7 +99,7 @@
             cursor: pointer;
             height: 38px;
             font-weight: bold;
-            color: var(--primary-color,@primary-color);
+            color: var(--primary-color,@_primary-color);
           }
 
           .delete {
@@ -139,7 +130,7 @@
         &:hover {
           .content {
             cursor: pointer;
-            color: var(--primary-color,@primary-color);
+            color: var(--primary-color,@_primary-color);
 
             .ivu-tooltip {
               .ivu-tooltip-rel {