zet-lib 1.2.54 → 1.2.56
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/zRoute.js +5 -5
- package/package.json +1 -1
package/lib/zRoute.js
CHANGED
|
@@ -896,7 +896,7 @@ zRoute.dataTableData = (key, value, MYMODEL, relations, myid = '') => {
|
|
|
896
896
|
break
|
|
897
897
|
|
|
898
898
|
case 'datetime':
|
|
899
|
-
myvalue = Util.timeSql(
|
|
899
|
+
myvalue = Util.timeSql(value)
|
|
900
900
|
break
|
|
901
901
|
|
|
902
902
|
case 'datepicker':
|
|
@@ -2099,8 +2099,8 @@ zRoute.formUser = (relations = {}, data = {}) => {
|
|
|
2099
2099
|
if (relations.hasOwnProperty('created_byObject')) {
|
|
2100
2100
|
obj.created_by = relations.created_byObject[data['created_by']]
|
|
2101
2101
|
obj.updated_by = relations.updated_byObject[data['updated_by']]
|
|
2102
|
-
obj.created_at = Util.timeSql(
|
|
2103
|
-
obj.updated_at = Util.timeSql(
|
|
2102
|
+
obj.created_at = Util.timeSql(data['created_at'])
|
|
2103
|
+
obj.updated_at = Util.timeSql(data['updated_at'])
|
|
2104
2104
|
}
|
|
2105
2105
|
}
|
|
2106
2106
|
obj.isUser = isUser
|
|
@@ -3525,8 +3525,8 @@ zRoute.import = async (req, res, MYMODEL) => {
|
|
|
3525
3525
|
//console.log(JSON.stringify(result))
|
|
3526
3526
|
for (let prop in keys) {
|
|
3527
3527
|
//console.log(prop)
|
|
3528
|
-
let value = result[prop] ? result[prop] : null
|
|
3529
|
-
if (value) {
|
|
3528
|
+
let value = result[prop] == 0 ? 0 : result[prop] ? result[prop] : null
|
|
3529
|
+
if (value != null) {
|
|
3530
3530
|
if (aliasRelations.includes(keys[prop])) {
|
|
3531
3531
|
let result_alias = await connection.result({
|
|
3532
3532
|
select: `id, ${MYMODEL.widgets[keys[prop]].import_field} `,
|