From 4c7e51631bb3459071ec70c49500a858a4bb8ab0 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Wed, 2 Jun 2021 11:56:43 +0800
Subject: [PATCH] core&ui: hello subjective

---
 packages/hydrooj/package.json                     |  4 ++--
 packages/hydrooj/src/lib/testdataConfig.ts        |  1 +
 .../components/subjective-question/index.jsx      |  8 +++++---
 packages/ui-default/package.json                  |  4 ++--
 packages/ui-default/pages/problem_detail.page.jsx | 15 ++++++++++++++-
 packages/ui-default/templates/problem_detail.html |  7 +++++--
 packages/utils/lib/cases.ts                       |  4 ++--
 packages/utils/package.json                       |  2 +-
 8 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index de7eb445e..47a9eeba4 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.28.16",
+    "version": "2.28.17",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",
@@ -12,7 +12,7 @@
     },
     "preferUnplugged": true,
     "dependencies": {
-        "@hydrooj/utils": "^1.0.19",
+        "@hydrooj/utils": "^1.0.20",
         "adm-zip": "^0.5.5",
         "ansi_up": "^5.0.1",
         "cac": "^6.7.3",
diff --git a/packages/hydrooj/src/lib/testdataConfig.ts b/packages/hydrooj/src/lib/testdataConfig.ts
index 969d231ca..4263134ad 100644
--- a/packages/hydrooj/src/lib/testdataConfig.ts
+++ b/packages/hydrooj/src/lib/testdataConfig.ts
@@ -34,6 +34,7 @@ export async function parseConfig(config: string | ProblemConfigFile = {}) {
         result.timeMax = result.timeMin = 1000;
     }
     if (cfg.langs) result.langs = cfg.langs;
+    console.log(result);
     return result;
 }
 
