From 4a52b0271598720b67a3325cd4213cadaa1d0a8e Mon Sep 17 00:00:00 2001
From: icssoa <615206459@qq.com>
Date: Wed, 10 Aug 2022 18:03:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3opened=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                     |  2 +-
 src/cool/service/request.ts      |  2 --
 src/modules/base/views/param.vue | 43 ++++++++++++++++----------------
 src/modules/base/views/role.vue  | 13 +++++-----
 4 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index e46b7b0..7eb3b15 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "front-next",
-	"version": "5.7.9",
+	"version": "5.7.10",
 	"scripts": {
 		"dev": "vite --host",
 		"build": "vite build",
diff --git a/src/cool/service/request.ts b/src/cool/service/request.ts
index 18cb388..ec365d0 100644
--- a/src/cool/service/request.ts
+++ b/src/cool/service/request.ts
@@ -124,8 +124,6 @@ request.interceptors.response.use(
 			const { status, config } = error.response;
 			const { user } = useBase();
 
-			console.log(config);
-
 			if (status == 401) {
 				user.logout();
 			}
diff --git a/src/modules/base/views/param.vue b/src/modules/base/views/param.vue
index e8bb83d..e83ce4a 100644
--- a/src/modules/base/views/param.vue
+++ b/src/modules/base/views/param.vue
@@ -17,15 +17,17 @@
 			<cl-pagination />
 		</el-row>
 
-		<cl-upsert ref="Upsert" @opened="onUpsertOpened">
+		<cl-upsert ref="Upsert">
 			<template #slot-content="{ scope }">
-				<div v-for="(item, index) in tab.list" :key="index" class="editor">
-					<template v-if="tab.index == index">
-						<el-button class="change-btn" @click="changeTab(item.to)">{{
-							item.label
-						}}</el-button>
+				<div class="editor">
+					<template v-for="(item, index) in tab.list" :key="index">
+						<template v-if="tab.index == index">
+							<el-button class="change-btn" @click="changeTab(item.to)">{{
+								item.label
+							}}</el-button>
 
-						<component :is="item.component" v-model="scope.data" height="300px" />
+							<component :is="item.component" v-model="scope.data" height="300px" />
+						</template>
 					</template>
 				</div>
 			</template>
@@ -150,7 +152,19 @@ const Upsert = useUpsert({
 				}
 			}
 		}
-	]
+	],
+
+	onOpened(isEdit, data) {
+		tab.index = null;
+
+		nextTick(() => {
+			if (isEdit) {
+				tab.index = /<*>/g.test(data.data) ? 1 : 0;
+			} else {
+				tab.index = 1;
+			}
+		});
+	}
 });
 
 // 切换编辑器
@@ -164,19 +178,6 @@ function changeTab(i: number) {
 		})
 		.catch(() => null);
 }
-
-// 打开后
-function onUpsertOpened(isEdit: boolean, data: any) {
-	tab.index = null;
-
-	nextTick(() => {
-		if (isEdit) {
-			tab.index = /<*>/g.test(data.data) ? 1 : 0;
-		} else {
-			tab.index = 1;
-		}
-	});
-}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/modules/base/views/role.vue b/src/modules/base/views/role.vue
index f8e808b..84a8230 100644
--- a/src/modules/base/views/role.vue
+++ b/src/modules/base/views/role.vue
@@ -23,7 +23,7 @@
 			<cl-pagination />
 		</el-row>
 
-		<cl-upsert ref="Upsert" @opened="onUpsertOpened">
+		<cl-upsert ref="Upsert">
 			<template #slot-relevance="{ scope }">
 				<el-switch
 					v-model="scope.relevance"
@@ -113,7 +113,11 @@ const Upsert = useUpsert({
 				name: "slot-relevance"
 			}
 		}
-	]
+	],
+
+	onOpened(_, data) {
+		onRelevanceChange(data.relevance || 0);
+	}
 });
 
 // cl-table 配置
@@ -164,9 +168,4 @@ function onRelevanceChange(val: number) {
 		checkStrictly: val == 0
 	});
 }
-
-// 打开后
-function onUpsertOpened(_: boolean, data: Eps.BaseSysRoleEntity) {
-	onRelevanceChange(data.relevance || 0);
-}
 </script>