lw-cdp-ui 1.4.16 → 1.4.18

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

@@ -1,17 +1,12 @@
 <template>
   <div class="layout-aside">
 
-    <img class="logo"
-         src="../../../assets/images/logo.svg"
-         alt="">
-
-    <el-popover placement="right"
-                :width="180"
-                trigger="click"
-                :show-arrow="false"
-                :offset="3"
-                popper-class="app-popper"
-                ref="popoverRef">
+    <slot name="logo">
+      <img class="logo" src="../../../assets/images/logo.svg" alt="" @click="openMneu">
+    </slot>
+
+    <el-popover placement="right" :width="180" trigger="click" :show-arrow="false" :offset="3" popper-class="app-popper"
+      ref="popoverRef">
       <template #reference>
         <p>
           <el-icon class="menu-btn">
@@ -22,21 +17,15 @@
       <div class="app-content">
         <div class="app-title">
           <span class="open" @click="openMneu">应用中心</span>
-          <el-icon class="iconClose"
-                   @click="closePopover">
+          <el-icon class="iconClose" @click="closePopover">
             <el-icon-close />
           </el-icon>
         </div>
         <el-divider style="margin: 5px 0;" />
         <template v-if="grantedApplications.length > 0">
-          <div class="menu-item"
-               @click="switchMenu(item)"
-               v-for="item in grantedApplications"
-               :key="item.resourceId">
-            <i class="iconfont"
-               :class="item.icon"
-               style="margin-right: 5px;"></i>
-            {{ item.name}}
+          <div class="menu-item" @click="switchMenu(item)" v-for="item in grantedApplications" :key="item.resourceId">
+            <i class="iconfont" :class="item.icon" style="margin-right: 5px;"></i>
+            {{ item?.aliasName || item.name }}
           </div>
         </template>
 
