From 5874d52f5393ac5630a1ff7c3553ea68befc7936 Mon Sep 17 00:00:00 2001 From: hanhh Date: Fri, 4 Jun 2021 19:14:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcron=E6=AD=A3=E5=88=99?= =?UTF-8?q?=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shell/update.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/shell/update.sh b/shell/update.sh index ccc51c9b..344c5688 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -125,13 +125,13 @@ add_cron() { if [ -f $file ]; then cron_line=$( perl -ne "{ - print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*/ - }" $file | + print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$file_name/ + }" $file | perl -pe "{ - s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*|\1|g; - s|\*([\d\*])(.*)|\1\2|g; - s| | |g; - }" | sort -u | head -1 + s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$file_name.*|\1|g; + s|\*([\d\*])(.*)|\1\2|g; + s| | |g; + }" | sort -u | head -1 ) cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1) [[ -z $cron_name ]] && cron_name="$file_name" @@ -194,10 +194,10 @@ update_raw() { cp -f $raw_file_name $dir_scripts/${filename} cron_line=$( perl -ne "{ - print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*/ + print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$raw_file_name/ }" $raw_file_name | perl -pe "{ - s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*|\1|g; + s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$raw_file_name.*|\1|g; s|\*([\d\*])(.*)|\1\2|g; s| | |g; }" | sort -u | head -1 From ece1ca84e2dbbedd1e2d37f1cf03c9b9e6e78570 Mon Sep 17 00:00:00 2001 From: hanhh Date: Fri, 4 Jun 2021 20:49:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcron=E6=AD=A3=E5=88=99?= =?UTF-8?q?=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shell/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/update.sh b/shell/update.sh index 344c5688..5eba4e96 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -135,6 +135,7 @@ add_cron() { ) cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1) [[ -z $cron_name ]] && cron_name="$file_name" + [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | xargs) [[ -z $cron_line ]] && cron_line="0 6 * * *" result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name") echo -e "$result" From 2bd9b82cc75e84cb9efa271b8474ff632b1f4053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E8=85=BE?= Date: Fri, 4 Jun 2021 20:57:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/log/index.module.less | 4 ---- src/pages/log/index.tsx | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/pages/log/index.module.less b/src/pages/log/index.module.less index fb59c15c..07e40d39 100644 --- a/src/pages/log/index.module.less +++ b/src/pages/log/index.module.less @@ -18,10 +18,6 @@ } &-search { margin-bottom: 16px; - // position: absolute; - // top: 0; - // left: 0; - // padding-bottom: 16px; } } diff --git a/src/pages/log/index.tsx b/src/pages/log/index.tsx index 532594c4..a18840d8 100644 --- a/src/pages/log/index.tsx +++ b/src/pages/log/index.tsx @@ -10,10 +10,10 @@ function getFilterData(keyword: string, data: any) { const expandedKeys: string[] = []; if (keyword) { const tree: any = []; - data.forEach((item) => { + data.forEach((item: any) => { if (item.title.includes(keyword)) { tree.push(item); - expandedKeys.push(...item.children.map((x) => x.key)); + expandedKeys.push(...item.children.map((x: any) => x.key)); } else { const children: any[] = []; (item.children || []).forEach((subItem: any) => { @@ -95,7 +95,7 @@ const Log = () => { const onSearch = useCallback( (e) => { const keyword = e.target.value; - const { tree, expandedKeys } = getFilterData(keyword, data); + const { tree } = getFilterData(keyword, data); setFilterData(tree); }, [data, setFilterData], From da1c5267b4c08e30684d332b46001b497247c4b5 Mon Sep 17 00:00:00 2001 From: zt8989 <251027705@qq.com> Date: Sun, 6 Jun 2021 08:07:56 +0800 Subject: [PATCH 4/4] Update index.module.less --- src/pages/log/index.module.less | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/log/index.module.less b/src/pages/log/index.module.less index 07e40d39..6eed1ad4 100644 --- a/src/pages/log/index.module.less +++ b/src/pages/log/index.module.less @@ -4,7 +4,6 @@ &-container { overflow: hidden; position: relative; - // padding: 16px 0; background-color: #fff; height: calc(100vh - 128px); height: calc(100vh - var(--vh-offset, 0px) - 128px);