diff --git a/packages/ui-default/components/subjective-question/index.jsx b/packages/ui-default/components/subjective-question/index.jsx
index 2087a228b..fecda37f8 100644
--- a/packages/ui-default/components/subjective-question/index.jsx
+++ b/packages/ui-default/components/subjective-question/index.jsx
@@ -36,7 +36,7 @@ export default class SubjectiveContainer extends React.PureComponent {
   Textbox(args, name) {
     return (
       <label htmlFor={`textbox${name}`}>
-        {args.desc}
+        {name}. {args.desc}
         <div name={`form_item_${name}`} className="textbox-container">
           <input type="text" name={name} id={`textbox${name}`} className="textbox" onChange={this.onChange}></input>
         </div>
@@ -47,7 +47,7 @@ export default class SubjectiveContainer extends React.PureComponent {
   Radio(args, name) {
     return (
       <>
-        {args.desc}
+        {name}. {args.desc}
         {args.choices.map((i) => (
           <label className="radiobox" htmlFor={`radio${name}${i}`} key={i}>
             <input type="radio" name={name} id={`radio${name}${i}`} value={i} onChange={this.onChange} /> {i} <br />
@@ -67,7 +67,9 @@ export default class SubjectiveContainer extends React.PureComponent {
             </div>
           </div>
         ))}
-        <input type="submit" className="button rounded primary" value="提交" />
+        {document.getElementsByClassName('nav__item--round').length
+          ? <input type="submit" disabled className="button rounded primary" value="登录后提交" />
+          : <input type="submit" className="button rounded primary" value="提交" />}
       </form>
     );
   }
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index 8c1b4ab8f..86e0790d1 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.11.8",
+  "version": "4.11.9",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
@@ -26,7 +26,7 @@
     "@blueprintjs/core": "^3.45.0",
     "@blueprintjs/icons": "^3.26.1",
     "@blueprintjs/select": "^3.16.4",
-    "@hydrooj/utils": "^1.0.15",
+    "@hydrooj/utils": "^1.0.20",
     "@undefined-moe/monaco-yaml": "^2.5.0",
     "ansi_up": "^5.0.1",
     "autoprefixer": "^9.8.6",
diff --git a/packages/ui-default/pages/problem_detail.page.jsx b/packages/ui-default/pages/problem_detail.page.jsx
index ab97ceaac..13bf3c8cb 100644
--- a/packages/ui-default/pages/problem_detail.page.jsx
+++ b/packages/ui-default/pages/problem_detail.page.jsx
@@ -177,7 +177,20 @@ const page = new NamedPage(['problem_detail', 'contest_detail_problem', 'homewor
   async function loadSubjective() {
     try {
       if (UiContext.pdoc.config?.type !== 'subjective') return;
-      const props = yaml.load(document.getElementsByClassName('section__body typo')[0].innerText);
+      let s = '';
+      try {
+        s = JSON.parse(UiContext.pdoc.content);
+      } catch {
+        s = UiContext.pdoc.content;
+      }
+      if (typeof s === 'object') {
+        const langs = Object.keys(s);
+        const f = langs.filter((i) => i.startsWith(UserContext.viewLang));
+        if (s[UserContext.viewLang]) s = s[UserContext.viewLang];
+        else if (f.length) s = s[f[0]];
+        else s = s[langs[0]];
+      }
+      const props = yaml.load(s);
       if (!(props instanceof Array)) return;
       $('.outer-loader-container').show();
       const { default: Subjective } = await import('vj/components/subjective-question/index');
diff --git a/packages/ui-default/templates/problem_detail.html b/packages/ui-default/templates/problem_detail.html
index 18dc8a3bd..f6949025a 100644
--- a/packages/ui-default/templates/problem_detail.html
+++ b/packages/ui-default/templates/problem_detail.html
@@ -39,8 +39,11 @@
       </div>
       <div class="section__body">
         <ul class="problem__tags">
-          <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Time') }}: {{ pdoc.config.timeMax if pdoc.config.timeMax == pdoc.config.timeMin else pdoc.config.timeMin+'~'+pdoc.config.timeMax }}ms</span>
-          <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Memory') }}: {{ pdoc.config.memoryMax if pdoc.config.memoryMax == pdoc.config.memoryMin else pdoc.config.memoryMin+'~'+pdoc.config.memoryMax }}MiB</span>
+          <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Type') }}: {{ pdoc.config.type }}</span>
+          {% if pdoc.config.type != 'subjective' and pdoc.config.type != 'submit_answer' %}
+            <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Time') }}: {{ pdoc.config.timeMax if pdoc.config.timeMax == pdoc.config.timeMin else pdoc.config.timeMin+'~'+pdoc.config.timeMax }}ms</span>
+            <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Memory') }}: {{ pdoc.config.memoryMax if pdoc.config.memoryMax == pdoc.config.memoryMin else pdoc.config.memoryMin+'~'+pdoc.config.memoryMax }}MiB</span>
+          {% endif %}
           <a class="bp3-tag bp3-large bp3-minimal bp3-interactive problem__tag-item" href="{{ url('record_main', query={pid:pdoc.docId}) }}">{{ _('Submitted') }}: {{ pdoc.nSubmit }}</a>
           <a class="bp3-tag bp3-large bp3-minimal bp3-interactive problem__tag-item" href="{{ url('record_main', query={pid:pdoc.docId, status:1}) }}">{{ _('Accepted') }}: {{ pdoc.nAccept }}</a>
           <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Accepted Ratio') }}: {% if pdoc.nSubmit > 0 %}{{ (100 * pdoc.nAccept / pdoc.nSubmit)|round|int }}%{% else %}{{ _('?') }}{% endif %}</span>
diff --git a/packages/utils/lib/cases.ts b/packages/utils/lib/cases.ts
index 51924033c..3bbfadaa7 100644
--- a/packages/utils/lib/cases.ts
+++ b/packages/utils/lib/cases.ts
@@ -31,7 +31,7 @@ export default async function readYamlCases(cfg: Record<string, any> = {}, check
         } else throw new Error('Invalid user_extra_files config.');
     }
     if (cfg.outputs) {
-        config.type = 'subjective';
+        config.type = cfg.type || 'subjective';
     } else if (cfg.cases?.length) {
         config.subtasks = [{
             score: +cfg.score || Math.floor(100 / cfg.cases.length),
@@ -70,7 +70,7 @@ export default async function readYamlCases(cfg: Record<string, any> = {}, check
     }
     if (cfg.time) config.time = parseTimeMS(cfg.time);
     if (cfg.memory) config.memory = parseMemoryMB(cfg.memory);
-    if (config.type === 'submit_answer' && !cfg.outputs?.length) throw new Error('outputs config not found');
+    if ((config.type === 'subjective' || cfg.type === 'submit_answer') && !cfg.outputs?.length) throw new Error('outputs config not found');
     return Object.assign(cfg, config);
 }
 
diff --git a/packages/utils/package.json b/packages/utils/package.json
index d413ae9ed..492aa9392 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hydrooj/utils",
-    "version": "1.0.19",
+    "version": "1.0.20",
     "description": "hydrooj utils",
     "main": "package.json",
     "repository": "https://github.com/hydro-dev/Hydro.git",