From f9ff57ff7250811e712bdc906f4c34add01477c7 Mon Sep 17 00:00:00 2001
From: SpecialX <47072643+wangxiner55@users.noreply.github.com>
Date: Tue, 24 Jun 2025 19:05:13 +0800
Subject: [PATCH] Finishddd

---
 Entities/Contracts/AppMainStruct.cs           |   4 +-
 Entities/DTO/AssignmentQuestionDto.cs         |   2 +-
 .../AuthProviders/TestAuthStateProvider.cs    |  23 -
 .../Content/AutoMapperProFile.cs              |  21 +
 TechHelper.Client/Exam/Exam.cs                | 241 ------
 .../Exam/ExamPaperExtensions .cs              | 251 +-----
 TechHelper.Client/Exam/ExamParse.cs           | 802 ++++++------------
 TechHelper.Client/Pages/Exam/ExamCreate.razor |  22 +-
 .../Pages/Exam/ParseRoleConfig.razor          | 163 ++--
 TechHelper.Client/Program.cs                  |   6 +-
 TechHelper.Client/Services/ExamService.cs     |   2 +-
 ...ner.cs => 20250624103910_init.Designer.cs} |   8 +-
 ...4030547_init.cs => 20250624103910_init.cs} |   6 +-
 .../ApplicationContextModelSnapshot.cs        |   6 +-
 .../Repositories/ExamRepository.cs            |   1 +
 15 files changed, 385 insertions(+), 1173 deletions(-)
 delete mode 100644 TechHelper.Client/AuthProviders/TestAuthStateProvider.cs
 create mode 100644 TechHelper.Client/Content/AutoMapperProFile.cs
 rename TechHelper.Server/Migrations/{20250624030547_init.Designer.cs => 20250624103910_init.Designer.cs} (99%)
 rename TechHelper.Server/Migrations/{20250624030547_init.cs => 20250624103910_init.cs} (99%)

diff --git a/Entities/Contracts/AppMainStruct.cs b/Entities/Contracts/AppMainStruct.cs
index 8fa68b5..5246b5c 100644
--- a/Entities/Contracts/AppMainStruct.cs
+++ b/Entities/Contracts/AppMainStruct.cs
@@ -70,8 +70,10 @@ namespace Entities.Contracts
 	public enum AssignmentStructType : byte
 	{
 		Question,
+		Composite,
 		Struct,
-		SubQuestion
+		SubQuestion,
+		Option
 	}
 
 }
diff --git a/Entities/DTO/AssignmentQuestionDto.cs b/Entities/DTO/AssignmentQuestionDto.cs
index 5068f76..5cb66a9 100644
--- a/Entities/DTO/AssignmentQuestionDto.cs
+++ b/Entities/DTO/AssignmentQuestionDto.cs
@@ -20,7 +20,7 @@ namespace Entities.DTO
 		public AssignmentStructType StructType { get; set; } = AssignmentStructType.Question;
 
 		public AssignmentQuestionDto? ParentAssignmentQuestion { get; set; }
-		public ICollection<AssignmentQuestionDto> ChildrenAssignmentQuestion { get; set; } = new List<AssignmentQuestionDto>();
+		public List<AssignmentQuestionDto> ChildrenAssignmentQuestion { get; set; } = new List<AssignmentQuestionDto>();
 
 		public QuestionDto? Question { get; set; }
 	}
diff --git a/TechHelper.Client/AuthProviders/TestAuthStateProvider.cs b/TechHelper.Client/AuthProviders/TestAuthStateProvider.cs
deleted file mode 100644
index 219578e..0000000
--- a/TechHelper.Client/AuthProviders/TestAuthStateProvider.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.AspNetCore.Components.Authorization;
-using System.Security.Claims;
-
-namespace TechHelper.Client.AuthProviders
-{
-	public class TestAuthStateProvider : AuthenticationStateProvider
-	{
-
-
-		public override async Task<AuthenticationState> GetAuthenticationStateAsync()
-		{
-			var claims = new List<Claim>
-			{
-				new Claim(ClaimTypes.Name, "John Doe"),
-				new Claim(ClaimTypes.Role, "Administrator")
-			};
-
-			var anonymous = new ClaimsIdentity();
-
-			return await Task.FromResult(new AuthenticationState(new ClaimsPrincipal(anonymous)));
-		}
-	}
-}
diff --git a/TechHelper.Client/Content/AutoMapperProFile.cs b/TechHelper.Client/Content/AutoMapperProFile.cs
new file mode 100644
index 0000000..aff8517
--- /dev/null
+++ b/TechHelper.Client/Content/AutoMapperProFile.cs
@@ -0,0 +1,21 @@
+using AutoMapper;
+using AutoMapper.Internal.Mappers;
+using Entities.Contracts;
+using Entities.DTO;
+using TechHelper.Client.Exam;
+
+namespace TechHelper.Context
+{
+	public class AutoMapperProFile : Profile
+	{
+		public AutoMapperProFile()
+		{
+			CreateMap<QuestionEx, QuestionDto>()
+				.ForMember(d => d.Options, o => o.MapFrom(s => string.Join(Environment.NewLine, s.Options.Select(op => op.Text))));
+			CreateMap<AssignmentQuestionEx, AssignmentQuestionDto>()
+				.ForMember(d=>d.Description, o=>o.Ignore());
+			CreateMap<AssignmentEx, AssignmentDto>();
+		}
+	}
+
+}
diff --git a/TechHelper.Client/Exam/Exam.cs b/TechHelper.Client/Exam/Exam.cs
index 26f6e50..a0141a5 100644
--- a/TechHelper.Client/Exam/Exam.cs
+++ b/TechHelper.Client/Exam/Exam.cs
@@ -5,245 +5,4 @@ using System.IO; // 用于 XML 反序列化
 
 namespace TechHelper.Client.Exam
 {
-
-	//[XmlRoot("EP")] 
-	//public class StringsList
-	//{
-
-	//	[XmlElement("Q")] 
-	//	public List<string> Items { get; set; }
-	//}
-
-	//// XML 根元素 <EP>
-	//[XmlRoot("EP")]
-	//public class ExamPaper
-	//{
-	//	// XML 特性：<QGs> 包含 <QG> 列表
-	//	[XmlArray("QGs")]
-	//	[XmlArrayItem("QG")]
-	//	[JsonProperty("QuestionGroups")]
-	//	public List<QuestionGroup> QuestionGroups { get; set; } = new List<QuestionGroup>();
-	//}
-
-	//[XmlRoot("QG")]
-	//public class QuestionGroup
-	//{
-	//	// JSON 特性
-	//	[JsonProperty("题号")]
-	//	// XML 特性：作为 <QG Id="X"> 属性
-	//	[XmlAttribute("Id")]
-	//	public byte Id { get; set; }
-
-	//	[JsonProperty("标题")]
-	//	[XmlElement("T")] // T for Title
-	//	public string Title { get; set; }
-
-	//	[JsonProperty("分值")]
-	//	[XmlAttribute("S")] // S for Score
-	//	public int Score { get; set; }
-
-	//	[JsonProperty("题目引用")]
-	//	[XmlElement("QR")] // QR for QuestionReference，作为 <QR> 元素
-	//	public string QuestionReference { get; set; } = ""; // 初始化为空字符串
-
-	//	[JsonProperty("子题目")]
-	//	[XmlArray("SQs")] // SQs 包含 <SQ> 列表
-	//	[XmlArrayItem("SQ")]
-	//	public List<SubQuestion> SubQuestions { get; set; } = new List<SubQuestion>();
-
-	//	[JsonProperty("子题组")]
-	//	[XmlArray("SQGs")] // SQGs 包含 <QG> 列表 (嵌套题组)
-	//	[XmlArrayItem("QG")]
-	//	public List<QuestionGroup> SubQuestionGroups { get; set; } = new List<QuestionGroup>();
-	//}
-
-	//// 子题目类
-	//public class SubQuestion
-	//{
-
-	//	[JsonProperty("子题号")]
-	//	[XmlAttribute("Id")] // Id for SubId
-	//	public byte SubId { get; set; }
-
-	//	[JsonProperty("题干")]
-	//	[XmlElement("T")] // T for Text (Stem)
-	//	public string Stem { get; set; }
-
-	//	[JsonProperty("分值")]
-	//	[XmlAttribute("S")] // S for Score
-	//	public int Score { get; set; } // 分值通常为整数
-
-	//	[JsonProperty("选项")]
-	//	[XmlArray("Os")] // Os 包含 <O> 列表
-	//	[XmlArrayItem("O")]
-	//	public List<Option> Options { get; set; } = new List<Option>();
-
-	//	[JsonProperty("示例答案")]
-	//	[XmlElement("SA")] // SA for SampleAnswer
-	//	public string SampleAnswer { get; set; } = "";
-	//}
-
-	//// 选项类，用于适配 <O V="X"/> 结构
-	//public class Option
-	//{
-	//	// XML 特性：作为 <O V="X"> 属性
-	//	[XmlAttribute("V")] // V for Value
-	//						// JSON 特性：如果 JSON 中的选项是 {"Value": "A"} 这样的对象，则需要 JsonProperty("Value")
-	//						// 但如果 JSON 选项只是 ["A", "B"] 这样的字符串数组，则此Option类不适合JSON Options
-	//						// 需要明确你的JSON Options的结构。我假设你JSON Options是 List<string>
-	//						// 如果是 List<string>，则Options属性在SubQuestion中直接是List<string>，Option类则不需要
-	//						// 但根据你的精简XML需求，Option类是必要的。
-	//						// 所以这里需要你自己根据实际JSON Options结构选择。
-	//						// 为了兼容XML，我会保留Option类，但如果JSON是List<string>，Options属性会很复杂
-	//	public string Value { get; set; }
-	//}
-
-	//// 独立的服务类来处理序列化和反序列化
-	//public static class ExamParser
-	//{
-	//	// JSON 反序列化方法
-	//	public static List<T> ParseExamJson<T>(string jsonContent)
-	//	{
-	//		string cleanedJson = jsonContent.Trim();
-
-	//		// 移除可能存在的 Markdown 代码块标记
-	//		if (cleanedJson.StartsWith("```json") && cleanedJson.EndsWith("```"))
-	//		{
-	//			cleanedJson = cleanedJson.Substring("```json".Length, cleanedJson.Length - "```json".Length - "```".Length).Trim();
-	//		}
-	//		// 移除可能存在的单引号包围（如果 AI 偶尔会这样输出）
-	//		if (cleanedJson.StartsWith("'") && cleanedJson.EndsWith("'"))
-	//		{
-	//			cleanedJson = cleanedJson.Substring(1, cleanedJson.Length - 2).Trim();
-	//		}
-
-	//		try
-	//		{
-	//			// 注意：这里假设你的 JSON 根直接是一个 QuestionGroup 列表
-	//			// 如果你的 JSON 根是 { "QuestionGroups": [...] }，则需要先反序列化到 ExamPaper
-	//			List<T> examQuestions = JsonConvert.DeserializeObject<List<T>>(cleanedJson);
-	//			return examQuestions;
-	//		}
-	//		catch (JsonSerializationException ex)
-	//		{
-	//			Console.WriteLine($"JSON 反序列化错误: {ex.Message}");
-	//			Console.WriteLine($"内部异常: {ex.InnerException?.Message}");
-	//			return null;
-	//		}
-	//		catch (Exception ex)
-	//		{
-	//			Console.WriteLine($"处理错误: {ex.Message}");
-	//			return null;
-	//		}
-	//	}
-
-
-
-	//	#region TEST
-	//	[XmlRoot("User")]
-	//	public class User
-	//	{
-	//		[XmlAttribute("id")]
-	//		public string Id { get; set; }
-
-	//		[XmlElement("PersonalInfo")]
-	//		public PersonalInfo PersonalInfo { get; set; }
-
-	//		[XmlArray("Roles")] // 包装元素 <Roles>
-	//		[XmlArrayItem("Role")] // 集合中的每个项是 <Role>
-	//		public List<Role> Roles { get; set; } = new List<Role>();
-
-	//		// 构造函数，方便测试
-	//		public User() { }
-	//	}
-
-	//	public class PersonalInfo
-	//	{
-	//		[XmlElement("FullName")]
-	//		public string FullName { get; set; }
-
-	//		[XmlElement("EmailAddress")]
-	//		public string EmailAddress { get; set; }
-
-	//		// 构造函数，方便测试
-	//		public PersonalInfo() { }
-	//	}
-
-	//	public class Role
-	//	{
-	//		[XmlAttribute("type")]
-	//		public string Type { get; set; }
-
-	//		// 构造函数，方便测试
-	//		public Role() { }
-	//	}
-	//	#endregion
-
-	//	// XML 反序列化方法
-	//	public static T ParseExamXml<T>(string xmlContent)
-	//	{
-	//		string cleanedXml = xmlContent.Trim();
-	//		if (cleanedXml.StartsWith("'") && cleanedXml.EndsWith("'"))
-	//		{
-	//			cleanedXml = cleanedXml.Substring(1, cleanedXml.Length - 2);
-	//		}
-	//		if (cleanedXml.StartsWith("```xml") && cleanedXml.EndsWith("```"))
-	//		{
-	//			cleanedXml = cleanedXml.Substring("```xml".Length, cleanedXml.Length - "```xml".Length - "```".Length).Trim();
-	//		}
-
-	//		XmlSerializer serializer = new XmlSerializer(typeof(T));
-
-	//		using (StringReader reader = new StringReader(cleanedXml))
-	//		{
-	//			try
-	//			{
-	//				T user = (T)serializer.Deserialize(reader);
-	//				return user;
-	//			}
-	//			catch (InvalidOperationException ex)
-	//			{
-	//				Console.WriteLine($"XML 反序列化操作错误: {ex.Message}");
-	//				Console.WriteLine($"内部异常: {ex.InnerException?.Message}");
-	//				return default(T);
-	//			}
-	//			catch (Exception ex)
-	//			{
-	//				Console.WriteLine($"处理错误: {ex.Message}");
-	//				return default(T);
-	//			}
-	//		}
-	//	}
-
-	//	public static List<QuestionGroup> ParseExamXmlFormQG(string xmlContent)
-	//	{
-	//		// 移除可能存在的 Markdown 代码块标记
-	//		if (xmlContent.StartsWith("```xml") && xmlContent.EndsWith("```"))
-	//		{
-	//			xmlContent = xmlContent.Substring("```xml".Length, xmlContent.Length - "```xml".Length - "```".Length).Trim();
-	//		}
-
-	//		var serializer = new XmlSerializer(typeof(List<QuestionGroup>), new XmlRootAttribute("QGs"));
-
-	//		using (StringReader reader = new StringReader(xmlContent))
-	//		{
-	//			try
-	//			{
-	//				List<QuestionGroup> questionGroups = (List<QuestionGroup>)serializer.Deserialize(reader);
-	//				return questionGroups;
-	//			}
-	//			catch (InvalidOperationException ex)
-	//			{
-	//				Console.WriteLine($"XML 反序列化操作错误: {ex.Message}");
-	//				Console.WriteLine($"内部异常: {ex.InnerException?.Message}");
-	//				return null;
-	//			}
-	//			catch (Exception ex)
-	//			{
-	//				Console.WriteLine($"处理错误: {ex.Message}");
-	//				return null;
-	//			}
-	//		}
-	//	}
-	//}
 }
