@pisell/pisellos 0.0.44 → 0.0.46

package/lib/modules/AccountList/index.js

@@ -26,6 +26,7 @@ var import_lodash_es = require("lodash-es");
 var import_Account = require("../Account");
 var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
+var import_utils = require("./utils");
 var AccountListModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -45,6 +46,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
     var _a, _b, _c;
     this.core = core;
     this.store = options == null ? void 0 : options.store;
+    this.request = this.core.getPlugin("request");
     if (Array.isArray((_a = options == null ? void 0 : options.initialState) == null ? void 0 : _a.accountList)) {
       const recordList = (0, import_lodash_es.cloneDeep)(options.initialState.accountList || []);
       this.store.accounts = [];
@@ -63,13 +65,41 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       this.fatherModule = options.otherParams.fatherModule;
     }
   }
+  /**
+   * 创建账号并添加到列表中
+   * @param account 账号信息
+   * @param needEmit 是否需要触发事件
+   */
+  async createAccountAndAdd(account, needEmit = true) {
+    const tempAccountModule = this.store.accounts.find(
+      (a) => a.getId() === account.id
+    );
+    if (tempAccountModule) {
+      return tempAccountModule;
+    }
+    this.store.accountList.push(account);
+    const accountModule = new import_Account.AccountModule(`account_${account.id}`);
+    this.core.registerModule(accountModule);
+    accountModule.setAccountInfo(account);
+    this.store.accounts = [...this.store.accounts || [], accountModule];
+    if (needEmit) {
+      await this.core.effects.emit(
+        import_types.AccountListHooks.OnAccountListUpdate,
+        this.store
+      );
+    }
+    return accountModule;
+  }
   async addAccount(account) {
+    let currentAccountModule;
     try {
       this.store.isLoading = true;
       this.store.error = null;
       if (this.store.accounts.some((a) => a.getId() === account.id)) {
+        currentAccountModule = this.store.accounts.find(
+          (n) => n.getId() === account.id
+        );
         throw new Error(`Account with id ${account.id} already exists`);
-        return;
       }
       this.store.accountList.push(account);
       const accountModule = new import_Account.AccountModule(`account_${account.id}`);
@@ -79,13 +109,21 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       if (this.store.accounts.length === 1) {
         this.setActiveAccount(accountModule.getId());
       }
-      await this.core.effects.emit(import_types.AccountListHooks.OnAccountListUpdate, this.store);
+      currentAccountModule = accountModule;
+      await this.core.effects.emit(
+        import_types.AccountListHooks.OnAccountListUpdate,
+        this.store
+      );
     } catch (error) {
       console.error(error);
       this.store.error = error instanceof Error ? error.message : "Failed to add account";
-      await this.core.effects.emit(import_types.AccountListHooks.OnAccountListError, this.store.error);
+      await this.core.effects.emit(
+        import_types.AccountListHooks.OnAccountListError,
+        this.store.error
+      );
     } finally {
       this.store.isLoading = false;
+      return currentAccountModule;
     }
   }
   async updateAccount(id, updates) {
@@ -97,14 +135,22 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
         throw new Error(`Account with id ${id} not found`);
       }
       account.setAccountInfo(updates);
-      const index = this.store.accountList.findIndex((account2) => account2.id === id);
+      const index = this.store.accountList.findIndex(
+        (account2) => account2.id === id
+      );
       if (index !== -1) {
         this.store.accountList[index] = updates;
       }
-      await this.core.effects.emit(import_types.AccountListHooks.OnAccountListUpdate, this.store);
+      await this.core.effects.emit(
+        import_types.AccountListHooks.OnAccountListUpdate,
+        this.store
+      );
     } catch (error) {
       this.store.error = error instanceof Error ? error.message : "Failed to update account";
-      await this.core.effects.emit(import_types.AccountListHooks.OnAccountListError, this.store.error);
+      await this.core.effects.emit(
+        import_types.AccountListHooks.OnAccountListError,
+        this.store.error
+      );
     } finally {
       this.store.isLoading = false;
     }
