@pisell/pisellos 2.0.67 → 2.1.1

package/lib/core/index.js

@@ -61,7 +61,7 @@ var PisellOSCore = class {
         console.log(`${prefix} ${message}`);
         break;
       case "warn":
-        console.log(`%c${prefix}%c ${message}`, "color: #f59e0b; font-weight: bold;", "color: #f59e0b;");
+        console.warn(`${prefix} ${message}`);
         break;
       case "error":
         console.error(`${prefix} ${message}`);

package/lib/effects/index.d.ts

@@ -2,17 +2,16 @@ type EffectCallback = (payload: any) => void | Promise<void | {
     status: boolean;
     message?: string;
 }>;
-type UnsubscribeFunction = () => void;
 declare class EffectsManager {
     private listeners;
-    on(event: string, callback: EffectCallback): UnsubscribeFunction;
+    on(event: string, callback: EffectCallback): void;
     off(event: string, callback: EffectCallback): void;
     offByModuleDestroy(module: string): void;
-    once(event: string, callback: EffectCallback): UnsubscribeFunction;
+    once(event: string, callback: EffectCallback): void;
     emit(event: string, payload: any): Promise<{
         status: boolean;
         data: any;
     }>;
     clear(): void;
 }
-export { EffectsManager, UnsubscribeFunction };
+export { EffectsManager };

package/lib/effects/index.js

@@ -31,9 +31,6 @@ var EffectsManager = class {
     if (!this.listeners.has(event))
       this.listeners.set(event, /* @__PURE__ */ new Set());
     (_a = this.listeners.get(event)) == null ? void 0 : _a.add(callback);
-    return () => {
-      this.off(event, callback);
-    };
   }
   off(event, callback) {
     var _a;
@@ -52,7 +49,7 @@ var EffectsManager = class {
       await callback(payload);
       this.off(event, wrapper);
     };
-    return this.on(event, wrapper);
+    this.on(event, wrapper);
   }
   async emit(event, payload) {
     const callbacks = this.listeners.get(event);

package/lib/modules/AccountList/index.d.ts

@@ -1,7 +1,7 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { AccountModule, Account } from '../Account';
 import { BaseModule } from '../BaseModule';
-import { IFetchHolderAccountsParams, IHolder, IGetCustomerListParams } from './types';
+import { IFetchHolderAccountsParams, IHolder } from './types';
 export declare class AccountListModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -37,12 +37,6 @@ export declare class AccountListModule extends BaseModule implements Module {
         customerId: number;
         type?: 'unshift' | 'push';
     }): Promise<AccountModule[]>;
-    /**
-     * 获取客户列表
-     * @param params 查询参数
-     * @returns 客户列表
-     */
-    getCustomerList(params?: IGetCustomerListParams): Promise<any>;
     /**
      * 获取holder类型账户列表
      * @param params

package/lib/modules/AccountList/index.js

@@ -288,33 +288,6 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
     );
     return accountModules;
   }
-  /**
-   * 获取客户列表
-   * @param params 查询参数
-   * @returns 客户列表
-   */
-  async getCustomerList(params = {}) {
-    const url = "/customer/es/data";
-    const { page = 1, pageSize = 20, keyword, ...otherParams } = params;
-    try {
-      this.store.isLoading = true;
-      this.store.error = null;
-      const queryParams = {
-        page,
-        pageSize,
-        ...keyword && { keyword },
-        ...otherParams
-      };
-      const res = await this.request.get(url, queryParams);
-      return (res == null ? void 0 : res.data) || [];
-    } catch (error) {
-      console.error("Failed to fetch customer list:", error);
-      this.store.error = error instanceof Error ? error.message : "Failed to fetch customer list";
-      throw error;
-    } finally {
-      this.store.isLoading = false;
-    }
-  }
   /**
    * 获取holder类型账户列表
    * @param params

package/lib/modules/AccountList/types.d.ts

@@ -67,31 +67,3 @@ export interface IHolder {
     main_field: string;
     customer_cover?: string;
 }
-/**
- * 获取客户列表参数
- */
-export interface IGetCustomerListParams {
-    /** 页码 */
-    page?: number;
-    /** 每页数量 */
-    pageSize?: number;
-    /** 搜索关键词 */
-    keyword?: string;
-    /** 其他筛选参数 */
-    [key: string]: any;
-}
-/**
- * 客户数据
- */
-export interface ICustomer {
-    /** 客户ID */
-    id: string | number;
-    /** 客户姓名 */
-    name: string;
-    /** 客户电话 */
-    phone?: string;
-    /** 客户邮箱 */
-    email?: string;
-    /** 其他客户信息 */
-    [key: string]: any;
-}

package/lib/modules/ProductList/index.d.ts

@@ -8,20 +8,16 @@ export declare class ProductList extends BaseModule implements Module {
     protected defaultVersion: string;
     private store;
     private request;
+    private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, }: {
+    loadProducts({ category_ids, product_ids, collection, schedule_date, cacheId }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
         schedule_date?: string;
         cacheId?: string;
-        customer_id?: number;
-        menu_list_ids?: number[];
-        schedule_datetime?: string;
-        with_count?: string[];
-        with_schedule?: number;
     }): Promise<any>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];
