@lambo-design/pro-layout 1.0.0-beta.320 → 1.0.0-beta.322

package/CHANGELOG.md

@@ -1,32 +1,32 @@
-# Changelog
-## [1.0.0-beta.320](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.319...@lambo-design/pro-layout@1.0.0-beta.320) (2024-04-29)
-
-## [1.0.0-beta.319](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.318...@lambo-design/pro-layout@1.0.0-beta.319) (2024-04-29)
-
-## [1.0.0-beta.318](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.317...@lambo-design/pro-layout@1.0.0-beta.318) (2024-04-28)
-
-
-### 💄 Styles | 风格
-
-* **@lambo-design/pro-layout:** 版本 ([c7910c1](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/c7910c13895ea219e428a40af8c1152dc296470d))
-
-## 1.0.0-beta.317 (2024-04-28)
-
-
-### ✨ Features | 新功能
-
-* **@lambo-design/pro-layout:** 样式 ([a27e390](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/a27e3904ebb6dfd46d003cd617745acf8ee54024))
-
-## 1.0.0-beta.316 (2024-04-28)
-
-
-### ✨ Features | 新功能
-
-* **@lambo-design/pro-layout:** 样式 ([a27e390](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/a27e3904ebb6dfd46d003cd617745acf8ee54024))
-
-## 1.0.0-beta.315 (2024-04-26)
-
-
-### ✨ Features | 新功能
-
-* **@lambo-design/pro-layout:** 样式 ([a27e390](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/a27e3904ebb6dfd46d003cd617745acf8ee54024))
+# Changelog
+## [1.0.0-beta.320](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.319...@lambo-design/pro-layout@1.0.0-beta.320) (2024-04-29)
+
+## [1.0.0-beta.319](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.318...@lambo-design/pro-layout@1.0.0-beta.319) (2024-04-29)
+
+## [1.0.0-beta.318](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design/pro-layout@1.0.0-beta.317...@lambo-design/pro-layout@1.0.0-beta.318) (2024-04-28)
+
+
+### 💄 Styles | 风格
+
+* **@lambo-design/pro-layout:** 版本 ([c7910c1](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/c7910c13895ea219e428a40af8c1152dc296470d))
+
+## 1.0.0-beta.317 (2024-04-28)
+
+
+### ✨ Features | 新功能
+
+* **@lambo-design/pro-layout:** 样式 ([a27e390](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/a27e3904ebb6dfd46d003cd617745acf8ee54024))
+
+## 1.0.0-beta.316 (2024-04-28)
+
+
+### ✨ Features | 新功能
+
+* **@lambo-design/pro-layout:** 样式 ([a27e390](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/a27e3904ebb6dfd46d003cd617745acf8ee54024))
+
+## 1.0.0-beta.315 (2024-04-26)
+
+
+### ✨ Features | 新功能
+
+* **@lambo-design/pro-layout:** 样式 ([a27e390](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/a27e3904ebb6dfd46d003cd617745acf8ee54024))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.320",
+  "version": "1.0.0-beta.322",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@lambo-design/core": "^4.7.1-beta.136",
-    "@lambo-design/shared": "^1.0.0-beta.168"
+    "@lambo-design/shared": "^1.0.0-beta.171"
   },
   "scripts": {
     "release-pro-layout": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

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

@@ -1,193 +1,193 @@
-<template>
-  <div class="menu-list" >
-    <ul class="top-menu" :style="layoutSize === 'default' ? {height: '64px'} : {height: '50px'}" ref="topNav">
-      <li class="top-menu-item" v-show="pointer <= index && index < pointer + topMenuNum && flag" :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'}">
-          <p class="menu-icon"><Icon :type="item.icon" :size="20"></Icon></p>
-          <p class="menu-txt" :title="item.name">{{ 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.topMenu ? data.topMenu : 4;
-        this.acceptAppId = data.acceptAppId ? data.acceptAppId : '';
-        if (!this.activeName) {
-          this.activeName = this.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)
-      }
-    },
-    selectApp(appId) {
-      if (appId) {
-        this.activeName = appId
-        let res = this.navList.filter(app => app.appId == appId)
-        Bus.$emit('change-app', { appId, appInfo: res[0] })
-      }
-    },
-    changeApp(appId, appInfo){
-      if (appId) {
-        this.activeName = appId
-      }
-    }
-  },
-  watch: {
-    acceptInt(val){
-      this.pointer = 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: 15px;
-  .top-menu {
-    overflow: hidden;
-    .top-menu-item {
-      padding-left: 15px;
-      padding-right: 15px;
-      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;
-          width: 135px;
-        }
-      }
-      .menu-item {
-        display: flex;
-        margin-top: 10px;
-        padding-right: 10px;
-        width: 135px;
-
-      }
-      .menu-icon {
-        height: 20px;
-        line-height: 20px;
-        text-align: center;
-        margin-right: 10px;
-        margin-left: 10px;
-        margin-top: 3px;
-      }
-      .menu-txt {
-        text-align: center;
-        font-size: 14px;
-        line-height: 2;
-        width: 135px;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div class="menu-list" >
+    <ul class="top-menu" :style="layoutSize === 'default' ? {height: '64px'} : {height: '50px'}" ref="topNav">
+      <li class="top-menu-item" v-show="pointer <= index && index < pointer + topMenuNum && flag" :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'}">
+          <p class="menu-icon"><Icon :type="item.icon" :size="20"></Icon></p>
+          <p class="menu-txt" :title="item.name">{{ 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.topMenu ? data.topMenu : 4;
+        this.acceptAppId = data.acceptAppId ? data.acceptAppId : '';
+        if (!this.activeName) {
+          this.activeName = this.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)
+      }
+    },
+    selectApp(appId) {
+      if (appId) {
+        this.activeName = appId
+        let res = this.navList.filter(app => app.appId == appId)
+        Bus.$emit('change-app', { appId, appInfo: res[0] })
+      }
+    },
+    changeApp(appId, appInfo){
+      if (appId) {
+        this.activeName = appId
+      }
+    }
+  },
+  watch: {
+    acceptInt(val){
+      this.pointer = 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: 15px;
+  .top-menu {
+    overflow: hidden;
+    .top-menu-item {
+      padding-left: 15px;
+      padding-right: 15px;
+      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;
+          width: 135px;
+        }
+      }
+      .menu-item {
+        display: flex;
+        margin-top: 10px;
+        padding-right: 10px;
+        width: 135px;
+
+      }
+      .menu-icon {
+        height: 20px;
+        line-height: 20px;
+        text-align: center;
+        margin-right: 10px;
+        margin-left: 10px;
+        margin-top: 3px;
+      }
+      .menu-txt {
+        text-align: center;
+        font-size: 14px;
+        line-height: 2;
+        width: 135px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    }
+  }
+}
+</style>

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

@@ -1,131 +1,131 @@
-<template>
-  <div class="pro-layout-tools-quick-notice">
-    <Dropdown >
-      <Badge :count="noticeDatas.length" class-name="badge-count">
-        <Icon type="ios-notifications-outline" size="20" style="cursor: pointer"></Icon>
-      </Badge>
-      <template #list>
-        <DropdownMenu slot="list" class="notice-dropdown-menu">
-          <DropdownItem v-for="(item, index) in noticeDatas" :key="index" class="dropdown-item" @click.native="getDetail(item)" >
-            <div class="item-image">
-              <Icon type="ios-mail" size="24"/>
-            </div>
-            <div class="item-title" :title="item.noticeTitle">
-              {{ item.noticeTitle }}
-            </div>
-            <div class="item-time">
-              {{ item.publishTime }}
-            </div>
-          </DropdownItem>
-          <div class="dropdown-footer" :class="[noticeDatas.length == 0 ? 'no-line' : '']">
-            <Button type="text" v-if="noticeDatas.length > 0" @click="getMore" class="display-more" >查看更多</Button>
-            <Button type="text" v-if="noticeDatas.length > 0" @click="markRead" class="mark-read" >一键已读</Button>
-            <div class="no-data" v-if="noticeDatas.length == 0" >暂无未读通知</div>
-          </div>
-        </DropdownMenu>
-      </template>
-    </Dropdown>
-  </div>
-</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-notice",
-  data() {
-    return {
-      noticeDatas:[]
-    }
-  },
-  methods: {
-    initListener() {
-      Bus.$on('other-datas',(data) => {
-        this.initNoticeList(data);
-      })
-    },
-    destroyListener() {
-      Bus.$off('other-datas')
-    },
-    initNoticeList(data) {
-      if (data && data.noticeDatas) {
-        this.noticeDatas = deepCopy(data.noticeDatas);
-      }
-    },
-    getDetail(item){
-      Bus.$emit('other-operate','notice-detail',item)
-    },
-    markRead(){
-      Bus.$emit('other-operate','notice-mark-read')
-    },
-    getMore() {
-      Bus.$emit('other-operate','notice-more')
-    }
-  },
-  created() {
-    this.initListener()
-  },
-  beforeDestroy() {
-    this.destroyListener()
-  }
-}
-</script>
-
-<style lang="less">
-@import "@lambo-design/core/src/styles/default";
-.pro-layout-tools-quick-notice{
-  .badge-count{
-    top:12px;
-    height: 10px;
-    line-height: 8px;
-    min-width: 8px;
-    padding: 0;
-    font-size: 8px;
-    width: 10px;
-  }
-}
-.notice-dropdown-menu {
-  max-height: 300px;
-  width: 300px;
-  &::-webkit-scrollbar {
-    width: 0;
-    height: 0;
-  }
-  .dropdown-item {
-    overflow: hidden;
-    line-height: 24px;
-    padding: 8px;
-    .item-image{
-      float: left;
-    }
-    .item-title{
-      float: left;
-      margin-left: 5px;
-      width: 120px;
-      white-space:nowrap;
-      overflow:hidden;
-      text-overflow: ellipsis;
-    }
-    .item-time{
-      float: right;
-    }
-  }
-  .dropdown-footer{
-    line-height: 24px;
-    border-top: 1px solid var(--layout-sider-line-color,@_layout-sider-line-color);
-    padding: 8px;
-    &.no-line{
-      border: 0;
-    }
-    .display-more{
-      float: left;
-    }
-    .mark-read{
-      float: right;
-    }
-    .no-data{
-      text-align: center;
-    }
-  }
-}
-</style>
+<template>
+  <div class="pro-layout-tools-quick-notice">
+    <Dropdown >
+      <Badge :count="noticeDatas.length" class-name="badge-count">
+        <Icon type="ios-notifications-outline" size="20" style="cursor: pointer"></Icon>
+      </Badge>
+      <template #list>
+        <DropdownMenu slot="list" class="notice-dropdown-menu">
+          <DropdownItem v-for="(item, index) in noticeDatas" :key="index" class="dropdown-item" @click.native="getDetail(item)" >
+            <div class="item-image">
+              <Icon type="ios-mail" size="24"/>
+            </div>
+            <div class="item-title" :title="item.noticeTitle">
+              {{ item.noticeTitle }}
+            </div>
+            <div class="item-time">
+              {{ item.publishTime }}
+            </div>
+          </DropdownItem>
+          <div class="dropdown-footer" :class="[noticeDatas.length == 0 ? 'no-line' : '']">
+            <Button type="text" v-if="noticeDatas.length > 0" @click="getMore" class="display-more" >查看更多</Button>
+            <Button type="text" v-if="noticeDatas.length > 0" @click="markRead" class="mark-read" >一键已读</Button>
+            <div class="no-data" v-if="noticeDatas.length == 0" >暂无未读通知</div>
+          </div>
+        </DropdownMenu>
+      </template>
+    </Dropdown>
+  </div>
+</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-notice",
+  data() {
+    return {
+      noticeDatas:[]
+    }
+  },
+  methods: {
+    initListener() {
+      Bus.$on('other-datas',(data) => {
+        this.initNoticeList(data);
+      })
+    },
+    destroyListener() {
+      Bus.$off('other-datas')
+    },
+    initNoticeList(data) {
+      if (data && data.noticeDatas) {
+        this.noticeDatas = deepCopy(data.noticeDatas);
+      }
+    },
+    getDetail(item){
+      Bus.$emit('other-operate','notice-detail',item)
+    },
+    markRead(){
+      Bus.$emit('other-operate','notice-mark-read')
+    },
+    getMore() {
+      Bus.$emit('other-operate','notice-more')
+    }
+  },
+  created() {
+    this.initListener()
+  },
+  beforeDestroy() {
+    this.destroyListener()
+  }
+}
+</script>
+
+<style lang="less">
+@import "@lambo-design/core/src/styles/default";
+.pro-layout-tools-quick-notice{
+  .badge-count{
+    top:12px;
+    height: 10px;
+    line-height: 8px;
+    min-width: 8px;
+    padding: 0;
+    font-size: 8px;
+    width: 10px;
+  }
+}
+.notice-dropdown-menu {
+  max-height: 300px;
+  width: 300px;
+  &::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+  }
+  .dropdown-item {
+    overflow: hidden;
+    line-height: 24px;
+    padding: 8px;
+    .item-image{
+      float: left;
+    }
+    .item-title{
+      float: left;
+      margin-left: 5px;
+      width: 120px;
+      white-space:nowrap;
+      overflow:hidden;
+      text-overflow: ellipsis;
+    }
+    .item-time{
+      float: right;
+    }
+  }
+  .dropdown-footer{
+    line-height: 24px;
+    border-top: 1px solid var(--layout-sider-line-color,@_layout-sider-line-color);
+    padding: 8px;
+    &.no-line{
+      border: 0;
+    }
+    .display-more{
+      float: left;
+    }
+    .mark-read{
+      float: right;
+    }
+    .no-data{
+      text-align: center;
+    }
+  }
+}
+</style>

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