@@ -116,7 +162,10 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       }
       return account;
     });
-    this.core.effects.emit(`${this.name}:changed`, { path: "accounts", value: this.store.accountList });
+    this.core.effects.emit(`${this.name}:changed`, {
+      path: "accounts",
+      value: this.store.accountList
+    });
   }
   async removeAccount(id) {
     try {
@@ -131,11 +180,19 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
         ...(this.store.accounts || []).slice(0, index),
         ...(this.store.accounts || []).slice(index + 1)
       ];
-      this.store.accountList = this.store.accountList.filter((account) => account.id !== id);
-      await this.core.effects.emit(import_types.AccountListHooks.OnAccountListUpdate, this.store);
+      this.store.accountList = this.store.accountList.filter(
+        (account) => account.id !== id
+      );
+      await this.core.effects.emit(
+        import_types.AccountListHooks.OnAccountListUpdate,
+        this.store
+      );
     } catch (error) {
       this.store.error = error instanceof Error ? error.message : "Failed to remove account";
-      await this.core.effects.emit(import_types.AccountListHooks.OnAccountListError, this.store.error);
+      await this.core.effects.emit(
+        import_types.AccountListHooks.OnAccountListError,
+        this.store.error
+      );
     } finally {
       this.store.isLoading = false;
     }
@@ -151,10 +208,16 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       this.store.isLoading = true;
       this.store.error = null;
       this.store.accounts = [];
-      await this.core.effects.emit(import_types.AccountListHooks.OnAccountListUpdate, this.store);
+      await this.core.effects.emit(
+        import_types.AccountListHooks.OnAccountListUpdate,
+        this.store
+      );
     } catch (error) {
       this.store.error = error instanceof Error ? error.message : "Failed to clear accounts";
-      await this.core.effects.emit(import_types.AccountListHooks.OnAccountListError, this.store.error);
+      await this.core.effects.emit(
+        import_types.AccountListHooks.OnAccountListError,
+        this.store.error
+      );
     } finally {
       this.store.isLoading = false;
     }
@@ -177,7 +240,53 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       store.accountList = store.accountList.filter(
         (account, index, self) => index === self.findIndex((t) => t.id === account.id)
       );
-      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store, cacheKey: ["accountList"] });
+      this.checkSaveCache({
+        cacheId: this.cacheId,
+        fatherModule: this.fatherModule,
+        store,
+        cacheKey: ["accountList"]
+      });
+    }
+  }
+  /**
+   * 批量添加holder类型账号
+   * @param holders 账号信息列表
+   * @param customerId 账户id
+   */
+  async addHolderAccounts(holders, customerId) {
+    const accountModules = [];
+    for (const holder of holders) {
+      const account = (0, import_utils.createHolderAccount)(holder, customerId);
+      const accountModule = await this.createAccountAndAdd(account, false);
+      accountModules.push(accountModule);
+    }
+    await this.core.effects.emit(
+      import_types.AccountListHooks.OnAccountListUpdate,
+      this.store
+    );
+    return accountModules;
+  }
+  /**
+   * 获取holder类型账户列表
+   * @param params
+   */
+  async fetchHolderAccounts(params) {
+    var _a, _b;
+    const url = params.url || "/account/holder";
+    const { form_id, shop_id, num, skip, customer_id } = (params == null ? void 0 : params.query) || {};
+    try {
+      const res = await this.request.get(url, {
+        customer_id,
+        form_id,
+        shop_id,
+        num: num || 100,
+        skip: skip || 1
+      });
+      if ((_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) == null ? void 0 : _b.length) {
+        await this.addHolderAccounts(res.data.list, customer_id);
+      }
+    } catch (error) {
+      console.error(error);
     }
   }
 };

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

