Merge branch 'master' into hot-reload

packages/hydrojudge/.npmignore

@@ -0,0 +1,2 @@
+vendor/testlib/tests
+node_modules

packages/hydrojudge/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@hydrooj/hydrojudge",
     "bin": "bin/hydrojudge.js",
-    "version": "3.0.1",
+    "version": "3.0.3",
     "main": "package.json",
     "author": "undefined <i@undefined.moe>",
     "repository": "https://github.com/hydro-dev/Hydro.git",

packages/hydrojudge/src/sandbox.ts

@@ -71,7 +71,7 @@ function parseArgs(execute: string): string[] {
 function proc(params: Parameter): Cmd {
     const copyOut = supportOptional
         ? params.copyOut
-        : params.copyOut.map((i) => (i.endsWith('?') ? i.substring(0, i.length - 1) : i));
+        : (params.copyOut || []).map((i) => (i.endsWith('?') ? i.substring(0, i.length - 1) : i));
     const size = parseMemoryMB(getConfig('stdio_size'));
     const rate = getConfig('rate');
     const copyOutCached = [...(params.copyOutCached || [])];

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "3.17.10",
+    "version": "3.17.12",
     "bin": "bin/hydrooj.js",
     "main": "src/loader",
     "module": "src/loader",

packages/hydrooj/src/model/contest.ts

@@ -32,7 +32,12 @@ interface AcmDetail extends AcmJournal {
 }
 
 function buildContestRule<T>(def: ContestRule<T>): ContestRule<T> {
-    const _originalRule = { scoreboard: def.scoreboard, stat: def.stat };
+    const _originalRule = {
+        scoreboard: def.scoreboard,
+        scoreboardRow: def.scoreboardRow,
+        scoreboardHeader: def.scoreboardHeader,
+        stat: def.stat,
+    };
     def.scoreboard = (def._originalRule?.scoreboard || def.scoreboard).bind(def);
     def.scoreboardHeader = (def._originalRule?.scoreboardHeader || def.scoreboardHeader).bind(def);
     def.scoreboardRow = (def._originalRule?.scoreboardRow || def.scoreboardRow).bind(def);
@@ -234,10 +239,7 @@ const oi = buildContestRule({
         return columns;
     },
     async scoreboardRow(isExport, _, tdoc, pdict, udoc, rank, tsdoc, meta) {
-        const tsddict = {};
-        for (const item of tsdoc.journal || []) {
-            if (!tsddict[item.pid] || tsddict[item.pid].score < item.score || this.submitAfterAccept) tsddict[item.pid] = item;
-        }
+        const tsddict = tsdoc.detail || {};
         const row: ScoreboardNode[] = [
             { type: 'rank', value: rank.toString() },
             { type: 'user', value: udoc.uname, raw: tsdoc.uid },

packages/ui-default/build/main.ts

@@ -122,9 +122,9 @@ async function main() {
       fs.copyFileSync('public/default.theme.css', `public/default-${pkg.version}.theme.css`);
     }
     if (argv.options.production) {
-      fs.removeSync('public/vditor/dist/js/echarts');
-      fs.removeSync('public/vditor/dist/js/graphviz');
-      fs.removeSync('public/vditor/dist/js/mermaid');
+      for (const f of ['echarts', 'graphviz', 'mermaid', 'mathjax']) {
+        fs.removeSync(`public/vditor/dist/js/${f}`);
+      }
       const files = fs.readdirSync('public');
       files.filter((i) => /(^[in]\..+|worker)\.js\.map$/.test(i)).forEach((i) => fs.removeSync(`public/${i}`));
     }

packages/ui-default/components/autocomplete/components/AutoComplete.tsx

@@ -130,7 +130,7 @@ const AutoComplete = forwardRef(function Impl<T>(props: AutoCompleteProps<T>, re
 
   const dispatchChange = () => {
     if (!multi) onChange(inputRef.current?.value);
-    else onChange(selectedKeys.join(','));
+    else onChange([...selectedKeys, inputRef.current?.value].filter((v) => v?.trim().length > 0).join(','));
   };
 
   let first = !multi;
@@ -148,7 +148,7 @@ const AutoComplete = forwardRef(function Impl<T>(props: AutoCompleteProps<T>, re
 
   const handleInputChange = debounce((e?) => queryList(e ? e.target.value : ''), 300);
 
-  const toggleItem = (item: T, key = itemKey(item)) => {
+  const toggleItem = (item: T, key = itemKey(item), preserve = false) => {
     const shouldKeepOpen = allowEmptyQuery && inputRef.current.value === '' && !multi;
     if (multi) {
       const idx = selectedKeys.indexOf(key);
@@ -167,14 +167,14 @@ const AutoComplete = forwardRef(function Impl<T>(props: AutoCompleteProps<T>, re
         setSelected((s) => [...s, item]);
         setSelectedKeys((s) => [...s, key]);
       }
-      inputRef.current.value = '';
+      if (!preserve) inputRef.current.value = '';
       inputRef.current.focus();
     } else {
       setSelected([item]);
       setSelectedKeys([key]);
       inputRef.current.value = key;
-      dispatchChange();
     }
+    dispatchChange();
     if (!shouldKeepOpen) {
       setItemList([]);
       setCurrentItem(null);
@@ -231,8 +231,8 @@ const AutoComplete = forwardRef(function Impl<T>(props: AutoCompleteProps<T>, re
 
   useImperativeHandle(ref, () => ({
     getSelectedItems: () => selected,
-    getSelectedItemKeys: () => selectedKeys,
-    getSelectedItemsAsString: () => selectedKeys.join(','),
+    getSelectedItemKeys: () => [...selectedKeys, inputRef.current?.value].filter((v) => v?.trim().length > 0),
+    getSelectedItemsAsString: () => [...selectedKeys, inputRef.current?.value].filter((v) => v?.trim().length > 0).join(','),
     setSelectedItems: (items) => {
       setSelected(items);
       setSelectedKeys(items.map((i) => itemKey(i)));
@@ -285,7 +285,7 @@ const AutoComplete = forwardRef(function Impl<T>(props: AutoCompleteProps<T>, re
             return (
               <DraggableSelection type={draggableId} id={key} move={move} className="autocomplete-tag" key={item ? key : `draft-${key}`}>
                 <div>{item ? itemText(item) : key}</div>
-                <Icon name="close" onClick={() => toggleItem(item, key)} />
+                <Icon name="close" onClick={() => toggleItem(item, key, true)} />
               </DraggableSelection>
             );
           })}

packages/ui-default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.40.7",
+  "version": "4.40.8",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",