@pisell/lowcode-renderer 1.0.45 → 1.0.47

package/es/Render/index.js

@@ -16,7 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { injectComponents } from "@alilc/lowcode-plugin-inject";
 import { AssetLoader, buildComponents } from "@alilc/lowcode-utils";
 import { Skeleton } from "antd";
-import { isArray, mergeWith } from "lodash-es";
+import { isArray, mergeWith, cloneDeep } from "lodash-es";
 import React, { useEffect, useState } from "react";
 import ReactRenderer from "../ReactRenderer";
 import appHelper from "../appHelper";
@@ -149,9 +149,7 @@ var Render = function Render(props) {
     schema: _objectSpread(_objectSpread({}, schema), {}, {
       dataSource: mergeWith(schema.dataSource, projectDataSource, customizer)
     }),
-    appHelper: _objectSpread(_objectSpread(_objectSpread({}, appHelper), propsAppHelper || {}), {}, {
-      utils: _objectSpread(_objectSpread({}, appHelper.utils), (propsAppHelper === null || propsAppHelper === void 0 ? void 0 : propsAppHelper.utils) || {})
-    }),
+    appHelper: mergeWith(cloneDeep(appHelper), propsAppHelper),
     components: components,
     messages: i18n,
     locale: locale

package/es/api/report/index.js

@@ -57,8 +57,8 @@ var getParams = function getParams(values, url) {
   }
 
   // 转换时间戳
-  start_at = start_at.unix();
-  end_at = end_at.unix();
+  start_at = start_at.tz(timezone).unix();
+  end_at = end_at.tz(timezone).unix();
   return _objectSpread(_objectSpread({
     shop_id: id,
     start_at: start_at,

package/lib/Render/index.js

@@ -121,14 +121,7 @@ var Render = (props) => {
         ...schema,
         dataSource: (0, import_lodash_es.mergeWith)(schema.dataSource, projectDataSource, customizer)
       },
-      appHelper: {
-        ...import_appHelper.default,
-        ...propsAppHelper || {},
-        utils: {
-          ...import_appHelper.default.utils,
-          ...(propsAppHelper == null ? void 0 : propsAppHelper.utils) || {}
-        }
-      },
+      appHelper: (0, import_lodash_es.mergeWith)((0, import_lodash_es.cloneDeep)(import_appHelper.default), propsAppHelper),
       components,
       messages: i18n,
       locale

package/lib/api/report/index.js

@@ -72,8 +72,8 @@ var getParams = (values, url) => {
     start_at = (0, import_dayjs.default)().startOf("day");
     end_at = start_at.endOf("day");
   }
-  start_at = start_at.unix();
-  end_at = end_at.unix();
+  start_at = start_at.tz(timezone2).unix();
+  end_at = end_at.tz(timezone2).unix();
   return {
     shop_id: id,
     start_at,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/lowcode-renderer",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",