From bbbe7cbb37b4e820c2b4b72bd45b09b3defcb4db Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sun, 24 Jan 2021 22:12:52 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9EisOpen=E5=AD=97=E6=AE=B5=E6=9D=A5=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8=E6=96=B0tab=E6=9D=A5?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E5=A4=96=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/index/sidebar/config.js       | 15 ++++-----
 src/page/index/sidebar/sidebarItem.vue | 43 +++++++++++++++++---------
 src/views/system/menu.vue              | 31 ++++++++++++++++++-
 3 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/src/page/index/sidebar/config.js b/src/page/index/sidebar/config.js
index 23fa4b3..156c570 100644
--- a/src/page/index/sidebar/config.js
+++ b/src/page/index/sidebar/config.js
@@ -1,8 +1,9 @@
 export default {
-    propsDefault: {
-        label: 'label',
-        path: 'path',
-        icon: 'icon',
-        children: 'children'
-    }
-}
\ No newline at end of file
+  propsDefault: {
+    label: 'label',
+    path: 'path',
+    icon: 'icon',
+    children: 'children',
+    isOpen: 'isOpen'
+  }
+}
diff --git a/src/page/index/sidebar/sidebarItem.vue b/src/page/index/sidebar/sidebarItem.vue
index 927483b..2693e31 100644
--- a/src/page/index/sidebar/sidebarItem.vue
+++ b/src/page/index/sidebar/sidebarItem.vue
@@ -5,7 +5,7 @@
                     :index="item[pathKey]"
                     @click="open(item)"
                     :key="item[labelKey]"
-                    :class="{'is-active':vaildAvtive(item)}">
+                    :class="{'is-active':vaildActive(item)}">
         <i :class="item[iconKey]"></i>
         <span slot="title"
               :alt="item[pathKey]">{{generateTitle(item)}}</span>
@@ -21,7 +21,7 @@
         <template v-for="(child,cindex) in item[childrenKey]">
           <el-menu-item :index="child[pathKey],cindex"
                         @click="open(child)"
-                        :class="{'is-active':vaildAvtive(child)}"
+                        :class="{'is-active':vaildActive(child)}"
                         v-if="validatenull(child[childrenKey])"
                         :key="child[labelKey]">
             <i :class="child[iconKey]"></i>
@@ -40,7 +40,7 @@
 </template>
 <script>
   import {mapGetters} from "vuex";
-  import {validatenull} from "@/util/validate";
+  import {isURL, validatenull} from "@/util/validate";
   import config from "./config.js";
 
   export default {
@@ -89,6 +89,9 @@
       childrenKey() {
         return this.props.children || this.config.propsDefault.children;
       },
+      isOpenKey() {
+        return this.props.isOpen || this.config.propsDefault.isOpen;
+      },
       nowTagValue() {
         return this.$router.$avueRouter.getValue(this.$route);
       }
@@ -100,7 +103,10 @@
           (item.meta || {}).i18n
         );
       },
-      vaildAvtive(item) {
+      vaildActive(item) {
+        if (this.validIsOpen(item)) {
+          return false;
+        }
         const groupFlag = (item["group"] || []).some(ele =>
           this.$route.path.includes(ele)
         );
@@ -113,17 +119,26 @@
       validatenull(val) {
         return validatenull(val);
       },
-      open (item) {
+      validIsOpen(item) {
+        if (item[this.isOpenKey] === 2 && isURL(item[this.pathKey])) {
+          return true;
+        }
+      },
+      open(item) {
         if (this.screen <= 1) this.$store.commit("SET_COLLAPSE");
-        this.$router.$avueRouter.group = item.group;
-        this.$router.$avueRouter.meta = item.meta;
-        this.$router.push({
-          path: this.$router.$avueRouter.getPath({
-            name: item[this.labelKey],
-            src: item[this.pathKey]
-          }, item.meta),
-          query: item.query
-        });
+        if (this.validIsOpen(item)) {
+          window.open(item[this.pathKey]);
+        } else {
+          this.$router.$avueRouter.group = item.group;
+          this.$router.$avueRouter.meta = item.meta;
+          this.$router.push({
+            path: this.$router.$avueRouter.getPath({
+              name: item[this.labelKey],
+              src: item[this.pathKey]
+            }, item.meta),
+            query: item.query
+          });
+        }
       }
     }
   };
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 53ae66c..c72cd97 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -184,10 +184,36 @@
                 }
               ]
             },
+            {
+              label: "新窗口",
+              prop: "isOpen",
+              type: "radio",
+              disabled: false,
+              dicData: [
+                {
+                  label: "否",
+                  value: 1
+                },
+                {
+                  label: "是",
+                  value: 2
+                }
+              ],
+              value: 1,
+              rules: [
+                {
+                  required: true,
+                  message: "请选择新窗口打开",
+                  trigger: "blur"
+                }
+              ]
+            },
             {
               label: "菜单排序",
               prop: "sort",
               type: "number",
+              row: true,
+              span: 24,
               rules: [
                 {
                   required: true,
@@ -216,8 +242,11 @@
           if (item.prop === "path") {
             item.rules[0].required = category === 1;
           }
+          if (item.prop === 'isOpen') {
+            item.disabled = category === 2;
+          }
         });
-      }
+      },
     },
     computed: {
       ...mapGetters(["userInfo", "permission"]),