From e0ff3a2c64d9e9de061889d2ad145ed29a492cb1 Mon Sep 17 00:00:00 2001 From: enncy <877526278@qq.com> Date: Sun, 22 May 2022 01:25:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(core):=20=E6=96=B0=E5=A2=9E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E7=AD=94=E9=A2=98=E9=80=89=E9=A1=B9=EF=BC=9A=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/src/components/index.tsx | 35 ++++++++++++++++---------- packages/core/src/core/worker/index.ts | 6 ++++- packages/core/src/scripts.ts | 2 +- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/packages/core/src/components/index.tsx b/packages/core/src/components/index.tsx index 55b2b3fd..c7658d22 100644 --- a/packages/core/src/components/index.tsx +++ b/packages/core/src/components/index.tsx @@ -55,22 +55,29 @@ export function createWorkerSetting ( : [ { label: '关闭自动答题', - value: 'close' + value: 'close', + title: '关闭自动答题后, 脚本将忽略答题, 自动进入下一节。' }, { label: '完成后自动保存', - value: 'save' + value: 'save', + title: '完成后自动保存答案, 注意如果你开启了随机作答, 有可能分辨不出答案是否正确。' }, { label: '完成后不做任何动作', - value: 'nomove' + value: 'nomove', + title: '完成后既不保存也不提交, 等待时间过后将会自动下一节, 适合在测试脚本时使用。' + }, + { + label: '强制自动提交', + value: 'force', + title: '不管答案是否正确直接强制自动提交,如需开启,请配合随机作答谨慎使用。' + }, ...[10, 20, 30, 40, 50, 60, 70, 80, 90].map((rate) => ({ label: `查到大于${rate}%的题目则自动提交`, value: rate, - attrs: { - title: `例如: 100题, 搜索到大于 ${rate} 的题, 则会自动提交答案。` - } + title: `例如: 100题, 搜索到大于 ${rate} 的题, 则会自动提交答案。` })), { label: '每个题目都查到答案才自动提交', @@ -91,13 +98,15 @@ export function createWorkerSetting ( <>
- + + +
diff --git a/packages/core/src/core/worker/index.ts b/packages/core/src/core/worker/index.ts index 0ca4dddb..9bd44eb3 100644 --- a/packages/core/src/core/worker/index.ts +++ b/packages/core/src/core/worker/index.ts @@ -185,7 +185,11 @@ export class OCSWorker { } const rate = results.length === 0 ? 0 : (finished / results.length) * 100; if (uploadRate !== 'nomove') { - await callback(rate, uploadRate === 'save' ? false : rate >= parseFloat(uploadRate)); + if (uploadRate === 'force') { + await callback(rate, true); + } else { + await callback(rate, uploadRate === 'save' ? false : rate >= parseFloat(uploadRate)); + } } } } diff --git a/packages/core/src/scripts.ts b/packages/core/src/scripts.ts index 86247a8f..0d9cb6e2 100644 --- a/packages/core/src/scripts.ts +++ b/packages/core/src/scripts.ts @@ -21,7 +21,7 @@ export interface CXSetting { /** 复习模式 */ restudy: boolean, /** 章节测试自动答题 */ - upload: 'close' + upload: string /** 播放路线列表 */ playlines: string[] /** 播放路线 */