@pisell/lowcode-renderer 1.0.4 → 1.0.6

package/es/api/report/index.js

@@ -2,10 +2,38 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc';
+import timezone from 'dayjs/plugin/timezone';
 import urls from "./URL";
-import { getShopId, injectedConfig } from "../../config";
-var getParams = function getParams(values) {
-  var shop_id = getShopId();
+import { getShopConfig, injectedConfig } from "../../config";
+dayjs.extend(utc);
+dayjs.extend(timezone);
+var includeTimeZoneUrl = ['REPORT_DASHBOARD'];
+
+// 获取时差
+var getTimeDiff = function getTimeDiff(timezone) {
+  var now = dayjs().tz(timezone);
+  var diff = now.utcOffset() / 60;
+  return diff;
+};
+var getParams = function getParams(values, url) {
+  var _getShopConfig = getShopConfig(),
+    id = _getShopConfig.id,
+    timezone = _getShopConfig.timezone;
+
+  // 包含时区
+  var timezoneObj = {};
+  if (includeTimeZoneUrl.includes(url)) {
+    timezoneObj = {
+      timezone: getTimeDiff(timezone)
+    };
+  }
   var _ref = values || {},
     date = _ref.date;
 
@@ -15,32 +43,30 @@ var getParams = function getParams(values) {
 
   // 有筛选时间 使用筛选日期
   if (date && Array.isArray(date) && date[0]) {
-    start_at = injectedConfig.dayjs(date[0]);
-    end_at = injectedConfig.dayjs(date[1]);
+    start_at = dayjs(date[0]);
+    end_at = dayjs(date[1]);
   } else {
     // 获取当天时间
-    start_at = injectedConfig.dayjs().startOf("day");
+    start_at = dayjs().startOf("day");
     end_at = start_at.endOf("day");
   }
 
   // 转换时间戳
   start_at = start_at.unix();
   end_at = end_at.unix();
-  return {
-    shop_id: shop_id,
+  return _objectSpread({
+    shop_id: id,
     start_at: start_at,
     end_at: end_at
-    // email: 'nick.li@pisell.com',
-  };
+  }, timezoneObj);
 };
-
 var getReportList = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values, url) {
     var params, data;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          params = getParams(values);
+          params = getParams(values, url);
           _context.next = 3;
           return injectedConfig.request.custom(urls[url || "REPORT_DETAILED_TRANSACTIONS"], {
             method: "post",

package/es/config/index.d.ts

@@ -1,9 +1,13 @@
+declare type ShopConfigType = {
+    timezone: string;
+    id: number;
+    [key: string]: any;
+};
 declare type InjectedConfigType = {
-    shop_id: number | (() => number);
+    shopConfig: ShopConfigType | (() => ShopConfigType);
     request: any;
-    dayjs: any;
 };
 declare let injectedConfig: InjectedConfigType;
 export declare const injectConfig: (context: InjectedConfigType) => void;
-declare const getShopId: () => number;
-export { injectedConfig, getShopId };
+declare const getShopConfig: () => ShopConfigType;
+export { injectedConfig, getShopConfig };

package/es/config/index.js

@@ -2,10 +2,10 @@ var injectedConfig = {};
 export var injectConfig = function injectConfig(context) {
   injectedConfig = context;
 };
-var getShopId = function getShopId() {
-  if (typeof injectedConfig.shop_id === "function") {
-    return injectedConfig.shop_id();
+var getShopConfig = function getShopConfig() {
+  if (typeof injectedConfig.shopConfig === "function") {
+    return injectedConfig.shopConfig();
   }
-  return injectedConfig.shop_id;
+  return injectedConfig.shopConfig;
 };
-export { injectedConfig, getShopId };
+export { injectedConfig, getShopConfig };

package/lib/api/report/index.js

@@ -32,31 +32,49 @@ __export(report_exports, {
   default: () => report_default
 });
 module.exports = __toCommonJS(report_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_utc = __toESM(require("dayjs/plugin/utc"));
+var import_timezone = __toESM(require("dayjs/plugin/timezone"));
 var import_URL = __toESM(require("./URL"));
 var import_config = require("../../config");
-var getParams = (values) => {
-  let shop_id = (0, import_config.getShopId)();
+import_dayjs.default.extend(import_utc.default);
+import_dayjs.default.extend(import_timezone.default);
+var includeTimeZoneUrl = ["REPORT_DASHBOARD"];
+var getTimeDiff = (timezone2) => {
+  const now = (0, import_dayjs.default)().tz(timezone2);
+  const diff = now.utcOffset() / 60;
+  return diff;
+};
+var getParams = (values, url) => {
+  let { id, timezone: timezone2 } = (0, import_config.getShopConfig)();
+  let timezoneObj = {};
+  if (includeTimeZoneUrl.includes(url)) {
+    timezoneObj = {
+      timezone: getTimeDiff(timezone2)
+    };
+  }
   let { date } = values || {};
   let start_at = 0;
   let end_at = 0;
   if (date && Array.isArray(date) && date[0]) {
-    start_at = import_config.injectedConfig.dayjs(date[0]);
-    end_at = import_config.injectedConfig.dayjs(date[1]);
+    start_at = (0, import_dayjs.default)(date[0]);
+    end_at = (0, import_dayjs.default)(date[1]);
   } else {
-    start_at = import_config.injectedConfig.dayjs().startOf("day");
+    start_at = (0, import_dayjs.default)().startOf("day");
     end_at = start_at.endOf("day");
   }
   start_at = start_at.unix();
   end_at = end_at.unix();
   return {
-    shop_id,
+    shop_id: id,
     start_at,
-    end_at
+    end_at,
+    ...timezoneObj
     // email: 'nick.li@pisell.com',
   };
 };
 var getReportList = async (values, url) => {
-  const params = getParams(values);
+  const params = getParams(values, url);
   const data = await import_config.injectedConfig.request.custom(
     import_URL.default[url || "REPORT_DETAILED_TRANSACTIONS"],
     {

package/lib/config/index.d.ts

@@ -1,9 +1,13 @@
+declare type ShopConfigType = {
+    timezone: string;
+    id: number;
+    [key: string]: any;
+};
 declare type InjectedConfigType = {
-    shop_id: number | (() => number);
+    shopConfig: ShopConfigType | (() => ShopConfigType);
     request: any;
-    dayjs: any;
 };
 declare let injectedConfig: InjectedConfigType;
 export declare const injectConfig: (context: InjectedConfigType) => void;
-declare const getShopId: () => number;
-export { injectedConfig, getShopId };
+declare const getShopConfig: () => ShopConfigType;
+export { injectedConfig, getShopConfig };

package/lib/config/index.js

@@ -19,7 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/config/index.ts
 var config_exports = {};
 __export(config_exports, {
-  getShopId: () => getShopId,
+  getShopConfig: () => getShopConfig,
   injectConfig: () => injectConfig,
   injectedConfig: () => injectedConfig
 });
@@ -28,15 +28,15 @@ var injectedConfig = {};
 var injectConfig = (context) => {
   injectedConfig = context;
 };
-var getShopId = () => {
-  if (typeof injectedConfig.shop_id === "function") {
-    return injectedConfig.shop_id();
+var getShopConfig = () => {
+  if (typeof injectedConfig.shopConfig === "function") {
+    return injectedConfig.shopConfig();
   }
-  return injectedConfig.shop_id;
+  return injectedConfig.shopConfig;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getShopId,
+  getShopConfig,
   injectConfig,
   injectedConfig
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/lowcode-renderer",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",
@@ -16,7 +16,8 @@
     "@alilc/lowcode-renderer-core": "^1.1.7",
     "antd": "^5.6.4",
     "@alifd/next": "^1.25.44",
-    "lodash-es": "^4.17.21"
+    "lodash-es": "^4.17.21",
+    "dayjs": "^1.11.9"
   },
   "peerDependencies": {
     "react": ">=16.9.0",