diff --git a/assets/etcdkeeper/framework/custom/js/common.js b/assets/etcdkeeper/framework/custom/js/common.js
index 1aedeee..37a0c4e 100644
--- a/assets/etcdkeeper/framework/custom/js/common.js
+++ b/assets/etcdkeeper/framework/custom/js/common.js
@@ -1,10 +1,10 @@
/**
- * 时间对象的格式化
+ * date format
*/
Date.prototype.format = function(format) {
/*
- * format="yyyy-MM-dd hh:mm:ss";
- */
+ * format="yyyy-MM-dd hh:mm:ss";
+ */
var o = {
"M+" : this.getMonth() + 1,
"d+" : this.getDate(),
@@ -17,20 +17,20 @@ Date.prototype.format = function(format) {
if (/(y+)/.test(format)) {
format = format.replace(RegExp.$1, (this.getFullYear() + "")
- .substr(4 - RegExp.$1.length));
+ .substr(4 - RegExp.$1.length));
}
- for ( var k in o) {
+ for (var k in o) {
if (new RegExp("(" + k + ")").test(format)) {
- format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k]
- : ("00" + o[k]).substr(("" + o[k]).length));
+ format = format.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k]
+ : ("00" + o[k]).substr(("" + o[k]).length));
}
}
return format;
};
/**
- * format date long to HH:ss
+ * format date long to HH:mm
* @param dl
* @returns {String}
*/
@@ -38,50 +38,53 @@ function getTime(dl) {
var date = new Date(Number(dl));
var hour = date.getHours();
var min = date.getMinutes();
- if(hour < 10)
+ if (hour < 10) {
hour = "0" + hour;
- if(min < 10)
+ }
+ if (min < 10) {
min = "0" + min;
+ }
return hour + ":" + min;
}
/**
- * format date long to yyyy年MM月dd日
+ * format date long to yyyy-MM-dd
* @param dl
* @returns {String}
*/
function getDate(dl) {
var date = new Date(Number(dl));
var year = date.getFullYear();
- var month = date.getMonth()+1;
+ var month = date.getMonth() + 1;
var day = date.getDate();
- return year+"-"+month+"-"+day;
+ return year + "-" + month + "-" + day;
}
/**
- * get date id format:yyyyMMdd
- * @returns
+ * get date id format: yyyyMMdd
+ * @returns {String}
*/
function getDateId() {
var date = new Date();
var year = date.getFullYear();
- var month = date.getMonth()+1;
+ var month = date.getMonth() + 1;
var day = date.getDate();
- return year+month+day;
+ return year + month + day;
}
/**
- * get date by custom day
- * @returns yyyy-MM-dd
+ * get date by custom day
+ * @param date
+ * @param i
+ * @returns {String} yyyy-MM-dd
*/
-function getNextDay(date,i) {
+function getNextDay(date, i) {
var a = new Date(date);
a = a.valueOf();
a = a + i * 24 * 60 * 60 * 1000;
a = new Date(a);
- //初始化时间
var year = a.getFullYear();
- var month = a.getMonth() + 1;
+ var month = a.getMonth() + 1;
var day = a.getDate();
var currentDate = year + "-";
if (month > 9) {
@@ -100,30 +103,38 @@ function getNextDay(date,i) {
/**
* format number to 12,345,678
* @param amount
- * @returns
+ * @returns {String}
*/
function CommaFormatted(amount) {
- var delimiter = ","; // replace comma if desired
- amount = new String(amount);
- var a = amount.split('.',2);
- var d = a[1];
- var i = parseInt(a[0]);
- if(isNaN(i)) { return ''; }
- var minus = '';
- if(i < 0) { minus = '-'; }
- i = Math.abs(i);
- var n = new String(i);
- var a = [];
- while(n.length > 3)
- {
- var nn = n.substr(n.length-3);
- a.unshift(nn);
- n = n.substr(0,n.length-3);
- }
- if(n.length > 0) { a.unshift(n); }
- n = a.join(delimiter);
- if(d == null || d.length < 1) { amount = n; }
- else { amount = n + '.' + d; }
- amount = minus + amount;
- return amount;
-}
\ No newline at end of file
+ var delimiter = ",";
+ amount = new String(amount);
+ var a = amount.split('.', 2);
+ var d = a[1];
+ var i = parseInt(a[0], 10);
+ if (isNaN(i)) {
+ return '';
+ }
+ var minus = '';
+ if (i < 0) {
+ minus = '-';
+ }
+ i = Math.abs(i);
+ var n = new String(i);
+ var arr = [];
+ while (n.length > 3) {
+ var nn = n.substr(n.length - 3);
+ arr.unshift(nn);
+ n = n.substr(0, n.length - 3);
+ }
+ if (n.length > 0) {
+ arr.unshift(n);
+ }
+ n = arr.join(delimiter);
+ if (d == null || d.length < 1) {
+ amount = n;
+ } else {
+ amount = n + '.' + d;
+ }
+ amount = minus + amount;
+ return amount;
+}
diff --git a/assets/etcdkeeper/index.html b/assets/etcdkeeper/index.html
index ed03bc5..3fa5fab 100644
--- a/assets/etcdkeeper/index.html
+++ b/assets/etcdkeeper/index.html
@@ -7,7 +7,7 @@
-
+
@@ -23,789 +23,907 @@
right: 15px;
bottom: 40px;
left: 15px;
- border:1px solid #ddd;
- font-size: 13px!important;
+ border: 1px solid #ddd;
+ font-size: 13px !important;
}
-
ETCD Keeper v3
-
+