pull/310/head
midoks 2 years ago
parent b779a18de6
commit 79c1e81d2c
  1. 2
      class/core/config_api.py
  2. 41
      route/static/app/crontab.js
  3. 34
      route/static/app/public.js
  4. 2
      route/templates/default/crontab.html

@ -27,7 +27,7 @@ from flask import request
class config_api:
__version = '0.11.4.8'
__version = '0.11.4.9'
__api_addr = 'data/api.json'
def __init__(self):

@ -61,7 +61,7 @@ function getCronData(page){
}
var cron_backupto = '-';
if (rdata.data[i]['stype'] == 'site' || rdata.data[i]['stype']=='database' || rdata.data[i]['stype'].indexOf('database_')>-1 ){
if (rdata.data[i]['stype'] == 'site' || rdata.data[i]['stype']=='path' || rdata.data[i]['stype']=='database' || rdata.data[i]['stype'].indexOf('database_')>-1 ){
cron_backupto = '本地磁盘';
if (rdata.data[i]['backup_to'] != 'localhost'){
cron_backupto = getBackupName(rdata['backup_hook'],rdata.data[i]['backup_to']);
@ -297,7 +297,6 @@ function planAdd(){
$("#set-Config input[name='sName']").val(sName);
layer.msg('正在添加,请稍候...!',{icon:16,time:0,shade: [0.3, '#000']});
var data = $("#set-Config").serialize() + '&sBody='+sBody + '&urladdress=' + urladdress;
// console.log(data);
$.post('/crontab/add',data,function(rdata){
if(!rdata.status) {
layer.msg(rdata.msg,{icon:2, time:2000});
@ -500,11 +499,11 @@ function toBackup(type){
var changeDir = '';
if (sType == 'path'){
changeDir = '<span onclick="changePath(\'sName\')" class="glyphicon glyphicon-folder-open cursor mr20" style="float:left;line-height: 30px;"></span>';
changeDir = '<span class="glyphicon glyphicon-folder-open cursor mr20 changePathDir" style="float:left;line-height: 30px;"></span>';
}
var sBody = '<div class="dropdown pull-left mr20">\
<button class="btn btn-default dropdown-toggle" type="button" id="backdata" data-toggle="dropdown" style="width:auto">\
var sBody = '<div class="dropdown pull-left mr20 check">\
<button class="btn btn-default dropdown-toggle sname" type="button" id="backdata" data-toggle="dropdown" style="width:auto">\
<b id="sName" val="'+rdata.data[0].name+'">'+rdata.data[0].name+'['+rdata.data[0].ps+']</b> <span class="caret"></span>\
</button>\
<ul class="dropdown-menu" role="menu" aria-labelledby="backdata">'+sOpt+'</ul>\
@ -526,6 +525,15 @@ function toBackup(type){
</div>';
$("#implement").html(sBody);
getselectname();
$('.changePathDir').click(function(){
changePathCallback($('#sName').val(),function(select_dir){
$(".planname input[name='name']").val('备份目录['+select_dir+']');
$('#implement .sname b').attr('val',select_dir).text(select_dir);
});
});
$(".dropdown ul li a").click(function(){
var sName = $("#sName").attr("val");
if(!sName) return;
@ -618,7 +626,7 @@ function editTaskInfo(id){
var changeDir = '';
if (obj.from.stype == 'path'){
changeDir = '<span onclick="changePath(\'sName\')" class="glyphicon glyphicon-folder-open cursor mr20" style="float:left;line-height: 30px;"></span>';
changeDir = '<span class="glyphicon glyphicon-folder-open cursor mr20 changePathDir" style="float:left;line-height: 30px;"></span>';
}
layer.open({
@ -707,12 +715,17 @@ function editTaskInfo(id){
<div class="clearfix plan ptb10">\
<div class="bt-submit plan-submits " style="margin-left: 141px;">保存编辑</div>\
</div>\
</div>'
,cancel: function(){
initDropdownMenu();
}
</div>',
success:function(){
$('.changePathDir').click(function(){
changePathCallback($('#sName').val(),function(select_dir){
$('input[name="name"]').val('备份目录['+select_dir+']');
$('.sName_btn button b').attr('val',select_dir).text(select_dir);
});
setTimeout(function(){
});
if(obj.from.stype == 'toShell'){
$('.site_list').hide();
}else if(obj.from.stype == 'rememory'){
@ -865,7 +878,11 @@ function editTaskInfo(id){
},'json');
});
},100);
}
,cancel: function(){
initDropdownMenu();
}
});
});
},'json');
}

@ -220,7 +220,7 @@ function getFormatTime(tm, format) {
function changePathCallback() {
function changePathCallback(default_dir, callback) {
var c = layer.open({
type: 1,
@ -236,26 +236,27 @@ function changePathCallback() {
<thead><tr class='file-list-head'><th width='40%'>文件名</th><th width='20%'></th><th width='10%'></th><th width='10%'></th><th width='10%'></th></tr></thead>\
<tbody id='tbody' class='list-list'></tbody></table></div></div></div></div><div class='getfile-btn' style='margin-top:0'>\
<button type='button' class='btn btn-default btn-sm pull-left' onclick='createFolder()'>新建文件夹</button>\
<button type='button' class='btn btn-danger btn-sm mr5' onclick=\"layer.close(getCookie('changePath'))\">关闭</button>\
<button type='button' class='btn btn-success btn-sm' onclick='getfilePath()'>选择</button>\
<button type='button' class='btn btn-danger btn-sm mr5 btn-close'>关闭</button>\
<button type='button' class='btn btn-success btn-sm btn-choose'>选择</button>\
</div>",
success:function(){
success:function(layero,layer_index){
$('.btn-close').click(function(){
layer.close(layer_index);
});
$('.btn-choose').click(function(){
var a = $("#PathPlace").find("span").text();
a = a.replace(new RegExp(/(\\)/g), "/");
a_len = a.length;
if (a[a_len-1] == '/'){
a = a.substr(0,a_len-1);
}
callback(a);
layer.close(layer_index);
});
setCookie("changePath", c);
var b = $("#" + d).val();
tmp = b.split(".");
if(tmp[tmp.length - 1] == "gz") {
tmp = b.split("/");
b = "";
for(var a = 0; a < tmp.length - 1; a++) {
b += "/" + tmp[a]
}
setCookie("SetName", tmp[tmp.length - 1])
}
b = b.replace(/\/\//g, "/");
getDiskList(b);
});
getDiskList(default_dir);
activeDisk();
}
@ -462,6 +463,7 @@ function getfilePath() {
$("#" + getCookie("SetId")).val(a + getCookie("SetName"));
layer.close(getCookie("changePath"));
return a;
}
function setCookie(a, c) {

@ -106,7 +106,7 @@
<input type="text" name="sType" value="" />
<textarea name='sBody'></textarea>
<input id="sFile" type="file" name="sFile" value="" />
<input id="sName" type="text" name="sName" value="" />
<input type="text" name="sName" value="" />
<input id="backupTo" type="text" name="backupTo" value="localhost" />
<input id="urladdress" type="text" name="urladdress" value="" />
<input type="number" name="save" value="" />

Loading…
Cancel
Save