@pisell/pisellos 3.0.76 → 3.0.78

package/lib/solution/BuyTickets/index.js

@@ -24,6 +24,7 @@ __export(BuyTickets_exports, {
 });
 module.exports = __toCommonJS(BuyTickets_exports);
 var import_modules = require("../../modules/");
+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 {
@@ -48,7 +49,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
     if (this.otherParams.prodctIds) {
       await this.loadProductsByIds(this.otherParams.prodctIds);
     }
-    await this.core.effects.emit(`${this.name}:onInited`, {});
+    await this.core.effects.emit(import_types.BuyTicketsHooks.onInited, {});
   }
   // 通过 ids 获取产品，在当前解决方案下，获取到的就是主商品
   async loadProductsByIds(ids) {
@@ -68,13 +69,13 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.store.mainProducts = mainProducts;
-    await this.core.effects.emit(`${this.name}:onMainProductsLoaded`, {});
+    await this.core.effects.emit(import_types.BuyTicketsHooks.onMainProductsLoaded, {});
   }
   // 通过 ids 获取产品，在当前解决方案下，获取到的就是其他商品
   async loadProductsByCategory(categoryId) {
   }
   async destroy() {
-    await this.core.effects.emit(`${this.name}:onDestroy`, {});
+    await this.core.effects.emit(import_types.BuyTicketsHooks.onDestroy, {});
     console.log("[BuyTickets] 已销毁");
   }
   // 获取当前绑定的所有商品
@@ -82,7 +83,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
     var _a;
     const mainData = await this.store.mainProducts.getProducts() || [];
     const otherData = await ((_a = this.store.otherProducts) == null ? void 0 : _a.getProducts()) || [];
