open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-07-28 15:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加codemirror搜索功能

Browse Source
This commit is contained in:
hanhh 2021-07-20 00:10:18 +08:00
parent 0da91dbf6c
commit 70444af762
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.umirc.ts
View File

@ -39,5 +39,8 @@ export default defineConfig({
'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/mode/shell/shell.js', 'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/mode/shell/shell.js',
'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/mode/python/python.js', 'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/mode/python/python.js',
'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/mode/javascript/javascript.js', 'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/mode/javascript/javascript.js',
'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/addon/dialog/dialog.js',
'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/addon/search/search.js',
'https://cdn.jsdelivr.net/npm/codemirror@5.62.0/addon/search/searchcursor.js',
], ],
}); });

48
shell/task.sh
View File

@ -99,7 +99,7 @@ run_normal() {
echo -e "## task_before执行失败，自行检查\n" | tee -p -a $log_path echo -e "## task_before执行失败，自行检查\n" | tee -p -a $log_path
fi fi
timeout $command_timeout_time $which_program $p1 2>&1 | tee -p -a $log_path timeout -k 10s $command_timeout_time $which_program $p1 2>&1 | tee -p -a $log_path
if [[ ! $(. $file_task_after 1>/dev/null) ]]; then if [[ ! $(. $file_task_after 1>/dev/null) ]]; then
. $file_task_after . $file_task_after
@ -145,8 +145,8 @@ run_concurrent() {
single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N") single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
for i in "${!array[@]}"; do for i in "${!array[@]}"; do
export ${p3}=${array[i]} export ${p3}=${array[i]}
single_log_path="$log_dir/${single_log_time}_$((i+1)).log" single_log_path="$log_dir/${single_log_time}_$((i + 1)).log"
timeout $command_timeout_time $which_program $p1 &>$single_log_path & timeout -k 10s $command_timeout_time $which_program $p1 &>$single_log_path &
done done
if [[ ! $(. $file_task_after 1>/dev/null) ]]; then if [[ ! $(. $file_task_after 1>/dev/null) ]]; then
@ -178,7 +178,7 @@ run_else() {
echo -e "## task_before执行失败，自行检查\n" | tee -p -a $log_path echo -e "## task_before执行失败，自行检查\n" | tee -p -a $log_path
fi fi
timeout $command_timeout_time "$@" 2>&1 | tee -p -a $log_path timeout -k 10s $command_timeout_time bash -c "$@" 2>&1 | tee -p -a $log_path
if [[ ! $(. $file_task_after 1>/dev/null) ]]; then if [[ ! $(. $file_task_after 1>/dev/null) ]]; then
. $file_task_after . $file_task_after
@ -193,31 +193,35 @@ run_else() {
## 命令检测 ## 命令检测
main() { main() {
case $# in if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
0) case $# in
echo 0)
usage echo
;; usage
1)
run_normal $1
;;
2|3)
case $2 in
now)
run_normal $1 $2
;; ;;
conc) 1)
run_concurrent $1 $2 $3 run_normal $1
;;
2 | 3)
case $2 in
now)
run_normal $1 $2
;;
conc)
run_concurrent $1 $2 $3
;;
*)
run_else "$@"
;;
esac
;; ;;
*) *)
run_else "$@" run_else "$@"
;; ;;
esac esac
;; else
*)
run_else "$@" run_else "$@"
;; fi
esac
} }
main "$@" main "$@"

1
src/layouts/index.less
View File

@ -14,6 +14,7 @@ body {
} }
@import '~codemirror/lib/codemirror.css'; @import '~codemirror/lib/codemirror.css';
@import '~codemirror/addon/dialog/dialog.css';
.ql-container-wrapper { .ql-container-wrapper {
.CodeMirror { .CodeMirror {