\ No newline at end of file
diff --git a/TechHelper.Client/Exam/ExamPaperExtensions .cs b/TechHelper.Client/Exam/ExamPaperExtensions .cs
index f98dbb7..699b1f5 100644
--- a/TechHelper.Client/Exam/ExamPaperExtensions .cs	
+++ b/TechHelper.Client/Exam/ExamPaperExtensions .cs	
@@ -3,75 +3,12 @@ using System.Text.Json.Serialization;
 using System.Text.Json;
 using Entities.Contracts;
 using Microsoft.Extensions.Options;
+using AutoMapper;
 
 namespace TechHelper.Client.Exam
 {
-	public class ParentStructInfo
-	{
-		public string Number { get; set; }
-		public SubjectAreaEnum SubjectArea { get; set; }
-		public byte Index { get; set; }
-	}
-
 	public static class ExamPaperExtensions
 	{
-		public static AssignmentDto ConvertToExamDTO(this ExamPaper examPaper)
-		{
-			AssignmentDto dto = new AssignmentDto();
-
-			dto.Title = examPaper.AssignmentTitle;
-			dto.Description = examPaper.Description;
-
-			var SubjectArea = SubjectAreaEnum.Literature;
-			Enum.TryParse<SubjectAreaEnum>(examPaper.SubjectArea, out SubjectArea);
-			dto.SubjectArea = SubjectArea;
-
-			AssignmentQuestionDto examStruct = new AssignmentQuestionDto();
-
-			foreach (var qg in examPaper.QuestionGroups)
-			{
-				examStruct.ChildrenAssignmentQuestion.Add(ParseMajorQuestionGroup(qg));
-				examStruct.ChildrenAssignmentQuestion.Last().Index = (byte)(examStruct.ChildrenAssignmentQuestion.Count());
-			}
-
-			dto.ExamStruct = examStruct;
-
-			return dto;
-		}
-
-		private static AssignmentQuestionDto ParseMajorQuestionGroup(MajorQuestionGroup sqg)
-		{
-			var examStruct = new AssignmentQuestionDto();
-			examStruct.Title = sqg.Title;
-			examStruct.Score = sqg.Score;
-			if (sqg.SubQuestionGroups != null)
-			{
-
-
-				examStruct.ChildrenAssignmentQuestion = new List<AssignmentQuestionDto>();
-				sqg.SubQuestionGroups?.ForEach(ssqg =>
-				{
-						examStruct.ChildrenAssignmentQuestion.Add(ParseMajorQuestionGroup(ssqg));
-						examStruct.ChildrenAssignmentQuestion.Last().Index = (byte)(examStruct.ChildrenAssignmentQuestion.Count());
-
-				});
-
-			}
-
-
-			if (sqg.SubQuestions != null)
-			{
-
-				sqg.SubQuestions?.ForEach(sq =>
-				{
-					examStruct.ChildrenAssignmentQuestion.Add(ParseAssignmentQuestion(sq));
-					examStruct.ChildrenAssignmentQuestion.Last().Index = (byte)(examStruct.ChildrenAssignmentQuestion.Count());
-				});
-			}
-
-			return examStruct;
-		}
-
 
 		public static List<string> ParseOptionsFromText(this string optionsText)
 		{
@@ -79,197 +16,21 @@ namespace TechHelper.Client.Exam
 				.Where(line => !string.IsNullOrWhiteSpace(line)).ToList();
 		}
 
-
-		private static AssignmentQuestionDto ParseAssignmentQuestion(PaperQuestion sq)
-		{
-			var aq = new AssignmentQuestionDto();
-			aq.Score = sq.Score;
-
-			aq.Question = ParseQuestion(sq);
-
-			sq.SubQuestions?.ForEach(ssq =>
-			{
-
-				aq.ChildrenAssignmentQuestion.Add(ParseAssignmentQuestion(ssq));
-				aq.ChildrenAssignmentQuestion.Last().Index = (byte)aq.ChildrenAssignmentQuestion.Count;
-
-			});
-
-			return aq;
-		}
-
-		private static QuestionDto ParseQuestion(PaperQuestion sq)
-		{
-			var dq = new QuestionDto();
-			dq.Title = sq.Stem;
-			dq.Options = string.Join(Environment.NewLine, sq.Options.Select(opt => $"{opt.Label} {opt.Text}"));
-
-			return dq;
-		}
-
-		private static void ParseMajorQuestionGroup(MajorQuestionGroup qg, QuestionGroupDto qgd, bool isParentGroupValidChain)
-		{
-			qgd.Title = qg.Title;
-			qgd.Score = (int)qg.Score;
-			qgd.Descript = qg.Descript;
-
-
-			qgd.ValidQuestionGroup = !string.IsNullOrEmpty(qg.Descript) && !isParentGroupValidChain;
-
-
-			bool nextIsParentGroupValidChain = qgd.ValidQuestionGroup || isParentGroupValidChain;
-
-
-			if (qg.SubQuestionGroups != null)
-			{
-				qg.SubQuestionGroups.ForEach(sqg =>
-				{
-					var sqgd = new QuestionGroupDto();
-					sqgd.Index = (byte)qg.SubQuestionGroups.IndexOf(sqg);
-					ParseMajorQuestionGroup(sqg, sqgd, nextIsParentGroupValidChain);
-					qgd.SubQuestionGroups.Add(sqgd);
-				});
-			}
-
-			if (qg.SubQuestions != null)
-			{
-				qg.SubQuestions.ForEach(sq =>
-				{
-					if (sq.SubQuestions != null && sq.SubQuestions.Any())
-					{
-						var subQgd = new QuestionGroupDto
-						{
-							Title = sq.Stem,
-							Index = (byte)qg.SubQuestions.IndexOf(sq),
-							Score = (int)sq.Score,
-							Descript = "" // 默认为空
-						};
-						subQgd.ValidQuestionGroup = !string.IsNullOrEmpty(subQgd.Descript) && !nextIsParentGroupValidChain;
-
-						ParseQuestionWithSubQuestions(sq, subQgd, subQgd.ValidQuestionGroup || nextIsParentGroupValidChain);
-						qgd.SubQuestionGroups.Add(subQgd);
-					}
-					else // 如果 MajorQuestionGroup 下的 Question 没有子问题，则转为 SubQuestionDto
-					{
-						var subQd = new SubQuestionDto();
-						// 只有当所有父组（包括当前组）都不是有效组时，这个题目才有效
-						ParseSingleQuestion(sq, subQd, !nextIsParentGroupValidChain);
-						subQd.Index = (byte)qg.SubQuestions.IndexOf(sq);
-						qgd.SubQuestions.Add(subQd);
-					}
-				});
-			}
-		}
-
-		// 解析包含子问题的 Question，将其转换为 QuestionGroupDto
-		// isParentGroupValidChain 参数表示从顶层到当前组的任一父组是否已经是“有效组”
-		private static void ParseQuestionWithSubQuestions(PaperQuestion question, QuestionGroupDto qgd, bool isParentGroupValidChain)
-		{
-			qgd.Title = question.Stem;
-			qgd.Score = (int)question.Score;
-			qgd.Descript = ""; // 默认为空
-
-			// 判断当前组是否有效：如果有描述，并且其父级链中没有任何一个组是有效组，则当前组有效
-			qgd.ValidQuestionGroup = !string.IsNullOrEmpty(qgd.Descript) && !isParentGroupValidChain;
-
-			// 更新传递给子项的 isParentGroupValidChain 状态
-			bool nextIsParentGroupValidChain = qgd.ValidQuestionGroup || isParentGroupValidChain;
-
-
-			if (question.SubQuestions != null)
-			{
-				question.SubQuestions.ForEach(subQ =>
-				{
-					// 如果子问题本身还有子问题（多层嵌套），则继续创建 QuestionGroupDto
-					if (subQ.SubQuestions != null && subQ.SubQuestions.Any())
-					{
-						var nestedQgd = new QuestionGroupDto
-						{
-							Title = subQ.Stem,
-							Score = (int)subQ.Score,
-							Descript = "" // 默认为空
-						};
-						// 判断当前组是否有效：如果有描述，并且其父级链中没有任何一个组是有效组，则当前组有效
-						nestedQgd.ValidQuestionGroup = !string.IsNullOrEmpty(nestedQgd.Descript) && !nextIsParentGroupValidChain;
-
-						ParseQuestionWithSubQuestions(subQ, nestedQgd, nestedQgd.ValidQuestionGroup || nextIsParentGroupValidChain);
-						qgd.SubQuestionGroups.Add(nestedQgd);
-					}
-					else // 如果子问题没有子问题，则直接创建 SubQuestionDto
-					{
-						var subQd = new SubQuestionDto();
-						// 只有当所有父组（包括当前组）都不是有效组时，这个题目才有效
-						ParseSingleQuestion(subQ, subQd, !nextIsParentGroupValidChain);
-						qgd.SubQuestions.Add(subQd);
-					}
-				});
-			}
-		}
-
-		// 解析单个 Question (没有子问题) 为 SubQuestionDto
-		private static void ParseSingleQuestion(PaperQuestion question, SubQuestionDto subQd, bool validQ)
-		{
-			subQd.Stem = question.Stem;
-			subQd.Score = (int)question.Score;
-			subQd.ValidQuestion = validQ; // 根据传入的 validQ 确定是否是“有效题目”
-			subQd.SampleAnswer = question.SampleAnswer;
-			subQd.QuestionType = question.QuestionType;
-			// 注意：DifficultyLevel 在本地 Question 中没有，如果服务器需要，可能需要补充默认值或从其他地方获取
-			// subQd.DifficultyLevel = ...;
-
-			if (question.Options != null)
-			{
-				question.Options.ForEach(o =>
-				{
-					subQd.Options.Add(new OptionDto { Value = o.Label + o.Text });
-				});
-			}
-		}
-
-
-		public static void SeqIndex(this ExamDto dto)
+		public static void SeqIndex(this AssignmentDto dto)
 		{
 			dto.ExamStruct.SeqQGroupIndex();
 		}
 
 
-		public static void SeqQGroupIndex(this QuestionGroupDto dto)
+		public static void SeqQGroupIndex(this AssignmentQuestionDto dto)
 		{
-			dto.SubQuestions?.ForEach(sq =>
-			{
-				sq.Index = (byte)dto.SubQuestions.IndexOf(sq);
-			});
 
-			dto.SubQuestionGroups?.ForEach(sqg =>
+			foreach(var sqg in dto.ChildrenAssignmentQuestion)
 			{
-				sqg.Index = (byte)dto.SubQuestionGroups.IndexOf(sqg);
+				sqg.Index = (byte)dto.ChildrenAssignmentQuestion.IndexOf(sqg);
 				sqg.SeqQGroupIndex();
-			});
-		}
 
-
-		public static string SerializeExamDto(this ExamDto dto)
-		{
-			// 配置序列化选项（可选）
-			var options = new JsonSerializerOptions
-			{
-				WriteIndented = true,
-				PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-				DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-			};
-
-			return JsonSerializer.Serialize(dto, options);
-		}
-
-		public static ExamDto DeserializeExamDto(string jsonString)
-		{
-
-			var options = new JsonSerializerOptions
-			{
-				PropertyNamingPolicy = JsonNamingPolicy.CamelCase
-			};
-
-			return JsonSerializer.Deserialize<ExamDto>(jsonString, options);
+			}
 		}
 
 	}
