@pisell/pisellos 3.0.4 → 3.0.6

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

@@ -1,8 +1,8 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Account, AccountModuleAPI } from './types';
+import { Account } from './types';
 export * from './types';
-export declare class AccountModule extends BaseModule implements Module, AccountModuleAPI {
+export declare class AccountModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     isGuest: boolean;
@@ -14,13 +14,9 @@ export declare class AccountModule extends BaseModule implements Module, Account
         username: string;
         password: string;
     }): Promise<void>;
-    logout(): Promise<void>;
-    register(account: Omit<Account, 'id'>): Promise<void>;
     getCurrentAccount(): Account | null;
     updateProfile(updates: Partial<Account>): Promise<void>;
     isLoggedIn(): boolean;
-    resetPassword(email: string): Promise<void>;
-    updatePassword(oldPassword: string, newPassword: string): Promise<void>;
     getLoginStatus(): boolean;
     getAccount(): Account | null;
     setAccountInfo(account: Account): void;

package/lib/modules/Account/index.js

@@ -33,7 +33,7 @@ var AccountModule = class extends import_BaseModule.BaseModule {
     this.defaultVersion = "1.0.0";
     this.isGuest = false;
     this.store = {
-      currentAccount: null,
+      accountInfo: null,
       isLoggedIn: false,
       active: false
     };
@@ -45,7 +45,7 @@ var AccountModule = class extends import_BaseModule.BaseModule {
   }
   getId() {
     var _a;
-    return ((_a = this.store.currentAccount) == null ? void 0 : _a.id) || "";
+    return ((_a = this.store.accountInfo) == null ? void 0 : _a.id) || "";
   }
   async login(credentials) {
     const account = {
@@ -54,54 +54,39 @@ var AccountModule = class extends import_BaseModule.BaseModule {
       username: credentials.username,
       email: `${credentials.username}@example.com`,
       name: credentials.username,
-      isGuest: false
+      isGuest: false,
+      type: "account"
     };
-    this.store.currentAccount = account;
+    this.store.accountInfo = account;
     this.store.isLoggedIn = true;
     await this.core.effects.emit(import_types.AccountHooks.OnLogin, account);
   }
-  async logout() {
-    this.store.currentAccount = null;
-    this.store.isLoggedIn = false;
-    await this.core.effects.emit(import_types.AccountHooks.OnLogout, {});
-  }
-  async register(account) {
-    const newAccount = {
-      id: "1",
-      // 实际应该从 API 返回
-      ...account
-    };
-    this.store.currentAccount = newAccount;
-    this.store.isLoggedIn = true;
-    await this.core.effects.emit(import_types.AccountHooks.OnRegister, newAccount);
-  }
   getCurrentAccount() {
-    return this.store.currentAccount;
+    return this.store.accountInfo;
   }
   async updateProfile(updates) {
-    if (!this.store.currentAccount)
+    if (!this.store.accountInfo)
       return;
-    this.store.currentAccount = {
-      ...this.store.currentAccount,
+    this.store.accountInfo = {
+      ...this.store.accountInfo,
       ...updates
     };
-    await this.core.effects.emit(import_types.AccountHooks.OnProfileUpdate, this.store.currentAccount);
+    await this.core.effects.emit(
+      import_types.AccountHooks.OnProfileUpdate,
+      this.store.accountInfo
+    );
   }
   isLoggedIn() {
     return this.store.isLoggedIn;
   }
-  async resetPassword(email) {
-  }
-  async updatePassword(oldPassword, newPassword) {
-  }
   getLoginStatus() {
     return this.store.isLoggedIn;
   }
   getAccount() {
-    return this.store.currentAccount;
+    return this.store.accountInfo;
   }
   setAccountInfo(account) {
-    this.store.currentAccount = account;
+    this.store.accountInfo = account;
     if (account.isGuest) {
       this.isGuest = true;
     }

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

@@ -9,19 +9,30 @@ export declare enum AccountHooks {
  */
 export interface Account {
     id: string | number;
+    /** 用户名 */
     username: string;
+    /** 邮箱 */
     email?: string;
+    /** 手机号 */
     phone?: string;
+    /** 昵称 */
     name?: string;
+    /** 头像 */
     avatar?: string;
+    /** 元数据 */
     metadata?: Record<string, any>;
+    /** 是否为游客 */
     isGuest?: boolean;
+    /** 账户类型 */
+    type?: 'account' | 'holder';
+    /** 账户信息原始数据 */
+    _origin?: Record<string, any>;
 }
 /**
  * 账户模块状态
  */
 export interface AccountState {
-    currentAccount: Account | null;
+    accountInfo: Account | null;
     isLoggedIn: boolean;
     active: boolean;
 }

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

@@ -1,16 +1,24 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { AccountModule, Account } from '../Account';
 import { BaseModule } from '../BaseModule';
+import { IFetchHolderAccountsParams, IHolder } from './types';
 export declare class AccountListModule extends BaseModule implements Module {
     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>;
-    addAccount(account: Account): Promise<void>;
+    /**
+     * 创建账号并添加到列表中
+     * @param account 账号信息
+     * @param needEmit 是否需要触发事件
+     */
+    private createAccountAndAdd;
+    addAccount(account: Account): Promise<AccountModule>;
     updateAccount(id: string, updates: Account): Promise<void>;
     updateAccountListById(id: string | number, updates: Account): Promise<void>;
     removeAccount(id: string): Promise<void>;
@@ -20,4 +28,15 @@ export declare class AccountListModule extends BaseModule implements Module {
     setActiveAccount(id: string | number): void;
     getActiveAccount(): AccountModule | null;
     storeChange(): void;
+    /**
+     * 批量添加holder类型账号
+     * @param holders 账号信息列表
+     * @param customerId 账户id
+     */
+    addHolderAccounts(holders: IHolder[], customerId: number): Promise<AccountModule[]>;
+    /**
+     * 获取holder类型账户列表
+     * @param params
+     */
+    fetchHolderAccounts(params: IFetchHolderAccountsParams): Promise<void>;
 }

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, ECartItemCheckType, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
+export * from './types';
 /**
  * 购物车模块实现
  */
@@ -57,11 +57,14 @@ export declare class CartModule extends BaseModule implements Module, CartModule
     clearCartByAccount(account_id: string): void;
     /**
      * 清除购物车商品中的信息
+     * @param type 清除购物车商品中的信息类型
+     * @param _id 购物车商品ID
      */
-    deleteCartItemInfo(types: "resource" | "time"): void;
+    deleteCartItemInfo(type: ECartItemInfoType, _id?: string): void;
     /**
      * 清除购物车
      */
     clear(): void;
     storeChange(): void;
+    checkCartItemByType(cartItem: CartItem, type: ECartItemCheckType): boolean;
 }