lw-cdp-ui 1.0.54 → 1.0.55

package/dist/components/lwLayout/components/tags.vue

@@ -7,7 +7,7 @@
           @contextmenu.prevent="openContextMenu($event, tag)">
         <router-link :to="tag">
           <span>{{ tag.meta.title }}</span>
-          <el-icon v-if="!tag.meta.affix && tagList.length > 1"
+          <el-icon v-if="!tag.meta.affix"
                    @click.prevent.stop='closeSelectedTag(tag)'><el-icon-close /></el-icon>
         </router-link>
       </li>
@@ -103,24 +103,18 @@ export default {
   methods: {
     // 初始化
     init() {
-      var dashboardRoute = this.treeFind(this.menu, node => node.path == this.$config.DASHBOARD_URL)
-      if (dashboardRoute) {
-        dashboardRoute.fullPath = dashboardRoute.path
+      let tags = this.$tool.data.get('RouteTags') || []
+      if (tags.length > 0) {
 
-        let tags = this.$tool.data.get('RouteTags') || []
-        tags.forEach(tag => {
+        tags.forEach((tag, index) => {
           var isRoute = this.treeFind(this.menu, node => node.path == tag.path)
           if (isRoute) {
             this.addViewTags(tag)
           }
-
         })
-        if (tags.length === 0) {
-          this.addViewTags(dashboardRoute)
-          this.addViewTags(this.$route)
-        }
-
       }
+      this.addViewTags(this.$route)
+
     },
     //查找树
     treeFind(tree, func) {
@@ -157,12 +151,19 @@ export default {
     },
     //关闭tag
     closeSelectedTag(tag, autoPushLatestView = true) {
+      let item = this.menu[0]
+      if (item.children) {
+        item = item.children[0]
+      }
+      if (this.tagList.length == 1 && item.path == this.$route.fullPath) {
+        return false
+      }
       this.$store.commit("removeViewTags", tag)
       this.$store.commit("removeIframeList", tag)
       this.$store.commit("removeKeepLive", tag.name)
+      this.$tool.data.set('RouteTags', this.$store.state.viewTags.viewTags)
       if (autoPushLatestView && this.isActive(tag)) {
         const latestView = this.tagList.slice(-1)[0]
-        this.$tool.data.set('RouteTags', this.$store.state.viewTags.viewTags)
         if (latestView) {
           this.$router.push(latestView)
         } else {

package/dist/lw-cdp-ui.esm.js

@@ -407,15 +407,11 @@ const Topbar = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$
   methods: {
     // 初始化
     init() {
-      var o = this.treeFind(this.menu, (a) => a.path == this.$config.DASHBOARD_URL);
-      if (o) {
-        o.fullPath = o.path;
-        let a = this.$tool.data.get("RouteTags") || [];
-        a.forEach((s) => {
-          var g = this.treeFind(this.menu, (d) => d.path == s.path);
-          g && this.addViewTags(s);
-        }), a.length === 0 && (this.addViewTags(o), this.addViewTags(this.$route));
-      }
+      let o = this.$tool.data.get("RouteTags") || [];
+      o.length > 0 && o.forEach((a, s) => {
+        var g = this.treeFind(this.menu, (d) => d.path == a.path);
+        g && this.addViewTags(a);
+      }), this.addViewTags(this.$route);
     },
     //查找树
     treeFind(o, a) {
@@ -446,9 +442,12 @@ const Topbar = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$
     },
     //关闭tag
     closeSelectedTag(o, a = !0) {
-      if (this.$store.commit("removeViewTags", o), this.$store.commit("removeIframeList", o), this.$store.commit("removeKeepLive", o.name), a && this.isActive(o)) {
-        const s = this.tagList.slice(-1)[0];
-        this.$tool.data.set("RouteTags", this.$store.state.viewTags.viewTags), s ? this.$router.push(s) : this.$router.push("/");
+      let s = this.menu[0];
+      if (s.children && (s = s.children[0]), this.tagList.length == 1 && s.path == this.$route.fullPath)
+        return !1;
+      if (this.$store.commit("removeViewTags", o), this.$store.commit("removeIframeList", o), this.$store.commit("removeKeepLive", o.name), this.$tool.data.set("RouteTags", this.$store.state.viewTags.viewTags), a && this.isActive(o)) {
+        const g = this.tagList.slice(-1)[0];
+        g ? this.$router.push(g) : this.$router.push("/");
       }
     },
     //tag右键
@@ -532,7 +531,7 @@ function _sfc_render$j(o, a, s, g, d, h) {
           createVNode(N, { to: M }, {
             default: withCtx(() => [
               createElementVNode("span", null, toDisplayString(M.meta.title), 1),
-              !M.meta.affix && h.tagList.length > 1 ? (openBlock(), createBlock(f, {
+              M.meta.affix ? createCommentVNode("", !0) : (openBlock(), createBlock(f, {
                 key: 0,
                 onClick: withModifiers(($) => h.closeSelectedTag(M), ["prevent", "stop"])
               }, {
@@ -540,7 +539,7 @@ function _sfc_render$j(o, a, s, g, d, h) {
                   createVNode(S)
                 ]),
                 _: 2
-              }, 1032, ["onClick"])) : createCommentVNode("", !0)
+              }, 1032, ["onClick"]))
             ]),
             _: 2
           }, 1032, ["to"])