From d93fe1137345eb28a152b42e835875bd2ab3ff1f Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 19 Jul 2019 12:01:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8Ddate=20format?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/static/js/jumpserver.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js index d67c403cf..2750e25c6 100644 --- a/apps/static/js/jumpserver.js +++ b/apps/static/js/jumpserver.js @@ -305,7 +305,6 @@ function requestApi(props) { toastr.error(msg); } if (typeof props.error === 'function') { - console.log(jqXHR); return props.error(jqXHR.responseText, jqXHR.status); } }); @@ -610,7 +609,6 @@ jumpserver.initServerSideDataTable = function (options) { if (kv.length === 2) { var value = kv[1]; value = value.replace("+", " "); - console.log(value); search_attr[kv[0]] = value } else { search_raw.push(kv) @@ -654,8 +652,6 @@ jumpserver.initServerSideDataTable = function (options) { $.each(rows, function (id, row) { table.selected_rows.push(row); if (row.id && $.inArray(row.id, table.selected) === -1){ - console.log(table) - console.log(table.selected); table.selected.push(row.id) } }) @@ -1110,7 +1106,12 @@ function objectAttrsIsBool(obj, attrs) { } function cleanDate(d) { - if (typeof d === 'number'){return d} + if (typeof d === 'number'){ + return d + } + if (typeof d === "string") { + d = d.replaceAll('-', '/') + } for (var i=0; i<2; i++) { if (isNaN(Date.parse(d))) { d = d.split('+')[0].trimRight(); @@ -1121,9 +1122,13 @@ function cleanDate(d) { return '' } +function safeDate(s) { + s = cleanDate(s); + return new Date(s) +} + function formatDateAsCN(d) { - d = cleanDate(d); - var date = new Date(d); + var date = safeDate(d); var date_s = date.toLocaleString(navigator.language, {hour12: false}); return date_s.split("/").join('-') } @@ -1179,7 +1184,6 @@ function readFile(ref) { var hasFile = files && files.length > 0; if (hasFile) { var reader = new FileReader();//新建一个FileReader - console.log(typeof files[0]); reader.readAsText(files[0], "UTF-8");//读取文件 reader.onload = function(evt){ //读取完文件之后会回来这里 ref.trigger("onload", evt.target.result); From 63c2343d2c53c0fdf60ce737f033e1af7bf5aa86 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Fri, 19 Jul 2019 12:55:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/templates/assets/_asset_user_list.html | 3 +-- apps/assets/templates/assets/asset_list.html | 3 +-- apps/ops/templates/ops/adhoc_history.html | 2 +- apps/ops/templates/ops/task_adhoc.html | 4 ++-- apps/ops/templates/ops/task_history.html | 5 +++-- apps/terminal/templates/terminal/command_list.html | 6 ++++-- apps/terminal/templates/terminal/session_list.html | 12 ++++++------ 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/apps/assets/templates/assets/_asset_user_list.html b/apps/assets/templates/assets/_asset_user_list.html index f76754391..ca752e58d 100644 --- a/apps/assets/templates/assets/_asset_user_list.html +++ b/apps/assets/templates/assets/_asset_user_list.html @@ -51,8 +51,7 @@ function initAssetUserTable() { } else { innerHtml = '' } - var date = new Date(cellData.datetime); - var dateManual = date.toLocaleString(); + var dateManual = formatDateAsCN(cellData.datetime); var dataContent = testDatetime + dateManual; innerHtml = "" + innerHtml + ""; $(td).html(innerHtml); diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index a20d4f35f..4750a4f95 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -159,8 +159,7 @@ function initTable() { } else { innerHtml = '' } - var date = new Date(cellData.datetime); - var dateManual = date.toLocaleString(); + var dateManual = formatDateAsCN(cellData.datetime); var dataContent = testDatetime + dateManual; innerHtml = "" + innerHtml + ""; $(td).html(innerHtml); diff --git a/apps/ops/templates/ops/adhoc_history.html b/apps/ops/templates/ops/adhoc_history.html index cab76f692..ef83e1c4f 100644 --- a/apps/ops/templates/ops/adhoc_history.html +++ b/apps/ops/templates/ops/adhoc_history.html @@ -82,7 +82,7 @@ function initTable() { select: [], columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var d = new Date(cellData); + var d = formatDateAsCN(cellData); $(td).html(d); }}, {targets: 2, createdCell: function (td, cellData) { diff --git a/apps/ops/templates/ops/task_adhoc.html b/apps/ops/templates/ops/task_adhoc.html index 95eb8f471..8dd29637f 100644 --- a/apps/ops/templates/ops/task_adhoc.html +++ b/apps/ops/templates/ops/task_adhoc.html @@ -109,8 +109,8 @@ $(document).ready(function () { } }}, {targets: 6, createdCell: function (td, cellData) { - var d = new Date(cellData); - $(td).html(d.toLocaleString()) + var d = formatDateAsCN(cellData); + $(td).html(d) }}, {targets: 7, createdCell: function (td, cellData, rowData) { var detail_btn = '{% trans "Detail" %}'.replace('{{ DEFAULT_PK }}', cellData); diff --git a/apps/ops/templates/ops/task_history.html b/apps/ops/templates/ops/task_history.html index 9aa73c176..054b0bf5e 100644 --- a/apps/ops/templates/ops/task_history.html +++ b/apps/ops/templates/ops/task_history.html @@ -88,8 +88,9 @@ function initTable() { select: [], columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var d = new Date(cellData); - $(td).html(d.toLocaleString()); + var d = formatDateAsCN(cellData); + $(td).html(d); + }}, {targets: 2, createdCell: function (td, cellData) { var total = "" + cellData.total + ""; diff --git a/apps/terminal/templates/terminal/command_list.html b/apps/terminal/templates/terminal/command_list.html index 88660a39d..047b72a4d 100644 --- a/apps/terminal/templates/terminal/command_list.html +++ b/apps/terminal/templates/terminal/command_list.html @@ -89,14 +89,16 @@ $(document).ready(function () { language: navigator.language || "en", }; dateFromRef.datepicker(options).on("changeDate", function () { - var date = new Date($(this).val() + ' 0:0:0'); + var value = $(this).val() + ' 0:0:0'; + var date = safeDate(value); var url = table.ajax.url(); url = setUrlParam(url, "date_from", date.getTime()/1000); table.ajax.url(url); table.ajax.reload(); }); dateToRef.datepicker(options).on("changeDate", function () { - var date = new Date($(this).val() + ' 23:59:59'); + var value = $(this).val() + ' 23:59:59'; + var date = safeDate(value); var url = table.ajax.url(); url = setUrlParam(url, "date_to", date.getTime()/1000); table.ajax.url(url); diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html index 648fc1ea7..7d7f4b5c5 100644 --- a/apps/terminal/templates/terminal/session_list.html +++ b/apps/terminal/templates/terminal/session_list.html @@ -104,8 +104,8 @@ var dateFrom = "{{ date_from.timestamp }}"; var dateTo = "{{ date_to.timestamp }}"; function initTable() { - dateFrom = new Date(dateFrom * 1000).toISOString(); - dateTo = new Date(dateTo * 1000).toISOString(); + dateFrom = formatDateAsCN(dateFrom * 1000); + dateTo = formatDateAsCN(dateTo * 1000); sessionListUrl = setUrlParam(sessionListUrl, "date_from", dateFrom); sessionListUrl = setUrlParam(sessionListUrl, "date_to", dateTo); var options = { @@ -201,9 +201,9 @@ $(document).ready(function() { return } var value = $(this).val() + ' 0:0:0'; - var date = new Date(value); + var date = formatDateAsCN(value); var url = table.ajax.url(); - url = setUrlParam(url, "date_from", date.toISOString()); + url = setUrlParam(url, "date_from", date); table.ajax.url(url); table.ajax.reload(); }); @@ -212,9 +212,9 @@ $(document).ready(function() { return } var value = $(this).val() + ' 23:59:59'; - var date = new Date(value); + var date = formatDateAsCN(value); var url = table.ajax.url(); - url = setUrlParam(url, "date_to", date.toISOString()); + url = setUrlParam(url, "date_to", date); table.ajax.url(url); table.ajax.reload(); }); From 7ec82cbc60889694cbb21cb054d7c0ab3083ce05 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Fri, 19 Jul 2019 13:10:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=A5=E6=9C=9F2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/static/js/jumpserver.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js index 2750e25c6..5931e1b7c 100644 --- a/apps/static/js/jumpserver.js +++ b/apps/static/js/jumpserver.js @@ -1091,7 +1091,7 @@ function objectAttrsIsList(obj, attrs) { function objectAttrsIsDatetime(obj, attrs) { attrs.forEach(function (attr) { - obj[attr] = new Date(obj[attr]).toISOString(); + obj[attr] = formatDateAsCN(obj[attr]); }) } @@ -1156,10 +1156,8 @@ function getTimeUnits(u) { } function timeOffset(a, b) { - a = cleanDate(a); - b = cleanDate(b); - var start = new Date(a); - var end = new Date(b); + var start = safeDate(a); + var end = safeDate(b); var offset = (end - start)/1000; var days = offset / 3600 / 24;