Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-19 17:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into contest-problemlist

Browse Source
This commit is contained in:
undefined committed 2022-10-18 16:56:18 +08:00
2 parents f1cbe155c7 a230d1c7c3
commit 58c0cade0e
28 files changed
+304 -187
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/ui-default/components/scratchpad/ScratchpadEditorContainer.tsx
+2 -2
View File
@@ -26,7 +26,7 @@ export default connect((state: any) => ({
});
},
}))(class MonacoEditor extends React.PureComponent<ScratchpadOptions> {
disposable = [];
disposable: monaco.IDisposable[] = [];
__prevent_trigger_change_event = false;
model: monaco.editor.ITextModel;
editor: monaco.editor.IStandaloneCodeEditor;
@@ -78,7 +78,7 @@ export default connect((state: any) => ({
[
{
range: model.getFullModelRange(),
text: value,
text: value!,
},
],
() => null,
packages/ui-default/components/selectUser.ts
+27 -28
View File
@@ -4,37 +4,36 @@ import i18n from 'vj/utils/i18n';
import tpl from 'vj/utils/tpl';
import createHint from './hint';
let inserted = false;
let hintInserted = false;
$(tpl`<div style="display: none" class="dialog__body--user-select">
<div class="row"><div class="columns">
<h1 name="select_user_hint">${i18n('Select User')}</h1>
</div></div>
<div class="row">
<div class="columns">
<label>${i18n('Username / UID')}
<input name="user" type="text" class="textbox" autocomplete="off" data-autofocus>
</label>
</div>
</div>
</div>`).appendTo(document.body);
const userSelector = UserSelectAutoComplete.getOrConstruct($('.dialog__body--user-select [name="user"]')) as any;
const userSelectDialog = new ActionDialog({
$body: $('.dialog__body--user-select > div'),
onDispatch(action) {
if (action === 'ok' && userSelector.value() === null) {
userSelector.focus();
return false;
}
return true;
},
});
export default async function selectUser(hint?: string) {
if (!inserted) {
const el = $(tpl`<div style="display: none" class="dialog__body--user-select">
<div class="row"><div class="columns">
<h1 name="select_user_hint">${i18n('Select User')}</h1>
</div></div>
<div class="row">
<div class="columns">
<label>${i18n('Username / UID')}
<input name="user" type="text" class="textbox" autocomplete="off" data-autofocus>
</label>
</div>
</div>
</div>`);
el.appendTo(document.body);
if (hint) createHint(hint, $('[name="select_user_hint"]'));
inserted = true;
if (hint && !hintInserted) {
createHint(hint, $('[name="select_user_hint"]'));
hintInserted = true;
}
const userSelector = UserSelectAutoComplete.getOrConstruct($('.dialog__body--user-select [name="user"]')) as any;
const userSelectDialog = new ActionDialog({
$body: $('.dialog__body--user-select > div'),
onDispatch(action) {
if (action === 'ok' && userSelector.value() === null) {
userSelector.focus();
return false;
}
return true;
},
});
userSelector.clear();
const action = await userSelectDialog.open();
if (action !== 'ok') return null;