lw-cdp-ui 1.1.12 → 1.1.13

package/dist/components/lwLayout/index.vue

@@ -79,7 +79,7 @@
       <section class="aminui-wrapper">
         <div v-if="!ismobile"
              :class="menuIsCollapse ? 'aminui-side isCollapse' : 'aminui-side'">
-          <div class="title-name">
+          <div class="aminui-title-name">
             {{ menuIsCollapse ? $config.APP_NAME.charAt(0) : $config.APP_NAME }}
           </div>
           <div class="adminui-side-scroll">
@@ -293,6 +293,7 @@ export default {
   data() {
     return {
       settingDialog: false,
+      changeMenu: false,
       menu: [],
       nextMenu: [],
       pmenu: {},
@@ -313,6 +314,13 @@ export default {
       return this.$store.state.global.menuIsCollapse
     }
   },
+  beforeCreate() {
+    // 挂载菜单订阅
+    this.$bus.$on('setMenu', (menu) => {
+      this.changeMenu = true
+      this.menu = this.filterUrl(menu)
+    })
+  },
   async created() {
     // 标识当前项目
     let isCombined = this.$tool.data.get("MENUCOMBINED")
@@ -322,16 +330,13 @@ export default {
 
     this.onLayoutResize();
     window.addEventListener('resize', this.onLayoutResize);
-    await this.getUserInfo();
-    var menu = this.$router.sc_getMenu();
-    this.menu = this.filterUrl(menu);
+    this.getUserInfo();
+    if (!this.changeMenu) {
+      var menu = this.$router.sc_getMenu();
+      this.menu = this.filterUrl(menu);
+    }
     this.showThis()
     this.$store.commit("LOAD_USER_FROM_LOCAL_STORAGE")
-
-    // 挂载菜单订阅
-    this.$bus.$on('setMenu', (menu) => {
-      this.menu = this.filterUrl(menu)
-    })
   },
   watch: {
     async $route() {
@@ -391,6 +396,7 @@ export default {
     },
     //转换外部链接的路由
     filterUrl(map) {
+
       var newMap = []
       map && map.forEach(item => {
         item.meta = item.meta ? item.meta : {};
@@ -408,6 +414,8 @@ export default {
         }
         newMap.push(item)
       })
+
+      this.changeMenu = false
       return newMap;
     },
     //退出最大化

package/dist/components/lwLogin/index.vue

@@ -1,14 +1,25 @@
 <template>
   <div class="login_bg">
     <div class="video-container">
-      <img class="logo"
-           src="/static/images/logo1.svg" />
-      <img v-show="isRegistered"
-           class="img"
-           src="/static/images/register.svg" />
-      <img v-show="!isRegistered"
-           class="img"
-           src="/static/images/login.svg" />
+      <!-- logo 插槽 -->
+      <slot name="logo">
+        <img class="logo"
+             src="/static/images/logo1.svg" />
+      </slot>
+
+      <!-- 注册背景图插槽 -->
+      <slot name="registerBg">
+        <img v-show="isRegistered"
+             class="img"
+             src="/static/images/register.svg" />
+      </slot>
+      <!-- 登录背景图插槽 -->
+      <slot name="loginBg">
+        <img v-show="!isRegistered"
+             class="img"
+             src="/static/images/login.svg" />
+      </slot>
+
     </div>
     <div class="login_main">
       <template v-if="isRegistered">
@@ -27,7 +38,10 @@
                    label-width="0"
                    size="large">
             <el-form-item>
-              <div class="title-name">{{ $t('loginPage.trialRequest') }}</div>
+              <!-- 系统名称插槽 -->
+              <slot name="title">
+                <div class="title-name">{{ $t('loginPage.trialRequest') }}</div>
+              </slot>
             </el-form-item>
             <el-form-item prop="name">
               <el-input v-model="registForm.name"

package/dist/components/lwLogin/locale/en-us.js

@@ -1,5 +1,6 @@
 export default {
 	loginPage: {
+		accountLoginNologo:'Marketing Cloud',
 		accountLogin: 'Lianwei Marketing Cloud',
 		rememberMe: 'Keep me logged in',
 		forgetPassword: 'Forgot password',

package/dist/components/lwLogin/locale/zh-cn.js

@@ -1,5 +1,6 @@
 export default {
 	loginPage: {
+		accountLoginNologo:'营销云',
 		accountLogin: '联蔚营销云',
 		rememberMe: '保持登录状态',
 		forgetPassword: '忘记密码',