zet-lib 1.2.32 → 1.2.34
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Util.js +9 -0
- package/lib/zRoute.js +4 -4
- package/package.json +1 -1
package/lib/Util.js
CHANGED
|
@@ -76,6 +76,15 @@ Util.dateSql = function (date, format) {
|
|
|
76
76
|
else return ''
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
+
Util.dateOriginal = function (date) {
|
|
80
|
+
if (date && date != '0000-00-00') {
|
|
81
|
+
let value = moment(date).utc(false)
|
|
82
|
+
return value
|
|
83
|
+
} else {
|
|
84
|
+
return ''
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
79
88
|
Util.dateFormat = function (date, format) {
|
|
80
89
|
format = format || 'YYYY-MM-DD'
|
|
81
90
|
if (date && date != '0000-00-00') return moment(date).format(format)
|
package/lib/zRoute.js
CHANGED
|
@@ -907,7 +907,7 @@ zRoute.dataTableData = (key, value, MYMODEL, relations) => {
|
|
|
907
907
|
break
|
|
908
908
|
|
|
909
909
|
case 'datetime':
|
|
910
|
-
myvalue = Util.timeSql(value)
|
|
910
|
+
myvalue = Util.timeSql(moment(value).utc(false))
|
|
911
911
|
break
|
|
912
912
|
|
|
913
913
|
case 'datepicker':
|
|
@@ -919,7 +919,7 @@ zRoute.dataTableData = (key, value, MYMODEL, relations) => {
|
|
|
919
919
|
break
|
|
920
920
|
|
|
921
921
|
case 'integer':
|
|
922
|
-
myvalue =
|
|
922
|
+
myvalue = value + ''
|
|
923
923
|
break
|
|
924
924
|
|
|
925
925
|
case 'image':
|
|
@@ -2058,8 +2058,8 @@ zRoute.formUser = (relations = {}, data = {}) => {
|
|
|
2058
2058
|
if (relations.hasOwnProperty('created_byObject')) {
|
|
2059
2059
|
obj.created_by = relations.created_byObject[data['created_by']]
|
|
2060
2060
|
obj.updated_by = relations.updated_byObject[data['updated_by']]
|
|
2061
|
-
obj.created_at = Util.timeSql(data['created_at'])
|
|
2062
|
-
obj.updated_at = Util.timeSql(data['updated_at'])
|
|
2061
|
+
obj.created_at = Util.timeSql(moment(data['created_at']).utc(false))
|
|
2062
|
+
obj.updated_at = Util.timeSql(moment(data['updated_at']).utc(false))
|
|
2063
2063
|
}
|
|
2064
2064
|
}
|
|
2065
2065
|
obj.isUser = isUser
|