@@ -88,6 +77,7 @@ export default {
   width: 100%;
   height: 100%;
   border-bottom: 1px solid var(--el-mask-color-extra-light);
+
   .logo {
     width: 100%;
     height: auto;
@@ -99,12 +89,15 @@ export default {
     font-size: 24px;
     color: #95989d;
   }
+
   .el-tooltip__trigger {
     text-align: center;
     padding: 10px;
     cursor: pointer;
+
     &:hover {
       background-color: var(--el-menu-hover-bg-color);
+
       .menu-btn {
         color: var(--el-menu-active-color);
       }
@@ -134,11 +127,13 @@ export default {
       width: inherit;
       height: 100%;
     }
+
     .app-box {
       width: 50px;
       height: 50px;
       color: #95989d;
     }
+
     .app-box:hover {
       background: var(--el-menu-hover-bg-color);
       color: var(--el-color-primary);
@@ -268,15 +263,18 @@ export default {
 .app-popper {
   padding: 10px 0 !important;
   top: 50px !important;
+
   .app-title {
     font-size: 12px;
     font-weight: bold;
     line-height: 19px;
     height: 19px;
     padding: 0 10px 2px;
-    .open{
+
+    .open {
       cursor: pointer;
     }
+
     .iconClose {
       position: absolute;
       top: 10px;
@@ -285,6 +283,7 @@ export default {
       font-weight: normal;
       cursor: pointer;
       font-size: 16px;
+
       &:hover {
         color: var(--el-color-primary);
       }
@@ -292,4 +291,3 @@ export default {
   }
 }
 </style>
-

package/dist/components/lwLayout/index.vue

@@ -3,32 +3,34 @@
   <template v-if="layout == 'menu'">
     <section class="aminui-body-menu">
       <div class="aminui-side-split-left">
-        <Aside></Aside>
+        <Aside>
+          <!-- LOGO -->
+          <template #logo>
+            <slot name="logo"></slot>
+          </template>
+        </Aside>
       </div>
 
       <section class="aminui-wrapper">
-        <div v-if="!ismobile"
-             :class="menuIsCollapse ? 'aminui-side isCollapse' : 'aminui-side'">
-          <div v-if="appName && appSimpleName"
-               class="aminui-title-name">
+        <div v-if="!ismobile" :class="menuIsCollapse ? 'aminui-side isCollapse' : 'aminui-side'">
+          <div v-if="appName && appSimpleName" class="aminui-title-name">
             {{ menuIsCollapse ? appSimpleName : appName }}
           </div>
-          <div v-else
-               class="aminui-title-name">
+          <div v-else-if="applicationName" class="aminui-title-name">
+            {{ menuIsCollapse ? applicationName.shortAliasName : applicationName.aliasName }}
+          </div>
+          <div v-else class="aminui-title-name">
             {{ menuIsCollapse ? $config.APP_NAME.charAt(0) : $config.APP_NAME }}
           </div>
           <div class="adminui-side-scroll">
             <el-scrollbar>
-              <el-menu :default-active="active"
-                       router
-                       :collapse="menuIsCollapse"
-                       :unique-opened="$config.MENU_UNIQUE_OPENED">
+              <el-menu :default-active="active" router :collapse="menuIsCollapse"
+                :unique-opened="$config.MENU_UNIQUE_OPENED">
                 <NavMenu :navMenus="menu"></NavMenu>
               </el-menu>
             </el-scrollbar>
           </div>
-          <div class="adminui-side-bottom"
-               @click="$store.commit('TOGGLE_menuIsCollapse')">
+          <div class="adminui-side-bottom" @click="$store.commit('TOGGLE_menuIsCollapse')">
             <el-icon>
               <el-icon-expand v-if="menuIsCollapse" />
               <el-icon-fold v-else />
@@ -42,23 +44,18 @@
               <span class="title">{{ $t("lwLayout.layout.topbar") }}：</span>
               <Topbar v-if="!ismobile"></Topbar>
             </div>
-            <userbar :isShowBu="isShowBu"
-                     :isShowTask="isShowTask"
-                     :isInitialized="isInitialized">
+            <userbar :isShowBu="isShowBu" :isShowTask="isShowTask" :isInitialized="isInitialized">
               <template #userbarActionBox>
                 <slot name="userbarActionBox"></slot>
               </template>
             </userbar>
           </div>
-          <Tags v-if="!ismobile && layoutTags"
-                :tagShowID="tagShowID"></Tags>
+          <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" />
+                  <component :is="Component" :key="$route.fullPath" v-if="$store.state.keepAlive.routeShow" />
                 </keep-alive>
               </router-view>
             </slot>
@@ -197,6 +194,17 @@ export default {
     },
     menuIsCollapse() {
       return this.$store.state.global.menuIsCollapse
+    },
+    applicationName() {
+      let userAuthInfo = localStorage.getItem('userAuthInfo')
+      let { grantedApplications } = JSON.parse(userAuthInfo) || {}
+
+      if (grantedApplications) {
+        let item = grantedApplications.find(x => x.code === this.$config.APP_NAME.toLowerCase())
+        return item?.aliasName ? item : ''
+      } else {
+        return ''
+      }
     }
   },
   beforeCreate() {
@@ -251,6 +259,12 @@ export default {
       // 获取用户信息
       let user = await this.$api.auth.user()
 
+      // 判断密码是否过期
+      if (!user?.userAuthInfo && user?.loginPage?.includes("pwdChange")) {
+        this.$message.warning('您的密码已过期，请修改密码!')
+        return false
+      }
+
       // 处理应用显示逻辑
       let application = [...new Set(user.userAuthInfo.menus.map(permission => permission.split('.')[0].split('_')[0]))]
       user.userAuthInfo.grantedApplications = user.userAuthInfo.grantedApplications.filter(x =>
@@ -342,7 +356,7 @@ export default {
       this.pmenu = route
       this.nextMenu = this.filterUrl(route.children)
       if ((!route.children || route.children.length == 0) && route.component) {
-        this.$router.push({path: route.path})
+        this.$router.push({ path: route.path })
       }
     },
     //转换外部链接的路由

package/dist/components/lwTour/index.vue

@@ -1,90 +1,90 @@
-<template>
-  <el-tour v-model="isOpen" :current="currentStep">
-    <el-tour-step v-for="(step, index) in formattedSteps" :key="index" :target="step.target" :title="step.title"
-      :description="step.description" />
-  </el-tour>
-</template>
-
-<script>
-import { ref, getCurrentInstance, onMounted, nextTick, onUnmounted } from 'vue'
-
-export default {
-  name: 'LwTour',
-  props: {
-    steps: {
-      type: Array,
-      required: true,
-      validator: (value) => {
-        return value.every(step => {
-          return step.css && step.title && step.description
-        })
-      }
-    },
-    // 是否在组件挂载后自动开始引导
-    autoStart: {
-      type: Boolean,
-      default: false
-    }
-  },
-  setup(props, { emit }) {
-    const {
-      proxy: { $api, $expression, t, $tool, $bus }
-    } = getCurrentInstance()
-    $bus.$emit(`lwTourOpen`, true)
-    $bus.$on(`lwTourChange`, () => {
-      startTour()
-    })
-
-    onUnmounted(() => {
-      $bus.$emit(`lwTourOpen`, false)
-    })
-
-    const currentStep = ref(0)
-    const isOpen = ref(false)
-    const formattedSteps = ref([])
-
-    // 开始引导
-    const startTour = () => {
-      const allElementsExist = props.steps.every(step => {
-        return document.querySelector(step.css)
-      })
-
-      if (!allElementsExist) {
-        console.warn('元素未加载完成')
-        startTour()
-        return
-      }
-
-      formattedSteps.value = props.steps.map(step => {
-        const targetElement = document.querySelector(step.css)
-        return {
-          target: targetElement || undefined,
-          title: step.title,
-          description: step.description,
-          // 可以添加更多el-tour支持的配置项
-          placement: 'bottom'
-        }
-      })
-      currentStep.value = 0
-      isOpen.value = true
-    }
-
-
-    // 组件挂载后自动开始引导
-    onMounted(() => {
-      if (props.autoStart) {
-        nextTick(() => {
-          startTour()
-        })
-      }
-    })
-
-    return {
-      currentStep,
-      formattedSteps,
-      isOpen,
-      startTour
-    }
-  }
-}
-</script>
+<template>
+  <el-tour v-model="isOpen" :current="currentStep">
+    <el-tour-step v-for="(step, index) in formattedSteps" :key="index" :target="step.target" :title="step.title"
+      :description="step.description" />
+  </el-tour>
+</template>
+
+<script>
+import { ref, getCurrentInstance, onMounted, nextTick, onUnmounted } from 'vue'
+
+export default {
+  name: 'LwTour',
+  props: {
+    steps: {
+      type: Array,
+      required: true,
+      validator: (value) => {
+        return value.every(step => {
+          return step.css && step.title && step.description
+        })
+      }
+    },
+    // 是否在组件挂载后自动开始引导
+    autoStart: {
+      type: Boolean,
+      default: false
+    }
+  },
+  setup(props, { emit }) {
+    const {
+      proxy: { $api, $expression, t, $tool, $bus }
+    } = getCurrentInstance()
+    $bus.$emit(`lwTourOpen`, true)
+    $bus.$on(`lwTourChange`, () => {
+      startTour()
+    })
+
+    onUnmounted(() => {
+      $bus.$emit(`lwTourOpen`, false)
+    })
+
+    const currentStep = ref(0)
+    const isOpen = ref(false)
+    const formattedSteps = ref([])
+
+    // 开始引导
+    const startTour = () => {
+      const allElementsExist = props.steps.every(step => {
+        return document.querySelector(step.css)
+      })
+
+      if (!allElementsExist) {
+        console.warn('元素未加载完成')
+        startTour()
+        return
+      }
+
+      formattedSteps.value = props.steps.map(step => {
+        const targetElement = document.querySelector(step.css)
+        return {
+          target: targetElement || undefined,
+          title: step.title,
+          description: step.description,
+          // 可以添加更多el-tour支持的配置项
+          placement: 'bottom'
+        }
+      })
+      currentStep.value = 0
+      isOpen.value = true
+    }
+
+
+    // 组件挂载后自动开始引导
+    onMounted(() => {
+      if (props.autoStart) {
+        nextTick(() => {
+          startTour()
+        })
+      }
+    })
+
+    return {
+      currentStep,
+      formattedSteps,
+      isOpen,
+      startTour
+    }
+  }
+}
+</script>