@pisell/pisellos 0.0.207 → 0.0.209

package/lib/solution/BookingByStep/utils/resources.js

@@ -444,8 +444,10 @@ var getTimeSlicesByResources = ({
     var _a, _b, _c, _d;
     const aIsCombined = ((_b = (_a = a.metadata) == null ? void 0 : _a.combined_resource) == null ? void 0 : _b.status) === 1;
     const bIsCombined = ((_d = (_c = b.metadata) == null ? void 0 : _c.combined_resource) == null ? void 0 : _d.status) === 1;
-    if (aIsCombined && !bIsCombined) return 1;
-    if (!aIsCombined && bIsCombined) return -1;
+    if (aIsCombined && !bIsCombined)
+      return 1;
+    if (!aIsCombined && bIsCombined)
+      return -1;
     return 0;
   });
   let timeSliceList = resources.reduce(
@@ -528,7 +530,8 @@ var getOthersCartSelectedResources = (cartItems, cartItemId, resourcesMap) => {
   }, []);
 };
 function filterScheduleByDateRange(schedule, startDate, endDate) {
-  if (!(schedule == null ? void 0 : schedule.length)) return [];
+  if (!(schedule == null ? void 0 : schedule.length))
+    return [];
   const start = new Date(startDate);
   const end = new Date(endDate);
   return schedule.filter((item) => {
@@ -594,7 +597,8 @@ function filterResourcesByFormItem(resources, form_id) {
 }
 function checkTwoResourcesIntersection(resource1, resource2) {
   var _a, _b;
-  if (resource1.id === resource2.id) return true;
+  if (resource1.id === resource2.id)
+    return true;
   if (((_a = resource1.metadata.combined_resource) == null ? void 0 : _a.status) === 1 && // 如果现在选择的是组合资源，需要判断
   // 1、当前其他购物车里是否选了当前组合资源的子资源
   // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集

package/lib/solution/BookingByStep/utils/timeslots.js

@@ -43,7 +43,8 @@ function calculateResourceAvailableTime({
   const matchingTimes = resource.times.filter((time) => {
     return (0, import_dayjs.default)(time.start_at).isSame((0, import_dayjs.default)(timeSlots.start_at), "day");
   });
-  if (matchingTimes.length === 0) return 0;
+  if (matchingTimes.length === 0)
+    return 0;
   const overlaps = [];
   for (const time of matchingTimes) {
     const overlapStart = (0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlots.start_at)) ? (0, import_dayjs.default)(time.start_at) : (0, import_dayjs.default)(timeSlots.start_at);
@@ -52,7 +53,8 @@ function calculateResourceAvailableTime({
       overlaps.push({ start: overlapStart, end: overlapEnd });
     }
   }
-  if (overlaps.length === 0) return 0;
+  if (overlaps.length === 0)
+    return 0;
   overlaps.sort((a, b) => a.start.diff(b.start));
   const merged = [];
   let current = overlaps[0];
@@ -85,13 +87,15 @@ function findFastestAvailableResource({
     const todayTimes = resource.times.filter((time) => {
       return (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
     });
-    if (todayTimes.length === 0) continue;
+    if (todayTimes.length === 0)
+      continue;
     todayTimes.sort((a, b) => {
       return (0, import_dayjs.default)(a.start_at).diff((0, import_dayjs.default)(b.start_at));
     });
     for (const time of todayTimes) {
       const startTime = (0, import_dayjs.default)(time.start_at);
-      if (startTime.isBefore(currentTime)) continue;
+      if (startTime.isBefore(currentTime))
+        continue;
       if (resource.resourceType === "single") {
         const hasBooking = (_a = time.event_list) == null ? void 0 : _a.some((event) => {
           return (0, import_dayjs.default)(event.start_at).isSame(startTime);
@@ -125,8 +129,10 @@ function findFastestAvailableResource({
       }
     }
   }
-  if (!fastestTime || fastestResources.length === 0) return null;
-  if (fastestResources.length === 1) return fastestResources[0];
+  if (!fastestTime || fastestResources.length === 0)
+    return null;
+  if (fastestResources.length === 1)
+    return fastestResources[0];
   let maxIdleTime = 0;
   let selectedResource = null;
   for (const resource of fastestResources) {

package/lib/solution/BuyTickets/index.js

@@ -28,26 +28,23 @@ var import_types = require("./types");
 var import_BaseModule = require("../../modules/BaseModule");
 __reExport(BuyTickets_exports, require("./types"), module.exports);
 var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
-  // 提供给 baseModule 用的默认名称 和 默认版本
-  defaultName = "buyTickets";
-  defaultVersion = "1.0.0";
-  isSolution = true;
-  request;
-  window;
-  store;
-  otherParams = {};
   constructor(name, version) {
     super(name, version);
+    // 提供给 baseModule 用的默认名称 和 默认版本
+    this.defaultName = "buyTickets";
+    this.defaultVersion = "1.0.0";
+    this.isSolution = true;
+    this.otherParams = {};
   }
   async initialize(core, options) {
     this.core = core;
     this.store = options.store || {};
     this.otherParams = options.otherParams || {};
-    console.log("[BuyTickets] \u521D\u59CB\u5316\u5B8C\u6210");
+    console.log("[BuyTickets] 初始化完成");
     this.request = core.getPlugin("request");
     this.window = core.getPlugin("window");
     if (!this.request) {
-      throw new Error("\u8D2D\u7269\u8F66\u6A21\u5757\u9700\u8981 request \u63D2\u4EF6\u652F\u6301");
+      throw new Error("购物车模块需要 request 插件支持");
     }
     if (this.otherParams.prodctIds) {
       await this.loadProductsByIds(this.otherParams.prodctIds);
@@ -79,7 +76,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
   }
   async destroy() {
     await this.core.effects.emit(import_types.BuyTicketsHooks.onDestroy, {});
-    console.log("[BuyTickets] \u5DF2\u9500\u6BC1");
+    console.log("[BuyTickets] 已销毁");
   }
   // 获取当前绑定的所有商品
   async getProducts() {
@@ -97,8 +94,10 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
     var _a, _b;
     const mainProduct = await ((_a = this.store.mainProducts) == null ? void 0 : _a.getProduct(id));
     const otherProduct = await ((_b = this.store.otherProducts) == null ? void 0 : _b.getProduct(id));
-    if (mainProduct) return mainProduct;
-    if (otherProduct) return otherProduct;
+    if (mainProduct)
+      return mainProduct;
+    if (otherProduct)
+      return otherProduct;
     return Promise.reject("Not fund product for id: " + id);
   }
   // 商品列表页提交
@@ -107,12 +106,13 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
       ...data,
       products: this.getProducts()
     });
-    if (res.status === false) return res;
+    if (res.status === false)
+      return res;
     this.window.localStorage.setItem(
       "buyTickets:listSubmit",
       JSON.stringify({ ...data, products: this.getProducts() })
     );
-    console.log("listSubmit \u5E94\u8BE5\u8D70\u903B\u8F91\u5C42\u7684 API \u53D1\u8BF7\u6C42\u4E86");
+    console.log("listSubmit 应该走逻辑层的 API 发请求了");
   }
   // 购物车提交
   async cartSubmit(data) {

package/lib/solution/ShopDiscount/index.js

@@ -39,16 +39,12 @@ var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
 var import_decimal = __toESM(require("decimal.js"));
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
-  defaultName = "shopDiscount";
-  defaultVersion = "1.0.0";
-  isSolution = true;
-  request;
-  window;
-  store;
-  options = {};
-  hooks;
   constructor(name, version) {
     super(name, version);
+    this.defaultName = "shopDiscount";
+    this.defaultVersion = "1.0.0";
+    this.isSolution = true;
+    this.options = {};
     this.store = {
       customer: null,
       productList: [],
@@ -63,7 +59,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     this.options = options;
     this.store = { ...this.store, ...options.store || {} };
     this.hooks = (_b = (_a = options.otherParams) == null ? void 0 : _a.rules) == null ? void 0 : _b.hooks;
-    console.log("[ShopDiscount] \u521D\u59CB\u5316\u5B8C\u6210");
+    console.log("[ShopDiscount] 初始化完成");
     this.initializePlugins();
     this.registerDependentModules();
     this.registerEventListeners();
@@ -76,7 +72,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     (_b = this.store.rules) == null ? void 0 : _b.destroy();
     this.core.effects.offByModuleDestroy(this.name);
     await this.core.effects.emit(import_types.ShopDiscountHooks.onDestroy, {});
-    console.log("[ShopDiscount] \u5DF2\u9500\u6BC1");
+    console.log("[ShopDiscount] 已销毁");
   }
   async clear() {
     var _a, _b;
@@ -91,10 +87,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     this.request = this.core.getPlugin("request");
     this.window = this.core.getPlugin("window");
     if (!this.request) {
-      throw new Error("ShopDiscount\u9700\u8981 request \u63D2\u4EF6\u652F\u6301");
+      throw new Error("ShopDiscount需要 request 插件支持");
     }
     if (!this.window) {
-      throw new Error("ShopDiscount\u9700\u8981 window \u63D2\u4EF6\u652F\u6301");
+      throw new Error("ShopDiscount需要 window 插件支持");
     }
   }
   registerDependentModules() {
@@ -258,7 +254,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         discountList: newDiscountList || this.getDiscountList()
       };
     } catch (error) {
-      console.error("[ShopDiscount] \u626B\u7801\u51FA\u9519:", error);
+      console.error("[ShopDiscount] 扫码出错:", error);
       return {
         type: "clientCalc",
         isAvailable: false,
@@ -388,7 +384,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         );
       }
     } catch (error) {
-      console.error("[ShopDiscount] \u83B7\u53D6\u5BA2\u6237\u94B1\u5305\u4FE1\u606F\u51FA\u9519:", error);
+      console.error("[ShopDiscount] 获取客户钱包信息出错:", error);
     }
   }
   // 加载准备配置
@@ -421,7 +417,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         newDiscountList
       );
     } catch (error) {
-      console.error("[ShopDiscount] \u52A0\u8F7D\u51C6\u5907\u914D\u7F6E\u51FA\u9519:", error);
+      console.error("[ShopDiscount] 加载准备配置出错:", error);
     }
   }
 };

package/lib/solution/ShopDiscount/types.d.ts

@@ -10,7 +10,7 @@ export declare enum ShopDiscountHooks {
     onRulesListChange = "shopDiscount:onRulesListChange",
     onLoadPrepareCalcResult = "shopDiscount:onLoadPrepareCalcResult"
 }
-export declare type Customer = {
+export type Customer = {
     id: string | number;
     name: string;
     email: string;

package/lib/types/index.d.ts

@@ -27,7 +27,7 @@ export interface ModuleOptions {
     initialState?: Record<string, any>;
     otherParams?: Record<string, any>;
 }
-export declare type EventHandler = (data?: any) => void;
+export type EventHandler = (data?: any) => void;
 export interface PisellCore {
     registerPlugin: (plugin: Plugin, options?: PluginOptions) => void;
     getPlugin: <T extends Plugin>(name: string) => T | null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.207",
+  "version": "0.0.209",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",