@lambo-design/pro-layout 1.0.0-beta.48 → 1.0.0-beta.480

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

@@ -1,11 +1,11 @@
 <template>
-  <div class="pro-layout-tabs-wrapper">
+  <div class="pro-layout-tabs-wrapper" :class="tabsHeight != 46 ? 'custom-tabs' : ''">
     <div class="close-con">
       <Dropdown transfer @on-click="handleTagsOption">
         <Icon :size="24" type="ios-close-circle-outline" class="btn-close"/>
         <DropdownMenu slot="list">
-          <DropdownItem name="close-all">关闭所有</DropdownItem>
-          <DropdownItem name="close-others">关闭其他</DropdownItem>
+          <DropdownItem name="close-all">{{ t('pro-layout.tabs.close-all') }}</DropdownItem>
+          <DropdownItem name="close-others">{{ t('pro-layout.tabs.close-others') }}</DropdownItem>
         </DropdownMenu>
       </Dropdown>
     </div>
@@ -46,15 +46,19 @@ import {
   getPreviousTagIndex,
   getDelTagIndex,
   setTagNavListInLocalstorage,
-  showTitle
+  setTagNavListInSessionstorage,
+  showTitle, getRootPermission, getTagNavListKey
 } from '@lambo-design/shared/utils/platform'
 import beforeClose from '@lambo-design/shared/utils/menu/before-close'
 import Bus from "@lambo-design/shared/utils/bus";
 import config from "@lambo-design/shared/config/config";
 import {deepCopy} from "@lambo-design/shared/utils/assist";
+import {getThemeVarByKey} from "@lambo-design/shared/utils/theme";
+import Locale from "@lambo-design/core/src/mixins/locale";
 
 export default {
   name: 'pro-layout-tabs',
+  mixins: [Locale],
   data() {
     return {
       systemInfo: {},
@@ -72,9 +76,16 @@ export default {
       contextMenuTop: 0,
       visible: false,
       menuList: {
-        others: '关闭其他',
-        all: '关闭所有'
-      }
+        others: this.t('pro-layout.tabs.close-others'),
+        all: this.t('pro-layout.tabs.close-all')
+      },
+      tabsHeight: 46
+    }
+  },
+  props: {
+    notSingleApp: {
+      type: Boolean,
+      default: true
     }
   },
   methods: {
@@ -124,7 +135,8 @@ export default {
         let index = getDelTagIndex(data,current);
         data.splice(index,1);
       }
-      setTagNavListInLocalstorage(data, config.routerBase + '-tagNavList');
+      // setTagNavListInLocalstorage(data, config.routerBase + '-tagNavList');
+      setTagNavListInSessionstorage(data, getTagNavListKey());
       this.tagList = data;
       if (current !== this.value) {
         this.value = current;
@@ -138,8 +150,34 @@ export default {
       }, 200)
     },
     changeApp(appId,appInfo){
+      let oldAppId = this.appId
+      let oldAppInfo = this.appInfo
       this.appId = appId;
       this.appInfo = appInfo;
+      if(oldAppId !== appId && oldAppInfo && this.appInfo){
+        let oldAppConfig = {}
+        if(oldAppInfo.extendProps){
+          oldAppConfig = oldAppInfo.extendProps
+        }
+        if(oldAppInfo.setting){
+          oldAppConfig = JSON.parse(oldAppInfo.setting)
+        }
+        let newAppConfig = {}
+        if(this.appInfo.extendProps){
+          newAppConfig = this.appInfo.extendProps
+        }
+        if(this.appInfo.setting){
+          newAppConfig = JSON.parse(this.appInfo.setting)
+        }
+        if(oldAppConfig && oldAppConfig.hasOwnProperty('is_hide_left_menu')
+            && oldAppConfig.is_hide_left_menu === '1' && oldAppConfig.homePagePath){
+          let removeTag = this.tagList.filter(item => item.meta.appId === oldAppInfo.appId)
+          //this.handleClose(removeTag[0],true)
+          for (let oneTag of removeTag) {
+            this.handleClose(oneTag,true)
+          }
+        }
+      }
     },
     emitTags(data,current){
       Bus.$emit('tag-list',data,current);
@@ -183,20 +221,22 @@ export default {
         }, 100)
       }
     },