@@ -1,4 +1,4 @@
-import { Account, AccountModule } from "../Account";
+import { Account, AccountModule } from '../Account';
 export declare enum AccountListHooks {
     OnAccountListUpdate = "accountList:onUpdate",
     OnAccountListError = "accountList:onError"
@@ -27,11 +27,43 @@ export interface AccountListState {
  * 账户列表模块 API
  */
 export interface AccountListModuleAPI {
+    /** 添加账户 */
     addAccount: (account: Account) => Promise<void>;
+    /** 更新账户 */
     updateAccount: (id: string, updates: Partial<AccountModule>) => Promise<void>;
+    /** 删除账户 */
     removeAccount: (id: string) => Promise<void>;
+    /** 获取账户列表 */
     getAccounts: () => AccountModule[];
+    /** 获取单个账户 */
     getAccount: (id: string) => AccountModule | null;
+    /** 清空账户列表 */
     clearAccounts: () => Promise<void>;
+    /** 批量添加账户 */
     addAccounts: (accounts: AccountModule[]) => Promise<void>;
+    /** 获取holder类型账户列表 */
+    fetchHolderAccounts: (params: IFetchHolderAccountsParams) => Promise<void>;
+}
+/**
+ * 获取holder类型账户列表参数
+ */
+export interface IFetchHolderAccountsParams {
+    url?: string;
+    query: {
+        customer_id: number;
+        form_id: string | number;
+        shop_id: string | number;
+        num?: number;
+        skip?: number;
+    };
+}
+/**
+ * holder类型数据
+ */
+export interface IHolder {
+    created_at: string;
+    form_id: number;
+    form_record_id: number;
+    main_field: string;
+    customer_cover?: string;
 }

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

@@ -0,0 +1,9 @@
+import { Account } from '../Account/types';
+import { IHolder } from './types';
+/**
+ * 创建holder类型账号
+ * @param holder
+ * @param customer_id 账户id
+ * @returns
+ */
+export declare const createHolderAccount: (holder: IHolder, customerId: number) => Account;

package/lib/modules/AccountList/utils.js

@@ -0,0 +1,39 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/AccountList/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  createHolderAccount: () => createHolderAccount
+});
+module.exports = __toCommonJS(utils_exports);
+var createHolderAccount = (holder, customerId) => {
+  const account = {
+    id: holder.form_record_id,
+    name: holder.main_field,
+    username: holder.main_field,
+    avatar: (holder == null ? void 0 : holder.customer_cover) || "",
+    type: "holder",
+    _origin: { ...holder, customer_id: customerId }
+  };
+  return account;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createHolderAccount
+});

package/lib/modules/BaseModule.d.ts

