From ffc8ae7d04c3aebcf2bd78fea1211a7c18335cfa Mon Sep 17 00:00:00 2001 From: dami Date: Sat, 12 Jul 2025 17:43:45 +0800 Subject: [PATCH] update --- web/admin/crontab/__init__.py | 1 + web/static/app/crontab.js | 58 ++++++++++++++++++++------------------ web/templates/default/crontab.html | 1 + web/utils/crontab.py | 1 + 4 files changed, 34 insertions(+), 27 deletions(-) diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py index 2fd69344b..b43c89e58 100644 --- a/web/admin/crontab/__init__.py +++ b/web/admin/crontab/__init__.py @@ -117,6 +117,7 @@ def add(): request_data['sname'] = request.form.get('sname', '') request_data['sbody'] = request.form.get('sbody', '') request_data['url_address'] = request.form.get('url_address', '') + request_data['attr'] = request.form.get('attr', '') info = thisdb.getCronByName(request_data['name']) if info is not None: diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js index 738afca5e..023b9d7b4 100755 --- a/web/static/app/crontab.js +++ b/web/static/app/crontab.js @@ -211,13 +211,13 @@ function planAdd(){ } $("#cronConfig input[name='name']").val(name); - var type = $(".plancycle").find("b").attr("val"); - $("#cronConfig input[name='type']").val(type); + var time_type = $(".plancycle").find("b").attr("val"); + $("#cronConfig input[name='type']").val(time_type); var is1; var is2 = 1; - switch(type){ + switch(time_type){ case 'day-n': is1=31; break; @@ -265,10 +265,10 @@ function planAdd(){ $("#cronConfig input[name='save']").val(save); $("#cronConfig input[name='week']").val($(".planweek").find("b").attr("val")); - var sType = $(".planjs").find("b").attr("val"); + var cron_type = $(".planjs").find("b").attr("val"); var sBody = encodeURIComponent($("#implement textarea[name='sbody']").val()); - if (sType == 'toShell'){ + if (cron_type == 'toShell'){ if(sBody == ''){ $("#implement textarea[name='sbody']").focus(); layer.msg('脚本代码不能为空!',{icon:2}); @@ -276,7 +276,7 @@ function planAdd(){ } } - if(sType == 'toFile'){ + if(cron_type == 'toFile'){ if($("#viewfile").val() == ''){ layer.msg('请选择脚本文件!',{icon:2}); return; @@ -284,7 +284,7 @@ function planAdd(){ } var url_address = $("#url_address").val(); - if(sType == 'toUrl'){ + if(cron_type == 'toUrl'){ if(!isURL(url_address)){ layer.msg('URL地址不正确!',{icon:2}); $("implement textarea[name='url_address']").focus(); @@ -293,16 +293,21 @@ function planAdd(){ } // url_address = encodeURIComponent(url_address); $("#cronConfig input[name='url_address']").val(url_address); - $("#cronConfig input[name='stype']").val(sType); + $("#cronConfig input[name='stype']").val(cron_type); $("#cronConfig textarea[name='sbody']").val(decodeURIComponent(sBody)); - if(sType == 'site' || sType == 'database' || sType.indexOf('database_')>-1 || sType == 'path'){ + if(cron_type == 'site' || cron_type == 'database' || cron_type.indexOf('database_')>-1 || cron_type == 'path'){ var backupTo = $(".planBackupTo").find("b").attr("val"); $("#backup_to").val(backupTo); } + + if (cron_type=='site' || cron_type=='path'){ + var attr = $("#exclude_dir textarea[name='exclude_dir']").val(); + $("#attr").val(attr); + } - var sName = $("#sName").attr("val"); - $("#cronConfig input[name='sname']").val(sName); + var sname = $("#sname").attr("val"); + $("#cronConfig input[name='sname']").val(sname); // if(sName == 'backupAll'){ // var alist = $("ul[aria-labelledby='backdata'] li a"); @@ -319,27 +324,27 @@ function planAdd(){ // return; // } - if (type == 'minute-n'){ + if (time_type == 'minute-n'){ var where1 = $("#ptime input[name='where1']").val(); $("#cronConfig input[name='where1']").val(where1); } - if (type == 'day-n'){ + if (time_type == 'day-n'){ var where1 = $("#ptime input[name='where1']").val(); $("#cronConfig input[name='where1']").val(where1); } - if (type == 'hour-n'){ + if (time_type == 'hour-n'){ var where1 = $("#ptime input[name='where1']").val(); $("#cronConfig input[name='where1']").val(where1); } - if (type == 'month'){ + if (time_type == 'month'){ var where1 = $("#ptime input[name='where1']").val(); $("#cronConfig input[name='where1']").val(where1); } - if (type == 'week'){ + if (time_type == 'week'){ var where1 = $("#ptime input[name='where1']").val(); $("#cronConfig input[name='where1']").val(where1); } @@ -424,7 +429,6 @@ function initDropdownMenu(){ break; case 'path': $('#tag_exclude_dir').show(); - console.log("path"); toBackup('path'); $(".controls").html('备份目录'); break; @@ -516,7 +520,7 @@ function toLogsHtml(type){ var sBody = '
\ \ \
\ @@ -530,7 +534,7 @@ function toLogsHtml(type){ getselectname(); $('.changePathDir').click(function(){ - changePathCallback($('#sName').val(),function(select_dir){ + changePathCallback($('#sname').val(),function(select_dir){ $(".planname input[name='name']").val('备份目录['+select_dir+']'); $('#implement .sname b').attr('val',select_dir).text(select_dir); }); @@ -538,9 +542,9 @@ function toLogsHtml(type){ $(".dropdown ul li a").click(function(){ - var sName = $("#sName").attr("val"); - if(!sName) return; - $(".planname input[name='name']").val(sMsg+'['+sName+']'); + var sname = $("#sname").attr("val"); + if(!sname) return; + $(".planname input[name='name']").val(sMsg+'['+sname+']'); }); },'json'); @@ -612,7 +616,7 @@ function toBackup(type){ var sBody = '
\ \ \
\ @@ -643,9 +647,9 @@ function toBackup(type){ $(".dropdown ul li a").click(function(){ - var sName = $("#sname").attr("val"); - if(!sName) return; - $(".planname input[name='name']").val(sMsg+'['+sName+']'); + var sname = $("#sname").attr("val"); + if(!sname) return; + $(".planname input[name='name']").val(sMsg+'['+sname+']'); }); },'json'); @@ -741,7 +745,7 @@ function editTaskInfo(id){ layer.open({ type:1, title:'编辑计划任务-['+rdata.name+']', - area: ['850px','440px'], + area: ['900px','440px'], skin:'layer-create-content', shadeClose:false, closeBtn:1, diff --git a/web/templates/default/crontab.html b/web/templates/default/crontab.html index 359a4b47f..4be0ac1d8 100755 --- a/web/templates/default/crontab.html +++ b/web/templates/default/crontab.html @@ -117,6 +117,7 @@ + diff --git a/web/utils/crontab.py b/web/utils/crontab.py index 0bca433bd..bc1ffac1c 100644 --- a/web/utils/crontab.py +++ b/web/utils/crontab.py @@ -181,6 +181,7 @@ class crontab(object): add_dbdata['stype'] = data['stype'] add_dbdata['echo'] = cron_shell add_dbdata['url_address'] = data['url_address'] + add_dbdata['attr'] = data['attr'] tid = thisdb.addCrontab(add_dbdata) return tid