@@ -1,119 +1,119 @@
-<template>
-  <div class="pro-layout-tools-quick-todo">
-    <Dropdown >
-      <Badge :count="todoDatas.length" class-name="badge-count">
-        <Icon type="ios-alarm-outline" size="18" style="cursor: pointer"/>
-      </Badge>
-      <template #list>
-        <DropdownMenu slot="list" class="todo-dropdown-menu">
-          <DropdownItem v-for="(item, index) in todoDatas" :key="index" class="dropdown-item" @click.native="getDetail(item)" >
-            <div class="item-title" :title="item.name">
-              {{ item.name }}
-            </div>
-            <div class="item-time">
-              {{ formatTimestamp(item.createTime,'YYYY-MM-DD HH:mm:ss') }}
-            </div>
-          </DropdownItem>
-          <div class="dropdown-footer" :class="[todoDatas.length == 0 ? 'no-line' : '']">
-            <Button type="text" v-if="todoDatas.length > 0" @click="getMore" >查看更多</Button>
-            <div class="no-data" v-if="todoDatas.length == 0" >暂无代办</div>
-          </div>
-        </DropdownMenu>
-      </template>
-    </Dropdown>
-  </div>
-</template>
-
-<script>
-import Bus from '@lambo-design/shared/utils/bus';
-import {deepCopy} from '@lambo-design/shared/utils/assist';
-import {formatTimestamp} from '@lambo-design/shared/utils/date'
-export default {
-  name: "pro-layout-tools-quick-todo",
-  data() {
-    return {
-      formatTimestamp: formatTimestamp,
-      todoDatas:[]
-    }
-  },
-  methods: {
-    initListener() {
-      Bus.$on('other-datas',(data) => {
-        this.initTodoList(data);
-      })
-    },
-    destroyListener() {
-      Bus.$off('other-datas')
-    },
-    initTodoList(data) {
-      if (data && data.todoDatas) {
-        this.todoDatas = deepCopy(data.todoDatas);
-      }
-    },
-    getDetail(item){
-      Bus.$emit('other-operate','todo-detail',item)
-    },
-    getMore() {
-      Bus.$emit('other-operate','todo-more')
-    }
-  },
-  created() {
-    this.initListener()
-  },
-  beforeDestroy() {
-    this.destroyListener()
-  }
-}
-</script>
-
-<style lang="less">
-@import "@lambo-design/core/src/styles/default";
-.pro-layout-tools-quick-todo{
-  .badge-count{
-    top:12px;
-    height: 10px;
-    line-height: 8px;
-    min-width: 8px;
-    padding: 0;
-    font-size: 8px;
-    width: 10px;
-  }
-}
-.todo-dropdown-menu {
-  max-height: 300px;
-  width: 300px;
-  overflow-y: auto;
-  &::-webkit-scrollbar {
-    width: 0;
-    height: 0;
-  }
-  .dropdown-item {
-    overflow: hidden;
-    line-height: 24px;
-    padding: 8px;
-    .item-title{
-      float: left;
-      margin-left: 5px;
-      width: 120px;
-      white-space:nowrap;
-      overflow:hidden;
-      text-overflow: ellipsis;
-    }
-    .item-time{
-      float: right;
-    }
-  }
-  .dropdown-footer{
-    line-height: 24px;
-    border-top: 1px solid var(--layout-sider-line-color,@_layout-sider-line-color);
-    padding: 8px;
-    text-align: center;
-    &.no-line{
-      border: 0;
-    }
-    .no-data{
-      text-align: center;
-    }
-  }
-}
-</style>
+<template>
+  <div class="pro-layout-tools-quick-todo">
+    <Dropdown >
+      <Badge :count="todoDatas.length" class-name="badge-count">
+        <Icon type="ios-alarm-outline" size="18" style="cursor: pointer"/>
+      </Badge>
+      <template #list>
+        <DropdownMenu slot="list" class="todo-dropdown-menu">
+          <DropdownItem v-for="(item, index) in todoDatas" :key="index" class="dropdown-item" @click.native="getDetail(item)" >
+            <div class="item-title" :title="item.name">
+              {{ item.name }}
+            </div>
+            <div class="item-time">
+              {{ formatTimestamp(item.createTime,'YYYY-MM-DD HH:mm:ss') }}
+            </div>
+          </DropdownItem>
+          <div class="dropdown-footer" :class="[todoDatas.length == 0 ? 'no-line' : '']">
+            <Button type="text" v-if="todoDatas.length > 0" @click="getMore" >查看更多</Button>
+            <div class="no-data" v-if="todoDatas.length == 0" >暂无代办</div>
+          </div>
+        </DropdownMenu>
+      </template>
+    </Dropdown>
+  </div>
+</template>
+
+<script>
+import Bus from '@lambo-design/shared/utils/bus';
+import {deepCopy} from '@lambo-design/shared/utils/assist';
+import {formatTimestamp} from '@lambo-design/shared/utils/date'
+export default {
+  name: "pro-layout-tools-quick-todo",
+  data() {
+    return {
+      formatTimestamp: formatTimestamp,
+      todoDatas:[]
+    }
+  },
+  methods: {
+    initListener() {
+      Bus.$on('other-datas',(data) => {
+        this.initTodoList(data);
+      })
+    },
+    destroyListener() {
+      Bus.$off('other-datas')
+    },
+    initTodoList(data) {
+      if (data && data.todoDatas) {
+        this.todoDatas = deepCopy(data.todoDatas);
+      }
+    },
+    getDetail(item){
+      Bus.$emit('other-operate','todo-detail',item)
+    },
+    getMore() {
+      Bus.$emit('other-operate','todo-more')
+    }
+  },
+  created() {
+    this.initListener()
+  },
+  beforeDestroy() {
+    this.destroyListener()
+  }
+}
+</script>
+
+<style lang="less">
+@import "@lambo-design/core/src/styles/default";
+.pro-layout-tools-quick-todo{
+  .badge-count{
+    top:12px;
+    height: 10px;
+    line-height: 8px;
+    min-width: 8px;
+    padding: 0;
+    font-size: 8px;
+    width: 10px;
+  }
+}
+.todo-dropdown-menu {
+  max-height: 300px;
+  width: 300px;
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+  }
+  .dropdown-item {
+    overflow: hidden;
+    line-height: 24px;
+    padding: 8px;
+    .item-title{
+      float: left;
+      margin-left: 5px;
+      width: 120px;
+      white-space:nowrap;
+      overflow:hidden;
+      text-overflow: ellipsis;
+    }
+    .item-time{
+      float: right;
+    }
+  }
+  .dropdown-footer{
+    line-height: 24px;
+    border-top: 1px solid var(--layout-sider-line-color,@_layout-sider-line-color);
+    padding: 8px;
+    text-align: center;
+    &.no-line{
+      border: 0;
+    }
+    .no-data{
+      text-align: center;
+    }
+  }
+}
+</style>

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

