@lambo-design/pro-layout 1.0.0-beta.381 → 1.0.0-beta.383

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.381",
+  "version": "1.0.0-beta.383",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,8 +10,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@lambo-design/core": "^4.7.1-beta.159",
-    "@lambo-design/shared": "^1.0.0-beta.260"
+    "@lambo-design/core": "^4.7.1-beta.161",
+    "@lambo-design/shared": "^1.0.0-beta.263"
   },
   "scripts": {
     "release-pro-layout": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

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

@@ -1,54 +1,17 @@
 <template>
-  <Tooltip v-if="currentItem && currentItem.type === 2" content="说明" placement="bottom">
+  <Tooltip content="说明" placement="bottom">
     <Icon @click="collectEvent"  type="ios-help-circle-outline" size="16" style="cursor: pointer" />
   </Tooltip>
 </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-document',
-  data() {
-    return {
-      menuList: [],
-      currentItem: {}
-    }
-  },
   methods: {
-    initListener() {
-      Bus.$on('menu-list', (data) => {
-        this.initMenu(data);
-      })
-      Bus.$on('menu-click',(name,item) => {
-        this.initMenuClick(name, item)
-      })
-    },
-    destroyListener() {
-      Bus.$off('menu-list')
-      Bus.$off('menu-click')
-    },
-    initMenu(data){
-      this.menuList = deepCopy(data);
-    },
-    initMenuClick(name, item){
-      if(item) {
-        this.currentItem = item;
-      } else {
-        this.currentItem = this.menuList.find(menu => menu.name === name)
-      }
-    },
     collectEvent(){
       let url = '%E5%A4%A7%E6%95%B0%E6%8D%AE%E5%B9%B3%E5%8F%B0%E6%93%8D%E4%BD%9C%E6%89%8B%E5%86%8C/';
       window.open('/dw-guide-doc/'+url, '_blank');
     }
-  },
-  created() {
-    this.initListener()
-  },
-  beforeDestroy() {
-    this.destroyListener()
   }
 }
 </script>

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

@@ -1,11 +1,11 @@
 <template>
   <Row class="pro-layout-tools-quick-icons">
-    <Col class="font-padding" v-show="rightTopOptButtonList.includes('document')">
-      <ProLayoutToolsQuickDocument></ProLayoutToolsQuickDocument>
-    </Col>
     <Col class="font-padding" v-show="rightTopOptButtonList.includes('collect')">
       <ProLayoutToolsQuickCollect></ProLayoutToolsQuickCollect>
     </Col>
+    <Col class="font-padding" v-show="rightTopOptButtonList.includes('document')">
+      <ProLayoutToolsQuickDocument></ProLayoutToolsQuickDocument>
+    </Col>
     <Col class="font-padding" v-show="rightTopOptButtonList.includes('fullScreen')">
       <ProLayoutToolsQuickFullscreen></ProLayoutToolsQuickFullscreen>
     </Col>
@@ -39,7 +39,7 @@ export default {
   name: 'pro-layout-tools-quick-icons',
   data() {
     return {
-      rightTopOptButtonList: ['search','collect','fullScreen']
+      rightTopOptButtonList: ['search','collect','document','fullScreen']
     }
   },
   components:{
@@ -53,6 +53,7 @@ export default {
   },
   methods: {
     initListener() {
+      debugger
       Bus.$on('system-info',(data) => {
         this.initSystemInfo(data);
       })
@@ -61,6 +62,7 @@ export default {
       Bus.$off('system-info')
     },
     initSystemInfo(data){
+      debugger
       if (data && data.rightTopOptButtonList) {
         this.rightTopOptButtonList = deepCopy(data.rightTopOptButtonList)
       }

package/src/index.vue

@@ -415,7 +415,7 @@ export default {
           .pro-layout-nav-wrapper {
             .ivu-menu-horizontal {
               height: 46px;
-              line-height: 46px;
+              line-height: var(--ivu-menu-horizontal-line-height,@_ivu-menu-horizontal-line-height);
             }
           }
         }

package/src/styles/color.less

@@ -27,7 +27,7 @@
           color: var(--layout-header-nav-color,@_layout-header-nav-color);
           &:hover {
             .line {
-              border-bottom: 3.35px solid var(--primary-color-tint-5, @_primary-color-tint-5);
+              border-bottom: var(--primary-color-border-bottom, @_primary-color-border-bottom) solid var(--primary-color-tint-5, @_primary-color-tint-5);
             }
           }
           &.ivu-menu-item-active,&.ivu-menu-item-selected{
@@ -35,7 +35,7 @@
             background: linear-gradient(to bottom, var(--layout-header-nav-active-background-begin,@_layout-header-nav-active-background-begin) 0%, var(--layout-header-nav-active-background-end,@_layout-header-nav-active-background-end) 100%);
             color: var(--layout-header-nav-active-color,@_layout-header-nav-active-color);
             .line {
-              border-bottom: 3.35px solid var(--primary-color-tint-5, @_primary-color-tint-5);
+              border-bottom: var(--primary-color-border-bottom, @_primary-color-border-bottom) solid var(--primary-color-tint-5, @_primary-color-tint-5);
             }
           }
         }