@@ -33,10 +29,4 @@ export declare class ProductList extends BaseModule implements Module {
     getProduct(id: number): Promise<Product | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;
-    /**
-     * 根据商品编码或条码搜索商品
-     * @param code 商品编码或条码
-     * @returns 匹配的商品列表，如果没有匹配则返回空数组
-     */
-    findProductsByCodeOrBarcode(code: string): ProductData[];
 }

package/lib/modules/ProductList/index.js

@@ -33,11 +33,13 @@ var ProductList = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "productList";
     this.defaultVersion = "1.0.0";
+    this.otherParams = {};
   }
   async initialize(core, options) {
     var _a;
     this.core = core;
     this.store = options.store;
+    this.otherParams = options.otherParams || {};
     if (Array.isArray((_a = options.initialState) == null ? void 0 : _a.list)) {
       this.store.list = options.initialState.list;
       this.core.effects.emit(`${this.name}:changed`, this.store.list);
@@ -68,19 +70,14 @@ var ProductList = class extends import_BaseModule.BaseModule {
     category_ids = [],
     product_ids = [],
     collection = [],
-    menu_list_ids = [],
-    customer_id: paramsCustomerId,
-    with_count = [],
-    schedule_datetime,
     schedule_date,
-    cacheId,
-    with_schedule
+    cacheId
   }) {
-    var _a;
+    var _a, _b;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
-      customer_id = paramsCustomerId || ((_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id);
+      customer_id = (_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id;
     } catch (error) {
       console.error(error);
     }
@@ -106,12 +103,9 @@ var ProductList = class extends import_BaseModule.BaseModule {
         ids: product_ids,
         collection,
         front_end_cache_id: cacheId,
-        menu_list_ids,
-        with_count,
         // client_schedule_ids: schedule_ids,
         schedule_date,
-        with_schedule,
-        schedule_datetime
+        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel
       },
       { useCache: true }
     );
@@ -170,24 +164,6 @@ var ProductList = class extends import_BaseModule.BaseModule {
   async selectProducts(products) {
     this.store.selectProducts = products;
   }
-  /**
-   * 根据商品编码或条码搜索商品
-   * @param code 商品编码或条码
-   * @returns 匹配的商品列表，如果没有匹配则返回空数组
-   */
-  findProductsByCodeOrBarcode(code) {
-    if (!code || typeof code !== "string") {
-      return [];
-    }
-    const trimmedCode = code.trim();
-    if (!trimmedCode) {
-      return [];
-    }
-    const matchingProducts = this.store.list.filter((product) => {
-      return product.code && product.code.trim() === trimmedCode || product.barcode && product.barcode.trim() === trimmedCode;
-    });
-    return (0, import_lodash_es.cloneDeep)(matchingProducts);
-  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Rules/index.js

@@ -37,7 +37,6 @@ var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
-var import_lodash_es = require("lodash-es");
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -189,23 +188,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
-          const discountType = discount.tag || discount.type;
-          const productData = {
+          applicableProducts.push({
             amount: product.price,
-            type: discountType,
-            tag: discountType,
+            type: discount.tag || discount.type,
+            tag: discount.tag || discount.type,
             discount: {
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.origin_total,
               pre_value: discount.par_value,
               product_id: originProduct.id
-            }
-          };
-          if (discountType !== "good_pass") {
-            productData.num = product.num || 1;
-          }
-          applicableProducts.push(productData);
+            },
+            num: product.num || 1
+          });
           discountApplicableProducts.set(discount.id, applicableProducts);
         }
       });
@@ -220,9 +215,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         var _a2;
-        if ((Number(product.price) <= 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
+        if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
           return false;
-        if ((Number(product.total) <= 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
+        if ((Number(product.total) === 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) !== "good_pass")
@@ -247,7 +242,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }))) {
         isManualDiscount = false;
       }
