@lambo-design/pro-layout 1.0.0-beta.211 → 1.0.0-beta.213

package/package.json

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

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

@@ -41,7 +41,7 @@ export default {
   methods: {
     initListener() {
       Bus.$on('system-info',(data) => {
-        this.initSystemInfo();
+        this.initSystemInfo(data);
       })
       Bus.$on('nav-list', (data) => {
         this.initNav(data)
@@ -160,6 +160,8 @@ export default {
     }
 
     /deep/ .ivu-menu-submenu {
+      background: var(--menu-dark-title, @_menu-dark-title);
+      color: var(--heading-color-dark, @_heading-color-dark);
       .ivu-menu-submenu-title > i {
         &.ivu-menu-submenu-title-icon {
 

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

@@ -47,38 +47,6 @@ export default {
   methods: {
     toggleCollect(item) {
       Bus.$emit('toggle-collect-menu',!this.collectMap[item.name],item)
-
-      /*const self = this
-      let list = this.$store.state.app.originalPermissionList
-      let item1 = list.find(item1 => item1.name == item.name)
-      const apiUrl = self.isCollected.get(item.name) ?
-          self.serverContext + '/manage/upmsMenuCollect/remove' :
-          self.serverContext + '/manage/upmsMenuCollect/add'
-      const data = {
-        appId: item1.appId,
-        permissionId: item1.permissionId
-      }
-      ajax.post(apiUrl, data).then(function (resp) {
-        if (resp.data.code == 1) {
-
-          if (self.isCollected.get(item.name)){
-            self.isCollected.delete(item.name)
-          }else {
-            self.isCollected.set(item.name,true)
-          }
-          //重新赋值刷新dom元素
-          self.isCollected = new Map(self.isCollected);
-          const message = self.isCollected.get(item.name) ? '收藏成功' : '取消收藏成功'
-          Bus.$emit('change-top-collect',self.isCollected.get(item.name))
-          self.$Message.success(message)
-        } else {
-          const message = self.isCollected.get(item.name) ? '取消收藏失败' : '收藏失败'
-          self.$Message.error(message + ', 请联系系统管理员')
-        }
-      }).catch(function (err) {
-        console.error('收藏操作失败:', err)
-        self.$Message.error('操作失败, 请联系系统管理员')
-      })*/
     }
   }
 }

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

@@ -2,8 +2,8 @@
   <div class="search-fast-con">
     <div class="search-fast-con-side" >
       <div class="sideInput" @click="handleSideClick">
-        <Input v-if="searchType === 0" v-model="searchText" clearable id="modalInput"  placeholder="搜索菜单" font-size="8px"
-               @on-change="handleInput" :border="false" @on-blur="searchSideModal= false">
+        <Input v-if="searchType === 0" v-model="searchText" clearable placeholder="搜索菜单" font-size="8px"
+               @on-change="handleInput" :border="false" @on-blur="searchSideModal = false">
           <template #prefix>
             <Icon type="ios-search"  size="17"/>
           </template>
@@ -11,7 +11,7 @@
       </div>
     </div>
     <Modal v-model="searchSideModal" class="search-fast-con-side-modal" footer-hide :closable="false" :mask="false"
-           scrollable :styles="{width: '255px'}" id="SideModalId" >
+           scrollable width="255px">
       <div v-if="spinShow" style="height: 300px;font-size: 19px;">
         <Spin size="large" :show="spinShow">
           <Icon type="ios-loading" size=18 class="search-spin-icon-load"></Icon>
@@ -22,8 +22,8 @@
         <div v-for="(item,index) in menuData"  :key="index" >
           <div class="menu-side-style" @click="handleSelect(item)" @mouseenter="handleMouseEnter(index)" @mouseleave="handleMouseLeave(index)">
             <div :style="getScrollingStyle(item.label)"  class="text" :class="{ 'scrolling': isHovered[index] && shouldScroll(item.label) }">
-              <Icon :type="item.icon" style="margin-left: 10.6px" size="13"></Icon>
-              <span style="margin-left: 12.6px">{{ item.label }}</span>
+              <Icon :type="item.icon" style="margin-left: 10.6px;min-width: 14px" size="14"></Icon>
+              <span style="margin-left: 9.5px">{{ item.label }}</span>
             </div>
           </div>
         </div>
@@ -158,94 +158,101 @@ export default {
     .sideInput{
       width: 221px;
       transform: translateX(-13px);
+      background-color: var(--menu-dark-active-bg  ,@_menu-dark-active-bg );
+      /deep/.ivu-input-prefix{
+        top:1px;
+      }
     }
-    .ivu-input{
+    /deep/.ivu-input{
       font-size: 13px;
       margin-top: -4px;
       width: 228.5px;
       height: 40px;
       font-weight: 400;
       border: none;
-      background-color: var(--legend-color ,@_legend-color);//修改这里
+      background-color: var(--menu-dark-active-bg  ,@_menu-dark-active-bg );
       text-align:left; /* 确保文本默认左对齐 */
-      color: var(--avatar-color  ,@_avatar-color );
+      color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
       padding-right: 99px;
       padding-left: 58px;
-      ::placeholder{
-        font-size: 13px;
-        font-family: Microsoft YaHei;
+      &::placeholder{
+        font-size: 14px;
         font-weight: 400;
-        color: var(--avatar-color  ,@_avatar-color ) !important;;
+        color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
       }
     }
-    .ivu-icon-ios-search:before {
+    /deep/.ivu-icon-ios-search:before {
       margin-right: -54px; /* 向右移动10像素 */
-      color: var(--avatar-color  ,@_avatar-color );
+      color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
       line-height: 1.6
     }
   }
-  .search-fast-con-side-modal {
-    .search-spin-icon-load{
-      animation: ani-search-spin 1s linear infinite;
+}
+.search-fast-con-side-modal {
+  .search-spin-icon-load{
+    animation: ani-search-spin 1s linear infinite;
+  }
+  .search-content {
+    padding-left: 10px;
+    height: 270px;
+    width: 211px;
+    margin-left: -13px;
+    overflow-x: hidden;
+    overflow-y: auto;
+    background-color:  var(--menu-dark-active-bg  ,@_menu-dark-active-bg );
+    -ms-overflow-style: none;  /* Internet Explorer 10+ */
+    scrollbar-width: none;  /* Firefox */
+    &::-webkit-scrollbar {
+      display: none;  /* Chrome, Safari 和 Opera */
     }
-    .ivu-modal{
-      padding-top: 1px;
-      margin-left: 0px;
-      margin-top: 1px;
-      .ivu-modal-content{
-        background-color: var(--menu-dark-active-bg  ,@_menu-dark-active-bg );
-        width: 218px;
-        margin-top: -18px;
-        height: 270px;
-        .ivu-modal-body{
-          padding: 0px 16px 16px 16px;
-          .search-content {
-            //padding-top: 6px;
-            padding-left: 10px;
-            height: 270px;
-            width: 211px;
-            margin-left: -13px;
-            overflow-x: hidden;
-            overflow-y: auto;
-            background-color:  var(--menu-dark-active-bg  ,@_menu-dark-active-bg );
-            -ms-overflow-style: none;  /* Internet Explorer 10+ */
-            scrollbar-width: none;  /* Firefox */
-            &::-webkit-scrollbar {
-              display: none;  /* Chrome, Safari 和 Opera */
-            }
-            .menu-side-style{
-              font-size: 14px;
-              font-family: Microsoft YaHei;
-              font-weight: 400;
-              width: 200px;
-              color:#EBEBEB;
-              margin-bottom: 8px;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-              .text {
-                display: inline-block;
-                &.scrolling {
-                  animation: scrollText linear infinite;
-                  animation-duration: 2s; /* 调整滚动速度和持续时间 */
-                }
-              }
-              &:hover {
-                overflow: visible;
-                cursor: pointer;
-                color: red;
-                .text {
-                  animation-play-state: running;
-                }
-              }
-            }
-          }
+    .menu-side-style{
+      font-size: 14px;
+      font-weight: 400;
+      width: 200px;
+      color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
+      margin-bottom: 8px;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      cursor: pointer;
+      .text {
+        display: inline-block;
+        &.scrolling {
+          animation: scrollText linear infinite;
+          animation-duration: 2s; /* 调整滚动速度和持续时间 */
+        }
+      }
+      &:hover {
+        overflow: visible;
+        cursor: pointer;
+        color: var(--primary-color-tint-20,@_primary-color-tint-20);
+        .text {
+          animation-play-state: running;
         }
       }
     }
   }
 }
+
 </style>
 <style lang="less">
+@import "@lambo-design/core/src/styles/default.less";
+.search-fast-con-side-modal {
+  .ivu-modal{
+    padding-top: 1px;
+    margin-left: 0px;
+    margin-top: 1px;
+    .ivu-modal-content{
+      background-color: var(--menu-dark-active-bg  ,@_menu-dark-active-bg );
+      width: 218px;
+      margin-top: -18px;
+      height: 270px;
+      .ivu-modal-body{
+        padding: 0px 16px 16px 16px;
+      }
+    }
+  }
+}
+
 .v-transfer-dom ::-webkit-scrollbar {
   display: none;  /* Chrome, Safari 和 Opera */
   overflow: hidden !important;

package/src/components/pro-layout-tools-user.vue

@@ -11,7 +11,7 @@
       </Col>
       <Col>
         <div class="user-avatar-dropdown">
-          <Dropdown @on-click="handleClick">
+          <Dropdown @on-click="handleClick" :transfer="false">
             <span>欢迎，{{ userInfo.userName }}</span>
             <Icon type="ios-arrow-down"/>
             <DropdownMenu v-if="userInfo.dropList.length > 0" slot="list">