lw-cdp-ui 1.4.18 → 1.4.19

package/dist/components/lwLayout/components/aside.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="layout-aside">
 
-    <slot name="logo">
+    <slot name="logo" v-if="unPassport">
       <img class="logo" src="../../../assets/images/logo.svg" alt="" @click="openMneu">
     </slot>
 
@@ -38,6 +38,11 @@
 export default {
   name: 'layoutAside',
   props: {
+    // 不是passport
+    unPassport: {
+      type: Boolean,
+      default: true
+    },
   },
   data() {
     return {

package/dist/components/lwLayout/components/userbar.vue

@@ -1,48 +1,39 @@
 <template>
   <div class="user-bar">
-    <slot name="userbarActionBox"></slot>
-    <!-- 任务中心 -->
-    <task v-if="isShowTask" />
+    <template v-if="unPassport">
+      <slot name="userbarActionBox"></slot>
+      <!-- 任务中心 -->
+      <task v-if="isShowTask" />
 
-    <!-- 下拉BU -->
-    <bu v-if="isShowBu"
-        :isInitialized="isInitialized" />
+      <!-- 下拉BU -->
+      <bu v-if="isShowBu" :isInitialized="isInitialized" />
+    </template>
 
-    <el-dropdown class="user panel-item"
-                 trigger="click"
-                 @command="handleUser">
+
+    <el-dropdown class="user panel-item" trigger="click" @command="handleUser">
       <div class="user-avatar">
-        <el-avatar :size="30"
-                   :src="$store.state.user.img || empty"></el-avatar>
+        <el-avatar :size="30" :src="$store.state.user.img || empty"></el-avatar>
       </div>
       <template #dropdown>
         <el-dropdown-menu>
           <el-dropdown-item command="uc">
             <div class="user-body">
-              <el-avatar :size="30"
-                         :src="$store.state.user.img || empty"></el-avatar>
+              <el-avatar :size="30" :src="$store.state.user.img || empty"></el-avatar>
               <div class="user-name">
                 <label>{{ $store.state.user.realName }}</label>
                 <label>{{ $store.state.user.username }}</label>
               </div>
             </div>
           </el-dropdown-item>
-          <el-dropdown-item divided
-                            command="setting">{{$t('lwLayout.layout.layoutConfiguration')}}</el-dropdown-item>
-          <el-dropdown-item
-                            command="clearCache">{{$t('lwLayout.layout.clearCache')}}</el-dropdown-item>
-          <el-dropdown-item divided
-                            command="outLogin">{{$t('lwLayout.layout.outLogin')}}</el-dropdown-item>
+          <el-dropdown-item divided command="setting">{{ $t('lwLayout.layout.layoutConfiguration') }}</el-dropdown-item>
+          <el-dropdown-item command="clearCache">{{ $t('lwLayout.layout.clearCache') }}</el-dropdown-item>
+          <el-dropdown-item divided command="outLogin">{{ $t('lwLayout.layout.outLogin') }}</el-dropdown-item>
         </el-dropdown-menu>
       </template>
     </el-dropdown>
   </div>
 
-  <el-drawer title="布局实时演示"
-             v-model="settingDialog"
-             :size="400"
-             append-to-body
-             destroy-on-close>
+  <el-drawer title="布局实时演示" v-model="settingDialog" :size="400" append-to-body destroy-on-close>
     <setting></setting>
   </el-drawer>
 </template>
@@ -66,6 +57,11 @@ export default {
       type: Boolean,
       default: true
     },
+    // 不是passport
+    unPassport: {
+      type: Boolean,
+      default: true
+    },
   },
   components: {
     bu,
@@ -149,6 +145,7 @@ export default {
   align-items: center;
   height: 100%;
 }
+
 .user-bar .panel-item {
   padding: 0 10px;
   cursor: pointer;
@@ -156,17 +153,21 @@ export default {
   display: flex;
   align-items: center;
 }
+
 .user-bar .panel-item i {
   font-size: 16px;
 }
+
 .user-bar .panel-item:hover {
   background: rgba(0, 0, 0, 0.1);
 }
+
 .user-bar .user-avatar {
   height: 49px;
   display: flex;
   align-items: center;
 }
+
 .user-bar .user-avatar label {
   display: inline-block;
   margin-left: 5px;
@@ -177,31 +178,38 @@ export default {
 .msg-list li {
   border-top: 1px solid #eee;
 }
+
 .msg-list li a {
   display: flex;
   padding: 20px;
 }
+
 .msg-list li a:hover {
   background: #ecf5ff;
 }
+
 .msg-list__icon {
   width: 40px;
   margin-right: 15px;
 }
+
 .msg-list__main {
   flex: 1;
 }
+
 .msg-list__main h2 {
   font-size: 15px;
   font-weight: normal;
   color: #333;
 }
+
 .msg-list__main p {
   font-size: 12px;
   color: #999;
   line-height: 1.8;
   margin-top: 5px;
 }
+
 .msg-list__time {
   width: 100px;
   text-align: right;
@@ -211,9 +219,11 @@ export default {
 .dark .msg-list__main h2 {
   color: #d0d0d0;
 }
+
 .dark .msg-list li {
   border-top: 1px solid #363636;
 }
+
 .dark .msg-list li a:hover {
   background: #383838;
 }
@@ -223,9 +233,11 @@ export default {
   align-items: center;
   gap: 20px;
   min-width: 100px;
+
   :deep(.el-avatar) {
     min-width: 30px;
   }
+
   .user-name {
     display: flex;
     flex-direction: column;

package/dist/components/lwLayout/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 经典布局 -->
-  <template v-if="layout == 'menu'">
+  <template v-if="layout == 'menu' && unPassport">
     <section class="aminui-body-menu">
       <div class="aminui-side-split-left">
         <Aside>
@@ -66,61 +66,21 @@
     </section>
   </template>
 
-  <!-- 默认布局 -->
-  <!-- <template v-else>
-    <div class="aminui-body-default">
-      <div class="aminui-title-name">
-        {{ menuIsCollapse ? $config.APP_NAME.charAt(0) : $config.APP_NAME }}
+  <!-- passport 模块 -->
+  <template v-if="!unPassport">
+    <section class="aminui-body-passport">
+      <div class="aminui-body-menu-top">
+        <div class="left">
+          <Aside class="menu" :unPassport="unPassport"></Aside>
+          <span class="title">{{ $t('loginPage.accountLogin') }}</span>
+        </div>
+        <userbar :isShowBu="isShowBu" :isInitialized="isInitialized" :unPassport="unPassport"></userbar>
       </div>
-
-      <Aside></Aside>
-
-      <div class="adminui-side-bottom"
-           @click="$store.commit('TOGGLE_menuIsCollapse')">
-        <el-icon>
-          <el-icon-expand v-if="menuIsCollapse" />
-          <el-icon-fold v-else />
-        </el-icon>
+      <div class="adminui-main" id="adminui-main">
+        <router-view></router-view>
       </div>
-
-      <Side-m v-if="ismobile"></Side-m>
-
-      <el-scrollbar>
-        <el-menu :default-active="active"
-                 router
-                 :collapse="menuIsCollapse"
-                 :unique-opened="$config.MENU_UNIQUE_OPENED">
-          <NavMenu :navMenus="menu"></NavMenu>
-        </el-menu>
-      </el-scrollbar>
-
-      <Topbar v-if="!ismobile"></Topbar>
-
-      <userbar :isShowBu="isShowBu"
-               :isShowTask="isShowTask"
-               :isInitialized="isInitialized">
-        <template #userbarActionBox>
-          <slot name="userbarActionBox"></slot>
-        </template>
-      </userbar>
-
-      <Tags v-if="!ismobile && layoutTags"
-            :tagShowID="tagShowID"></Tags>
-
-      <div class="adminui-main">
-        <slot name="routerView">
-          <router-view v-slot="{ Component }">
-            <keep-alive :include="this.$store.state.keepAlive.keepLiveRoute">
-              <component :is="Component"
-                         :key="$route.fullPath"
-                         v-if="$store.state.keepAlive.routeShow" />
-            </keep-alive>
-          </router-view>
-        </slot>
-        <iframe-view></iframe-view>
-      </div>
-    </div>
-  </template> -->
+    </section>
+  </template>
 
 </template>
 
@@ -153,6 +113,11 @@ export default {
       type: Boolean,
       default: false
     },
+    // 不是passport
+    unPassport: {
+      type: Boolean,
+      default: true
+    },
     // 应用名称
     appName: {
       type: String,