@lambo-design/pro-layout 1.0.0-beta.281 → 1.0.0-beta.282

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.281",
+  "version": "1.0.0-beta.282",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/src/components/{pro-layout-header.vue → pro-layout-header/index.vue}

@@ -13,7 +13,7 @@
       <LamboProTools></LamboProTools>
     </div>
     <div v-show="systemInfo && systemInfo.navType && systemInfo.navType == 'slide'">
-      <LamboProNavSildeBtn></LamboProNavSildeBtn>
+      <LamboProNavSilde></LamboProNavSilde>
     </div>
   </div>
 </template>
@@ -22,7 +22,7 @@
 import LamboProTrigger from './pro-layout-trigger'
 import LamboProLogo from './pro-layout-logo'
 import LamboProNav from './pro-layout-nav'
-import LamboProNavSildeBtn from './pro-layout-nav-slide-btn'
+import LamboProNavSilde from './pro-layout-nav/index-slide'
 import LamboProTools from './pro-layout-tools'
 import Bus from "@lambo-design/shared/utils/bus";
 export default {
@@ -42,7 +42,7 @@ export default {
     LamboProTrigger,
     LamboProLogo,
     LamboProNav,
-    LamboProNavSildeBtn,
+    LamboProNavSilde,
     LamboProTools
   },
   computed:{

package/src/components/{pro-layout-logo.vue → pro-layout-header/pro-layout-logo/index.vue}

@@ -122,7 +122,7 @@ export default {
   .logo{
     width: 150px;
     height: 43px;
-    background: url("../styles/images/inspur.png") no-repeat;
+    background: url("../../../styles/images/inspur.png") no-repeat;
     background-size: 100%;
     background-position: center; /* 图片在背景区域内居中显示 */
     //float: left;

package/src/components/{pro-layout-nav-slide.vue → pro-layout-header/pro-layout-nav/components/pro-layout-nav-slide-menu.vue}

@@ -1,178 +1,178 @@
-<template>
-  <div class="menu-list" >
-    <ul class="top-menu" :style="layoutSize === 'default' ? {height: '64px'} : {height: '50px'}" ref="topNav">
-      <li class="top-menu-item" :class="{ 'active': activeName === item.appId }" v-for="(item,index) in topMenList"  :key="item.appId"  @click="selectApp(item.appId)">
-        <div class="menu-item" :style="layoutSize === 'default' ? {paddingTop: '10px'} : {paddingTop: '2px'}"  v-show="pointer <= index && index < pointer + topMenuNum && flag">
-          <p class="menu-icon"><Icon :type="item.icon" :size="20"></Icon></p>
-          <p class="menu-txt">{{ item.name }}</p>
-        </div>
-      </li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import Bus from '@lambo-design/shared/utils/bus'
-import { deepCopy } from '@lambo-design/shared/utils/assist'
-
-export default {
-  props: {
-    acceptInt: {
-      type: Number,
-      default: 0
-    },
-    topMenListNum: {
-      type: Number,
-      default: 0
-    }
-  },
-  data() {
-    return {
-      systemInfo:{},
-      pointer:0,
-      flag:true,
-      arrowFlag: true,
-      acceptAppId: '',
-      navList: [],
-      topMenList: [],
-      topTqmMenList:[],
-      otherList: [],
-      activeName: '',
-      topMenuNum: 7,
-      lastTopMenuNum:-1,
-      originMenuList: [],
-      layoutSize:"default"
-    }
-  },
-  methods: {
-    initListener() {
-      Bus.$on('system-info',(data) => {
-        this.initSystemInfo(data);
-      })
-      Bus.$on('nav-list', (data) => {
-        this.initNav(data)
-      })
-      Bus.$on('change-app', ({ appId, appInfo }) => {
-        this.changeApp(appId, appInfo)
-      })
-    },
-    destroyListener() {
-      Bus.$off('system-info')
-      Bus.$off('nav-list')
-      Bus.$off('change-app')
-    },
-    initSystemInfo(data) {
-      if (data) {
-        this.layoutSize = data.layoutSize ? data.layoutSize : 'default';
-        this.topMenuNum = data.topMenuNum ? data.topMenuNum : 4;
-        this.acceptAppId = data.acceptAppId ? data.acceptAppId : '';
-        this.initNav(this.navList)
-      }
-    },
-    initNav(data) {
-      if (data.toString() === this.navList.toString() && this.topMenuNum === this.lastTopMenuNum) {
-        return
-      }
-      this.navList = data
-      this.lastTopMenuNum = this.topMenuNum
-      if (data.length > this.topMenuNum) {
-        let navList = deepCopy(data)
-        this.topMenList = navList
-        this.$emit('topMen-list', this.topMenList);
-        this.$emit('topMen-num', this.topMenuNum);
-        this.$emit('topMen-true', true);
-        // this.topMenList = navList.splice(0, this.topMenuNum)
-        // this.otherList = navList
-      } else {
-        this.topMenList = this.navList
-        this.$emit('topMen-true', false);
-      }
-      if (this.topMenList.length > 0) {
-        let appId = this.topMenList[0].appId
-        for (let i = 0; i < this.topMenList.length; i++) {
-          if (this.topMenList[i].selected == true) {
-            appId = this.topMenList[i].appId
-          }
-        }
-        if (this.activeName) {
-          appId = this.activeName
-        }
-        this.selectApp(appId)
-      }
-    },
-    changeApp(appId, appInfo){
-      this.activeName = appId
-    },
-    selectApp(appId) {
-      this.activeName = appId
-      let res = this.navList.filter(app => app.appId == appId)
-      Bus.$emit('change-app', { appId, appInfo: res[0] })
-    },
-  },
-  watch: {
-    acceptInt(val){
-      this.pointer = val;
-    },
-    acceptAppId(val) {
-      this.selectApp(val)
-    }
-  },
-  created() {
-    this.initListener()
-  },
-  beforeDestroy() {
-    this.destroyListener()
-  }
-}
-</script>
-
-<style scoped lang="less">
-@import '@lambo-design/core/src/styles/default.less';
-.menu-list {
-  height: 100%;
-  line-height: 24px;
-  //color: #ffffff;
-  cursor: pointer;
-  font-size: 16px;
-  margin-left: 53px;
-  .top-menu {
-    overflow: hidden;
-    .top-menu-item {
-      position: relative;
-      height: 100%;
-      //color: #FFFFFF;
-      list-style: none;
-      float: left;
-      &:hover {
-        //background: transparent;
-        .menu-item {
-          //color: #fff;
-        }
-      }
-      &.active {
-        //background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0)) !important;
-        //border-bottom: 2px solid var(--primary-color-tint-5, @_primary-color-tint-5);
-        .menu-item {
-          //color: #fff;
-        }
-      }
-      .menu-item {
-        padding: 2px 0px 0px 8px;
-        margin: 0px 30px;
-      }
-      .menu-icon {
-        height: 20px;
-        line-height: 20px;
-        text-align: center;
-        //position: absolute;
-        left: 14px;
-      }
-      .menu-txt {
-        text-align: center;
-        font-size: 14px;
-        line-height: 2;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div class="menu-list" >
+    <ul class="top-menu" :style="layoutSize === 'default' ? {height: '64px'} : {height: '50px'}" ref="topNav">
+      <li class="top-menu-item" :class="{ 'active': activeName === item.appId }" v-for="(item,index) in topMenList"  :key="item.appId"  @click="selectApp(item.appId)">
+        <div class="menu-item" :style="layoutSize === 'default' ? {paddingTop: '10px'} : {paddingTop: '2px'}"  v-show="pointer <= index && index < pointer + topMenuNum && flag">
+          <p class="menu-icon"><Icon :type="item.icon" :size="20"></Icon></p>
+          <p class="menu-txt">{{ item.name }}</p>
+        </div>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import Bus from '@lambo-design/shared/utils/bus'
+import { deepCopy } from '@lambo-design/shared/utils/assist'
+
+export default {
+  props: {
+    acceptInt: {
+      type: Number,
+      default: 0
+    },
+    topMenListNum: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      systemInfo:{},
+      pointer:0,
+      flag:true,
+      arrowFlag: true,
+      acceptAppId: '',
+      navList: [],
+      topMenList: [],
+      topTqmMenList:[],
+      otherList: [],
+      activeName: '',
+      topMenuNum: 7,
+      lastTopMenuNum:-1,
+      originMenuList: [],
+      layoutSize:"default"
+    }
+  },
+  methods: {
+    initListener() {
+      Bus.$on('system-info',(data) => {
+        this.initSystemInfo(data);
+      })
+      Bus.$on('nav-list', (data) => {
+        this.initNav(data)
+      })
+      Bus.$on('change-app', ({ appId, appInfo }) => {
+        this.changeApp(appId, appInfo)
+      })
+    },
+    destroyListener() {
+      Bus.$off('system-info')
+      Bus.$off('nav-list')
+      Bus.$off('change-app')
+    },
+    initSystemInfo(data) {
+      if (data) {
+        this.layoutSize = data.layoutSize ? data.layoutSize : 'default';
+        this.topMenuNum = data.topMenuNum ? data.topMenuNum : 4;
+        this.acceptAppId = data.acceptAppId ? data.acceptAppId : '';
+        this.initNav(this.navList)
+      }
+    },
+    initNav(data) {
+      if (data.toString() === this.navList.toString() && this.topMenuNum === this.lastTopMenuNum) {
+        return
+      }
+      this.navList = data
+      this.lastTopMenuNum = this.topMenuNum
+      if (data.length > this.topMenuNum) {
+        let navList = deepCopy(data)
+        this.topMenList = navList
+        this.$emit('topMen-list', this.topMenList);
+        this.$emit('topMen-num', this.topMenuNum);
+        this.$emit('topMen-true', true);
+        // this.topMenList = navList.splice(0, this.topMenuNum)
+        // this.otherList = navList
+      } else {
+        this.topMenList = this.navList
+        this.$emit('topMen-true', false);
+      }
+      if (this.topMenList.length > 0) {
+        let appId = this.topMenList[0].appId
+        for (let i = 0; i < this.topMenList.length; i++) {
+          if (this.topMenList[i].selected == true) {
+            appId = this.topMenList[i].appId
+          }
+        }
+        if (this.activeName) {
+          appId = this.activeName
+        }
+        this.selectApp(appId)
+      }
+    },
+    changeApp(appId, appInfo){
+      this.activeName = appId
+    },
+    selectApp(appId) {
+      this.activeName = appId
+      let res = this.navList.filter(app => app.appId == appId)
+      Bus.$emit('change-app', { appId, appInfo: res[0] })
+    },
+  },
+  watch: {
+    acceptInt(val){
+      this.pointer = val;
+    },
+    acceptAppId(val) {
+      this.selectApp(val)
+    }
+  },
+  created() {
+    this.initListener()
+  },
+  beforeDestroy() {
+    this.destroyListener()
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '@lambo-design/core/src/styles/default.less';
+.menu-list {
+  height: 100%;
+  line-height: 24px;
+  //color: #ffffff;
+  cursor: pointer;
+  font-size: 16px;
+  margin-left: 53px;
+  .top-menu {
+    overflow: hidden;
+    .top-menu-item {
+      position: relative;
+      height: 100%;
+      //color: #FFFFFF;
+      list-style: none;
+      float: left;
+      &:hover {
+        //background: transparent;
+        .menu-item {
+          //color: #fff;
+        }
+      }
+      &.active {
+        //background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0)) !important;
+        //border-bottom: 2px solid var(--primary-color-tint-5, @_primary-color-tint-5);
+        .menu-item {
+          //color: #fff;
+        }
+      }
+      .menu-item {
+        padding: 2px 0px 0px 8px;
+        margin: 0px 30px;
+      }
+      .menu-icon {
+        height: 20px;
+        line-height: 20px;
+        text-align: center;
+        //position: absolute;
+        left: 14px;
+      }
+      .menu-txt {
+        text-align: center;
+        font-size: 14px;
+        line-height: 2;
+      }
+    }
+  }
+}
+</style>

package/src/components/{pro-layout-nav-slide-btn.vue → pro-layout-header/pro-layout-nav/index-slide.vue}

@@ -1,7 +1,7 @@
 <template>
   <div class="pro-layout-nav-slide-wrapper">
     <div class="nav-box-slide">
-      <LamboProNavSlide :accept-int="pointer" @topMen-list="handleCustomEvent" @topMen-num="topMen"  @topMen-true="topMenTrue"></LamboProNavSlide>
+      <LamboProNavSlideMenu :accept-int="pointer" @topMen-list="handleCustomEvent" @topMen-num="topMen"  @topMen-true="topMenTrue"></LamboProNavSlideMenu>
     </div>
     <!--slide按钮-->
     <div class="tools-box-slide">
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import LamboProNavSlide from './pro-layout-nav-slide.vue'
+import LamboProNavSlideMenu from './components/pro-layout-nav-slide-menu'
 export default {
   data(){
     return {
@@ -36,7 +36,7 @@ export default {
     }
   },
   components: {
-    LamboProNavSlide
+    LamboProNavSlideMenu
   },
   methods:{
     handleCustomEvent(data) {

package/src/components/{pro-layout-tools-quick-fullscreen.vue → pro-layout-header/pro-layout-tools/components/pro-layout-tools-quick-fullscreen.vue}

@@ -5,6 +5,9 @@
 </template>
 
 <script>
+import Bus from '@lambo-design/shared/utils/bus'
+import { deepCopy } from '@lambo-design/shared/utils/assist'
+
 export default {
   name: 'pro-layout-tools-quick-fullscreen',
   data() {

package/src/components/{pro-layout-tools-quick-notice.vue → pro-layout-header/pro-layout-tools/components/pro-layout-tools-quick-notice.vue}

@@ -11,7 +11,7 @@
               <div class="dropdown-content">
                 <DropdownItem v-for="(item, index) in noticeDatas" :key="index" class="dropdown-item" @click.native="detail(item)" >
                   <div class="item-image-container">
-                    <img src="../styles/images/xiaoxitongzhi.png" class="item-image" alt=""/>
+                    <img src="../../../../styles/images/xiaoxitongzhi.png" class="item-image" alt=""/>
                     <span class="red-dot"></span>
                   </div>
                   <div class="item-content">

package/src/components/{pro-layout-tools-quick-todo.vue → pro-layout-header/pro-layout-tools/components/pro-layout-tools-quick-todo.vue}

@@ -11,7 +11,7 @@
               <div class="dropdown-content">
                 <DropdownItem v-for="(item, index) in noticeDatas" :key="index" class="dropdown-item" @click.native="detail(item)" >
                   <div class="item-image-container">
-                    <img src="../styles/images/xiaoxitongzhi.png" class="item-image" alt=""/>
+                    <img src="../../../../styles/images/xiaoxitongzhi.png" class="item-image" alt=""/>
                     <span class="red-dot"></span>
                   </div>
                   <div class="item-content">

package/src/components/{pro-layout-tools.vue → pro-layout-header/pro-layout-tools/index.vue}

@@ -6,8 +6,8 @@
 </template>
 
 <script>
-import LamboProLayoutToolsQuickIcons from './pro-layout-tools-quick-icons'
-import LamboProLayoutToolsUser from './pro-layout-tools-user'
+import LamboProLayoutToolsQuickIcons from './components/pro-layout-tools-quick-icons'
+import LamboProLayoutToolsUser from './components/pro-layout-tools-user'
 export default {
   name: "pro-layout-tools",
   components: {

package/src/components/{pro-layout-sider-collapsed-menu.vue → pro-layout-sider/components/pro-layout-sider-collapsed-menu.vue}

@@ -22,8 +22,8 @@
   </Dropdown>
 </template>
 <script>
-import sider from '../utils/sider'
-import menuItem from '../utils/menuItem'
+import sider from '../../../utils/sider'
+import menuItem from '../../../utils/menuItem'
 import {findNodeUpperByClasses} from '@lambo-design/shared/utils/platform'
 
 export default {

package/src/components/{pro-layout-sider-icon.vue → pro-layout-sider/components/pro-layout-sider-icon.vue}

@@ -40,7 +40,7 @@ export default {
       }
       if (iconType.indexOf('iconfont') > -1) {
         let imgName = iconType.replace('iconfont','').replace(/\s+/g,'');
-        return 'background: url('+ require('../styles/images/menuicon/' + imgName + '-s.png') +') no-repeat;background-size: 100%;';
+        return 'background: url('+ require('../../../styles/images/menuicon/' + imgName + '-s.png') +') no-repeat;background-size: 100%;';
       }
       return '';
     }
@@ -78,4 +78,4 @@ export default {
       }
     }
   }
-</style>
+</style>

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

@@ -55,8 +55,8 @@
   </Submenu>
 </template>
 <script>
-import sider from '../utils/sider'
-import menuItem from '../utils/menuItem'
+import sider from '../../../utils/sider'
+import menuItem from '../../../utils/menuItem'
 import Bus from '@lambo-design/shared/utils/bus'
 import {deepCopy} from '@lambo-design/shared/utils/assist'
 
@@ -100,5 +100,5 @@ export default {
 </script>
 
 <style scoped lang="less">
-@import '../styles/other-menu.less';
+@import '../../../styles/other-menu.less';
 </style>

package/src/components/{pro-layout-other-menu.vue → pro-layout-sider/components/pro-layout-sider-other-menu.vue}

@@ -133,5 +133,5 @@ export default {
 
 
 <style lang="less">
-@import '../styles/other-menu.less';
+@import '../../../styles/other-menu.less';
 </style>

package/src/components/{pro-layout-sider.vue → pro-layout-sider/index.vue}

@@ -48,7 +48,7 @@
       </template>
     </Menu>
 
-    <ProLayoutOtherMenu :collapsed="collapsed" @select-menu="selectMenu"></ProLayoutOtherMenu>
+    <ProLayoutSiderOtherMenu :collapsed="collapsed" @select-menu="selectMenu"></ProLayoutSiderOtherMenu>
     <ProLayoutSiderSearch
         v-show="!collapsed"
         :searchType="0"
@@ -82,11 +82,11 @@
 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 ProLayoutSiderSearch from "./pro-layout-sider-search";
-import ProLayoutSiderMenuItem from './pro-layout-sider-menu-item'
-import ProLayoutSiderCollapsedMenu from './pro-layout-sider-collapsed-menu'
+import sider from '../../utils/sider'
+import ProLayoutSiderOtherMenu from "./components/pro-layout-sider-other-menu";
+import ProLayoutSiderSearch from "./components/pro-layout-sider-search";
+import ProLayoutSiderMenuItem from './components/pro-layout-sider-menu-item'
+import ProLayoutSiderCollapsedMenu from './components/pro-layout-sider-collapsed-menu'
 import {
   filterMenuName,
   filterMenuUri,
@@ -99,7 +99,7 @@ export default {
   components: {
     ProLayoutSiderMenuItem,
     ProLayoutSiderCollapsedMenu,
-    ProLayoutOtherMenu,
+    ProLayoutSiderOtherMenu,
     ProLayoutSiderSearch
   },
   props:{
@@ -338,7 +338,7 @@ export default {
 
 <style scoped lang="less">
 @import "@lambo-design/core/src/styles/default";
-@import '../styles/other-menu.less';
+@import '../../styles/other-menu.less';
 .pro-layout-sider-wrapper{
   margin-bottom: 50px;
   padding-top: 47px;