diff --git a/TechHelper.Client/Exam/ExamParse.cs b/TechHelper.Client/Exam/ExamParse.cs
index 63860e9..a59dad0 100644
--- a/TechHelper.Client/Exam/ExamParse.cs
+++ b/TechHelper.Client/Exam/ExamParse.cs
@@ -1,18 +1,24 @@
-using Entities.DTO;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using Entities.Contracts; // 假设这些实体合约仍然是必需的
 using System.Text.RegularExpressions;
+using System.Text;
 
 namespace TechHelper.Client.Exam
 {
-	
+	public enum ParseErrorType
+	{
+		Validation = 1,
+		DataParsing = 2,
+		Structural = 3,
+		RegexMatchIssue = 4,
+		UnexpectedError = 5
+	}
+
 	public class ParseError
 	{
 		public ParseErrorType Type { get; }
 		public string Message { get; }
-		public int? Index { get; } 
-		public string MatchedText { get; } 
+		public int? Index { get; }
+		public string MatchedText { get; }
 		public Exception InnerException { get; }
 
 		public ParseError(ParseErrorType type, string message, int? index = null, string matchedText = null, Exception innerException = null)
@@ -26,7 +32,7 @@ namespace TechHelper.Client.Exam
 
 		public override string ToString()
 		{
-			var sb = new System.Text.StringBuilder();
+			var sb = new StringBuilder();
 			sb.Append($"[{Type}] {Message}");
 			if (Index.HasValue) sb.Append($" (Index: {Index.Value})");
 			if (!string.IsNullOrEmpty(MatchedText)) sb.Append($" (MatchedText: '{MatchedText}')");
@@ -35,47 +41,32 @@ namespace TechHelper.Client.Exam
 		}
 	}
 
-	public enum ParseErrorType
+	public class AssignmentEx
 	{
-		Validation = 1,          // 输入验证失败
-		DataParsing = 2,         // 数据解析失败（如数字转换）
-		Structural = 3,          // 结构性问题（如选项没有对应的问题）
-		RegexMatchIssue = 4,     // 正则表达式匹配结果不符合预期
-		UnexpectedError = 5      // 未预料到的通用错误
-	}
-
-
-	public class ExamPaper
-	{
-		public string AssignmentTitle { get; set; } = "未识别试卷标题";
-		public string Description { get; set; } = "未识别试卷描述";
-		public string SubjectArea { get; set; } = "试卷类别";
-		public List<MajorQuestionGroup> QuestionGroups { get; set; } = new List<MajorQuestionGroup>();
-		public List<PaperQuestion> TopLevelQuestions { get; set; } = new List<PaperQuestion>();
+		public string Title { get; set; } = "Title";
+		public string Description { get; set; } = "Description";
+		public SubjectAreaEnum SubjectArea { get; set; } = SubjectAreaEnum.Unknown;
+		public AssignmentQuestionEx ExamStruct { get; set; } = new AssignmentQuestionEx();
 		public List<ParseError> Errors { get; set; } = new List<ParseError>();
 	}
 
-	public class MajorQuestionGroup
+	public class AssignmentQuestionEx
 	{
 		public string Title { get; set; } = string.Empty;
-		public string Descript { get; set; } = string.Empty;
+		public string Description { get; set; } = string.Empty;
+		public byte Index { get; set; } = 0;
 		public float Score { get; set; }
-		public List<MajorQuestionGroup> SubQuestionGroups { get; set; } = new List<MajorQuestionGroup>();
-		public List<PaperQuestion> SubQuestions { get; set; } = new List<PaperQuestion>();
+		public QuestionEx? Question { get; set; }
+		public AssignmentStructType Type { get; set; }
+		public List<AssignmentQuestionEx> ChildrenAssignmentQuestion { get; set; } = new List<AssignmentQuestionEx>();
 		public int Priority { get; set; }
-		public bool bGroup { get; set; } = true;
 	}
 
-	public class PaperQuestion
+	public class QuestionEx
 	{
-		public string Number { get; set; } = string.Empty;
-		public string Stem { get; set; } = string.Empty;
-		public float Score { get; set; }
+		public string Title { get; set; } = string.Empty;
+		public string Answer { get; set; } = string.Empty;
 		public List<Option> Options { get; set; } = new List<Option>();
-		public List<PaperQuestion> SubQuestions { get; set; } = new List<PaperQuestion>();
-		public string SampleAnswer { get; set; } = string.Empty;
-		public string QuestionType { get; set; } = string.Empty;
-		public int Priority { get; set; }
 	}
 
 	public class Option
@@ -90,155 +81,116 @@ namespace TechHelper.Client.Exam
 	/// </summary>
 	public class RegexPatternConfig
 	{
-		public string Pattern { get; set; } // 正则表达式字符串
-		public int Priority { get; set; }    // 优先级，数字越小优先级越高
-		public Regex Regex { get; private set; } // 编译后的Regex对象，用于性能优化
+		public string Pattern { get; set; }
+		public int Priority { get; set; }
+		public AssignmentStructType Type { get; set; }
+		public Regex Regex { get; private set; }
 
-		public RegexPatternConfig(string pattern, int priority)
+		public RegexPatternConfig(string pattern, int priority, AssignmentStructType type = AssignmentStructType.Question)
 		{
 			Pattern = pattern;
 			Priority = priority;
-			Regex = new Regex(pattern, RegexOptions.Multiline | RegexOptions.Compiled); // 多行模式，编译以提高性能
+			Type = type;
+			Regex = new Regex(pattern, RegexOptions.Multiline | RegexOptions.Compiled);
 		}
 	}
 
-	public enum ExamParserEnum
-	{
-		MajorQuestionGroupPatterns = 0,
-		QuestionPatterns,
-		OptionPatterns
-	}
-
 	/// <summary>
 	/// 试卷解析的配置类，包含所有正则表达式
 	/// </summary>
 	public class ExamParserConfig
 	{
-		public List<RegexPatternConfig> MajorQuestionGroupPatterns { get; set; } = new List<RegexPatternConfig>();
 		public List<RegexPatternConfig> QuestionPatterns { get; set; } = new List<RegexPatternConfig>();
 		public List<RegexPatternConfig> OptionPatterns { get; set; } = new List<RegexPatternConfig>();
+		public Regex ScoreRegex { get; private set; } // 独立的得分正则表达式
 
 		public ExamParserConfig()
 		{
-			MajorQuestionGroupPatterns.Add(new RegexPatternConfig(@"^([一二三四五六七八九十]+)[、\.]\s*(.+?)(?:\s*\(((\d+(?:\.\d+)?))\s*分\))?\s*$", 1));
-			QuestionPatterns.Add(new RegexPatternConfig(@"^\(([一二三四五六七八九十]{1,2}|十[一二三四五六七八九])\)\s*(.+?)(?:\s*\(((\d+(?:\.\d+)?))\s*分\))?\s*$", 1));
+			// 题目/题组模式：只匹配行开头，并按优先级区分
+			// Group 1: 编号部分
+			// Group 2: 题目/题组标题内容
+
+			// 例如：一. 这是大题一
+			QuestionPatterns.Add(new RegexPatternConfig(@"^([一二三四五六七八九十]+)[.\、]\s*(.+)", 1, AssignmentStructType.Struct));
+
+			// 例如：(一) 这是第一子题组
+			QuestionPatterns.Add(new RegexPatternConfig(@"^\(([一二三四五六七八九十]{1,2}|十[一二三四五六七八九])\)\s*(.+)", 2, AssignmentStructType.Composite));
+
+			// 例如：1. 这是第一道题目 或 1 这是第一道题目
+			QuestionPatterns.Add(new RegexPatternConfig(@"^(\d+)\.?\s*(.+)", 3, AssignmentStructType.Question));
+
+			// 例如：(1). 这是小问一 或 (1) 这是小问一
+			QuestionPatterns.Add(new RegexPatternConfig(@"^\((\d+)\)\.?\s*(.+)", 4, AssignmentStructType.Question));
+
+			// 例如：① 这是另一种小问 或 ①. 这是另一种小问 (如果 ① 后面会跟点，这个更通用)
+			// 如果 ① 后面通常没有点，但您希望它也能匹配，则保留原样或根据实际情况调整
+			QuestionPatterns.Add(new RegexPatternConfig(@"^[①②③④⑤⑥⑦⑧⑨⑩]+\.?\s*(.+)", 5, AssignmentStructType.Question));
 
 
-			// 模式 1: "1. 这是一个题目 (5分)" 或 "1. 这是一个题目"
-			QuestionPatterns.Add(new RegexPatternConfig(@"^(\d+)\.\s*(.+?)(?:\s*\(((\d+(?:\.\d+)?))\s*分\))?\s*$", 2));
 
-			// 模式 2: "(1) 这是一个子题目 (3分)" 或 "(1) 这是一个子题目"
-			QuestionPatterns.Add(new RegexPatternConfig(@"^\((\d+)\)\s*(.+?)(?:\s*\(((\d+(?:\.\d+)?))\s*分\))?\s*$", 3));
-
-			// 模式 3: "① 这是一个更深层次的子题目 (2分)" 或 "① 这是一个更深层次的子题目"
-			QuestionPatterns.Add(new RegexPatternConfig(@"^[①②③④⑤⑥⑦⑧⑨⑩]+\s*(.+?)(?:\s*\(((\d+(?:\.\d+)?))\s*分\))?\s*$", 4));
-
-
-			OptionPatterns.Add(new RegexPatternConfig(@"([A-Z]\.)\s*(.*?)(?=[A-Z]\.|$)", 1)); // 大写字母选项
-			OptionPatterns.Add(new RegexPatternConfig(@"([a-z]\.)\s*(.*?)(?=[a-z]\.|$)", 1)); // 小写字母选项
+			// 选项模式 (保持不变，使用 AssignmentStructType.Option 区分)
+			OptionPatterns.Add(new RegexPatternConfig(@"([A-Z]\.)\s*(.*?)(?=[A-Z]\.|$)", 1, AssignmentStructType.Option));
+			OptionPatterns.Add(new RegexPatternConfig(@"([a-z]\.)\s*(.*?)(?=[a-z]\.|$)", 2, AssignmentStructType.Option));
 
+			// 独立的得分正则表达式：匹配行末尾的 "(X分)" 格式
+			// Group 1: 捕获分数（如 "10" 或 "0.5"）
+			ScoreRegex = new Regex(@"(?:\s*\(((\d+(?:\.\d+)?))\s*分\)\s*$)", RegexOptions.Multiline | RegexOptions.Compiled);
 		}
 	}
 
-
 	public class PotentialMatch
 	{
 		public int StartIndex { get; set; }
-		public int EndIndex { get; set; } // 匹配到的结构在原始文本中的结束位置
-		public string MatchedText { get; set; } // 匹配到的完整行或段落
-		public Match RegexMatch { get; set; } // 原始的Regex.Match对象，方便获取捕获组
-		public RegexPatternConfig PatternConfig { get; set; } // 匹配到的模式配置
-		public MatchType Type { get; set; } // 枚举：MajorQuestionGroup, Question, Option, etc.
+		public int EndIndex { get; set; }
+		public string MatchedText { get; set; }
+		public Match RegexMatch { get; set; }
+		public RegexPatternConfig PatternConfig { get; set; }
 	}
 
-	public enum MatchType
-	{
-		MajorQuestionGroup,
-		Question,
-		Option,
-		Other // 如果有其他需要识别的类型
-	}
-
-
-	/// <summary>
-	/// 负责扫描原始文本，收集所有潜在的匹配项（题组、题目、选项）。
-	/// 它只进行匹配，不进行结构化归属。
-	/// </summary>
 	public class ExamDocumentScanner
 	{
 		private readonly ExamParserConfig _config;
 
 		public ExamDocumentScanner(ExamParserConfig config)
 		{
-			_config = config ?? throw new ArgumentNullException(nameof(config)); // 确保配置不为空
+			_config = config ?? throw new ArgumentNullException(nameof(config));
 		}
 
-		/// <summary>
-		/// 扫描给定的文本，返回所有潜在的匹配项，并按起始位置排序。
-		/// </summary>
-		/// <param name="text">要扫描的文本</param>
-		/// <returns>所有匹配到的 PotentialMatch 列表</returns>
-		public List<PotentialMatch> Scan(string text)
+		public List<PotentialMatch> Scan(string text, List<ParseError> errors)
 		{
 			if (string.IsNullOrEmpty(text))
 			{
-				return new List<PotentialMatch>(); // 对于空文本，直接返回空列表
+				return new List<PotentialMatch>();
 			}
 
 			var allPotentialMatches = new List<PotentialMatch>();
+			var allPatternConfigs = new List<RegexPatternConfig>();
+			allPatternConfigs.AddRange(_config.QuestionPatterns);
+			allPatternConfigs.AddRange(_config.OptionPatterns);
 
-			// 扫描所有题组模式
-			foreach (var patternConfig in _config.MajorQuestionGroupPatterns)
+			foreach (var patternConfig in allPatternConfigs)
 			{
-				foreach (Match match in patternConfig.Regex.Matches(text))
+				try
 				{
-					allPotentialMatches.Add(new PotentialMatch
+					foreach (Match match in patternConfig.Regex.Matches(text))
 					{
-						StartIndex = match.Index,
-						EndIndex = match.Index + match.Length,
-						MatchedText = match.Value,
-						RegexMatch = match,
-						PatternConfig = patternConfig,
-						Type = MatchType.MajorQuestionGroup
-					});
+						allPotentialMatches.Add(new PotentialMatch
+						{
+							StartIndex = match.Index,
+							EndIndex = match.Index + match.Length,
+							MatchedText = match.Value,
+							RegexMatch = match,
+							PatternConfig = patternConfig,
+						});
+					}
+				}
+				catch (Exception ex)
+				{
+					errors.Add(new ParseError(ParseErrorType.UnexpectedError,
+						$"An error occurred during regex matching for pattern: '{patternConfig.Pattern}'.",
+						innerException: ex));
 				}
 			}
-
-			// 扫描所有题目模式
-			foreach (var patternConfig in _config.QuestionPatterns)
-			{
-				foreach (Match match in patternConfig.Regex.Matches(text))
-				{
-					allPotentialMatches.Add(new PotentialMatch
-					{
-						StartIndex = match.Index,
-						EndIndex = match.Index + match.Length,
-						MatchedText = match.Value,
-						RegexMatch = match,
-						PatternConfig = patternConfig,
-						Type = MatchType.Question
-					});
-				}
-			}
-
-			// 扫描所有选项模式
-			foreach (var patternConfig in _config.OptionPatterns)
-			{
-				foreach (Match match in patternConfig.Regex.Matches(text))
-				{
-					allPotentialMatches.Add(new PotentialMatch
-					{
-						StartIndex = match.Index,
-						EndIndex = match.Index + match.Length,
-						MatchedText = match.Value,
-						RegexMatch = match,
-						PatternConfig = patternConfig,
-						Type = MatchType.Option
-					});
-				}
-			}
-
-			// 统一按起始位置排序
 			return allPotentialMatches.OrderBy(pm => pm.StartIndex).ToList();
 		}
 	}
