From 336cff75f205cecf3f3434a8f5bfeeae62892474 Mon Sep 17 00:00:00 2001 From: undefined Date: Mon, 26 Jul 2021 13:58:46 +0800 Subject: [PATCH] =?UTF-8?q?ui:=20=E4=B8=BA=E4=BD=BF=E7=94=A8=E6=96=87?= =?UTF-8?q?=E4=BB=B6IO=E7=9A=84=E9=A2=98=E7=9B=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/lib/testdataConfig.ts | 4 ++++ packages/ui-default/locales/en.yaml | 1 + packages/ui-default/locales/zh.yaml | 1 + packages/ui-default/package.json | 2 +- packages/ui-default/templates/problem_detail.html | 2 +- 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index afc79438c..8374309c5 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.29.43", + "version": "2.29.44", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", diff --git a/packages/hydrooj/src/lib/testdataConfig.ts b/packages/hydrooj/src/lib/testdataConfig.ts index d0f49f41a..1ca1ed86f 100644 --- a/packages/hydrooj/src/lib/testdataConfig.ts +++ b/packages/hydrooj/src/lib/testdataConfig.ts @@ -36,6 +36,10 @@ export async function parseConfig(config: string | ProblemConfigFile = {}) { result.timeMax = result.timeMin = 1000; } if (cfg.langs) result.langs = cfg.langs; + if (cfg.filename && result.type === 'default') { + result.type = 'fileio'; + result.subType = cfg.filename; + } return result; } diff --git a/packages/ui-default/locales/en.yaml b/packages/ui-default/locales/en.yaml index 80d50d12a..babb14e35 100644 --- a/packages/ui-default/locales/en.yaml +++ b/packages/ui-default/locales/en.yaml @@ -25,6 +25,7 @@ problem_solution: Problem Solution problem_statistics: Problem Statistics problem_submit: Problem Submit problem_type.default: 'Type: Default' +problem_type.fileio: 'Type: FileIO ({0})' problem_type.interactive: 'Type: Interactive' problem_type.remote_judge: 'Type: RemoteJudge' problem_type.subjective: 'Type: Subjective' diff --git a/packages/ui-default/locales/zh.yaml b/packages/ui-default/locales/zh.yaml index 7cfe172b5..08e1195c7 100644 --- a/packages/ui-default/locales/zh.yaml +++ b/packages/ui-default/locales/zh.yaml @@ -555,6 +555,7 @@ problem_solution: 题解 problem_statistics: 题目统计 problem_submit: 递交代码 problem_type.default: 传统题 +problem_type.fileio: '文件IO ({0})' problem_type.interactive: 交互题 problem_type.remote_judge: 远端评测题 problem_type.subjective: 客观题 diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index be1bfb187..07ea1c1c6 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.13.9", + "version": "4.13.10", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/problem_detail.html b/packages/ui-default/templates/problem_detail.html index 25c7e0c40..78d999927 100644 --- a/packages/ui-default/templates/problem_detail.html +++ b/packages/ui-default/templates/problem_detail.html @@ -40,7 +40,7 @@
    {{ _('ID') }}: {{ pdoc.docId }} - {{ _('problem_type.' + pdoc.config.type) }} + {{ _('problem_type.' + pdoc.config.type).format(pdoc.config.subType) }} {% if pdoc.config.type != 'subjective' and pdoc.config.type != 'submit_answer' %} {{ pdoc.config.timeMax if pdoc.config.timeMax == pdoc.config.timeMin else pdoc.config.timeMin+'~'+pdoc.config.timeMax }}ms {{ pdoc.config.memoryMax if pdoc.config.memoryMax == pdoc.config.memoryMin else pdoc.config.memoryMin+'~'+pdoc.config.memoryMax }}MiB