From 5cfb7ee34d585b12b45a8ba90eaa2ff9994248b7 Mon Sep 17 00:00:00 2001
From: icssoa <615206459@qq.com>
Date: Wed, 3 Mar 2021 18:13:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cool/modules/base/components/menu/file.vue    |  8 ++++-
 .../error-page/components/error-page.vue      | 24 +++++++------
 cool/modules/base/pages/login/index.vue       |  2 +-
 cool/modules/base/store/menu.js               |  3 +-
 cool/modules/base/store/module.js             |  4 +--
 cool/modules/base/views/plugin.vue            | 36 +++++++++----------
 package.json                                  |  2 +-
 src/service/request.js                        | 18 ++++++----
 vue.config.js                                 |  2 +-
 9 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/cool/modules/base/components/menu/file.vue b/cool/modules/base/components/menu/file.vue
index 31dacc7..d55c0e5 100644
--- a/cool/modules/base/components/menu/file.vue
+++ b/cool/modules/base/components/menu/file.vue
@@ -2,7 +2,13 @@
 	<div class="cl-menu-file">
 		<el-row :gutter="10">
 			<el-col :span="16">
-				<el-select v-model="newValue" filterable clearable placeholder="请选择">
+				<el-select
+					v-model="newValue"
+					allow-create
+					filterable
+					clearable
+					placeholder="请选择"
+				>
 					<el-option
 						v-for="(item, index) in list"
 						:key="index"
diff --git a/cool/modules/base/pages/error-page/components/error-page.vue b/cool/modules/base/pages/error-page/components/error-page.vue
index 7f86d5b..ca07420 100644
--- a/cool/modules/base/pages/error-page/components/error-page.vue
+++ b/cool/modules/base/pages/error-page/components/error-page.vue
@@ -3,7 +3,7 @@
 		<h1 class="code">{{ code }}</h1>
 		<p class="desc">{{ desc }}</p>
 
-		<template v-if="token">
+		<template v-if="token || isLogout">
 			<div class="router">
 				<el-select size="medium" filterable prefix-icon="el-icon-search" v-model="url">
 					<el-option v-for="(item, index) in routes" :key="index" :value="item.path">
@@ -18,7 +18,7 @@
 			<div class="link">
 				<el-link class="to-home" @click="home">回到首页</el-link>
 				<el-link class="to-back" @click="back">返回上一页</el-link>
-				<el-link class="to-login" @click="login">重新登录</el-link>
+				<el-link class="to-login" @click="reLogin">重新登录</el-link>
 			</div>
 		</template>
 
@@ -34,6 +34,7 @@
 
 <script>
 import { mapGetters } from "vuex";