@@ -252,35 +204,8 @@ namespace TechHelper.Client.Exam
 			_config = config ?? throw new ArgumentNullException(nameof(config), "ExamParserConfig cannot be null.");
 		}
 
-
-
-		/// 
-		/// 一.基础
-		///		1.听写
-		///		2.阅读
-		///	二.提升
-		///		1.阅读
-		///			(1).选择
-		///			(2).填空
-		/// 三.写
-		///		(一)课文
-		///		
-		///
-		///
-
-
-		/// <summary>
-		/// Builds the ExamPaper structure from raw text and potential matches.
-		/// Collects and returns parsing errors encountered during the process.
-		/// </summary>
-		/// <param name="fullExamText">The complete text of the exam paper.</param>
-		/// <param name="allPotentialMatches">A list of all identified potential matches.</param>
-		/// <returns>An ExamPaper object containing the parsed structure and a list of errors.</returns>
-		/// <exception cref="ArgumentException">Thrown if fullExamText is null or empty.</exception>
-		/// <exception cref="ArgumentNullException">Thrown if allPotentialMatches is null.</exception>
-		public ExamPaper BuildExam(string fullExamText, List<PotentialMatch> allPotentialMatches)
+		public AssignmentEx BuildExam(string fullExamText, List<PotentialMatch> allPotentialMatches)
 		{
-			// 核心输入验证仍然是必要的，因为这些错误是无法恢复的
 			if (string.IsNullOrWhiteSpace(fullExamText))
 			{
 				throw new ArgumentException("Full exam text cannot be null or empty.", nameof(fullExamText));
@@ -290,270 +215,79 @@ namespace TechHelper.Client.Exam
 				throw new ArgumentNullException(nameof(allPotentialMatches), "Potential matches list cannot be null.");
 			}
 
-			var examPaper = new ExamPaper(); // ExamPaper 现在包含一个 Errors 列表
-
-			// 尝试获取试卷标题
+			var assignment = new AssignmentEx();
 			try
 			{
-				examPaper.AssignmentTitle = GetExamTitle(fullExamText);
+				assignment.Title = GetExamTitle(fullExamText);
 			}
 			catch (Exception ex)
 			{
-				// 如果获取标题失败，记录错误而不是抛出致命异常
-				examPaper.Errors.Add(new ParseError(ParseErrorType.UnexpectedError, "Failed to extract exam title.", innerException: ex));
-				examPaper.AssignmentTitle = "未识别试卷标题"; // 提供默认值
+				assignment.Errors.Add(new ParseError(ParseErrorType.UnexpectedError, "Failed to extract exam title.", innerException: ex));
+				assignment.Title = "未识别试卷标题";
 			}
 
-			var majorQGStack = new Stack<MajorQuestionGroup>();
-			MajorQuestionGroup currentMajorQG = null;
-
-			var questionStack = new Stack<PaperQuestion>();
-			PaperQuestion currentQuestion = null;
+			var assignmentQuestionStack = new Stack<AssignmentQuestionEx>();
+			var rootAssignmentQuestion = new AssignmentQuestionEx { Type = AssignmentStructType.Struct, Priority = 0, Title = "Root Exam Structure" };
+			assignmentQuestionStack.Push(rootAssignmentQuestion);
+			assignment.ExamStruct = rootAssignmentQuestion;
 
 			int currentContentStart = 0;
 
-			// 处理试卷开头的描述性文本
 			if (allPotentialMatches.Any() && allPotentialMatches[0].StartIndex > 0)
 			{
 				string introText = fullExamText.Substring(0, allPotentialMatches[0].StartIndex).Trim();
 				if (!string.IsNullOrWhiteSpace(introText))
 				{
-					examPaper.Description += (string.IsNullOrWhiteSpace(examPaper.Description) ? "" : "\n") + introText;
+					assignment.Description += (string.IsNullOrWhiteSpace(assignment.Description) ? "" : "\n") + introText;
 				}
 			}
-
-			currentContentStart = allPotentialMatches[0].StartIndex;
+			currentContentStart = allPotentialMatches.Any() ? allPotentialMatches[0].StartIndex : 0;
 
 			for (int i = 0; i < allPotentialMatches.Count; i++)
 			{
 				var pm = allPotentialMatches[i];
 
-
 				try
 				{
-					// **数据验证：不再抛出，而是记录错误**
-					if (pm.StartIndex < currentContentStart || pm.EndIndex > fullExamText.Length || pm.StartIndex > pm.EndIndex)
+					if (!IsValidPotentialMatch(pm, i, fullExamText.Length, currentContentStart, assignment.Errors))
 					{
-						examPaper.Errors.Add(new ParseError(ParseErrorType.Validation,
-							$"PotentialMatch at index {i} has invalid start/end indices. Start: {pm.StartIndex}, End: {pm.EndIndex}, CurrentContentStart: {currentContentStart}, FullTextLength: {fullExamText.Length}",
-							index: i, matchedText: pm.MatchedText));
-						currentContentStart = Math.Max(currentContentStart, pm.EndIndex); // 尝试跳过这个损坏的匹配项
-						continue; // 跳过当前循环迭代，处理下一个匹配项
-					}
-					if (pm.RegexMatch == null || pm.PatternConfig == null)
-					{
-						examPaper.Errors.Add(new ParseError(ParseErrorType.Validation,
-							$"PotentialMatch at index {i} is missing RegexMatch or PatternConfig.",
-							index: i, matchedText: pm.MatchedText));
-						currentContentStart = Math.Max(currentContentStart, pm.EndIndex); // 尝试跳过这个损坏的匹配项
-						continue; // 跳过当前循环迭代，处理下一个匹配项
+						currentContentStart = Math.Max(currentContentStart, pm.EndIndex);
+						continue;
 					}
 
 					string precedingText = fullExamText.Substring(currentContentStart, pm.StartIndex - currentContentStart).Trim();
 					if (!string.IsNullOrWhiteSpace(precedingText))
 					{
-						if (currentQuestion != null)
+						if (assignmentQuestionStack.Peek().Question != null)
 						{
-							// 将 examPaper.Errors 传递给 ProcessQuestionContent 收集错误
-							ProcessQuestionContent(currentQuestion, precedingText,
-								GetSubMatchesForRange(allPotentialMatches, currentContentStart, pm.StartIndex, examPaper.Errors),
-								examPaper.Errors);
-						}
-						else if (currentMajorQG != null)
-						{
-							currentMajorQG.Descript += (string.IsNullOrWhiteSpace(currentMajorQG.Descript) ? "" : "\n") + precedingText;
+							ProcessQuestionContent(assignmentQuestionStack.Peek(), precedingText, assignment.Errors);
 						}
 						else
 						{
-							examPaper.Description += (string.IsNullOrWhiteSpace(examPaper.Description) ? "" : "\n") + precedingText;
+							assignment.Description += (string.IsNullOrWhiteSpace(assignment.Description) ? "" : "\n") + precedingText;
 						}
 					}
 
-					if (pm.Type == MatchType.MajorQuestionGroup)
+					if (pm.PatternConfig.Type == AssignmentStructType.Option)
 					{
-						// 对 MajorQuestionGroup 的处理
-						try
-						{
-							while (majorQGStack.Any() && pm.PatternConfig.Priority <= majorQGStack.Peek().Priority)
-							{
-								majorQGStack.Pop();
-							}
-
-							// RegexMatch Groups 验证：不再抛出，记录错误
-							if (pm.RegexMatch.Groups.Count < 2 || string.IsNullOrWhiteSpace(pm.RegexMatch.Groups[1].Value))
-							{
-								examPaper.Errors.Add(new ParseError(ParseErrorType.RegexMatchIssue,
-									$"MajorQuestionGroup match at index {i} does not have enough regex groups or a valid title group (Group 1). Skipping this group.",
-									index: i, matchedText: pm.MatchedText));
-								currentContentStart = pm.EndIndex; // 继续，尝试跳过此项
-								continue;
-							}
-
-							float score = 0;
-							// 使用 float.TryParse 避免异常
-							if (pm.RegexMatch.Groups.Count > 3 && pm.RegexMatch.Groups[4].Success) // 假设纯数字分数是 Group 4
-							{
-								if (!float.TryParse(pm.RegexMatch.Groups[4].Value, out score))
-								{
-									examPaper.Errors.Add(new ParseError(ParseErrorType.DataParsing,
-										$"Failed to parse score '{pm.RegexMatch.Groups[4].Value}' for MajorQuestionGroup at index {i}. Defaulting to 0.",
-										index: i, matchedText: pm.MatchedText));
-								}
-							}
-
-							MajorQuestionGroup newMajorQG = new MajorQuestionGroup
-							{
-								Title = pm.RegexMatch.Groups[2].Value.Trim(), // 标题是 Group 2
-								Score = score,
-								Priority = pm.PatternConfig.Priority,
-								bGroup = true
-							};
-
-							if (majorQGStack.Any())
-							{
-								majorQGStack.Peek().SubQuestionGroups.Add(newMajorQG);
-							}
-							else
-							{
-								examPaper.QuestionGroups.Add(newMajorQG);
-							}
-
-							currentContentStart = pm.EndIndex;
-							majorQGStack.Push(newMajorQG);
-							currentMajorQG = newMajorQG;
-							questionStack.Clear();
-							currentQuestion = null;
-						}
-						catch (Exception ex)
-						{
-							examPaper.Errors.Add(new ParseError(ParseErrorType.UnexpectedError,
-								$"An unexpected error occurred during processing MajorQuestionGroup at index {i}.",
-								index: i, matchedText: pm.MatchedText, innerException: ex));
-							currentContentStart = pm.EndIndex; // 尝试跳过此项
-							continue;
-						}
+						HandleOptionMatch(pm, i, assignmentQuestionStack.Peek(), assignment.Errors);
 					}
-					else if (pm.Type == MatchType.Question)
+					else
 					{
-						// 对 Question 的处理
-						try
-						{
-							while (questionStack.Any() && pm.PatternConfig.Priority <= questionStack.Peek().Priority)
-							{
-								questionStack.Pop();
-							}
-
-							// RegexMatch Groups 验证
-							if (pm.RegexMatch.Groups.Count < 3 || string.IsNullOrWhiteSpace(pm.RegexMatch.Groups[1].Value) || string.IsNullOrWhiteSpace(pm.RegexMatch.Groups[2].Value))
-							{
-								examPaper.Errors.Add(new ParseError(ParseErrorType.RegexMatchIssue,
-									$"Question match at index {i} does not have enough regex groups or valid number/text groups (Group 1/2). Skipping this question.",
-									index: i, matchedText: pm.MatchedText));
-								currentContentStart = pm.EndIndex; // 尝试跳过此项
-								continue;
-							}
-
-							float score = 0;
-							// 使用 float.TryParse 避免异常
-							if (pm.RegexMatch.Groups.Count > 4 && pm.RegexMatch.Groups[4].Success) // 假设纯数字分数是 Group 4
-							{
-								if (!float.TryParse(pm.RegexMatch.Groups[4].Value, out score))
-								{
-									examPaper.Errors.Add(new ParseError(ParseErrorType.DataParsing,
-										$"Failed to parse score '{pm.RegexMatch.Groups[4].Value}' for Question at index {i}. Defaulting to 0.",
-										index: i, matchedText: pm.MatchedText));
-								}
-							}
-
-							PaperQuestion newQuestion = new PaperQuestion
-							{
-								Number = pm.RegexMatch.Groups[1].Value.Trim(),
-								Stem = pm.RegexMatch.Groups[2].Value.Trim(),
-								Priority = pm.PatternConfig.Priority,
-								Score = score // 赋值解析到的分数
-							};
-
-							if (questionStack.Any())
-							{
-								questionStack.Peek().SubQuestions.Add(newQuestion);
-							}
-							else if (currentMajorQG != null)
-							{
-								currentMajorQG.SubQuestions.Add(newQuestion);
-							}
-							else
-							{
-								examPaper.TopLevelQuestions.Add(newQuestion);
-							}
-
-							currentContentStart = pm.EndIndex;
-							questionStack.Push(newQuestion);
-							currentQuestion = newQuestion;
-						}
-						catch (Exception ex)
-						{
-							examPaper.Errors.Add(new ParseError(ParseErrorType.UnexpectedError,
-								$"An unexpected error occurred during processing Question at index {i}.",
-								index: i, matchedText: pm.MatchedText, innerException: ex));
-							currentContentStart = pm.EndIndex; // 尝试跳过此项
-							continue;
-						}
-					}
-					else if (pm.Type == MatchType.Option)
-					{
-						// 对 Option 的处理
-						try
-						{
-							if (currentQuestion != null)
-							{
-								// RegexMatch Groups 验证
-								if (pm.RegexMatch.Groups.Count < 3 || string.IsNullOrWhiteSpace(pm.RegexMatch.Groups[1].Value) || string.IsNullOrWhiteSpace(pm.RegexMatch.Groups[2].Value))
-								{
-									examPaper.Errors.Add(new ParseError(ParseErrorType.RegexMatchIssue,
-										$"Option match at index {i} does not have enough regex groups or valid label/text groups (Group 1/2). Skipping this option.",
-										index: i, matchedText: pm.MatchedText));
-									currentContentStart = pm.EndIndex; // 尝试跳过此项
-									continue;
-								}
-
-								Option newOption = new Option
-								{
-									Label = pm.RegexMatch.Groups[1].Value.Trim(),
-									Text = pm.RegexMatch.Groups[2].Value.Trim()
-								};
-								currentQuestion.Options.Add(newOption);
-							}
-							else
-							{
-								// 结构性问题：找到孤立的选项，记录错误但继续
-								examPaper.Errors.Add(new ParseError(ParseErrorType.Structural,
-									$"Found isolated Option at index {i}. Options must belong to a question. Ignoring this option.",
-									index: i, matchedText: pm.MatchedText));
-							}
-						}
-						catch (Exception ex)
-						{
-							examPaper.Errors.Add(new ParseError(ParseErrorType.UnexpectedError,
-								$"An unexpected error occurred during processing Option at index {i}.",
-								index: i, matchedText: pm.MatchedText, innerException: ex));
-							// 这里不需要 `continue`，因为即使出错也可能只是该选项的问题，不影响后续处理
-						}
+						HandleQuestionGroupMatch(pm, i, assignmentQuestionStack, assignment.Errors);
 					}
 
-					currentContentStart = pm.EndIndex; // 更新当前内容起点
+					currentContentStart = pm.EndIndex;
 				}
 				catch (Exception ex)
 				{
-					// 捕获任何在处理单个 PotentialMatch 过程中未被更具体 catch 块捕获的意外错误
-					examPaper.Errors.Add(new ParseError(ParseErrorType.UnexpectedError,
+					assignment.Errors.Add(new ParseError(ParseErrorType.UnexpectedError,
 						$"An unexpected error occurred during main loop processing of PotentialMatch at index {i}.",
 						index: i, matchedText: pm.MatchedText, innerException: ex));
-					currentContentStart = Math.Max(currentContentStart, pm.EndIndex); // 尝试跳过当前匹配项，继续下一项
-																					  // 这里不 `continue` 是因为外层循环会推进 `i`，但确保 `currentContentStart` 更新以避免无限循环
+					currentContentStart = Math.Max(currentContentStart, pm.EndIndex);
 				}
 			}
 
-			// --- 处理所有匹配项之后的剩余内容 ---
 			if (currentContentStart < fullExamText.Length)
 			{
 				try
@@ -561,171 +295,177 @@ namespace TechHelper.Client.Exam
 					string remainingText = fullExamText.Substring(currentContentStart).Trim();
 					if (!string.IsNullOrWhiteSpace(remainingText))
 					{
-						if (currentQuestion != null)
+						if (assignmentQuestionStack.Peek().Question != null)
 						{
-							ProcessQuestionContent(currentQuestion, remainingText,
-								 GetSubMatchesForRange(allPotentialMatches, currentContentStart, fullExamText.Length, examPaper.Errors),
-								 examPaper.Errors);
-						}
-						else if (currentMajorQG != null)
-						{
-							currentMajorQG.Descript += (string.IsNullOrWhiteSpace(currentMajorQG.Descript) ? "" : "\n") + remainingText;
+							ProcessQuestionContent(assignmentQuestionStack.Peek(), remainingText, assignment.Errors);
 						}
 						else
 						{
-							examPaper.Description += (string.IsNullOrWhiteSpace(examPaper.Description) ? "" : "\n") + remainingText;
+							assignment.Description += (string.IsNullOrWhiteSpace(assignment.Description) ? "" : "\n") + remainingText;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					examPaper.Errors.Add(new ParseError(ParseErrorType.UnexpectedError,
+					assignment.Errors.Add(new ParseError(ParseErrorType.UnexpectedError,
 						"An unexpected error occurred while processing remaining text after all potential matches.",
 						innerException: ex));
 				}
 			}
 
-			return examPaper;
+			return assignment;
+		}
+
+		private bool IsValidPotentialMatch(PotentialMatch pm, int index, int fullTextLength, int currentContentStart, List<ParseError> errors)
+		{
+			if (pm.StartIndex < currentContentStart || pm.EndIndex > fullTextLength || pm.StartIndex > pm.EndIndex)
+			{
+				errors.Add(new ParseError(ParseErrorType.Validation,
+					$"PotentialMatch at index {index} has invalid start/end indices. Start: {pm.StartIndex}, End: {pm.EndIndex}, CurrentContentStart: {currentContentStart}, FullTextLength: {fullTextLength}",
+					index: index, matchedText: pm.MatchedText));
+				return false;
+			}
+			if (pm.RegexMatch == null || pm.PatternConfig == null)
+			{
+				errors.Add(new ParseError(ParseErrorType.Validation,
+					$"PotentialMatch at index {index} is missing RegexMatch or PatternConfig.",
+					index: index, matchedText: pm.MatchedText));
+				return false;
+			}
+			return true;
+		}
+
+		private void HandleQuestionGroupMatch(PotentialMatch pm, int index, Stack<AssignmentQuestionEx> assignmentQuestionStack, List<ParseError> errors)
+		{
+			try
+			{
+				while (assignmentQuestionStack.Count > 1 && pm.PatternConfig.Priority <= assignmentQuestionStack.Peek().Priority)
+				{
+					assignmentQuestionStack.Pop();
+				}
+
+				// 验证捕获组：Group 1 是编号，Group 2 是题目内容
+				if (pm.RegexMatch.Groups.Count < 3 || !pm.RegexMatch.Groups[1].Success || string.IsNullOrWhiteSpace(pm.RegexMatch.Groups[2].Value))
+				{
+					errors.Add(new ParseError(ParseErrorType.RegexMatchIssue,
+						$"Question/Group match at index {index} does not have enough regex groups (expected 3 for number and title) or a valid title group (Group 2). Skipping this group.",
+						index: index, matchedText: pm.MatchedText));
+					return;
+				}
+
+				float score = 0;
+				// 尝试从 MatchedText 的末尾匹配分数
+				Match scoreMatch = _config.ScoreRegex.Match(pm.MatchedText);
+				if (scoreMatch.Success && scoreMatch.Groups.Count > 1 && scoreMatch.Groups[1].Success)
+				{
+					if (!float.TryParse(scoreMatch.Groups[1].Value, out score))
+					{
+						errors.Add(new ParseError(ParseErrorType.DataParsing,
+							$"Failed to parse score '{scoreMatch.Groups[1].Value}' for match at index {index}. Defaulting to 0.",
+							index: index, matchedText: pm.MatchedText));
+					}
+					// 从 MatchedText 中移除分数部分，使其只包含编号和标题
+					// 注意：这里修改的是pm.MatchedText，这不会影响原始文本，只是当前匹配项的“内容”
+					pm.MatchedText = pm.MatchedText.Substring(0, scoreMatch.Index).Trim();
+				}
+
+				// 提取标题，这里使用 Group 2 的值，它不包含分数
+				string title = pm.RegexMatch.Groups[2].Value.Trim();
+
+
+				AssignmentQuestionEx newAssignmentQuestion;
+				if (pm.PatternConfig.Type == AssignmentStructType.Struct)
+				{
+					newAssignmentQuestion = new AssignmentQuestionEx
+					{
+						Title = title,
+						Score = score,
+						Priority = pm.PatternConfig.Priority,
+						Type = pm.PatternConfig.Type
+					};
+				}
+				else // AssignmentStructType.Question 类型
+				{
+					newAssignmentQuestion = new AssignmentQuestionEx
+					{
+						Priority = pm.PatternConfig.Priority,
+						Type = pm.PatternConfig.Type,
+						Score = score,
+						Question = new QuestionEx
+						{
+							Title = title,
+						}
+					};
+				}
+
+				assignmentQuestionStack.Peek().ChildrenAssignmentQuestion.Add(newAssignmentQuestion);
+				assignmentQuestionStack.Push(newAssignmentQuestion);
+			}
+			catch (Exception ex)
+			{
+				errors.Add(new ParseError(ParseErrorType.UnexpectedError,
+					$"An unexpected error occurred during processing a non-option match (type: {pm.PatternConfig.Type}) at index {index}.",
+					index: index, matchedText: pm.MatchedText, innerException: ex));
+			}
+		}
+
+		private void HandleOptionMatch(PotentialMatch pm, int index, AssignmentQuestionEx currentAssignmentQuestion, List<ParseError> errors)
+		{
+			try
+			{
+				if (currentAssignmentQuestion.Question == null)
+				{
+					errors.Add(new ParseError(ParseErrorType.Structural,
+						$"Found isolated Option at index {index}. Options must belong to a 'Question' type structure. Ignoring this option.",
+						index: index, matchedText: pm.MatchedText));
+					return;
+				}
+
+				if (pm.RegexMatch.Groups.Count < 3 || !pm.RegexMatch.Groups[1].Success || string.IsNullOrWhiteSpace(pm.RegexMatch.Groups[2].Value))
+				{
+					errors.Add(new ParseError(ParseErrorType.RegexMatchIssue,
+						$"Option match at index {index} does not have enough regex groups or valid label/text groups (Group 1/2). Skipping this option.",
+						index: index, matchedText: pm.MatchedText));
+					return;
+				}
+
+				Option newOption = new Option
+				{
+					Label = pm.RegexMatch.Groups[1].Value.Trim(),
+					Text = pm.RegexMatch.Groups[2].Value.Trim()
+				};
+				currentAssignmentQuestion.Question.Options.Add(newOption);
+			}
+			catch (Exception ex)
+			{
+				errors.Add(new ParseError(ParseErrorType.UnexpectedError,
+					$"An unexpected error occurred during processing Option at index {index}.",
+					index: index, matchedText: pm.MatchedText, innerException: ex));
+			}
+		}
+
+		private void ProcessQuestionContent(AssignmentQuestionEx question, string contentText, List<ParseError> errors)
+		{
+			if (question?.Question == null)
+			{
+				errors.Add(new ParseError(ParseErrorType.Structural,
+					$"Attempted to process content for a non-question type AssignmentQuestionEx (Type: {question?.Type}). Content: '{contentText}'",
+					matchedText: contentText));
+				return;
+			}
+
+			if (!string.IsNullOrWhiteSpace(contentText))
+			{
+				question.Question.Title += (string.IsNullOrWhiteSpace(question.Question.Title) ? "" : "\n") + contentText;
+			}
 		}
 
-		/// <summary>
-		/// Extracts the exam title (simple implementation).
-		/// Logs errors to the provided error list instead of throwing.
-		/// </summary>
 		private string GetExamTitle(string examPaperText)
 		{
-			// 内部不再直接抛出异常，而是让外部的 try-catch 负责
 			var firstLine = examPaperText.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
 										.FirstOrDefault(line => !string.IsNullOrWhiteSpace(line));
 			return firstLine ?? "未识别试卷标题";
 		}
-
-		/// <summary>
-		/// Gets a subset of the given PotentialMatch list within a specified range.
-		/// Logs errors to the provided error list instead of throwing.
-		/// </summary>
-		private List<PotentialMatch> GetSubMatchesForRange(List<PotentialMatch> allMatches, int start, int end, List<ParseError> errors)
-		{
-			// 输入验证，如果输入错误，记录错误并返回空列表
-			if (start < 0 || end < start)
-			{
-				errors.Add(new ParseError(ParseErrorType.Validation,
-					$"Invalid range provided to GetSubMatchesForRange. Start: {start}, End: {end}.",
-					index: start)); // 使用 start 作为大概索引
-				return new List<PotentialMatch>();
-			}
-			// allMatches 为 null 的情况已经在 BuildExamPaper 顶部处理，这里为了方法的健壮性可以再加一次检查
-			if (allMatches == null)
-			{
-				return new List<PotentialMatch>();
-			}
-
-			try
-			{
-				return allMatches.Where(pm => pm.StartIndex >= start && pm.StartIndex < end).ToList();
-			}
-			catch (Exception ex)
-			{
-				errors.Add(new ParseError(ParseErrorType.UnexpectedError,
-					$"An unexpected error occurred getting sub-matches for range [{start}, {end}).",
-					innerException: ex));
-				return new List<PotentialMatch>(); // 出错时返回空列表
-			}
-		}
-
-		/// <summary>
-		/// Processes the content of a Question, mainly for parsing Options and identifying unstructured text.
-		/// Logs errors to the provided error list instead of throwing.
-		/// </summary>
-		private void ProcessQuestionContent(PaperQuestion question, string contentText, List<PotentialMatch> potentialMatchesInScope, List<ParseError> errors)
-		{
-			// 参数验证，这些是内部方法的契约，如果违反则直接抛出，因为这意味着调用者有错
-			if (question == null) throw new ArgumentNullException(nameof(question), "Question cannot be null in ProcessQuestionContent.");
-			if (contentText == null) throw new ArgumentNullException(nameof(contentText), "Content text cannot be null in ProcessQuestionContent.");
-			if (potentialMatchesInScope == null) throw new ArgumentNullException(nameof(potentialMatchesInScope), "Potential matches in scope cannot be null.");
-
-
-			try
-			{
-				int lastOptionEndIndex = 0;
-
-				foreach (var pm in potentialMatchesInScope.OrderBy(p => p.StartIndex))
-				{
-					// 对每个匹配项的内部处理，记录错误但继续
-					try
-					{
-						if (pm.Type == MatchType.Option)
-						{
-							// 验证索引，记录错误但继续
-							if (pm.StartIndex < lastOptionEndIndex || pm.StartIndex > contentText.Length || pm.EndIndex > contentText.Length)
-							{
-								errors.Add(new ParseError(ParseErrorType.Validation,
-									$"Option match at index {pm.StartIndex} has invalid indices within content text. MatchedText: '{pm.MatchedText}'. Skipping.",
-									index: pm.StartIndex, matchedText: pm.MatchedText));
-								continue; // 跳过当前选项
-							}
-
-							// 处理选项前的文本
-							if (pm.StartIndex > lastOptionEndIndex)
-							{
-								string textBeforeOption = contentText.Substring(lastOptionEndIndex, pm.StartIndex - lastOptionEndIndex).Trim();
-								if (!string.IsNullOrWhiteSpace(textBeforeOption))
-								{
-									question.Stem += (string.IsNullOrWhiteSpace(question.Stem) ? "" : "\n") + textBeforeOption;
-								}
-							}
-
-							// RegexMatch Groups 验证，记录错误但继续
-							if (pm.RegexMatch.Groups.Count < 3 || string.IsNullOrWhiteSpace(pm.RegexMatch.Groups[1].Value) || string.IsNullOrWhiteSpace(pm.RegexMatch.Groups[2].Value))
-							{
-								errors.Add(new ParseError(ParseErrorType.RegexMatchIssue,
-									$"Option regex match '{pm.MatchedText}' does not have enough groups (expected 3) for label and text. Skipping option.",
-									index: pm.StartIndex, matchedText: pm.MatchedText));
-								lastOptionEndIndex = pm.EndIndex; // 更新索引，避免卡死
-								continue; // 跳过当前选项
-							}
-
-							var newOption = new Option
-							{
-								Label = pm.RegexMatch.Groups[1].Value.Trim(),
-								Text = pm.RegexMatch.Groups[2].Value.Trim()
-							};
-							question.Options.Add(newOption);
-							lastOptionEndIndex = pm.EndIndex;
-						}
-						else
-						{
-							question.Stem += contentText;
-						}
-					}
-					catch (Exception innerEx)
-					{
-						errors.Add(new ParseError(ParseErrorType.UnexpectedError,
-							$"An unexpected error occurred during processing a potential match ({pm.Type}) within question content.",
-							index: pm.StartIndex, matchedText: pm.MatchedText, innerException: innerEx));
-						lastOptionEndIndex = pm.EndIndex; // 尝试更新索引，避免无限循环
-						continue; // 尝试继续下一个匹配项
-					}
-				}
-
-				// 处理所有选项之后的剩余文本
-				if (lastOptionEndIndex < contentText.Length)
-				{
-					string remainingContent = contentText.Substring(lastOptionEndIndex).Trim();
-					if (!string.IsNullOrWhiteSpace(remainingContent))
-					{
-						question.Stem += (string.IsNullOrWhiteSpace(question.Stem) ? "" : "\n") + remainingContent;
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				// 捕获 ProcessQuestionContent 整个方法内部的意外错误
-				errors.Add(new ParseError(ParseErrorType.UnexpectedError,
-					$"An unexpected error occurred while processing content for Question '{question.Number}'.",
-					innerException: ex));
-			}
-		}
 	}
 
 	public class ExamParser
@@ -742,20 +482,16 @@ namespace TechHelper.Client.Exam
 		}
 
 		/// <summary>
-		/// 解析给定的试卷文本，返回结构化的 ExamPaper 对象。
+		/// 解析给定的试卷文本，返回结构化的 AssignmentEx 对象。
 		/// </summary>
 		/// <param name="examPaperText">完整的试卷文本</param>
-		/// <returns>解析后的 ExamPaper 对象</returns>
-		public ExamPaper ParseExamPaper(string examPaperText)
+		/// <returns>解析后的 AssignmentEx 对象</returns>
+		public AssignmentEx ParseExamPaper(string examPaperText)
 		{
-			// 1. 扫描：一次性扫描整个文本，收集所有潜在的匹配项
-			// Scan 方法现在已经优化为不抛出 ArgumentNullException
-			List<PotentialMatch> allPotentialMatches = _scanner.Scan(examPaperText);
-
-			// 2. 构建：根据扫描结果和原始文本，线性遍历并构建层级结构
-			// BuildExamPaper 现在会返回一个包含错误列表的 ExamPaper 对象
-			// 外部不再需要捕获内部解析异常，只需检查 ExamPaper.Errors 列表
-			return _builder.BuildExam(examPaperText, allPotentialMatches);
+			var assignment = new AssignmentEx();
+			List<PotentialMatch> allPotentialMatches = _scanner.Scan(examPaperText, assignment.Errors);
+			assignment = _builder.BuildExam(examPaperText, allPotentialMatches);
+			return assignment;
 		}
 	}
 }
\ No newline at end of file
diff --git a/TechHelper.Client/Pages/Exam/ExamCreate.razor b/TechHelper.Client/Pages/Exam/ExamCreate.razor
index 8b205ad..836385f 100644
--- a/TechHelper.Client/Pages/Exam/ExamCreate.razor
+++ b/TechHelper.Client/Pages/Exam/ExamCreate.razor
@@ -1,4 +1,5 @@
 @page "/exam/create"
+@using AutoMapper
 @using TechHelper.Client.Services
 @using Blazored.TextEditor
 @using Entities.DTO
@@ -72,6 +73,16 @@
 				</MudPaper>
 			</MudPaper>
 
+			<MudPaper MaxWidth="300">
+
+				@if (_parsedExam.Errors.Any())
+				{
+					foreach (var item in _parsedExam.Errors)
+					{
+						<MudText> @item.Message </MudText>
+					}
+				}
+			</MudPaper>
 			<MudButtonGroup Vertical="true" Color="Color.Primary" Variant="Variant.Filled">
 				<MudIconButton Icon="@Icons.Material.Filled.Settings" OnClick="@ToggleDrawer" Color="Color.Secondary" />
 				<MudIconButton Icon="@Icons.Material.Filled.TransitEnterexit" OnClick="@ParseExam" Color="Color.Secondary" />
@@ -98,11 +109,15 @@
 		_edit = false;
 	}
 	private BlazoredTextEditor _textEditor = new BlazoredTextEditor();
-	private ExamPaper _parsedExam = new ExamPaper();
+	private AssignmentEx _parsedExam = new AssignmentEx();
 	private AssignmentDto ExamContent = new AssignmentDto();
 
 	private ExamParserConfig _examParserConfig { get; set; } = new ExamParserConfig();
 
+	[Inject]
+	public IMapper Mapper { get; set; }
+
+
 	private void HandleClickedStruct(AssignmentQuestionDto dto)
 	{
 		_open = true;
@@ -125,8 +140,9 @@
 				_parsedExam = exampar.ParseExamPaper(plainText);
 				Snackbar.Add("试卷解析成功。", Severity.Success);
 				Snackbar.Add($"{_parsedExam.Errors}。", Severity.Success);
-				ExamContent = _parsedExam.ConvertToExamDTO();
-				// ExamContent.SeqIndex();
+				StateHasChanged();
+				ExamContent = Mapper.Map<AssignmentDto>(_parsedExam);
+				ExamContent.SeqIndex();
 			}
 			catch (Exception ex)
 			{
diff --git a/TechHelper.Client/Pages/Exam/ParseRoleConfig.razor b/TechHelper.Client/Pages/Exam/ParseRoleConfig.razor
index 2bac41c..76bc3ba 100644
--- a/TechHelper.Client/Pages/Exam/ParseRoleConfig.razor
+++ b/TechHelper.Client/Pages/Exam/ParseRoleConfig.razor
@@ -1,127 +1,62 @@
 @using TechHelper.Client.Exam
+@using Entities.Contracts // Assuming SubjectAreaEnum is defined here, adjust if not
 
 <MudPaper Outlined="true" Class="mt-2">
 
-	<MudRadioGroup @bind-Value="_examParser">
-		@foreach (ExamParserEnum item in Enum.GetValues(typeof(ExamParserEnum)))
-		{
-			<MudRadio T="ExamParserEnum" Value="@item">@item</MudRadio>
-		}
-	</MudRadioGroup>
+    <MudText Typo="Typo.h6" Class="mb-4">Current Parsing Rules</MudText>
 
-	<MudTextField @bind-Value="_ParserConfig" Label="正则表达式模式" Variant="Variant.Outlined" FullWidth="true" Class="mb-2" />
-	<MudNumericField Label="优先级" @bind-Value="_Priority" Variant="Variant.Outlined" Min="1" Max="100" />
-	<MudButton OnClick="AddPattern" Variant="Variant.Filled" Color="Color.Primary" Class="mt-2">添加模式</MudButton>
+    @* Display Question Patterns *@
+    @if (ExamParserConfig.QuestionPatterns.Any())
+    {
+        <MudExpansionPanel Text="Question Patterns" Class="mb-2" IsInitiallyExpanded="true">
+            <MudStack Spacing="1">
+                @foreach (var config in ExamParserConfig.QuestionPatterns)
+                {
+                    <MudChip T="string" Color="Color.Info" Variant="Variant.Outlined" Class="d-flex justify-content-between align-items-center">
+                        <div class="d-flex flex-column align-items-start">
+                            <MudText Typo="Typo.body2">**Type:** @config.Type</MudText>
+                            <MudText Typo="Typo.body2">**Pattern:** <code>@config.Pattern</code></MudText>
+                        </div>
+                        <MudText Typo="Typo.body2">**Priority:** @config.Priority</MudText>
+                    </MudChip>
+                }
+            </MudStack>
+        </MudExpansionPanel>
+    }
+    else
+    {
+        <MudText Typo="Typo.body2" Class="mb-2">No question patterns configured.</MudText>
+    }
 
-
-	<MudText Typo="Typo.subtitle1" Class="mb-2">所有已配置模式:</MudText>
-
-
-	@if (ExamParserConfig.MajorQuestionGroupPatterns.Any())
-	{
-		<MudExpansionPanel Text="大题组模式详情" Class="mb-2">
-			<MudStack>
-				@foreach (var config in ExamParserConfig.MajorQuestionGroupPatterns)
-				{
-					<MudChip T="string">
-						**模式:** <code>@config.Pattern</code>, **优先级:** @config.Priority
-					</MudChip>
-				}
-			</MudStack>
-		</MudExpansionPanel>
-	}
-	else
-	{
-		<MudText Typo="Typo.body2" Class="mb-2">暂无大题组模式。</MudText>
-	}
-
-	@* 题目模式详情 *@
-	@if (ExamParserConfig.QuestionPatterns.Any())
-	{
-		<MudExpansionPanel Text="题目模式详情" Class="mb-2">
-			<MudStack>
-				@foreach (var config in ExamParserConfig.QuestionPatterns)
-				{
-					<MudChip T="string">
-						**模式:** <code>@config.Pattern</code>, **优先级:** @config.Priority
-					</MudChip>
-				}
-			</MudStack>
-		</MudExpansionPanel>
-	}
-	else
-	{
-		<MudText Typo="Typo.body2" Class="mb-2">暂无题目模式。</MudText>
-	}
-
-	@if (ExamParserConfig.OptionPatterns.Any())
-	{
-		<MudExpansionPanel Text="选项模式详情" Class="mb-2">
-			<MudStack>
-				@foreach (var config in ExamParserConfig.OptionPatterns)
-				{
-					<MudChip T="string">
-						**模式:** <code>@config.Pattern</code>, **优先级:** @config.Priority
-					</MudChip>
-				}
-			</MudStack>
-		</MudExpansionPanel>
-	}
-	else
-	{
-		<MudText Typo="Typo.body2" Class="mb-2">暂无选项模式。</MudText>
-	}
-
-
-	<MudButton Variant="Variant.Filled" Color="Color.Secondary" OnClick="ResetPatterns">重置默认规则</MudButton>
+    @* Display Option Patterns *@
+    @if (ExamParserConfig.OptionPatterns.Any())
+    {
+        <MudExpansionPanel Text="Option Patterns" Class="mb-2" IsInitiallyExpanded="true">
+            <MudStack Spacing="1">
+                @foreach (var config in ExamParserConfig.OptionPatterns)
+                {
+                    <MudChip T="string" Color="Color.Warning" Variant="Variant.Outlined" Class="d-flex justify-content-between align-items-center">
+                        <div class="d-flex flex-column align-items-start">
+                            <MudText Typo="Typo.body2">**Type:** @config.Type</MudText>
+                            <MudText Typo="Typo.body2">**Pattern:** <code>@config.Pattern</code></MudText>
+                        </div>
+                        <MudText Typo="Typo.body2">**Priority:** @config.Priority</MudText>
+                    </MudChip>
+                }
+            </MudStack>
+        </MudExpansionPanel>
+    }
+    else
+    {
+        <MudText Typo="Typo.body2" Class="mb-2">No option patterns configured.</MudText>
+    }
 
 </MudPaper>
 
-
 @code {
 
+    [Parameter]
+    public ExamParserConfig ExamParserConfig { get; set; } = new ExamParserConfig();
 
-	public ExamParserEnum _examParser { get; set; } = ExamParserEnum.MajorQuestionGroupPatterns;
-	private string _ParserConfig;
-	private int _Priority = 1;
-
-	[Parameter]
-	public ExamParserConfig ExamParserConfig { get; set; } = new ExamParserConfig();
-
-	[Inject]
-	public ISnackbar Snackbar { get; set; }
-
-	private void AddPattern()
-	{
-
-		switch ((ExamParserEnum)_examParser)
-		{
-			case ExamParserEnum.MajorQuestionGroupPatterns:
-				ExamParserConfig.MajorQuestionGroupPatterns.Add(new RegexPatternConfig(_ParserConfig, _Priority));
-				Snackbar.Add($"已添加大题组模式: {_ParserConfig}, 优先级: {_Priority}", Severity.Success); 
-				break;
-			case ExamParserEnum.QuestionPatterns:
-				ExamParserConfig.QuestionPatterns.Add(new RegexPatternConfig(_ParserConfig, _Priority));
-				Snackbar.Add($"已添加题目模式: {_ParserConfig}, 优先级: {_Priority}", Severity.Success);
-				break;
-			case ExamParserEnum.OptionPatterns:
-				ExamParserConfig.OptionPatterns.Add(new RegexPatternConfig(_ParserConfig, _Priority));
-				Snackbar.Add($"已添加选项模式: {_ParserConfig}, 优先级: {_Priority}", Severity.Success);
-				break;
-			default:
-				Snackbar.Add("请选择要添加的模式类型。");
-				break;
-
-		}
-
-		StateHasChanged();
-
-	}
-
-
-	private void ResetPatterns()
-	{
-		ExamParserConfig = new ExamParserConfig();
-		StateHasChanged(); 
-	}
+    // No other properties or methods are needed as the component is now purely for display.
 }
\ No newline at end of file
diff --git a/TechHelper.Client/Program.cs b/TechHelper.Client/Program.cs
index 01b6167..f2611b0 100644
--- a/TechHelper.Client/Program.cs
+++ b/TechHelper.Client/Program.cs
@@ -14,6 +14,7 @@ using Microsoft.Extensions.Options;
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using TechHelper.Client.AI;
 using Microsoft.AspNetCore.Components;
+using TechHelper.Context;
 
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
@@ -26,12 +27,16 @@ builder.Services.AddOidcAuthentication(options =>
     builder.Configuration.Bind("Local", options.ProviderOptions);
 });
 
+builder.Services.AddAutoMapper(typeof(AutoMapperProFile).Assembly);
+
 
 builder.Services.Configure<ApiConfiguration>(builder.Configuration.GetSection("ApiConfiguration"));
 builder.Services.AddAuthorizationCore();
 builder.Services.AddCascadingAuthenticationState();
 builder.Services.AddLocalStorageServices();
 
+
+
 builder.Services.AddScoped<IAuthenticationClientService, AuthenticationClientService>();
 builder.Services.AddScoped<IExamService, ExamService>();
 builder.Services.AddScoped<AuthenticationStateProvider, AuthStateProvider>();
@@ -41,7 +46,6 @@ builder.Services.AddScoped<IEmailSender, QEmailSender>();
 builder.Services.AddScoped<HttpInterceptorHandlerService>();
 builder.Services.AddScoped<RefreshTokenService2>();
 builder.Services.AddScoped<IAIService, AiService>();
-
 builder.Services.AddHttpClient("WebApiClient", client =>
 {
 	var baseAddress = builder.Configuration.GetSection("ApiConfiguration:BaseAddress").Value;
diff --git a/TechHelper.Client/Services/ExamService.cs b/TechHelper.Client/Services/ExamService.cs
index 9e70131..fb6ef57 100644
--- a/TechHelper.Client/Services/ExamService.cs
+++ b/TechHelper.Client/Services/ExamService.cs
@@ -111,7 +111,7 @@ namespace TechHelper.Client.Services
 			if (response.IsSuccessStatusCode)
 			{
 				var content = await response.Content.ReadAsStringAsync();
-				var exam = JsonConvert.DeserializeObject<ExamDto>(content);
+				var exam = JsonConvert.DeserializeObject<AssignmentDto>(content);
 				return ApiResponse.Success(result: exam);
 			}
 			else
diff --git a/TechHelper.Server/Migrations/20250624030547_init.Designer.cs b/TechHelper.Server/Migrations/20250624103910_init.Designer.cs
similarity index 99%
rename from TechHelper.Server/Migrations/20250624030547_init.Designer.cs
rename to TechHelper.Server/Migrations/20250624103910_init.Designer.cs
index c88a2dc..658ff55 100644
--- a/TechHelper.Server/Migrations/20250624030547_init.Designer.cs
+++ b/TechHelper.Server/Migrations/20250624103910_init.Designer.cs
@@ -12,7 +12,7 @@ using TechHelper.Context;
 namespace TechHelper.Server.Migrations
 {
     [DbContext(typeof(ApplicationContext))]
-    [Migration("20250624030547_init")]
+    [Migration("20250624103910_init")]
     partial class init
     {
         /// <inheritdoc />
@@ -747,19 +747,19 @@ namespace TechHelper.Server.Migrations
                     b.HasData(
                         new
                         {
-                            Id = new Guid("6163bf44-8dc7-4ad4-8d4c-c4452123949e"),
+                            Id = new Guid("ab2c8f8c-1ade-4ff5-9eb4-2925a89567b1"),
                             Name = "Student",
                             NormalizedName = "STUDENT"
                         },
                         new
                         {
-                            Id = new Guid("90caaab6-bfc7-4b70-891a-4c6f327e29d8"),
+                            Id = new Guid("c6f92bbf-190f-47a5-b4d6-ed6874a378e8"),
                             Name = "Teacher",
                             NormalizedName = "TEACHER"
                         },
                         new
                         {
-                            Id = new Guid("bf88293a-32d6-4d73-bc83-fe763c143024"),
+                            Id = new Guid("8b814a50-fd96-4bfa-a666-b247c0f13e22"),
                             Name = "Administrator",
                             NormalizedName = "ADMINISTRATOR"
                         });
diff --git a/TechHelper.Server/Migrations/20250624030547_init.cs b/TechHelper.Server/Migrations/20250624103910_init.cs
similarity index 99%
rename from TechHelper.Server/Migrations/20250624030547_init.cs
rename to TechHelper.Server/Migrations/20250624103910_init.cs
index 58273f1..e7f0219 100644
--- a/TechHelper.Server/Migrations/20250624030547_init.cs
+++ b/TechHelper.Server/Migrations/20250624103910_init.cs
@@ -644,9 +644,9 @@ namespace TechHelper.Server.Migrations
                 columns: new[] { "Id", "ConcurrencyStamp", "Name", "NormalizedName" },
                 values: new object[,]
                 {
-                    { new Guid("6163bf44-8dc7-4ad4-8d4c-c4452123949e"), null, "Student", "STUDENT" },
-                    { new Guid("90caaab6-bfc7-4b70-891a-4c6f327e29d8"), null, "Teacher", "TEACHER" },
-                    { new Guid("bf88293a-32d6-4d73-bc83-fe763c143024"), null, "Administrator", "ADMINISTRATOR" }
+                    { new Guid("8b814a50-fd96-4bfa-a666-b247c0f13e22"), null, "Administrator", "ADMINISTRATOR" },
+                    { new Guid("ab2c8f8c-1ade-4ff5-9eb4-2925a89567b1"), null, "Student", "STUDENT" },
+                    { new Guid("c6f92bbf-190f-47a5-b4d6-ed6874a378e8"), null, "Teacher", "TEACHER" }
                 });
 
             migrationBuilder.CreateIndex(
diff --git a/TechHelper.Server/Migrations/ApplicationContextModelSnapshot.cs b/TechHelper.Server/Migrations/ApplicationContextModelSnapshot.cs
index 033b4e1..3c5c7ec 100644
--- a/TechHelper.Server/Migrations/ApplicationContextModelSnapshot.cs
+++ b/TechHelper.Server/Migrations/ApplicationContextModelSnapshot.cs
@@ -744,19 +744,19 @@ namespace TechHelper.Server.Migrations
                     b.HasData(
                         new
                         {
-                            Id = new Guid("6163bf44-8dc7-4ad4-8d4c-c4452123949e"),
+                            Id = new Guid("ab2c8f8c-1ade-4ff5-9eb4-2925a89567b1"),
                             Name = "Student",
                             NormalizedName = "STUDENT"
                         },
                         new
                         {
-                            Id = new Guid("90caaab6-bfc7-4b70-891a-4c6f327e29d8"),
+                            Id = new Guid("c6f92bbf-190f-47a5-b4d6-ed6874a378e8"),
                             Name = "Teacher",
                             NormalizedName = "TEACHER"
                         },
                         new
                         {
-                            Id = new Guid("bf88293a-32d6-4d73-bc83-fe763c143024"),
+                            Id = new Guid("8b814a50-fd96-4bfa-a666-b247c0f13e22"),
                             Name = "Administrator",
                             NormalizedName = "ADMINISTRATOR"
                         });
diff --git a/TechHelper.Server/Repositories/ExamRepository.cs b/TechHelper.Server/Repositories/ExamRepository.cs
index c702a22..bb61ecd 100644
--- a/TechHelper.Server/Repositories/ExamRepository.cs
+++ b/TechHelper.Server/Repositories/ExamRepository.cs
@@ -17,6 +17,7 @@ namespace TechHelper.Server.Repositories
 		{
 			_unitOfWork = unitOfWork;
 			_assignmentRepo = _unitOfWork.GetRepository<Assignment>();
+			_assignQuestionRepo = _unitOfWork.GetRepository<AssignmentQuestion>();	
 		}
 
 		public async Task<Assignment?> GetFullExamByIdAsync(Guid assignmentId)