-      if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+      if (applicableDiscounts.length === 0 || isManualDiscount) {
         if (product.isClient) {
           processedProductsMap.set(
             product._id,
@@ -314,21 +309,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           productOriginTotal = product.total;
         }
         const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
-        const discountType = selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag;
         const discountDetail = {
           amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
-          type: discountType,
+          type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
           discount: {
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
             original_amount: productOriginTotal,
             product_id: originProduct.id,
             percent: selectedDiscount2.par_value
-          }
+          },
+          num: product.num || 1
         };
-        if ((selectedDiscount2.tag || selectedDiscount2.type) !== "good_pass") {
-          discountDetail.num = product.num || 1;
-        }
         appliedProducts.push(discountDetail);
         appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
         if (product.isClient) {

package/lib/modules/Rules/types.d.ts

@@ -39,7 +39,6 @@ type ProductDetail = {
     original_price?: number | string;
     num?: number;
     quantity: number;
-    vouchersApplicable?: boolean;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/lib/modules/index.d.ts

@@ -3,7 +3,6 @@ export * from './ProductList';
 export * from './Cart';
 export * from './Account';
 export * from './AccountList';
-export * from './Customer';
 export * from './Date';
 export * from './Guests';
 export * from './Order';

package/lib/modules/index.js

@@ -21,7 +21,6 @@ __reExport(modules_exports, require("./ProductList"), module.exports);
 __reExport(modules_exports, require("./Cart"), module.exports);
 __reExport(modules_exports, require("./Account"), module.exports);
 __reExport(modules_exports, require("./AccountList"), module.exports);
-__reExport(modules_exports, require("./Customer"), module.exports);
 __reExport(modules_exports, require("./Date"), module.exports);
 __reExport(modules_exports, require("./Guests"), module.exports);
 __reExport(modules_exports, require("./Order"), module.exports);
@@ -37,7 +36,6 @@ __reExport(modules_exports, require("./Schedule"), module.exports);
   ...require("./Cart"),
   ...require("./Account"),
   ...require("./AccountList"),
-  ...require("./Customer"),
   ...require("./Date"),
   ...require("./Guests"),
   ...require("./Order"),

package/lib/plugins/window.d.ts

@@ -13,7 +13,6 @@ export interface WindowPlugin extends Plugin {
     navigator: Partial<Navigator>;
     document: Partial<Document>;
     history: History;
-    interaction?: any;
 }
 /**
  * 简单的 Storage 接口实现

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

@@ -215,7 +215,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
                         // 是否是只用来计算用，组合资源里，假设商品只关联了组合资源没关联子资源，需要通过这个计算来在后面从 renderList 里删除这个资源
                         metadata: {
                           ...resourcesMap[id].metadata,
-                          combined_resource: resourcesMap[id].combined_resource
+                          combined_resource: resourcesMap[id].combined_resource,
+                          form_name: item.title,
+                          resource_name: resourcesMap[id].main_field
                         }
                       })
                     );
@@ -230,7 +232,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
                 children: combiningResources,
                 metadata: {
                   ...resourcesMap[d].metadata,
-                  combined_resource: resourcesMap[d].combined_resource
+                  combined_resource: resourcesMap[d].combined_resource,
+                  form_name: item.title,
+                  resource_name: resourcesMap[d].main_field
                 }
               })
             );
@@ -259,7 +263,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
                         // 是否是只用来计算用，组合资源里，假设商品只关联了组合资源没关联子资源，需要通过这个计算来在后面从 renderList 里删除这个资源
                         metadata: {
                           ...resourcesMap[id].metadata,
-                          combined_resource: resourcesMap[id].combined_resource
+                          combined_resource: resourcesMap[id].combined_resource,
+                          form_name: item.title,
+                          resource_name: resourcesMap[id].main_field
                         }
                       })
                     );
@@ -275,7 +281,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
                 children: combiningResources,
                 metadata: {
                   ...resourcesMap[d].metadata,
-                  combined_resource: resourcesMap[d].combined_resource
+                  combined_resource: resourcesMap[d].combined_resource,
+                  form_name: item.title,
+                  resource_name: resourcesMap[d].main_field
                 }
               })
             );

package/lib/solution/ShopDiscount/index.js

@@ -38,7 +38,6 @@ var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
 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);
@@ -338,7 +337,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       var _a2;
       const targetProduct = productList.find((n) => n.id === id);
       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.map((n) => {
       var _a2;

package/lib/solution/index.d.ts

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

package/lib/solution/index.js

@@ -18,12 +18,10 @@ 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);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./BuyTickets"),
   ...require("./BookingByStep"),
-  ...require("./BookingTicket"),
   ...require("./ShopDiscount")
 });

package/lib/types/index.d.ts

@@ -38,9 +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;
-        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": "2.0.67",
+  "version": "2.1.1",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

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';