@@ -1,4 +1,4 @@
-import { PisellCore } from "../types";
+import { PisellCore } from '../types';
 export declare class BaseModule {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -8,7 +8,7 @@ export declare class BaseModule {
     protected core: PisellCore;
     constructor(name?: string, version?: string);
     destroy(): void;
-    checkSaveCache({ cacheId, fatherModule, store, cacheKey }: {
+    checkSaveCache({ cacheId, fatherModule, store, cacheKey, }: {
         cacheId: string | undefined;
         fatherModule: string | undefined;
         store: any;

package/lib/modules/BaseModule.js

@@ -35,7 +35,12 @@ var BaseModule = class {
     this.core.unregisterModule(this);
   }
   // 提供统一的缓存 module 里的数据的方法
-  checkSaveCache({ cacheId, fatherModule, store, cacheKey }) {
+  checkSaveCache({
+    cacheId,
+    fatherModule,
+    store,
+    cacheKey
+  }) {
     const window = this.core.getPlugin("window");
     if (cacheId) {
       if (fatherModule) {
@@ -54,7 +59,10 @@ var BaseModule = class {
         cacheKey.forEach((key) => {
           currentCacheDataObj[cacheId][this.name][key] = store == null ? void 0 : store[key];
         });
-        window.sessionStorage.setItem(fatherModule, JSON.stringify(currentCacheDataObj));
+        window.sessionStorage.setItem(
+          fatherModule,
+          JSON.stringify(currentCacheDataObj)
+        );
       } else {
         let currentCacheData = window.sessionStorage.getItem(cacheId);
         let currentCacheDataObj = JSON.parse(currentCacheData || "{}");
@@ -67,7 +75,10 @@ var BaseModule = class {
         cacheKey.forEach((key) => {
           currentCacheDataObj[this.name][key] = store[key];
         });
-        window.sessionStorage.setItem(cacheId, JSON.stringify(currentCacheDataObj));
+        window.sessionStorage.setItem(
+          cacheId,
+          JSON.stringify(currentCacheDataObj)
+        );
       }
     }
   }

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

@@ -1,7 +1,7 @@
-import { Module, PisellCore, ModuleOptions } from "../../types";
-import { BaseModule } from "../BaseModule";
-import { CartItem, CartModuleAPI, IAddItemParams, IUpdateItemParams } from "./types";
-export * from "./types";
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { CartItem, CartModuleAPI, IAddItemParams, IUpdateItemParams } from './types';
+export * from './types';
 /**
  * 购物车模块实现
  */
@@ -58,7 +58,7 @@ export declare class CartModule extends BaseModule implements Module, CartModule
     /**
      * 清除购物车商品中的信息
      */
-    deleteCartItemInfo(types: "resource" | "time"): void;
+    deleteCartItemInfo(types: 'resource' | 'time'): void;
     /**
      * 清除购物车
      */

package/lib/modules/Cart/index.js

@@ -23,9 +23,9 @@ __export(Cart_exports, {
   CartModule: () => CartModule
 });
 module.exports = __toCommonJS(Cart_exports);
-var import_lodash_es = require("lodash-es");
 var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
+var import_lodash_es = require("lodash-es");
 __reExport(Cart_exports, require("./types"), module.exports);
 var CartModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -69,13 +69,14 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 添加商品到购物车
    */
   async addItem(params) {
-    const { account, product, bundle, options } = params;
+    const { account, product, bundle, options, date } = params;
     let cartItem = {
       _id: (0, import_utils.getUniqueId)(),
       _origin: (0, import_utils.createCartItemOrigin)()
     };
     if (product) {
       cartItem._productOrigin = (0, import_lodash_es.cloneDeep)(product);
+      cartItem._productInit = (0, import_lodash_es.cloneDeep)(product);
       cartItem = (0, import_utils.formatProductToCartItem)({
         cartItem,
         product,
@@ -86,6 +87,9 @@ var CartModule = class extends import_BaseModule.BaseModule {
     if (account) {
       cartItem = (0, import_utils.formatAccountToCartItem)({ cartItem, account });
     }
+    if (date) {
+      cartItem = (0, import_utils.formatDateToCartItem)({ cartItem, date });
+    }
     const items = [...this.store.list, cartItem];
     this.store.list = items;
     await this.core.effects.emit(`${this.name}:onAddItem`, cartItem);
@@ -112,7 +116,16 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 格式化数据到购物车
    */
   formatCartItem(params) {
-    const { _id, cartItem, account, product, discounts, resources, note } = params;
+    const {
+      _id,
+      cartItem,
+      account,
+      product,
+      discounts,
+      resources,
+      note,
+      date
+    } = params;
     let tempCartItem = this.store.list.find((i) => i._id === _id);
     if (!tempCartItem) {
       throw new Error("[CartModule] 格式化数据到购物车失败，商品不存在");
@@ -145,6 +158,9 @@ var CartModule = class extends import_BaseModule.BaseModule {
         resources
       });
     }
+    if (date) {
+      tempCartItem = (0, import_utils.formatDateToCartItem)({ cartItem: tempCartItem, date });
+    }
     if (note) {
       tempCartItem = (0, import_utils.formatNoteToCartItem)({ cartItem: tempCartItem, note });
     }
@@ -172,7 +188,9 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 根据账户ID获取购物车
    */
   getCartByAccount(account_id) {
-    return this.store.list.filter((item) => item.holder_id === account_id);
+    return this.store.list.filter(
+      (item) => item.holder_id === account_id
+    );
   }
   /**
    * 移除购物车商品
@@ -186,7 +204,9 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 根据账户ID清除购物车
    */
   clearCartByAccount(account_id) {
-    const items = this.store.list.filter((item) => item.holder_id !== account_id);
+    const items = this.store.list.filter(
+      (item) => item.holder_id !== account_id
+    );
     this.store.list = [...items || []];
   }
   /**
@@ -212,7 +232,9 @@ var CartModule = class extends import_BaseModule.BaseModule {
   storeChange() {
     if (this.openCache) {
       const store = (0, import_lodash_es.cloneDeep)(this.store);
-      store.list = store.list.filter((item, index, self) => index === self.findIndex((t) => t._id === item._id));
+      store.list = store.list.filter(
+        (item, index, self) => index === self.findIndex((t) => t._id === item._id)
+      );
       this.checkSaveCache({
         cacheId: this.cacheId,
         fatherModule: this.fatherModule,

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

@@ -1,6 +1,6 @@
-import { ProductData } from "../Product/types";
-import { Account } from "../Account/types";
-import { Resource } from "../Resource/types";
+import { ProductData } from '../Product/types';
+import { Account } from '../Account/types';
+import { Resource } from '../Resource/types';
 export declare enum CartHooks {
     OnAddItem = "card:onAddItem",
     OnCartChange = "card:onCartChange",
@@ -57,7 +57,7 @@ export interface CartItem {
     /** 备注 */
     note?: string;
     /** 点赞状态 */
-    like_status?: "like" | "common";
+    like_status?: 'like' | 'common';
     /** 用户名称 */
     holder_title?: string;
     /** 用户ID */
@@ -96,16 +96,16 @@ export interface CartItem {
             title: string;
         }[];
     } | null;
-    /** 原始数据 */
+    /** 接口原始数据 */
     _origin: any;
+    /** 商品加入购物车时初始数据 */
+    _productInit?: ProductData;
     /** 商品原始数据 */
     _productOrigin?: ProductData;
     /** 资源原始数据 */
     _resourceOrigin?: Resource[];
     /** 容量 */
     capacity?: any;
-    /** 商品套餐 */
-    product_bundle?: any;
 }
 /**
  * 购物车状态接口
@@ -127,6 +127,13 @@ export interface IAddItemParams {
     bundle?: any[];
     /** 商品规格信息 */
     options?: any[];
+    /** 日期 */
+    date?: {
+        /** 开始时间 */
+        startTime: string;
+        /** 结束时间 */
+        endTime: string;
+    };
 }
 /**
  * 更新购物车信息参数
@@ -148,6 +155,13 @@ export interface IUpdateItemParams {
     resources?: Resource[];
     /** 备注 */
     note?: string;
+    /** 日期 */
+    date?: {
+        /** 开始时间 */
+        startTime: string;
+        /** 结束时间 */
+        endTime: string;
+    };
 }
 /**
  * 折扣

package/lib/modules/Cart/utils.d.ts

@@ -1,8 +1,8 @@
-import { Account } from "../Account";
-import { ProductData } from "../Product/types";
-import { Resource } from "../Resource/types";
-import { CartItem, IDiscount } from "./types";
-import Decimal from "decimal.js";
+import { Account } from '../Account';
+import { ProductData } from '../Product/types';
+import { Resource } from '../Resource/types';
+import { CartItem, IDiscount } from './types';
+import Decimal from 'decimal.js';
 /**
  * 生成一个唯一的 ID
  */
@@ -90,6 +90,30 @@ export declare const formatResourceToCartItemOrigin: (params: {
     cartItem: CartItem;
     resources: Resource[];
 }) => any;
+/**
+ * 格式化日期到购物车
+ * @param date 开始时间和结束时间
+ * @returns 格式化后的日期
+ */
+export declare const formatDateToCartItem: (params: {
+    cartItem: CartItem;
+    date: {
+        startTime: string;
+        endTime: string;
+    };
+}) => CartItem;
+/**
+ * 格式化日期到购物车原始数据
+ * @param date 开始时间和结束时间
+ * @returns 格式化后的日期原始数据
+ */
+export declare const formatDateToCartItemOrigin: (params: {
+    cartItem: CartItem;
+    date: {
+        startTime: string;
+        endTime: string;
+    };
+}) => any;
 /**
  * 从购物车中删除资源相关信息
  * @param cartItem 购物车