cloud-web-corejs 1.0.276 → 1.0.277

package/src/layout/components/AppMain.vue

@@ -1,119 +1,147 @@
-<template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-<!--      <keep-alive :include="cachedViews"><router-view :key="key" v-if="$route.name !== 'outLink'" /></keep-alive>-->
-
-      <BaseKeepAlive :include="cachedViews">
-        <router-view :key="key" v-if="$route.name !== 'outLink'" />
-      </BaseKeepAlive>
-
-    </transition>
-    <template v-for="item in outVisitedViews">
-      <outLink
-        :ref="'ref_'+$route.path"
-        :key="item.path"
-        v-show="$route.path === item.path"
-        v-if="$route.path !== item.path || reflushFlag"
-        visible-key="reflushFlag"
-        :parent-target="_self"
-        @reload="$reloadHandle"
-      ></outLink>
-    </template>
-    <unreadDialog></unreadDialog>
-    <watermark></watermark>
-  </section>
-</template>
-
-<script>
-import outLink from '@base/views/user/outLink/index.vue';
-import unreadDialog from "../../layout/components/notify_message/unreadDialog.vue";
-import watermark from "./watermark";
-import { isRepeatable } from "@base/utils/repeatOpen";
-
-
-export default {
-  name: 'AppMain',
-  computed: {
-    cachedViews() {
-      return this.$store.state.tagsView.cachedViews.filter(item => item != 'outLink');
-    },
-    key() {
-      // 可重复打开的路由按 fullPath 作为 key，使多开实例相互独立；
-      // 其余保持按 path，行为与原来一致。
-      return isRepeatable(this.$route) ? this.$route.fullPath : this.$route.path;
-    },
-    outVisitedViews() {
-      let visitedViews = this.$store.state.tagsView.visitedViews;
-      return visitedViews.filter(visitedView => visitedView.name == 'outLink');
-    }
-  },
-  components: {
-    outLink,
-    unreadDialog,
-    watermark
-  },
-  data() {
-    return {
-      rIndex: -1,
-      reflushFlag: true
-    };
-  },
-  methods: {
-    reflushIframe(path) {
-      this.outVisitedViews.findIndex(item => item.full);
-    }
-  },
-  created() {
-    this.$baseEventBus.$on("reflushRouteView",(view)=>{
-      if(this.$route.name=="outLink"){
-        let t = this.$refs["ref_"+this.$route.path][0];
-        t.$baseReload();
-      }else{
-        this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-          const { fullPath } = view
-          this.$nextTick(() => {
-            this.$router.replace({
-              path: '/redirect' + fullPath
-            })
-          })
-        })
-      }
-    })
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.app-main {
-  /* 45= navbar  45  */
-  /**min-height: calc(100vh - 45px);*/
-  height:calc(100vh - 10px);
-  width: 100%;
-  position: relative;
-  overflow: hidden;
-}
-
-.fixed-header + .app-main {
-  padding-top: 32px;
-}
-
-.hasTagsView {
-  .app-main {
-    /* 84 = navbar + tags-view = 45 + 34 */
-    min-height: calc(100vh - 79px);
-  }
-
-  .fixed-header + .app-main {
-    padding-top: 79px;
-  }
-}
-</style>
-
-<style lang="scss">
-// fix css style bug in open el-dialog
-.el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 15px;
-  }
-}
-</style>
+<template>
+  <section class="app-main">
+    <transition name="fade-transform" mode="out-in">
+<!--      <keep-alive :include="cachedViews"><router-view :key="key" v-if="$route.name !== 'outLink'" /></keep-alive>-->
+
+      <BaseKeepAlive :include="cachedViews">
+        <router-view :key="key" v-if="microReloadFlag && $route.name !== 'outLink'" />
+      </BaseKeepAlive>
+
+    </transition>
+    <template v-for="item in outVisitedViews">
+      <outLink
+        :ref="'ref_'+$route.path"
+        :key="item.path"
+        v-show="$route.path === item.path"
+        v-if="$route.path !== item.path || reflushFlag"
+        visible-key="reflushFlag"
+        :parent-target="_self"
+        @reload="$reloadHandle"
+      ></outLink>
+    </template>
+    <!-- 挂载子应用 开始 -->
+    <section id="Appmicro" />
+    <!-- 挂载子应用 结束 -->
+    <unreadDialog></unreadDialog>
+    <watermark></watermark>
+  </section>
+</template>
+
+<script>
+import outLink from '@base/views/user/outLink/index.vue';
+import unreadDialog from "../../layout/components/notify_message/unreadDialog.vue";
+import watermark from "./watermark";
+import { isRepeatable } from "@base/utils/repeatOpen";
+import { refreshMicroApp } from "@base/microRouter";
+
+
+export default {
+  name: 'AppMain',
+  computed: {
+    cachedViews() {
+      return this.$store.state.tagsView.cachedViews.filter(item => item != 'outLink');
+    },
+    key() {
+      // 可重复打开的路由按 fullPath 作为 key，使多开实例相互独立；
+      // 其余保持按 path，行为与原来一致。
+      return isRepeatable(this.$route) ? this.$route.fullPath : this.$route.path;
+    },
+    outVisitedViews() {
+      let visitedViews = this.$store.state.tagsView.visitedViews;
+      return visitedViews.filter(visitedView => visitedView.name == 'outLink');
+    }
+  },
+  components: {
+    outLink,
+    unreadDialog,
+    watermark
+  },
+  data() {
+    return {
+      rIndex: -1,
+      reflushFlag: true,
+      // 子应用模式下由 micro.reloadSeq 驱动的重建开关，见下方 watch
+      microReloadFlag: true
+    };
+  },
+  methods: {},
+  watch: {
+    // 主应用页签刷新经 update({microRefresh}) 传到子应用后自增该序号。
+    // 这里不走 /redirect 重建：子应用与主应用共用同一个浏览器 hash，
+    // 跳 /redirect 会被主应用 afterEach 判成"离开子应用路由"从而隐藏容器并暂停子应用路由，
+    // 重建被掐断，表现为刷新无反应。改为原地销毁重建组件，完全不碰 URL。
+    "$store.state.micro.reloadSeq"() {
+      let view = this.$route;
+      this.$store.dispatch("tagsView/delCachedView", view).then(() => {
+        this.microReloadFlag = false;
+        this.$nextTick(() => {
+          this.microReloadFlag = true;
+        });
+      });
+    }
+  },
+  created() {
+    // handler 存实例属性并在销毁时 $off：事件总线是应用级单例，
+    // 不解绑会在登出重建布局后累积 handler 并钉住旧实例（内存泄露）
+    this.reflushRouteViewHandler = (view) => {
+      // 子应用页面不在本 router-view 内（由 qiankun 挂独立容器），
+      // 走本地 /redirect 重建只会隐藏再显示容器、实例不变，须转发给子应用自己重建
+      if (refreshMicroApp(this.$route)) {
+        return;
+      }
+      if(this.$route.name=="outLink"){
+        let t = this.$refs["ref_"+this.$route.path][0];
+        t.$baseReload();
+      }else{
+        this.$store.dispatch('tagsView/delCachedView', view).then(() => {
+          const { fullPath } = view
+          this.$nextTick(() => {
+            this.$router.replace({
+              path: '/redirect' + fullPath
+            })
+          })
+        })
+      }
+    };
+    this.$baseEventBus.$on("reflushRouteView", this.reflushRouteViewHandler);
+  },
+  beforeDestroy() {
+    this.$baseEventBus.$off("reflushRouteView", this.reflushRouteViewHandler);
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.app-main {
+  /* 45= navbar  45  */
+  //min-height: calc(100vh - 45px);
+  height:calc(100vh - 10px);
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+}
+
+.fixed-header + .app-main {
+  padding-top: 32px;
+}
+
+.hasTagsView {
+  .app-main {
+    /* 84 = navbar + tags-view = 45 + 34 */
+    min-height: calc(100vh - 79px);
+  }
+
+  .fixed-header + .app-main {
+    padding-top: 79px;
+  }
+}
+</style>
+
+<style lang="scss">
+// fix css style bug in open el-dialog
+.el-popup-parent--hidden {
+  .fixed-header {
+    padding-right: 15px;
+  }
+}
+</style>

package/src/layout/components/Sidebar/default.vue

@@ -142,9 +142,15 @@
           :key="'menuModule' + menuModule.id"
           @click.native="rourteTo(menuModule)"
         >
-          <i :class="getMenuClass(menuModule, 1)" v-if="menuModule.children.length <= 0"></i>
+          <i
+            :class="getMenuClass(menuModule, 1)"
+            v-if="menuModule.children.length <= 0"
+          ></i>
           <template slot="title">
-            <i :class="getMenuClass(menuModule, 1)" v-if="menuModule.children.length > 0"></i>
+            <i
+              :class="getMenuClass(menuModule, 1)"
+              v-if="menuModule.children.length > 0"
+            ></i>
             <span>{{ getMenuName(menuModule) }}</span>
           </template>
           <component
@@ -173,7 +179,7 @@
             </el-menu-item>
           </component>
         </component>
-        <el-menu-item
+        <!-- <el-menu-item
           @click.native="openCreateCompanyDialog"
           index="xx"
           v-if="isFormDev"
@@ -182,7 +188,7 @@
             <i :class="getMenuClass({}, 1)"></i>
             <span>新建企业</span>
           </template>
-        </el-menu-item>
+        </el-menu-item> -->
       </el-scrollbar>
     </el-menu>
     <div class="menu-btn">
@@ -798,7 +804,7 @@ export default {
           if (sh >= 0) {
             $snav.style["margin-top"] = sh1 + "px";
           } else if (sh < 0) {
-            let bd = sh1 + sh ;
+            let bd = sh1 + sh;
 
             $snav.style["margin-top"] = bd + "px";
             $snav.querySelector(".ico-arrow").style["margin-top"] =
@@ -1058,30 +1064,50 @@ export default {
     position: relative;
     background-color: rgba(0, 0, 0, 0.2);
     word-break: break-word;
-    .el-scrollbar__view >{
-      .el-menu-item{padding:0 11px !important;
-        span{font-size:14px;}
+    .el-scrollbar__view > {
+      .el-menu-item {
+        padding: 0 11px !important;
+        span {
+          font-size: 14px;
+        }
       }
-      .el-submenu > .el-submenu__title{padding:0 11px !important;
-        span{font-size:14px;}
-        ~ .el-menu{
-          padding:5px 0;display: grid;
-          > .el-menu-item{
-             span{line-height:1.4;height: 26px;}
+      .el-submenu > .el-submenu__title {
+        padding: 0 11px !important;
+        span {
+          font-size: 14px;
+        }
+        ~ .el-menu {
+          padding: 5px 0;
+          display: grid;
+          > .el-menu-item {
+            span {
+              line-height: 1.4;
+              height: 26px;
+            }
           }
-          .el-submenu.is-opened .el-submenu__title{background-color:#FFF;opacity:1;
-            span{color:$baseColor;}
-            i.iconfont{color:$baseColor}
+          .el-submenu.is-opened .el-submenu__title {
+            background-color: #fff;
+            opacity: 1;
+            span {
+              color: $baseColor;
+            }
+            i.iconfont {
+              color: $baseColor;
+            }
           }
         }
-
       }
     }
-    .el-submenu__title,.el-menu-item {
+    .el-submenu__title,
+    .el-menu-item {
       padding: 0 11px;
       height: 48px;
       line-height: 48px;
-      &:hover,&.is-active{background-color:rgba(0, 0, 0, 0.29)}
+      overflow: hidden;
+      &:hover,
+      &.is-active {
+        background-color: rgba(0, 0, 0, 0.29);
+      }
       i {
         color: #fff;
         font-size: 13px;
@@ -1090,7 +1116,7 @@ export default {
 
         &.iconfont {
           margin-right: 5px;
-          font-size: 19px;
+          font-size: 18px;
           float: left;
         }
 
@@ -1120,18 +1146,22 @@ export default {
       &.is-opened .el-submenu__title {
         //background-color: rgba(27, 66, 97) !important;
       }
-      .el-submenu .el-menu{display:none}
+      .el-submenu .el-menu {
+        display: none;
+      }
     }
 
     .el-submenu {
-      &.is-opened{
-        > .el-submenu__title{background-color:rgba(0, 0, 0, 0.29)}
+      &.is-opened {
+        > .el-submenu__title {
+          background-color: rgba(0, 0, 0, 0.29);
+        }
       }
       .el-menu {
         background: rgba(0, 0, 0, 0.35);
         box-shadow: 0px -5px 8px #00000014 inset;
         //padding:4px 0;
-        .el-submenu__title{
+        .el-submenu__title {
           height: auto;
           line-height: 1.4;
           font-size: 12px;
@@ -1165,13 +1195,18 @@ export default {
             zoom: 0.8;
             display: none;
           }
-          span{height:auto;text-align: left !important;}
+          span {
+            height: auto;
+            text-align: left !important;
+          }
           &:hover,
           &.on {
             opacity: 1;
             background-color: #fbfdfe !important;
             color: $baseColor !important;
-            i.iconfont{color:$baseColor}
+            i.iconfont {
+              color: $baseColor;
+            }
             .el-icon-arrow-right {
               color: $baseColor;
             }
@@ -1179,7 +1214,7 @@ export default {
         }
       }
 
-      .el-menu-item{
+      .el-menu-item {
         height: auto;
         line-height: 1.4;
         padding-left: 33px !important;
@@ -1202,7 +1237,7 @@ export default {
           line-height: 20px;
           left: 7px;
           font-size: 18px;
-          color:#D0D6DB;
+          color: #d0d6db;
         }
 
         [class^="el-icon-"] {
@@ -1215,7 +1250,6 @@ export default {
           width: 14px;
           zoom: 0.8;
           display: none;
-
         }
 
         &:hover,
@@ -1224,7 +1258,8 @@ export default {
           background-color: #fbfdfe !important;
           color: $baseColor !important;
 
-          .el-icon-arrow-right,i.iconfont {
+          .el-icon-arrow-right,
+          i.iconfont {
             color: $baseColor;
           }
         }
@@ -1547,46 +1582,61 @@ export default {
 // .el-submenu .el-menu {
 //   height: auto !important;
 // }
-.el-menu--vertical{
-   > .el-menu--popup{overflow: auto;//不用atuo 超出不出滚动条
-      .el-submenu__title, .el-menu-item{
-        height: auto !important;
-        line-height: 1.4 !important;
-        padding: 8px 0;
-        text-align: left;
-        white-space: normal;
-        word-break: break-word;
-        background:none;
-        i.iconfont{color:#FFF;margin-right:8px;}
+.el-menu--vertical {
+  > .el-menu--popup {
+    overflow: auto; //不用atuo 超出不出滚动条
+    .el-submenu__title,
+    .el-menu-item {
+      height: auto !important;
+      line-height: 1.4 !important;
+      padding: 8px 0;
+      text-align: left;
+      white-space: normal;
+      word-break: break-word;
+      background: none;
+      i.iconfont {
+        color: #fff;
+        margin-right: 8px;
       }
-   }
-  .el-submenu{
-    .el-submenu__title{
-      .el-submenu__icon-arrow{display:none}
     }
-    &:hover{
-      .el-submenu__title{
+  }
+  .el-submenu {
+    .el-submenu__title {
+      .el-submenu__icon-arrow {
+        display: none;
+      }
+    }
+    &:hover {
+      .el-submenu__title {
         background-color: rgba(0, 0, 0, 0.29) !important;
-        i.iconfont{color:$baseColor}
+        i.iconfont {
+          color: $baseColor;
+        }
       }
     }
 
-    &.is-opened{
-      .el-submenu__title{
+    &.is-opened {
+      .el-submenu__title {
         background-color: rgba(0, 0, 0, 0.29) !important;
-        i.iconfont{color:$baseColor}
+        i.iconfont {
+          color: $baseColor;
+        }
       }
     }
   }
-  .el-menu-item{
-    &:hover{
-        background-color: rgba(0, 0, 0, 0.29) !important;
-        i.iconfont{color:$baseColor}
+  .el-menu-item {
+    &:hover {
+      background-color: rgba(0, 0, 0, 0.29) !important;
+      i.iconfont {
+        color: $baseColor;
+      }
     }
 
-    &.is-opened{
-        background-color: rgba(0, 0, 0, 0.29) !important;
-        i.iconfont{color:$baseColor}
+    &.is-opened {
+      background-color: rgba(0, 0, 0, 0.29) !important;
+      i.iconfont {
+        color: $baseColor;
+      }
     }
   }
   // .el-menu-item{

package/src/layout/components/TagsView/index.vue

@@ -37,7 +37,7 @@
           <el-dropdown-item @click.native="refreshSelectedTag($route)" :disabled="getIsLock()">
             <i class="el-icon-refresh"/><span>{{ $t1('刷新') }}</span>
           </el-dropdown-item>
-          <el-dropdown-item @click.native="closeAllTags(selectedTag)">
+          <el-dropdown-item @click.native="closeAllTags($route)">
             <i class="el-icon-close"/><span>{{ $t1('全部关闭') }}</span>
           </el-dropdown-item>
         </el-dropdown-menu>