fix(script): 修复重新答题按钮点击后，答题完成后的一些操作依然在进行的BUG

ocsjs · Mar 27, 2024 · e7148a3 · e7148a3
1 parent 978d927
commit e7148a3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/packages/scripts/src/projects/icourse.ts b/packages/scripts/src/projects/icourse.ts
@@ -490,11 +490,16 @@ function workAndExam(
 	worker
 		.doWork()
 		.then(async (results) => {
+			if (worker.isClose) {
+				return;
+			}
 			if (type === 'chapter-test') {
 				$message('info', { content: `答题完成，将等待 ${stopSecondWhenFinish} 秒后进行保存或提交。` });
 				$console.info(`答题完成，将等待 ${stopSecondWhenFinish} 秒后进行保存或提交。`);
 				await $.sleep(stopSecondWhenFinish * 1000);
-
+				if (worker.isClose) {
+					return;
+				}
 				// 处理提交
 				await worker.uploadHandler({
 					type: upload,
@@ -507,7 +512,9 @@ function workAndExam(
 						$message('success', { content: content, duration: 0 });
 
 						await $.sleep(3000);
-
+						if (worker.isClose) {
+							return;
+						}
 						if (uploadable) {
 							const sumbit = document.querySelector('.j-submit');
 							if (sumbit) {

diff --git a/packages/scripts/src/projects/zhs.ts b/packages/scripts/src/projects/zhs.ts
@@ -912,13 +912,24 @@ function gxkWorkAndExam(
 	worker
 		.doWork()
 		.then(async () => {
+			// 如果被强制关闭，则不进行保存操作
+			if (worker.isClose === true) {
+				return;
+			}
 			$message('success', { content: `答题完成，将等待 ${stopSecondWhenFinish} 秒后进行保存或提交。` });
 			await $.sleep(stopSecondWhenFinish * 1000);
-
+			// @ts-ignore
+			if (worker.isClose === true) {
+				return;
+			}
 			/**
 			 * 保存题目，不在选择答案后保存的原因是，如果答题线程大于3会导致题目错乱，因为 resolverIndex 并不是顺序递增的
 			 */
 			for (let index = 0; index < worker.totalQuestionCount; index++) {
+				// @ts-ignore
+				if (worker.isClose === true) {
+					return;
+				}
 				const modal = $modal('alert', {
 					content: '正在保存题目中（必须保存，否则填写的答案无效），<br>请勿操作...',
 					confirmButton: null