From 60b2b2dcdf23ae17b98765052755dca46149c45b Mon Sep 17 00:00:00 2001
From: xvyv99 <xvyv99@163.com>
Date: Sun, 26 May 2024 14:28:45 +0800
Subject: [PATCH] 	modified:   package-lock.json 	modified:  
 package.json 	modified:   src/main.ts 	modified:  
 src/sve/GetMeaning.svelte

---
 package-lock.json         | 14 +++++++-------
 package.json              |  2 +-
 src/main.ts               |  2 +-
 src/sve/GetMeaning.svelte | 27 ++++++++++++++++++---------
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b764f30..55cf2be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
 				"svelte": "^4.2.8",
 				"svelte-preprocess": "^5.1.3",
 				"tslib": "2.4.0",
-				"typescript": "^5.3.3"
+				"typescript": "^5.4.5"
 			}
 		},
 		"node_modules/@aashutoshrathi/word-wrap": {
@@ -2560,9 +2560,9 @@
 			}
 		},
 		"node_modules/typescript": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
-			"integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+			"version": "5.4.5",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+			"integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
 			"dev": true,
 			"bin": {
 				"tsc": "bin/tsc",
@@ -4370,9 +4370,9 @@
 			"peer": true
 		},
 		"typescript": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
-			"integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+			"version": "5.4.5",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+			"integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
 			"dev": true
 		},
 		"uri-js": {
diff --git a/package.json b/package.json
index fe357ee..a14e3b6 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
 		"svelte": "^4.2.8",
 		"svelte-preprocess": "^5.1.3",
 		"tslib": "2.4.0",
-		"typescript": "^5.3.3"
+		"typescript": "^5.4.5"
 	},
 	"dependencies": {
 		"tsc": "^2.0.4"
diff --git a/src/main.ts b/src/main.ts
index 8c6147e..bd8ff28 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -155,7 +155,7 @@ export class GetMeaning extends Modal {
         props: {
           Vault: vault,
           Sel: this.Selection,
-          Path: DataPath
+          Path: DataPath,
         }
       });
     }
diff --git a/src/sve/GetMeaning.svelte b/src/sve/GetMeaning.svelte
index 6fc75d0..3b37480 100644
--- a/src/sve/GetMeaning.svelte
+++ b/src/sve/GetMeaning.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import {Notice} from "obsidian";
 	export let Vault;
 	export let Path: string; //数据文件的路径
 	export let Sel: string; //需要查找的词语
@@ -7,32 +8,40 @@
 		[key: string] : { [key: string]: string }
 	}; //词语存储类型
 
-	let SenseMap: Map<string, string> = new Map();
+	let Sense: Map<string, string>; //TODO:没办法删掉这行代码.
 	let Data: WordObject;
-	let WordExist: boolean;
+	let WordHit = new Map();
 	const { adapter } = Vault; //读写接口
 
 	init();
 
-	$: SenseMap = SenseMap
+	$: Sense = Sense //TODO:没办法删掉这行代码.
+	$: WordHit = WordHit
 
 	async function init() {
 		Data = JSON.parse(await adapter.read(Path));
-		WordExist = Sel in Data;
-		if (WordExist) {
-			SenseMap = new Map(Object.entries(Data[Sel]));
+		Sense = new Map(); //TODO:没办法删掉这行代码.
+		for (let key in Data) {
+			if (key.toLowerCase() == Sel.toLowerCase()) {
+				WordHit.set(key,Object.entries(Data[key]));
+			}
 		}
 	}
 </script>
 
 <h2>The Meaning of the Word "<span class="highlight">{Sel}</span>"</h2>
 
-{#if !WordExist}
+{#if WordHit.size==0}
 	Not found.
 {:else}
 	<ul>
-		{#each SenseMap as [key, value], i}
-			<li>Sense{i + 1} {value} {key}</li>
+		{#each WordHit.keys() as key,i}
+		<li>Hit{i + 1} {key}</li>
+			<ul>
+				{#each WordHit.get(key) as [meaning, type],j}
+				<li>Sense{j + 1} {type} {meaning}</li>
+				{/each}
+			</ul>
 		{/each}
 	</ul>
 {/if}