Merge pull request #25 from Lemonnnnnnnnnnn/master

fix: 修复新增分类/接口报错的问题
Lemonnnnnnnnnnn · Mar 14, 2024 · acdff1e · acdff1e
2 parents 80c7de4 + e06a0da
commit acdff1e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/src/routes/type/components/ProjectTab/AddInterfaceModal.svelte b/src/routes/type/components/ProjectTab/AddInterfaceModal.svelte
@@ -28,16 +28,15 @@
 
 		try {
 			toast.push('正在获取接口信息...', toastTheme.success);
-			const interfaceDataItem = await invoke<SuccessResponse<InterfaceDataItem & { ts: string }>>(
-				'get_interface_detail',
-				{
-					data: {
-						token,
-						source_path: $sourcePath,
-						interface_id: Number(form.interface_id)
-					}
+			const interfaceDataItem = await invoke<
+				SuccessResponse<{ interface_data: InterfaceDataItem; ts: string }>
+			>('get_interface_detail', {
+				data: {
+					token,
+					source_path: $sourcePath,
+					interface_id: Number(form.interface_id)
 				}
-			).then((res) => res.data);
+			}).then((res) => res.data.interface_data);
 
 			if (isCategoryExist(interfaceDataItem.catid, categories)) {
 				toast.push(`接口所在分类已存在`, toastTheme.success);

diff --git a/src/routes/type/components/ProjectTab/Interface.svelte b/src/routes/type/components/ProjectTab/Interface.svelte
@@ -24,13 +24,16 @@
 
 	async function preview(interface_id: number) {
 		toast.push('正在获取接口信息...', toastTheme.success);
-		await invoke<SuccessResponse<InterfaceDataItem & { ts: string }>>('get_interface_detail', {
-			data: {
-				token,
-				source_path: $sourcePath,
-				interface_id
+		await invoke<SuccessResponse<{ interface_data: InterfaceDataItem; ts: string }>>(
+			'get_interface_detail',
+			{
+				data: {
+					token,
+					source_path: $sourcePath,
+					interface_id
+				}
 			}
-		})
+		)
 			.then((res) => {
 				$PreviewModalOpen = true;
 				$PreviewModalContent = res.data.ts;