-    handleClose(current) {
+    handleClose(current,isHomePage) {
       if (current.meta && current.meta.beforeCloseName && current.meta.beforeCloseName in beforeClose) {
         new Promise(beforeClose[current.meta.beforeCloseName]).then(close => {
           if (close) {
-            this.close(current)
+            this.close(current,isHomePage)
           }
         })
       } else {
-        this.close(current)
+        this.close(current,isHomePage)
       }
     },
-    close(route) {
+    close(route,isHomePage) {
       let value = this.value;
-      if (route.name == this.value) {
+      if (isHomePage) {
+        value = config.homeRouter.name;
+      } else if (route.name == this.value) {
         let preTagIndex = getPreviousTagIndex(this.tagList, this.value)
         value = this.tagList[preTagIndex].name;
       }
@@ -204,18 +244,33 @@ export default {
       this.emitTags(res, value);
     },
     handleClick(item) {
-      this.value = item.name
-      Bus.$emit('menu-click', item.name , item)
-      if (item.meta && item.meta.appId
-          && item.meta.appId != this.appId
-          && item.meta.appId != config.homeRouter.meta.appId) {
-        let appInfo = this.navList.filter(app => app.appId === item.meta.appId);
-        if (appInfo && appInfo.length > 0) {
-          Bus.$emit('change-app', {appId:appInfo[0].appId,appInfo:appInfo[0]})
-        } else {
-          Bus.$emit('change-app', {appId:item.meta.appId,appInfo:null})
+      if (item.meta && item.meta.appId && item.meta.appId != config.homeRouter.meta.appId) {
+        let appIdInner = item.meta.appId;
+        if (!this.notSingleApp) {
+          // 如果是单应用模式，根据permissionId找到最上层目录（即导航栏中的应用）的permissionId
+          const permissionList = this.$store.getters.getOriginalPermissionList;
+          if (permissionList && permissionList.length > 0) {
+            const permission = {
+              pid: item.pid,
+              appId: item.meta ? item.meta.appId : item.appId
+            }
+            const rootPermission = getRootPermission(permissionList, permission);
+            if (rootPermission && rootPermission.permissionId) {
+              appIdInner = rootPermission.permissionId
+            }
+          }
+        }
+        if (appIdInner != this.appId) {
+          let appInfo = this.navList.filter(app => app.appId === appIdInner);
+          if (appInfo && appInfo.length > 0) {
+            Bus.$emit('change-app', {appId: appInfo[0].appId, appInfo: appInfo[0]})
+          } else {
+            Bus.$emit('change-app', {appId: appIdInner, appInfo: null})
+          }
         }
       }
+      this.value = item.name
+      Bus.$emit('menu-click', item.name , item);
     },
     showTitleInside(item) {
       return showTitle(item, this)
@@ -261,6 +316,13 @@ export default {
     },
     closeMenu() {
       this.visible = false
+    },
+    loadingCustomStyle(){
+      let themeKey = localStorage.getItem("theme") ? localStorage.getItem("theme") : "default"
+      let tabsHeight = getThemeVarByKey(themeKey,'--layout-tabs-height');
+      if (tabsHeight) {
+        this.tabsHeight = tabsHeight;
+      }
     }
   },
   watch: {
@@ -276,6 +338,7 @@ export default {
     setTimeout(() => {
       this.getTagElementByRoute(this.value)
     }, 200)
+    this.loadingCustomStyle();
   },
   created(){
     this.initListener();
@@ -400,5 +463,40 @@ export default {
       background-color: var(--primary-color,@_primary-color)
     }
   }
+  &.custom-tabs{
+    height: 36px;
+    line-height: 30px;
+    .close-con{
+      .btn-close{
+        margin-top: 5px;
+      }
+    }
+    .btn-con{
+      padding: 5px 0px;
+    }
+    .scroll-outer{
+      left: 8px;
+      right: 51px;
+      .scroll-body{
+        /deep/.ivu-tag-dot{
+          height: 28px;
+          line-height: 28px;
+          padding: 0 8px;
+          .ivu-tag-dot-inner{
+            width: 10px;
+            height: 10px;
+            margin-right: 2px;
+            top: 1px;
+          }
+        }
+        /deep/.ivu-tag{
+          .ivu-icon-ios-close{
+            margin-left: 0px !important;
+            top: 0px;
+          }
+        }
+      }
+    }
+  }
 }
 </style>