diff --git a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js index 0d1408a..e4b3e57 100644 --- a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js @@ -3,7 +3,7 @@ // init date tables var jobTable = $("#job_list").dataTable({ "deferRender": true, - "processing" : true, + "processing" : true, "serverSide": true, "ajax": { url: base_url + "/jobinfo/pageList", @@ -30,8 +30,8 @@ "visible" : true, "width":'7%' }, - { - "data": 'jobGroup', + { + "data": 'jobGroup', "visible" : false, "render": function ( data, type, row ) { var groupMenu = $("#jobGroup").find("option"); @@ -67,23 +67,23 @@ "visible" : true, "width":'13%' }, - { - "data": 'addTime', - "visible" : false, + { + "data": 'addTime', + "visible" : false, "render": function ( data, type, row ) { return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):""; } }, - { - "data": 'updateTime', - "visible" : false, + { + "data": 'updateTime', + "visible" : false, "render": function ( data, type, row ) { return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):""; } }, { "data": 'author', "visible" : true, "width":'10%'}, { "data": 'alarmEmail', "visible" : false}, - { + { "data": 'triggerStatus', "width":'10%', "visible" : true, @@ -181,14 +181,14 @@ $('#searchBtn').on('click', function(){ jobTable.fnDraw(); }); - + // jobGroup change $('#jobGroup').on('change', function(){ //reload var jobGroup = $('#jobGroup').val(); window.location.href = base_url + "/jobinfo?jobGroup=" + jobGroup; }); - + // job operate $("#job_list").on('click', '.job_operate',function() { var typeName; @@ -211,7 +211,7 @@ } else { return; } - + var id = $(this).parents('ul').attr("_id"); layer.confirm( I18n.system_ok + typeName + '?', { @@ -319,14 +319,14 @@ $(".add").click(function(){ // init - //$("#addModal .form input[name='jobCron']").cronGen({}); + $("#addModal .form input[name='jobCron']").cronGen({}); $('#addModal').modal({backdrop: false, keyboard: false}).modal('show'); }); var addModalValidate = $("#addModal .form").validate({ - errorElement : 'span', + errorElement : 'span', errorClass : 'help-block', - focusInvalid : true, + focusInvalid : true, rules : { jobDesc : { required : true, @@ -344,8 +344,8 @@ executorFailRetryCount : { digits:true } - }, - messages : { + }, + messages : { jobDesc : { required : I18n.system_please_input + I18n.jobinfo_field_jobdesc }, @@ -362,15 +362,15 @@ digits: I18n.system_please_input + I18n.system_digits } }, - highlight : function(element) { - $(element).closest('.form-group').addClass('has-error'); + highlight : function(element) { + $(element).closest('.form-group').addClass('has-error'); }, - success : function(label) { - label.closest('.form-group').removeClass('has-error'); - label.remove(); + success : function(label) { + label.closest('.form-group').removeClass('has-error'); + label.remove(); }, - errorPlacement : function(error, element) { - element.parent('div').append(error); + errorPlacement : function(error, element) { + element.parent('div').append(error); }, submitHandler : function(form) { @@ -414,6 +414,8 @@ $("#addModal").on('hide.bs.modal', function () { $("#addModal .form")[0].reset(); addModalValidate.resetForm(); + // 清理 cronGen + $("input[name=jobCron]").show().siblings().remove(); $("#addModal .form .form-group").removeClass("has-error"); $(".remote_panel").show(); // remote @@ -446,7 +448,7 @@ } else if ('GLUE_PHP'==glueType){ $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_php").val() ); } else if ('GLUE_NODEJS'==glueType){ - $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_nodejs").val() ); + $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_nodejs").val() ); } else if ('GLUE_POWERSHELL'==glueType){ $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_powershell").val() ); } else { @@ -479,13 +481,13 @@ $("#updateModal .form select[name=glueType]").change(); // init - //$("#updateModal .form input[name='jobCron']").cronGen({}); + $("#updateModal .form input[name='jobCron']").cronGen({}); // show $('#updateModal').modal({backdrop: false, keyboard: false}).modal('show'); }); var updateModalValidate = $("#updateModal .form").validate({ - errorElement : 'span', + errorElement : 'span', errorClass : 'help-block', focusInvalid : true, @@ -525,14 +527,14 @@ } }, highlight : function(element) { - $(element).closest('.form-group').addClass('has-error'); + $(element).closest('.form-group').addClass('has-error'); }, - success : function(label) { - label.closest('.form-group').removeClass('has-error'); - label.remove(); + success : function(label) { + label.closest('.form-group').removeClass('has-error'); + label.remove(); }, - errorPlacement : function(error, element) { - element.parent('div').append(error); + errorPlacement : function(error, element) { + element.parent('div').append(error); }, submitHandler : function(form) { @@ -574,7 +576,9 @@ } }); $("#updateModal").on('hide.bs.modal', function () { - $("#updateModal .form")[0].reset() + $("#updateModal .form")[0].reset(); + // 清理 cronGen + $("input[name=jobCron]").show().siblings().remove(); }); /** diff --git a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js index 0d1408a..e4b3e57 100644 --- a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js @@ -3,7 +3,7 @@ // init date tables var jobTable = $("#job_list").dataTable({ "deferRender": true, - "processing" : true, + "processing" : true, "serverSide": true, "ajax": { url: base_url + "/jobinfo/pageList", @@ -30,8 +30,8 @@ "visible" : true, "width":'7%' }, - { - "data": 'jobGroup', + { + "data": 'jobGroup', "visible" : false, "render": function ( data, type, row ) { var groupMenu = $("#jobGroup").find("option"); @@ -67,23 +67,23 @@ "visible" : true, "width":'13%' }, - { - "data": 'addTime', - "visible" : false, + { + "data": 'addTime', + "visible" : false, "render": function ( data, type, row ) { return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):""; } }, - { - "data": 'updateTime', - "visible" : false, + { + "data": 'updateTime', + "visible" : false, "render": function ( data, type, row ) { return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):""; } }, { "data": 'author', "visible" : true, "width":'10%'}, { "data": 'alarmEmail', "visible" : false}, - { + { "data": 'triggerStatus', "width":'10%', "visible" : true, @@ -181,14 +181,14 @@ $('#searchBtn').on('click', function(){ jobTable.fnDraw(); }); - + // jobGroup change $('#jobGroup').on('change', function(){ //reload var jobGroup = $('#jobGroup').val(); window.location.href = base_url + "/jobinfo?jobGroup=" + jobGroup; }); - + // job operate $("#job_list").on('click', '.job_operate',function() { var typeName; @@ -211,7 +211,7 @@ } else { return; } - + var id = $(this).parents('ul').attr("_id"); layer.confirm( I18n.system_ok + typeName + '?', { @@ -319,14 +319,14 @@ $(".add").click(function(){ // init - //$("#addModal .form input[name='jobCron']").cronGen({}); + $("#addModal .form input[name='jobCron']").cronGen({}); $('#addModal').modal({backdrop: false, keyboard: false}).modal('show'); }); var addModalValidate = $("#addModal .form").validate({ - errorElement : 'span', + errorElement : 'span', errorClass : 'help-block', - focusInvalid : true, + focusInvalid : true, rules : { jobDesc : { required : true, @@ -344,8 +344,8 @@ executorFailRetryCount : { digits:true } - }, - messages : { + }, + messages : { jobDesc : { required : I18n.system_please_input + I18n.jobinfo_field_jobdesc }, @@ -362,15 +362,15 @@ digits: I18n.system_please_input + I18n.system_digits } }, - highlight : function(element) { - $(element).closest('.form-group').addClass('has-error'); + highlight : function(element) { + $(element).closest('.form-group').addClass('has-error'); }, - success : function(label) { - label.closest('.form-group').removeClass('has-error'); - label.remove(); + success : function(label) { + label.closest('.form-group').removeClass('has-error'); + label.remove(); }, - errorPlacement : function(error, element) { - element.parent('div').append(error); + errorPlacement : function(error, element) { + element.parent('div').append(error); }, submitHandler : function(form) { @@ -414,6 +414,8 @@ $("#addModal").on('hide.bs.modal', function () { $("#addModal .form")[0].reset(); addModalValidate.resetForm(); + // 清理 cronGen + $("input[name=jobCron]").show().siblings().remove(); $("#addModal .form .form-group").removeClass("has-error"); $(".remote_panel").show(); // remote @@ -446,7 +448,7 @@ } else if ('GLUE_PHP'==glueType){ $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_php").val() ); } else if ('GLUE_NODEJS'==glueType){ - $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_nodejs").val() ); + $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_nodejs").val() ); } else if ('GLUE_POWERSHELL'==glueType){ $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_powershell").val() ); } else { @@ -479,13 +481,13 @@ $("#updateModal .form select[name=glueType]").change(); // init - //$("#updateModal .form input[name='jobCron']").cronGen({}); + $("#updateModal .form input[name='jobCron']").cronGen({}); // show $('#updateModal').modal({backdrop: false, keyboard: false}).modal('show'); }); var updateModalValidate = $("#updateModal .form").validate({ - errorElement : 'span', + errorElement : 'span', errorClass : 'help-block', focusInvalid : true, @@ -525,14 +527,14 @@ } }, highlight : function(element) { - $(element).closest('.form-group').addClass('has-error'); + $(element).closest('.form-group').addClass('has-error'); }, - success : function(label) { - label.closest('.form-group').removeClass('has-error'); - label.remove(); + success : function(label) { + label.closest('.form-group').removeClass('has-error'); + label.remove(); }, - errorPlacement : function(error, element) { - element.parent('div').append(error); + errorPlacement : function(error, element) { + element.parent('div').append(error); }, submitHandler : function(form) { @@ -574,7 +576,9 @@ } }); $("#updateModal").on('hide.bs.modal', function () { - $("#updateModal .form")[0].reset() + $("#updateModal .form")[0].reset(); + // 清理 cronGen + $("input[name=jobCron]").show().siblings().remove(); }); /** diff --git a/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js b/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js index a4d7715..b5bbfab 100755 --- a/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js +++ b/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js @@ -1,5 +1,5 @@ (function ($) { - var resultsName = ""; + // var resultsName = ""; var inputElement; var displayElement; $.fn.extend({ @@ -34,7 +34,7 @@ $("",{type : "radio", value : "1", name : "second"}).appendTo(seconds1); $(seconds1).append("每秒 允许的通配符[, - * /]"); $(seconds1).appendTo(secondsTab); - + var seconds2 = $("
",{"class":"line"}); $("",{type : "radio", value : "2", name : "second"}).appendTo(seconds2); $(seconds2).append("周期 从"); @@ -43,7 +43,7 @@ $("",{type : "text", id : "secondEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(seconds2); $(seconds2).append("秒"); $(seconds2).appendTo(secondsTab); - + var seconds3 = $("
",{"class":"line"}); $("",{type : "radio", value : "3", name : "second"}).appendTo(seconds3); $(seconds3).append("从"); @@ -52,12 +52,12 @@ $("",{type : "text", id : "secondEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(seconds3); $(seconds3).append("秒执行一次"); $(seconds3).appendTo(secondsTab); - + var seconds4 = $("
",{"class":"line"}); $("",{type : "radio", value : "4", name : "second", id: "sencond_appoint"}).appendTo(seconds4); $(seconds4).append("指定"); $(seconds4).appendTo(secondsTab); - + $(secondsTab).append('
00010203040506070809
'); $(secondsTab).append('
10111213141516171819
'); $(secondsTab).append('
20212223242526272829
'); @@ -66,15 +66,15 @@ $(secondsTab).append('
50515253545556575859
'); $("",{type : "hidden", id : "secondHidden"}).appendTo(secondsTab); $(secondsTab).appendTo(tabContent); - + //creating the minutesTab var minutesTab = $("
", { "class": "tab-pane", id: "Minutes" }); - + var minutes1 = $("
",{"class":"line"}); $("",{type : "radio", value : "1", name : "min"}).appendTo(minutes1); $(minutes1).append("每分钟 允许的通配符[, - * /]"); $(minutes1).appendTo(minutesTab); - + var minutes2 = $("
",{"class":"line"}); $("",{type : "radio", value : "2", name : "min"}).appendTo(minutes2); $(minutes2).append("周期 从"); @@ -83,7 +83,7 @@ $("",{type : "text", id : "minEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(minutes2); $(minutes2).append("分钟"); $(minutes2).appendTo(minutesTab); - + var minutes3 = $("
",{"class":"line"}); $("",{type : "radio", value : "3", name : "min"}).appendTo(minutes3); $(minutes3).append("从"); @@ -92,12 +92,12 @@ $("",{type : "text", id : "minEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(minutes3); $(minutes3).append("分钟执行一次"); $(minutes3).appendTo(minutesTab); - + var minutes4 = $("
",{"class":"line"}); $("",{type : "radio", value : "4", name : "min", id: "min_appoint"}).appendTo(minutes4); $(minutes4).append("指定"); $(minutes4).appendTo(minutesTab); - + $(minutesTab).append('
00010203040506070809
'); $(minutesTab).append('
10111213141516171819
'); $(minutesTab).append('
20212223242526272829
'); @@ -106,7 +106,7 @@ $(minutesTab).append('
50515253545556575859
'); $("",{type : "hidden", id : "minHidden"}).appendTo(minutesTab); $(minutesTab).appendTo(tabContent); - + //creating the hourlyTab var hourlyTab = $("
", { "class": "tab-pane", id: "Hourly" }); @@ -114,7 +114,7 @@ $("",{type : "radio", value : "1", name : "hour"}).appendTo(hourly1); $(hourly1).append("每小时 允许的通配符[, - * /]"); $(hourly1).appendTo(hourlyTab); - + var hourly2 = $("
",{"class":"line"}); $("",{type : "radio", value : "2", name : "hour"}).appendTo(hourly2); $(hourly2).append("周期 从"); @@ -123,7 +123,7 @@ $("",{type : "text", id : "hourEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(hourly2); $(hourly2).append("小时"); $(hourly2).appendTo(hourlyTab); - + var hourly3 = $("
",{"class":"line"}); $("",{type : "radio", value : "3", name : "hour"}).appendTo(hourly3); $(hourly3).append("从"); @@ -132,19 +132,19 @@ $("",{type : "text", id : "hourEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(hourly3); $(hourly3).append("小时执行一次"); $(hourly3).appendTo(hourlyTab); - + var hourly4 = $("
",{"class":"line"}); $("",{type : "radio", value : "4", name : "hour", id: "hour_appoint"}).appendTo(hourly4); $(hourly4).append("指定"); $(hourly4).appendTo(hourlyTab); - + $(hourlyTab).append('
000102030405
'); $(hourlyTab).append('
060708091011
'); $(hourlyTab).append('
121314151617
'); $(hourlyTab).append('
181920212223
'); $("",{type : "hidden", id : "hourHidden"}).appendTo(hourlyTab); $(hourlyTab).appendTo(tabContent); - + //creating the dailyTab var dailyTab = $("
", { "class": "tab-pane", id: "Daily" }); @@ -153,12 +153,12 @@ $("",{type : "radio", value : "1", name : "day"}).appendTo(daily1); $(daily1).append("每天 允许的通配符[, - * / L W]"); $(daily1).appendTo(dailyTab); - + var daily5 = $("
",{"class":"line"}); $("",{type : "radio", value : "2", name : "day"}).appendTo(daily5); $(daily5).append("不指定"); $(daily5).appendTo(dailyTab); - + var daily2 = $("
",{"class":"line"}); $("",{type : "radio", value : "3", name : "day"}).appendTo(daily2); $(daily2).append("周期 从"); @@ -167,7 +167,7 @@ $("",{type : "text", id : "dayEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(daily2); $(daily2).append("日"); $(daily2).appendTo(dailyTab); - + var daily3 = $("
",{"class":"line"}); $("",{type : "radio", value : "4", name : "day"}).appendTo(daily3); $(daily3).append("从"); @@ -176,32 +176,32 @@ $("",{type : "text", id : "dayEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(daily3); $(daily3).append("天执行一次"); $(daily3).appendTo(dailyTab); - + var daily6 = $("
",{"class":"line"}); $("",{type : "radio", value : "5", name : "day"}).appendTo(daily6); $(daily6).append("每月"); $("",{type : "text", id : "dayStart_2", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(daily6); $(daily6).append("号最近的那个工作日"); $(daily6).appendTo(dailyTab); - + var daily7 = $("
",{"class":"line"}); $("",{type : "radio", value : "6", name : "day"}).appendTo(daily7); $(daily7).append("本月最后一天"); $(daily7).appendTo(dailyTab); - + var daily4 = $("
",{"class":"line"}); $("",{type : "radio", value : "7", name : "day", id: "day_appoint"}).appendTo(daily4); $(daily4).append("指定"); $(daily4).appendTo(dailyTab); - + $(dailyTab).append('
01020304050607080910
'); $(dailyTab).append('
11121314151617181920
'); $(dailyTab).append('
21222324252627282930
'); $(dailyTab).append('
31
'); $("",{type : "hidden", id : "dayHidden"}).appendTo(dailyTab); $(dailyTab).appendTo(tabContent); - - + + //creating the monthlyTab var monthlyTab = $("
", { "class": "tab-pane", id: "Monthly" }); @@ -209,12 +209,12 @@ $("",{type : "radio", value : "1", name : "month"}).appendTo(monthly1); $(monthly1).append("每月 允许的通配符[, - * /]"); $(monthly1).appendTo(monthlyTab); - + var monthly2 = $("
",{"class":"line"}); $("",{type : "radio", value : "2", name : "month"}).appendTo(monthly2); $(monthly2).append("不指定"); $(monthly2).appendTo(monthlyTab); - + var monthly3 = $("
",{"class":"line"}); $("",{type : "radio", value : "3", name : "month"}).appendTo(monthly3); $(monthly3).append("周期 从"); @@ -223,7 +223,7 @@ $("",{type : "text", id : "monthEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(monthly3); $(monthly3).append("月"); $(monthly3).appendTo(monthlyTab); - + var monthly4 = $("
",{"class":"line"}); $("",{type : "radio", value : "4", name : "month"}).appendTo(monthly4); $(monthly4).append("从"); @@ -232,12 +232,12 @@ $("",{type : "text", id : "monthEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(monthly4); $(monthly4).append("月执行一次"); $(monthly4).appendTo(monthlyTab); - + var monthly5 = $("
",{"class":"line"}); $("",{type : "radio", value : "5", name : "month", id: "month_appoint"}).appendTo(monthly5); $(monthly5).append("指定"); $(monthly5).appendTo(monthlyTab); - + $(monthlyTab).append('
010203040506
'); $(monthlyTab).append('
070809101112
'); $("",{type : "hidden", id : "monthHidden"}).appendTo(monthlyTab); @@ -245,17 +245,17 @@ //creating the weeklyTab var weeklyTab = $("
", { "class": "tab-pane", id: "Weekly" }); - + var weekly1 = $("
",{"class":"line"}); $("",{type : "radio", value : "1", name : "week"}).appendTo(weekly1); $(weekly1).append("每周 允许的通配符[, - * / L #]"); $(weekly1).appendTo(weeklyTab); - + var weekly2 = $("
",{"class":"line"}); $("",{type : "radio", value : "2", name : "week"}).appendTo(weekly2); $(weekly2).append("不指定"); $(weekly2).appendTo(weeklyTab); - + var weekly3 = $("
",{"class":"line"}); $("",{type : "radio", value : "3", name : "week"}).appendTo(weekly3); $(weekly3).append("周期 从星期"); @@ -263,7 +263,7 @@ $(weekly3).append("-"); $("",{type : "text", id : "weekEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly3); $(weekly3).appendTo(weeklyTab); - + var weekly4 = $("
",{"class":"line"}); $("",{type : "radio", value : "4", name : "week"}).appendTo(weekly4); $(weekly4).append("第"); @@ -271,36 +271,36 @@ $(weekly4).append("周的星期"); $("",{type : "text", id : "weekEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly4); $(weekly4).appendTo(weeklyTab); - + var weekly5 = $("
",{"class":"line"}); $("",{type : "radio", value : "5", name : "week"}).appendTo(weekly5); $(weekly5).append("本月最后一个星期"); $("",{type : "text", id : "weekStart_2", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly5); $(weekly5).appendTo(weeklyTab); - + var weekly6 = $("
",{"class":"line"}); $("",{type : "radio", value : "6", name : "week", id: "week_appoint"}).appendTo(weekly6); $(weekly6).append("指定"); $(weekly6).appendTo(weeklyTab); - + $(weeklyTab).append('
1234567
'); - + $("",{type : "hidden", id : "weekHidden"}).appendTo(weeklyTab); $(weeklyTab).appendTo(tabContent); //creating the yearlyTab var yearlyTab = $("
", { "class": "tab-pane", id: "Yearly" }); - + var yearly1 = $("
",{"class":"line"}); $("",{type : "radio", value : "1", name : "year"}).appendTo(yearly1); $(yearly1).append("不指定 允许的通配符[, - * /] 非必填"); $(yearly1).appendTo(yearlyTab); - + var yearly3 = $("
",{"class":"line"}); $("",{type : "radio", value : "2", name : "year"}).appendTo(yearly3); $(yearly3).append("每年"); $(yearly3).appendTo(yearlyTab); - + var yearly2 = $("
",{"class":"line"}); $("",{type : "radio", value : "3", name : "year"}).appendTo(yearly2); $(yearly2).append("周期从"); @@ -311,18 +311,18 @@ $(yearly2).appendTo(yearlyTab); $("",{type : "hidden", id : "yearHidden"}).appendTo(yearlyTab); $(yearlyTab).appendTo(tabContent); - + $(tabContent).appendTo(span12); - //creating the button and results input - resultsName = $(this).prop("id"); - $(this).prop("name", resultsName); + //creating the button and results input + // resultsName = $(this).prop("id"); + // $(this).prop("name", resultsName); $(span12).appendTo(row); $(row).appendTo(container); $(container).appendTo(mainDiv); $(cronContainer).append(mainDiv); - + var that = $(this); // Hide the original input @@ -355,18 +355,18 @@ }).on('click', function (e) { e.preventDefault(); - + //fillDataOfMinutesAndHoursSelectOptions(); //fillDayWeekInMonth(); //fillInWeekDays(); //fillInMonths(); - + $.fn.cronGen.tools.cronParse(inputElement.val()); - + //绑定指定事件 $.fn.cronGen.tools.initChangeEvent(); - - + + $('#CronGenTabs a').click(function (e) { e.preventDefault(); $(this).tab('show'); @@ -711,7 +711,7 @@ secondList.eq(0).change(); } }); - + secondList.change(function() { var sencond_appoint = $("#sencond_appoint").prop("checked"); if (sencond_appoint) { @@ -723,14 +723,14 @@ }); var val = "?"; if (vals.length > 0 && vals.length < 59) { - val = vals.join(","); + val = vals.join(","); }else if(vals.length == 59){ val = "*"; } $("#secondHidden").val(val); } }); - + var minList = $(".minList").children(); $("#min_appoint").click(function(){ if (this.checked) { @@ -740,7 +740,7 @@ minList.eq(0).change(); } }); - + minList.change(function() { var min_appoint = $("#min_appoint").prop("checked"); if (min_appoint) { @@ -759,7 +759,7 @@ $("#minHidden").val(val); } }); - + var hourList = $(".hourList").children(); $("#hour_appoint").click(function(){ if (this.checked) { @@ -769,7 +769,7 @@ hourList.eq(0).change(); } }); - + hourList.change(function() { var hour_appoint = $("#hour_appoint").prop("checked"); if (hour_appoint) { @@ -788,7 +788,7 @@ $("#hourHidden").val(val); } }); - + var dayList = $(".dayList").children(); $("#day_appoint").click(function(){ if (this.checked) { @@ -798,7 +798,7 @@ dayList.eq(0).change(); } }); - + dayList.change(function() { var day_appoint = $("#day_appoint").prop("checked"); if (day_appoint) { @@ -817,7 +817,7 @@ $("#dayHidden").val(val); } }); - + var monthList = $(".monthList").children(); $("#month_appoint").click(function(){ if (this.checked) { @@ -827,7 +827,7 @@ monthList.eq(0).change(); } }); - + monthList.change(function() { var month_appoint = $("#month_appoint").prop("checked"); if (month_appoint) { @@ -846,7 +846,7 @@ $("#monthHidden").val(val); } }); - + var weekList = $(".weekList").children(); $("#week_appoint").click(function(){ if (this.checked) { @@ -856,7 +856,7 @@ weekList.eq(0).change(); } }); - + weekList.change(function() { var week_appoint = $("#week_appoint").prop("checked"); if (week_appoint) {