cloud-web-corejs 1.0.54-dev.717 → 1.0.54-dev.719

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.717",
+  "version": "1.0.54-dev.719",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/utils/repeatOpen.js

@@ -1,4 +1,4 @@
-import settingConfig from "@base/settings";
+import settingConfig from "@/settings";
 
 /**
  * 同一菜单是否允许重复打开为独立标签页。
@@ -30,7 +30,8 @@ export function viewKey(view) {
  * @returns {Object} 归一化后的 location（带唯一 _rk）
  */
 export function withRepeatKey(location) {
-  const loc = typeof location === "string" ? { path: location } : { ...location };
+  const loc =
+    typeof location === "string" ? { path: location } : { ...location };
   loc.query = { ...(loc.query || {}), _rk: Date.now() };
   return loc;
 }
@@ -44,6 +45,8 @@ export function withRepeatKey(location) {
  */
 export function openView(router, location, route) {
   // 未指定 route 时，用开关本身判定（等价于「除 affix/outLink 外都可重复」）
-  const repeatable = route ? isRepeatable(route) : settingConfig.repeatOpenEnabled;
+  const repeatable = route
+    ? isRepeatable(route)
+    : settingConfig.repeatOpenEnabled;
   return router.push(repeatable ? withRepeatKey(location) : location);
 }

package/src/views/user/commMenu/index.vue

@@ -278,10 +278,10 @@ export default {
         if (route.linkType == 4) {
           this.jumpOutLink(route)
         } else if (route.linkType == 3) {
-          this.$router.push({path: route.path, query: {url: route.outLink}});
+          this.$openView({path: route.path, query: {url: route.outLink}}, route);
         } else {
           // this.jumpTo(route, firstRow)
-          this.$router.push(route.path);
+          this.$openView(route.path, route);
         }
       } catch (e) {
         console.error(e);

package/src/views/user/home/default.vue

@@ -565,11 +565,11 @@ export default {
       } else if (route.type == 3) {
         let menuCode = route.menuCode;
         let path = "/user/outLink/index/" + menuCode;
-        this.$router.push({ path: path, query: { url: route.url } });
+        this.$openView({ path: path, query: { url: route.url } }, route);
       } else {
         let path = this.getPath(route);
         if (!path) return;
-        this.$router.push(path);
+        this.$openView(path, route);
       }
     },
     getPath(route3) {

package/src/views/user/home/default2.vue

@@ -504,12 +504,15 @@ export default {
         if (route.linkType === 4) {
           this.jumpOutLink(route);
         } else if (route.linkType === 3) {
-          this.$router.push({
-            path: path,
-            query: { url: route.outLink, route: route.route },
-          });
+          this.$openView(
+            {
+              path: path,
+              query: { url: route.outLink, route: route.route },
+            },
+            route
+          );
         } else {
-          this.$router.push(path);
+          this.$openView(path, route);
         }
       } catch (e) {
         console.error(e);
@@ -796,11 +799,11 @@ export default {
       } else if (route.type === 3) {
         let menuCode = route.menuCode;
         let path = "/user/outLink/index/" + menuCode;
-        this.$router.push({ path: path, query: { url: route.url } });
+        this.$openView({ path: path, query: { url: route.url } }, route);
       } else {
         let path = this.getPath(route);
         if (!path) return;
-        this.$router.push(path);
+        this.$openView(path, route);
       }
     },
     getPath(route3) {