@@ -58,9 +58,9 @@
       </template>
     </Menu>
 
-    <ProLayoutSiderOtherMenu :style="{width:otherWidth}" :collapsed="collapsed" @select-menu="selectMenu"></ProLayoutSiderOtherMenu>
+    <ProLayoutSiderOtherMenu :style="systemInfo.menuScaling === '0' ? { width: otherWidth } : {}" :collapsed="collapsed" @select-menu="selectMenu"></ProLayoutSiderOtherMenu>
     <ProLayoutSiderSearch
-        :style="{width:otherWidth}"
+        :style="systemInfo.menuScaling === '0' ? { width: otherWidth } : {}"
         v-show="!collapsed"
         :searchType="0"
         @select-menu="selectMenu"

package/src/styles/other-menu.css

@@ -1,106 +1,106 @@
-.other-menu {
-  width: 100%;
-  position: absolute;
-  bottom: 0;
-  z-index: 1000;
-}
-.other-menu.other-menu-collapsed .other-menu-item {
-  width: 100%;
-}
-.other-menu.other-menu-collapsed .other-menu-item .ivu-tooltip {
-  width: 100%;
-}
-.other-menu.other-menu-collapsed .other-menu-item .ivu-tooltip .ivu-tooltip-rel {
-  width: 100%;
-}
-.other-menu.other-menu-collapsed .other-menu-item .other-menu-icon {
-  font-size: 20px;
-}
-.other-menu.other-menu-collapsed .other-menu-item .other-menu-title {
-  display: none;
-}
-.other-menu .other-menu-item {
-  text-align: center;
-  line-height: 50px;
-  height: 48.6px;
-  width: 50%;
-  display: inline-block;
-  cursor: pointer;
-}
-.other-menu-drawer-list .other-menu-drawer-item {
-  width: 100%;
-  height: 35px;
-  line-height: 35px;
-  position: relative;
-}
-.other-menu-drawer-list .other-menu-drawer-item .delete {
-  display: none;
-  position: absolute;
-  right: 0px;
-  top: 0px;
-  cursor: pointer;
-  font-size: large;
-}
-.other-menu-drawer-list .other-menu-drawer-item:hover .content {
-  cursor: pointer;
-  height: 38px;
-  font-weight: bold;
-  color: var(--primary-color, #2d8cf0);
-}
-.other-menu-drawer-list .other-menu-drawer-item:hover .delete {
-  display: inline;
-}
-.other-menu-drawer-wrap .ivu-drawer {
-  left: 220px;
-  height: calc(100% - 110px);
-  bottom: 0;
-  top: auto;
-  overflow: hidden;
-}
-.other-menu-drawer-wrap-collapsed .ivu-drawer {
-  left: 65px;
-  height: calc(100% - 110px);
-  bottom: 0;
-  top: auto;
-}
-.menu-title-wrap {
-  width: 90%;
-  word-wrap: break-word;
-  display: inline-block;
-}
-.menu-title-ellipsis {
-  display: flex;
-  width: 90%;
-  overflow: hidden;
-  white-space: nowrap;
-  /* 防止内容换行 */
-  text-overflow: ellipsis;
-  /* 超出部分省略 */
-  align-items: center;
-}
-.menu-title-nochildren-wrap {
-  width: 100%;
-  word-wrap: break-word;
-  display: inline-block;
-}
-.menu-title-nochildren-ellipsis {
-  display: flex;
-  width: 100%;
-  overflow: hidden;
-  white-space: nowrap;
-  /* 防止内容换行 */
-  text-overflow: ellipsis;
-  /* 超出部分省略 */
-  align-items: center;
-}
-.draggable-text {
-  -webkit-user-select: none;
-  /* Safari */
-  -moz-user-select: none;
-  /* Firefox */
-  -ms-user-select: none;
-  /* IE10+/Edge */
-  user-select: none;
-  /* Standard syntax */
-}
+.other-menu {
+  width: 100%;
+  position: absolute;
+  bottom: 0;
+  z-index: 1000;
+}
+.other-menu.other-menu-collapsed .other-menu-item {
+  width: 100%;
+}
+.other-menu.other-menu-collapsed .other-menu-item .ivu-tooltip {
+  width: 100%;
+}
+.other-menu.other-menu-collapsed .other-menu-item .ivu-tooltip .ivu-tooltip-rel {
+  width: 100%;
+}
+.other-menu.other-menu-collapsed .other-menu-item .other-menu-icon {
+  font-size: 20px;
+}
+.other-menu.other-menu-collapsed .other-menu-item .other-menu-title {
+  display: none;
+}
+.other-menu .other-menu-item {
+  text-align: center;
+  line-height: 50px;
+  height: 48.6px;
+  width: 50%;
+  display: inline-block;
+  cursor: pointer;
+}
+.other-menu-drawer-list .other-menu-drawer-item {
+  width: 100%;
+  height: 35px;
+  line-height: 35px;
+  position: relative;
+}
+.other-menu-drawer-list .other-menu-drawer-item .delete {
+  display: none;
+  position: absolute;
+  right: 0px;
+  top: 0px;
+  cursor: pointer;
+  font-size: large;
+}
+.other-menu-drawer-list .other-menu-drawer-item:hover .content {
+  cursor: pointer;
+  height: 38px;
+  font-weight: bold;
+  color: var(--primary-color, #2d8cf0);
+}
+.other-menu-drawer-list .other-menu-drawer-item:hover .delete {
+  display: inline;
+}
+.other-menu-drawer-wrap .ivu-drawer {
+  left: 220px;
+  height: calc(100% - 110px);
+  bottom: 0;
+  top: auto;
+  overflow: hidden;
+}
+.other-menu-drawer-wrap-collapsed .ivu-drawer {
+  left: 65px;
+  height: calc(100% - 110px);
+  bottom: 0;
+  top: auto;
+}
+.menu-title-wrap {
+  width: 90%;
+  word-wrap: break-word;
+  display: inline-block;
+}
+.menu-title-ellipsis {
+  display: flex;
+  width: 90%;
+  overflow: hidden;
+  white-space: nowrap;
+  /* 防止内容换行 */
+  text-overflow: ellipsis;
+  /* 超出部分省略 */
+  align-items: center;
+}
+.menu-title-nochildren-wrap {
+  width: 100%;
+  word-wrap: break-word;
+  display: inline-block;
+}
+.menu-title-nochildren-ellipsis {
+  display: flex;
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  /* 防止内容换行 */
+  text-overflow: ellipsis;
+  /* 超出部分省略 */
+  align-items: center;
+}
+.draggable-text {
+  -webkit-user-select: none;
+  /* Safari */
+  -moz-user-select: none;
+  /* Firefox */
+  -ms-user-select: none;
+  /* IE10+/Edge */
+  user-select: none;
+  /* Standard syntax */
+}
 /*# sourceMappingURL=other-menu.css.map */

package/src/styles/other-menu.less

@@ -83,12 +83,11 @@
   display: inline-block;
 }
 .menu-title-ellipsis{
-  display: flex;
   width: 90%;
   overflow: hidden;
   white-space: nowrap; /* 防止内容换行 */
   text-overflow: ellipsis; /* 超出部分省略 */
-  align-items: center;
+  line-height:100%;
 }
 .menu-title-nochildren-wrap{
   width: 100%;
@@ -96,12 +95,11 @@
   display: inline-block;
 }
 .menu-title-nochildren-ellipsis{
-  display: flex;
   width: 100%;
   overflow: hidden;
   white-space: nowrap; /* 防止内容换行 */
   text-overflow: ellipsis; /* 超出部分省略 */
-  align-items: center;
+  line-height:100%;
 }
 .draggable-text {
   -webkit-user-select: none; /* Safari */