-    await this.core.effects.emit(`${this.name}:onGetProducts`, [
+    await this.core.effects.emit(import_types.BuyTicketsHooks.OnGetProducts, [
       ...mainData,
       ...otherData
     ]);
@@ -101,7 +102,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
   }
   // 商品列表页提交
   async listSubmit(data) {
-    const res = await this.core.effects.emit(`${this.name}:onListSubmit`, {
+    const res = await this.core.effects.emit(import_types.BuyTicketsHooks.onListSubmit, {
       ...data,
       products: this.getProducts()
     });
@@ -115,14 +116,14 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
   }
   // 购物车提交
   async cartSubmit(data) {
-    await this.core.effects.emit(`${this.name}:onCartSubmit`, {
+    await this.core.effects.emit(import_types.BuyTicketsHooks.onCartSubmit, {
       ...data,
       products: this.getProducts()
     });
   }
   // 结算提交
   async checkoutSubmit(data) {
-    await this.core.effects.emit(`${this.name}:onCheckoutSubmit`, {
+    await this.core.effects.emit(import_types.BuyTicketsHooks.onCheckoutSubmit, {
       ...data,
       products: this.getProducts()
     });

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

@@ -1,7 +1,8 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { Customer, SetDiscountSelectedParams } from './types';
+import { Customer } from './types';
 import { Discount } from '../../modules/Discount/types';
+import { UnavailableReason } from '../../modules/Rules/types';
 export declare class ShopDiscountImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -28,11 +29,17 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         type?: 'form' | 'customer';
         [key: string]: any;
     }): void;
-    calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
+    calcDiscount(productList: Record<string, any>[], options?: {
+        discountId: number;
+        isSelected: boolean;
+    }): {
         productList: Record<string, any>[];
         discountList: Discount[];
     };
-    setDiscountSelected(params: SetDiscountSelectedParams): {
+    setDiscountSelected({ discountId, isSelected, }: {
+        discountId: number;
+        isSelected: boolean;
+    }): {
         productList: Record<string, any>[];
         discountList: Discount[];
     };
@@ -42,6 +49,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         productList: Record<string, any>[];
         discountList: Discount[];
         type: "server" | "clientCalc";
+        unavailableReason?: UnavailableReason;
     }>;
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     private getCustomer;
@@ -50,12 +58,6 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private setDiscountList;
     private getDiscountList;
     private getCustomerWallet;
-    private bestDiscount;
-    loadPrepareConfig(params: {
-        customerId: number;
-        action?: 'create' | 'update';
-        with_good_pass?: 0 | 1;
-        with_discount_card?: 0 | 1;
-    }): Promise<void>;
+    private loadPrepareConfig;
 }
 export default ShopDiscountImpl;

package/lib/solution/ShopDiscount/index.js

@@ -34,11 +34,12 @@ __export(ShopDiscount_exports, {
 });
 module.exports = __toCommonJS(ShopDiscount_exports);
 var import_BaseModule = require("../../modules/BaseModule");
+var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
 var import_utils = require("./utils");
+var import_types2 = require("../../modules/Rules/types");
 var import_decimal = __toESM(require("decimal.js"));
-var import_lodash_es = require("lodash-es");
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -77,7 +78,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     (_a = this.store.discount) == null ? void 0 : _a.destroy();
     (_b = this.store.rules) == null ? void 0 : _b.destroy();
     this.core.effects.offByModuleDestroy(this.name);
-    await this.core.effects.emit(`${this.name}:onDestroy`, {});
+    await this.core.effects.emit(import_types.ShopDiscountHooks.onDestroy, {});
     console.log("[ShopDiscount] 已销毁");
   }
   async clear() {
@@ -127,8 +128,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     this.store.rules = rules;
   }
   registerEventListeners() {
-    this.core.effects.only(
-      `${this.name}:onCustomerChange`,
+    this.core.effects.on(
+      import_types.ShopDiscountHooks.onCustomerChange,
       (customer) => {
         var _a;
         if (((_a = this.options.otherParams) == null ? void 0 : _a.cacheId) && this.getDiscountList().length) {
@@ -188,7 +189,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     if (((_a = this.store.customer) == null ? void 0 : _a.id) !== customer.id) {
       this.store.customer = customer;
       await this.core.effects.emit(
-        `${this.name}:onCustomerChange`,
+        import_types.ShopDiscountHooks.onCustomerChange,
         customer
       );
     }
@@ -226,34 +227,27 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     };
   }
   // 设置优惠券使用状态
-  setDiscountSelected(params) {
+  setDiscountSelected({
+    discountId,
+    isSelected
+  }) {
     const discountList = this.getDiscountList();
-    const selectionOperations = [];
-    selectionOperations.push({
-      discountId: params.discountId,
-      isSelected: params.isSelected
-    });
-    if (params.selectedList && params.selectedList.length > 0) {
-      selectionOperations.push(...params.selectedList);
-    }
-    const selectionMap = /* @__PURE__ */ new Map();
-    selectionOperations.forEach((operation) => {
-      selectionMap.set(operation.discountId, operation.isSelected);
-    });
     const newDiscountList = discountList.map((discount) => {
-      if (selectionMap.has(discount.id)) {
-        const targetIsSelected = selectionMap.get(discount.id);
+      if (discount.id === discountId) {
         return {
           ...discount,
-          isSelected: targetIsSelected,
+          isSelected,
           // 手动设置不使用
-          isManualSelect: !targetIsSelected
+          isManualSelect: !isSelected
         };
       }
       return { ...discount, isManualSelect: !(discount == null ? void 0 : discount.isSelected) };
     });
     this.setDiscountList(newDiscountList);
-    return this.calcDiscount(this.store.productList || [], params);
+    return this.calcDiscount(this.store.productList || [], {
+      discountId,
+      isSelected
+    });
   }
   setProductList(productList) {
     this.store.productList = productList;
@@ -269,7 +263,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           type: "clientCalc",
           isAvailable: false,
           productList: this.store.productList || [],
-          discountList: this.getDiscountList()
+          discountList: this.getDiscountList(),
+          unavailableReason: import_types2.UnavailableReason.Unknown
         };
       }
       if (!resultDiscountList.length) {
@@ -298,7 +293,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const {
         productList: newProductList,
         discountList: newDiscountList,
-        isAvailable
+        isAvailable,
+        unavailableReason
       } = rulesModule.isDiscountListAvailable({
         productList: this.store.productList || [],
         oldDiscountList: this.getDiscountList(),
@@ -312,7 +308,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       };
       if (isAvailable) {
         this.setDiscountList(newDiscountList || []);
-        this.store.originalDiscountList = newDiscountList || [];
         this.setProductList(newProductList || []);
         if (this.isWalkIn() && resultDiscountList.length && ((_c = this.options.otherParams) == null ? void 0 : _c.platform) === "shop") {
           await this.getCustomerWallet(
@@ -324,7 +319,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         type: "clientCalc",
         isAvailable: isAvailable || false,
         productList: newProductList || this.store.productList || [],
-        discountList: newDiscountList || this.getDiscountList()
+        discountList: newDiscountList || this.getDiscountList(),
+        unavailableReason
       };
     } catch (error) {
       console.error("[ShopDiscount] 扫码出错:", error);
@@ -332,7 +328,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         type: "clientCalc",
         isAvailable: false,
         productList: this.store.productList || [],
-        discountList: this.getDiscountList()
+        discountList: this.getDiscountList(),
+        unavailableReason: import_types2.UnavailableReason.Unknown
       };
     }
   }
@@ -355,7 +352,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   // 触发优惠列表变更事件
   async emitDiscountListChange(discountList) {
     await this.core.effects.emit(
-      `${this.name}:onDiscountListChange`,
+      import_types.ShopDiscountHooks.onDiscountListChange,
       discountList
     );
   }
@@ -387,7 +384,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
               }
               editModeDiscountList.push({
                 ...discount,
-                name: discount.name || discount.discount.title.auto,
                 isEditMode: true,
                 limited_relation_product_data: {},
                 savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.product_discount_difference) || 0).toNumber(),
@@ -413,7 +409,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (!targetProduct)
         return false;
       const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(targetProduct);
-      return Number(product == null ? void 0 : product.total) <= 0 && (Number(product == null ? void 0 : product.origin_total) <= 0 || !(product == null ? void 0 : product.origin_total)) || (0, import_lodash_es.isBoolean)(product == null ? void 0 : product.vouchersApplicable) && !(product == null ? void 0 : product.vouchersApplicable);
+      return Number(product == null ? void 0 : product.total) === 0 && (Number(product == null ? void 0 : product.origin_total) === 0 || !(product == null ? void 0 : product.origin_total));
     };
     const allUsedProductIds = newDiscountList.filter((item) => !(item == null ? void 0 : item.isEditMode)).map((n) => {
       var _a2;
@@ -455,7 +451,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         const { ...customer } = result.data;
         this.setCustomer(customer);
         await this.core.effects.emit(
-          `${this.name}:onScanCustomerChange`,
+          import_types.ShopDiscountHooks.onScanCustomerChange,
           customer
         );
       }
@@ -463,23 +459,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       console.error("[ShopDiscount] 获取客户钱包信息出错:", error);
     }
   }
-  async bestDiscount(cb) {
-    var _a;
-    const newDiscountList = this.store.originalDiscountList;
-    this.setDiscountList(newDiscountList);
-    if ((_a = this.store.productList) == null ? void 0 : _a.length) {
-      const result = this.calcDiscount(this.store.productList);
-      cb == null ? void 0 : cb(result);
-      await this.core.effects.emit(
-        `${this.name}:onLoadPrepareCalcResult`,
-        result
-      );
-    }
-    await this.core.effects.emit(
-      `${this.name}:onLoadDiscountList`,
-      newDiscountList
-    );
-  }
   // 加载准备配置
   async loadPrepareConfig(params) {
     var _a, _b, _c, _d, _e;
@@ -506,12 +485,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if ((_e = this.store.productList) == null ? void 0 : _e.length) {
         const result = this.calcDiscount(this.store.productList);
         await this.core.effects.emit(
-          `${this.name}:onLoadPrepareCalcResult`,
+          import_types.ShopDiscountHooks.onLoadPrepareCalcResult,
           result
         );
       }
       await this.core.effects.emit(
-        `${this.name}:onLoadDiscountList`,
+        import_types.ShopDiscountHooks.onLoadDiscountList,
         filteredDiscountList
       );
     } catch (error) {

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

@@ -36,11 +36,3 @@ export interface ShopDiscountState {
         [key: string]: any;
     };
 }
-export interface SetDiscountSelectedParams {
-    discountId: number;
-    isSelected: boolean;
-    selectedList?: {
-        discountId: number;
-        isSelected: boolean;
-    }[];
-}

package/lib/solution/index.d.ts

@@ -1,6 +1,4 @@
 export * from './BuyTickets';
 export * from './BookingByStep';
-export * from './BookingTicket';
 export * from './ShopDiscount';
 export * from './RegisterAndLogin';
-export * from './Checkout';

package/lib/solution/index.js

@@ -18,16 +18,12 @@ var solution_exports = {};
 module.exports = __toCommonJS(solution_exports);
 __reExport(solution_exports, require("./BuyTickets"), module.exports);
 __reExport(solution_exports, require("./BookingByStep"), module.exports);
-__reExport(solution_exports, require("./BookingTicket"), module.exports);
 __reExport(solution_exports, require("./ShopDiscount"), module.exports);
 __reExport(solution_exports, require("./RegisterAndLogin"), module.exports);
-__reExport(solution_exports, require("./Checkout"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./BuyTickets"),
   ...require("./BookingByStep"),
-  ...require("./BookingTicket"),
   ...require("./ShopDiscount"),
-  ...require("./RegisterAndLogin"),
-  ...require("./Checkout")
+  ...require("./RegisterAndLogin")
 });

package/lib/types/index.d.ts

@@ -38,10 +38,7 @@ export interface PisellCore {
     getModuleExports: <T = any>(name: string) => T | null;
     hasModule: (name: string) => boolean;
     effects: {
-        on: (event: string, callback: (payload: any) => void) => () => void;
-        once: (event: string, callback: (payload: any) => void) => () => void;
-        only: (event: string, callback: (payload: any) => void) => () => void;
-        off: (event: string, callback: (payload: any) => void) => void;
+        on: (event: string, callback: (payload: any) => void) => void;
         emit: (event: string, payload: any, value?: any) => Promise<{
             status: boolean;
             data: any;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "3.0.76",
+  "version": "3.0.78",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,7 +12,6 @@
   "scripts": {
     "build": "father build",
     "dev": "father dev --watch",
-    "push": "yalc push --replace",
     "test": "vitest",
     "lint": "eslint src --ext .ts",
     "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md}\"",
@@ -55,7 +54,6 @@
     "@typescript-eslint/parser": "^5.57.1",
     "axios": "1.7.2",
     "eslint": "^8.37.0",
-    "fake-indexeddb": "^6.0.1",
     "father": "^4.1.0",
     "prettier": "^3.5.3",
     "ts-node": "^10.9.1",

package/dist/modules/Customer/constants.d.ts

@@ -1,7 +0,0 @@
-export declare const SORT_BY = "id";
-export declare const DEFAULT_PAGE_SIZE = 20;
-export declare const DEFAULT_CUSTOMER: {
-    id: number;
-    nickname: string;
-    name: string;
-};

package/dist/modules/Customer/constants.js

@@ -1,12 +0,0 @@
-// 排序字段
-export var SORT_BY = "id";
-
-// 默认每页数量
-export var DEFAULT_PAGE_SIZE = 20;
-
-// 默认客户
-export var DEFAULT_CUSTOMER = {
-  "id": 1,
-  "nickname": "Select a customer",
-  "name": "选择一个客户"
-};

package/dist/modules/Customer/index.d.ts

@@ -1,122 +0,0 @@
-import { Module, PisellCore, ModuleOptions } from '../../types';
-import { BaseModule } from '../BaseModule';
-import { CustomerState, ShopCustomer, ShopGetCustomerListParams, CustomerModuleAPI, IPaginationInfo, ICustomerListResponse } from './types';
-export declare class CustomerModule extends BaseModule implements Module, CustomerModuleAPI {
-    protected defaultName: string;
-    protected defaultVersion: string;
-    private store;
-    private request;
-    private cacheId;
-    private openCache;
-    private fatherModule;
-    constructor(name?: string, version?: string);
-    initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
-    /**
-     * 获取客户列表数据（内部方法）
-     * @param params 查询参数
-     * @returns API响应数据
-     */
-    private fetchCustomerListData;
-    /**
-     * 处理客户列表操作的错误（内部方法）
-     * @param error 错误对象
-     * @param operation 操作名称
-     */
-    private handleCustomerListError;
-    /**
-     * 获取客户列表
-     * @param params 查询参数
-     * @returns 客户列表响应
-     */
-    getCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
-    /**
-     * 设置客户列表
-     * @param customers 客户列表
-     * @param total 总数
-     */
-    setCustomerList(customers: ShopCustomer[], total?: number): void;
-    /**
-     * 设置当前选择的客户
-     * @param customer 选择的客户
-     */
-    setSelectedCustomer(customer: ShopCustomer | null): void;
-    /**
-     * 获取当前选择的客户
-     * @returns 当前选择的客户
-     */
-    getSelectedCustomer(): ShopCustomer | null;
-    /**
-     * 获取客户列表
-     * @returns 客户列表
-     */
-    getCustomers(): ShopCustomer[];
-    /**
-     * 根据ID查找客户
-     * @param id 客户ID
-     * @returns 客户信息
-     */
-    getCustomerById(id: string | number): ShopCustomer | null;
-    /**
-     * 清空客户列表
-     */
-    clearCustomers(): void;
-    /**
-     * 添加客户到列表第一位
-     * @param customer 要添加的客户信息
-     */
-    addCustomerToFirst(customer: ShopCustomer): void;
-    /**
-     * 获取当前状态
-     * @returns 当前状态
-     */
-    getState(): CustomerState;
-    /**
-     * 获取分页信息
-     * @returns 分页信息
-     */
-    getPaginationInfo(): IPaginationInfo;
-    /**
-     * 触发分页变化事件
-     * @param pagination 分页信息
-     */
-    triggerPaginationChange(pagination: IPaginationInfo): void;
-    /**
-     * 设置分页信息
-     * @param page 页码
-     * @param pageSize 每页数量
-     */
-    setPaginationInfo(page: number, pageSize: number): void;
-    /**
-     * 便捷方法：切换分页并自动获取数据
-     * @param page 页码
-     * @param pageSize 每页数量（可选，不传则使用当前pageSize）
-     * @returns 客户列表响应
-     */
-    changeCustomerPage(page: number, pageSize?: number): Promise<ICustomerListResponse>;
-    /**
-     * 滚动加载更多客户数据 - 数据会追加到现有列表中
-     * @returns 客户列表响应
-     */
-    loadMoreCustomers(): Promise<ICustomerListResponse>;
-    /**
-     * 重置并重新开始滚动加载
-     * @param params 查询参数
-     * @returns 客户列表响应
-     */
-    resetAndLoadCustomers(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
-    /**
-     * 检查是否还有更多数据可以加载
-     * @returns 是否还有更多数据
-     */
-    hasMoreCustomers(): boolean;
-    /**
-     * 获取当前的搜索条件
-     * @returns 当前搜索条件
-     */
-    getCurrentSearchParams(): Omit<ShopGetCustomerListParams, 'skip' | 'num'>;
-    /**
-     * 缓存状态变化
-     */
-    private storeChange;
-}
-export * from './types';