@lambo-design/pro-layout 1.0.0-beta.272 → 1.0.0-beta.274

package/package.json

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

package/src/components/pro-layout-header/pro-layout-tools/components/pro-layout-tools-quick-icons.vue

@@ -1,13 +1,13 @@
 <template>
-  <i-row class="pro-layout-tools-quick-icons">
-    <i-col v-for="(item,index) in rightTopOptButtonList" :key="index" class="font-padding">
+  <Row class="pro-layout-tools-quick-icons">
+    <Col v-for="(item,index) in rightTopOptButtonList" :key="index" class="font-padding">
       <ProLayoutToolsQuickSearch v-if="item === 'search'"></ProLayoutToolsQuickSearch>
       <ProLayoutToolsQuickCollect v-if="item === 'collect'"></ProLayoutToolsQuickCollect>
       <ProLayoutToolsQuickFullscreen v-if="item === 'fullScreen'"></ProLayoutToolsQuickFullscreen>
       <ProLayoutToolsQuickTodo v-if="item === 'todo'"></ProLayoutToolsQuickTodo>
       <ProLayoutToolsQuickNotice v-if="item === 'notice'"></ProLayoutToolsQuickNotice>
-    </i-col>
-  </i-row>
+    </Col>
+  </Row>
 </template>
 
 <script>

package/src/components/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="@/assets/images/tqmImg/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">
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import config from '@/config/config'
+import config from '@lambo-design/shared/config/config'
 import ajax from "@lambo-design/shared/utils/ajax";
 import Bus from "@lambo-design/shared/utils/bus";
 export default {

package/src/components/pro-layout-header/pro-layout-tools/components/pro-layout-tools-quick-search.vue

@@ -56,28 +56,12 @@ export default {
   },
   methods: {
     initListener() {
-      Bus.$on('system-info',(data) => {
-        this.initSystemInfo(data);
-      })
-      Bus.$on('origin-all-menu-list', (data) => {
-        this.initOriginAllMenu(data);
-      })
       Bus.$on('menu-list', (data) => {
         this.initMenu(data);
       })
-      Bus.$on('menu-click',(name,item) => {
-        this.initMenuClick(name, item)
-      })
-      Bus.$on('collect-menu-list',(data)=>{
-        this.initCollectMenu(data)
-      });
     },
     destroyListener() {
-      Bus.$off('system-info')
-      Bus.$off('origin-all-menu-list')
       Bus.$off('menu-list')
-      Bus.$off('menu-click')
-      Bus.$off('collect-menu-list')
     },
     initMenu(data){
       this.menuList = deepCopy(data);

package/src/components/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="@/assets/images/tqmImg/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">
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import config from '@/config/config'
+import config from '@lambo-design/shared/config/config'
 import ajax from "@lambo-design/shared/utils/ajax";
 import Bus from "@lambo-design/shared/utils/bus";
 export default {

package/src/components/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/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/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-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/index.vue

@@ -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;

package/src/utils/sider.js

@@ -1,5 +1,5 @@
 import {showTitle} from '@lambo-design/shared/utils/platform'
-import ProLayoutSiderIcon from "../components/pro-layout-sider-icon";
+import ProLayoutSiderIcon from "../components/pro-layout-sider/components/pro-layout-sider-icon";
 
 export default {
   components: {