@lambo-design/pro-layout 1.0.0-beta.354 → 1.0.0-beta.356

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.354",
+  "version": "1.0.0-beta.356",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,8 +10,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@lambo-design/shared": "^1.0.0-beta.236",
-    "@lambo-design/core": "^4.7.1-beta.147"
+    "@lambo-design/core": "^4.7.1-beta.149",
+    "@lambo-design/shared": "^1.0.0-beta.237"
   },
   "scripts": {
     "release-pro-layout": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

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

@@ -1,6 +1,6 @@
 <template>
   <div class="pro-layout-header-wrapper">
-    <div class="trigger-box" :style="menuScalingStyle">
+    <div class="trigger-box" :style="menuScalingStyle" v-show="hideMenuLogo">
       <slot name="pro-layout-trigger">
         <LamboProTrigger v-if="systemInfo.menuScaling === '1'"></LamboProTrigger>
       </slot>
@@ -44,6 +44,10 @@ export default {
     acceptAppId: {
       type: String,
       default:''
+    },
+    hideMenuLogo: {
+      type: Boolean,
+      default:true
     }
   },
   data(){

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

@@ -15,6 +15,9 @@
     <Col class="font-padding" v-show="rightTopOptButtonList.includes('search')">
       <ProLayoutToolsQuickSearch></ProLayoutToolsQuickSearch>
     </Col>
+    <Col class="font-padding" v-show="rightTopOptButtonList.includes('i18n')">
+      <ProLayoutToolsQuickIntl></ProLayoutToolsQuickIntl>
+    </Col>
   </Row>
 </template>
 
@@ -24,6 +27,7 @@ import ProLayoutToolsQuickCollect from './pro-layout-tools-quick-collect';
 import ProLayoutToolsQuickFullscreen from './pro-layout-tools-quick-fullscreen';
 import ProLayoutToolsQuickTodo from './pro-layout-tools-quick-todo';
 import ProLayoutToolsQuickNotice from './pro-layout-tools-quick-notice';
+import ProLayoutToolsQuickIntl from './pro-layout-tools-quick-intl';
 import Bus from '@lambo-design/shared/utils/bus'
 import {deepCopy} from "@lambo-design/shared/utils/assist";
 
@@ -39,7 +43,8 @@ export default {
     ProLayoutToolsQuickCollect,
     ProLayoutToolsQuickFullscreen,
     ProLayoutToolsQuickTodo,
-    ProLayoutToolsQuickNotice
+    ProLayoutToolsQuickNotice,
+    ProLayoutToolsQuickIntl
   },
   methods: {
     initListener() {

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

@@ -0,0 +1,79 @@
+<template>
+  <div class="user-avatar-dropdown">
+    <Dropdown @on-click="switchLang" :transfer="false">
+      <span>{{defaultLang}}</span>
+      <Icon type="ios-arrow-down"/>
+      <DropdownMenu slot="list">
+        <DropdownItem v-for="(item, index) in intlDictList" :key="index" :name="item.dictKey"><span>{{ item.dictValue }}</span></DropdownItem>
+      </DropdownMenu>
+    </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-intl',
+  data() {
+    return {
+      defaultLang: '语言',
+      langCodeDict:{},
+      intlDictList:[]
+    }
+  },
+  methods: {
+    initListener() {
+      Bus.$on('other-datas',(data) => {
+        this.initIntlDictList(data);
+      })
+    },
+    destroyListener() {
+      Bus.$off('other-datas')
+    },
+    initIntlDictList(data) {
+      if (data && data.intlDatas){
+        this.intlDictList = deepCopy(data.intlDatas);
+        this.intlDictList.forEach(item => {
+          this.langCodeDict[item.dictKey] = item.dictValue;
+        })
+      }
+
+      this.setDefaultLang();
+    },
+    switchLang(name) {
+        window.sessionStorage.clear();
+        this.defaultLang = this.langCodeDict[name];
+        sessionStorage.setItem("lambo_lang_code", name);
+        window.location.reload();
+    },
+    setDefaultLang() {
+      let langCode = sessionStorage.getItem("lambo_lang_code");
+      if(langCode){
+        this.defaultLang = this.langCodeDict[langCode];
+      }
+    }
+  },
+  mounted() {
+    this.setDefaultLang();
+  },
+  created() {
+    this.initListener()
+  },
+  beforeDestroy() {
+    this.destroyListener()
+  }
+}
+</script>
+<style lang="less" scoped>
+@import '@lambo-design/core/src/styles/default.less';
+.user-avatar-dropdown {
+  float: left;
+  cursor: pointer;
+  vertical-align: middle;
+  font-size: var(--font-size-base, @_font-size-base);
+}
+</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/index.vue

@@ -1,7 +1,7 @@
 <template>
   <i-layout class="pro-layout" :class="layoutClass">
     <i-header class="pro-layout-header" :style="systemInfo.headBackground ? headBackgroundStyle : ''">
-      <LamboProLayoutHeader>
+      <LamboProLayoutHeader :hide-menu-logo="isHideLeftMenu">
         <template slot = "pro-layout-trigger">
           <slot name="pro-layout-trigger"></slot>
         </template>
@@ -20,7 +20,7 @@
       </LamboProLayoutHeader>
     </i-header>
     <i-layout>
-      <i-sider
+      <i-sider v-show="isHideLeftMenu"
           class="pro-layout-sider"
           hide-trigger
           collapsible
@@ -114,7 +114,8 @@ export default {
       collapsed: false,
       appId: '',
       activeName: '',
-      tagList: []
+      tagList: [],
+      isHideLeftMenu: false
     }
   },
   components: {
@@ -259,6 +260,7 @@ export default {
       if (!appInfo) {
         appInfo = this.navList.filter(item => item.appId == appId)[0];
       }
+      this.isHideLeftMenu=appInfo.extendProps.is_hide_left_menu!='1'
       this.appId = appId;
       this.$emit('change-app',{appId,appInfo})
     },