+import { href } from "cl-admin/utils";
 
 export default {
 	props: {
@@ -43,7 +44,8 @@ export default {
 
 	data() {
 		return {
-			url: ""
+			url: "",
+			isLogout: false
 		};
 	},
 
@@ -60,20 +62,20 @@ export default {
 			this.$router.push("/login");
 		},
 
+		reLogin() {
+			this.isLogout = true;
+
+			this.$store.dispatch("userLogout").done(() => {
+				href("/login");
+			});
+		},
+
 		back() {
 			history.back();
 		},
 
 		home() {
 			this.$router.push("/");
-		},
-
-		login() {
-			this.$store.dispatch("userLogout");
-
-			setTimeout(() => {
-				this.$router.push("/login");
-			}, 30);
 		}
 	}
 };
diff --git a/cool/modules/base/pages/login/index.vue b/cool/modules/base/pages/login/index.vue
index ed0e2aa..d562710 100644
--- a/cool/modules/base/pages/login/index.vue
+++ b/cool/modules/base/pages/login/index.vue
@@ -164,7 +164,7 @@ export default {
 					border: 0;
 					border-bottom: 0.5px solid #999;
 					border-radius: 0;
-					padding: 0;
+					padding: 0 5px;
 					background-color: transparent;
 					color: #ccc;
 					transition: border-color 0.3s;
diff --git a/cool/modules/base/store/menu.js b/cool/modules/base/store/menu.js
index f52a0e4..84e3eaf 100644
--- a/cool/modules/base/store/menu.js
+++ b/cool/modules/base/store/menu.js
@@ -45,8 +45,7 @@ export default {
 						.filter((e) => e.type != 2)
 						.map((e) => {
 							let r = {
-								moduleName:
-									e.moduleName || (e.router || "").substr(1).replace(/\//g, "-"),
+								moduleName: e.moduleName,
 								id: e.id,
 								parentId: e.parentId,
 								path: revisePath(e.router || e.id),
diff --git a/cool/modules/base/store/module.js b/cool/modules/base/store/module.js
index 37c66db..5b7702e 100644
--- a/cool/modules/base/store/module.js
+++ b/cool/modules/base/store/module.js
@@ -11,7 +11,7 @@ export default {
 		// 模块列表
 		moduleList: (state) => state.list,
 		// 模块视图
-		moduleViews: (state) => state.moduleViews
+		moduleViews: (state) => state.views
 	},
 
 	mutations: {
@@ -27,7 +27,7 @@ export default {
 		},
 
 		SET_MODULE_VIEWS(state, list) {
-			state.moduleViews = list;
+			state.views = list;
 		}
 	}
 };
diff --git a/cool/modules/base/views/plugin.vue b/cool/modules/base/views/plugin.vue
index 86b628a..61025f1 100644
--- a/cool/modules/base/views/plugin.vue
+++ b/cool/modules/base/views/plugin.vue
@@ -3,6 +3,8 @@
 		<el-row type="flex" align="middle">
 			<!-- 刷新按钮 -->
 			<cl-refresh-btn />
+			<!-- 提示 -->
+			<p class="tips">修改完配置如无生效则需要重启 <i class="el-icon-warning"></i></p>
 			<cl-flex1 />
 			<!-- 关键字搜索 -->
 			<cl-search-key />
@@ -27,7 +29,7 @@
 		<el-row type="flex">
 			<cl-flex1 />
 			<!-- 分页控件 -->
-			<cl-pagination layout="total" />
+			<cl-pagination :props="{ layout: 'total' }" />
 		</el-row>
 	</cl-crud>
 </template>
@@ -73,43 +75,35 @@ export default {
 				columns: [
 					{
 						label: "名称",
-						prop: "name",
-						align: "center"
+						prop: "name"
 					},
 					{
 						label: "作者",
-						prop: "author",
-						align: "center"
+						prop: "author"
 					},
 					{
 						label: "联系方式",
-						prop: "contact",
-						align: "center"
+						prop: "contact"
 					},
 					{
 						label: "功能描述",
-						prop: "description",
-						align: "center"
+						prop: "description"
 					},
 					{
 						label: "版本号",
-						prop: "version",
-						align: "center"
+						prop: "version"
 					},
 					{
 						label: "是否启用",
-						prop: "enable",
-						align: "center"
+						prop: "enable"
 					},
 					{
 						label: "命名空间",
-						prop: "namespace",
-						align: "center"
+						prop: "namespace"
 					},
 					{
 						label: "状态",
 						prop: "status",
-						align: "center",
 						dict: [
 							{
 								label: "缺少配置",
@@ -136,13 +130,11 @@ export default {
 					{
 						label: "创建时间",
 						prop: "createTime",
-						align: "center",
 						width: 150,
 						sortable: "custom"
 					},
 					{
 						type: "op",
-						align: "center",
 						buttons: [
 							({ scope }) => {
 								return (
@@ -236,3 +228,11 @@ export default {
 	}
 };
 </script>
+
+<style lang="scss" scoped>
+.tips {
+	font-size: 13px;
+	margin-left: 10px;
+	color: $color-warning;
+}
+</style>
diff --git a/package.json b/package.json
index 80a2d45..675da9f 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
 	"dependencies": {
 		"axios": "^0.21.1",
 		"cl-admin": "^1.2.0",
-		"cl-admin-crud": "^1.3.3",
+		"cl-admin-crud": "^1.3.4",
 		"cl-admin-export": "^1.0.5",
 		"core-js": "^3.9.0",
 		"dayjs": "^1.10.3",
diff --git a/src/service/request.js b/src/service/request.js
index eaf5dc6..d913974 100644
--- a/src/service/request.js
+++ b/src/service/request.js
@@ -12,18 +12,18 @@ NProgress.configure({
 	showSpinner: false
 });
 
-// 请求队列
-let requests = [];
-
-// Token 是否刷新中
-let isRefreshing = false;
-
 // 忽略规则
 const ignore = {
 	NProgress: ["/sys/info/record"],
 	token: ["/login", "/captcha"]
 };
 
+// 请求队列
+let requests = [];
+
+// Token 是否刷新中
+let isRefreshing = false;
+
 // Request
 axios.interceptors.request.use(
 	(config) => {
@@ -134,7 +134,11 @@ axios.interceptors.response.use(
 					break;
 
 				case 502:
-					href("/502");
+					if (isDev) {
+						return Promise.reject("服务异常！！");
+					} else {
+						href("/502");
+					}
 					break;
 
 				default:
diff --git a/vue.config.js b/vue.config.js
index 116d355..1048f8a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -44,7 +44,7 @@ module.exports = {
 				target: "https://admin.cn.utools.club",
 				changeOrigin: true,
 				pathRewrite: {
-					"^/dev": ""
+					"^/test": ""
 				}
 			},