From dc5ac43b0131026d47a1292a9612b837f1f25abc Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 02 四月 2024 17:56:10 +0800
Subject: [PATCH] 整合代码
---
Source/ProjectWeb/src/router/avue-router.js | 19 +++++++++----------
Source/ProjectWeb/src/permission.js | 2 +-
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/Source/ProjectWeb/src/permission.js b/Source/ProjectWeb/src/permission.js
index 0b8137a..116b150 100644
--- a/Source/ProjectWeb/src/permission.js
+++ b/Source/ProjectWeb/src/permission.js
@@ -11,7 +11,7 @@
NProgress.configure({showSpinner: false});
const lockPage = store.getters.website.lockPage; //閿佸睆椤�
router.beforeEach((to, from, next) => {
- debugger;
+ // debugger;
const meta = to.meta || {};
const isMenu = meta.menu === undefined ? to.query.menu : meta.menu;
store.commit('SET_IS_MENU', isMenu === undefined);
diff --git a/Source/ProjectWeb/src/router/avue-router.js b/Source/ProjectWeb/src/router/avue-router.js
index 1f5f0a7..a12448f 100644
--- a/Source/ProjectWeb/src/router/avue-router.js
+++ b/Source/ProjectWeb/src/router/avue-router.js
@@ -6,7 +6,7 @@
RouterPlugin.install = function (vue, option = {}) {
this.$router = option.router;
this.$store = option.store;
- this.$vue = new vue({ i18n: option.i18n });
+ this.$vue = new vue({i18n: option.i18n});
// 杩欎釜鐨勪綔鐢ㄦ槸 涓轰簡妫�鏌ュ嚭缃戦〉閾炬帴锛屽洜涓烘湰椤圭洰鐢ㄥ埌浜� iframe
function isURL(s) {
@@ -85,12 +85,12 @@
},
//鍔ㄦ�佽矾鐢�
// 璺敱鏄笓闂ㄧ殑涓�涓帴鍙ｈ幏鍙�
- /**
- * aMenu: 鎺ュ彈鍒扮殑鍔ㄦ�佽矾鐢辨暟鎹� menu鐨勭粨鏋勫灞傛湁鐖剁骇path 閲岄潰鏈変竴涓猚hilden 璁板綍椤甸潰鐨勮矾鐢�
- * first: 涓轰簡鍖哄垎澶栫晫 璋冪敤formatRoutes 鍜� 褰撳墠鏂囦欢璋冪敤 formatRoutes
- */
+ /**
+ * aMenu: 鎺ュ彈鍒扮殑鍔ㄦ�佽矾鐢辨暟鎹� menu鐨勭粨鏋勫灞傛湁鐖剁骇path 閲岄潰鏈変竴涓猚hilden 璁板綍椤甸潰鐨勮矾鐢�
+ * first: 涓轰簡鍖哄垎澶栫晫 璋冪敤formatRoutes 鍜� 褰撳墠鏂囦欢璋冪敤 formatRoutes
+ */
formatRoutes: function (aMenu = [], first) {
- debugger;
+ // debugger;
const aRouter = []
// 鑾峰彇鍒板叏灞�閰嶇疆涓殑 props
const propsConfig = this.$website.menu.props;
@@ -118,13 +118,12 @@
}
})(),
//鐗规畩澶勭悊缁勪欢 鎵ц瀹岃繖涓� component 涔熷氨鏄簿纭埌鍏蜂綋鐨勬枃浠朵簡 views鏂囦欢澶逛笅闈㈠氨鏄叿浣撶殑椤甸潰浠ｇ爜
- //component = 'views' + oMenu.path,
- component = oMenu.path,
+ component = 'views' + path,
name = oMenu[propsDefault.label],
icon = oMenu[propsDefault.icon],
children = oMenu[propsDefault.children],
meta = oMenu[propsDefault.meta] || {};
- // meta涓� keepalive 鐨勫鐞�
+ // meta涓� keepalive 鐨勫鐞�
meta = Object.assign(meta, (function () {
if (option.keepAlive === true) {
return {
@@ -179,7 +178,7 @@
/**
* 杩欓噷鏄噸鐐癸紝褰撴湁瀛愯矾鐢辩殑鏃跺�� 浼氬啀鍘绘墽琛� formatRoutes 鏂规硶锛岀劧鍚庡張浼氭湁涓�涓柊鐨� aMenu for寰幆銆�
* 鏈�鍚庤繑鍥炵殑鏄竴涓暟缁� aRouter 杩欎釜鏁扮粍灏变細浣滀负 childen鐨勫�艰 return
- */
+ */
return this.formatRoutes(children, false)
})()
}
--
Gitblit v1.9.3