@pisell/lowcode-renderer 1.0.100 → 1.0.102
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/es/api/report/index.js
CHANGED
|
@@ -33,13 +33,11 @@ var getParams = function getParams(values, url) {
|
|
|
33
33
|
|
|
34
34
|
// 包含时区
|
|
35
35
|
var timezoneObj = {};
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
41
|
-
// }
|
|
42
|
-
|
|
36
|
+
if (includeTimeZoneUrl.includes(url)) {
|
|
37
|
+
timezoneObj = {
|
|
38
|
+
timezone: getTimeDiff(timezone)
|
|
39
|
+
};
|
|
40
|
+
}
|
|
43
41
|
var _ref = values || {},
|
|
44
42
|
date = _ref.date,
|
|
45
43
|
exportFile = _ref.exportFile,
|
|
@@ -65,7 +63,7 @@ var getParams = function getParams(values, url) {
|
|
|
65
63
|
start_at = dayjs().startOf("day");
|
|
66
64
|
end_at = start_at.endOf("day");
|
|
67
65
|
}
|
|
68
|
-
console.log(id, timezone, start_at
|
|
66
|
+
console.log(id, timezone, start_at, end_at, values, "getReportList");
|
|
69
67
|
|
|
70
68
|
// 转换时间戳
|
|
71
69
|
start_at = dayjs.tz(start_at.format('YYYY-MM-DD HH:mm:ss'), timezone).unix();
|
package/lib/api/report/index.js
CHANGED
|
@@ -59,9 +59,11 @@ var getParams = (values, url) => {
|
|
|
59
59
|
var _a, _b;
|
|
60
60
|
let { id, timezone: timezone2 } = (0, import_config.getShopConfig)();
|
|
61
61
|
let timezoneObj = {};
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
62
|
+
if (includeTimeZoneUrl.includes(url)) {
|
|
63
|
+
timezoneObj = {
|
|
64
|
+
timezone: getTimeDiff(timezone2)
|
|
65
|
+
};
|
|
66
|
+
}
|
|
65
67
|
let { date, exportFile, ...others } = values || {};
|
|
66
68
|
if (url === "TEAM_SELF_COMMISSION_DETAIL") {
|
|
67
69
|
const { id: id2 } = (0, import_config.getAccount)() || {};
|
|
@@ -78,7 +80,7 @@ var getParams = (values, url) => {
|
|
|
78
80
|
start_at = (0, import_dayjs.default)().startOf("day");
|
|
79
81
|
end_at = start_at.endOf("day");
|
|
80
82
|
}
|
|
81
|
-
console.log(id, timezone2, start_at
|
|
83
|
+
console.log(id, timezone2, start_at, end_at, values, "getReportList");
|
|
82
84
|
start_at = import_dayjs.default.tz(start_at.format("YYYY-MM-DD HH:mm:ss"), timezone2).unix();
|
|
83
85
|
end_at = import_dayjs.default.tz(end_at.format("YYYY-MM-DD HH:mm:ss"), timezone2).unix();
|
|
84
86
|
let server = "au";
|