@pisell/pisellos 0.0.567 → 0.0.569

package/lib/modules/AccountList/index.js

@@ -1,70 +1,55 @@
-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);
+"use strict";
 
-// src/modules/AccountList/index.ts
-var AccountList_exports = {};
-__export(AccountList_exports, {
-  AccountListModule: () => AccountListModule
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(AccountList_exports);
-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 {
+exports.AccountListModule = void 0;
+var _lodashEs = require("lodash-es");
+var _Account = require("../Account");
+var _BaseModule = require("../BaseModule");
+var _types = require("./types");
+var _utils = require("./utils");
+class AccountListModule extends _BaseModule.BaseModule {
+  defaultName = 'accountList';
+  defaultVersion = '1.0.0';
+  store = {
+    accountList: [],
+    // 账号的纯数据列表
+    accounts: [],
+    // 账号的 module 列表
+    isLoading: false,
+    error: null
+  };
+  request;
+  cacheId;
+  openCache = false;
+  fatherModule;
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "accountList";
-    this.defaultVersion = "1.0.0";
-    this.store = {
-      accountList: [],
-      // 账号的纯数据列表
-      accounts: [],
-      // 账号的 module 列表
-      isLoading: false,
-      error: null
-    };
-    this.openCache = false;
   }
   async initialize(core, options) {
-    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 = options?.store;
+    this.request = this.core.getPlugin('request');
+    if (Array.isArray(options?.initialState?.accountList)) {
+      const recordList = (0, _lodashEs.cloneDeep)(options.initialState.accountList || []);
       this.store.accounts = [];
-      recordList.forEach((account) => {
+      recordList.forEach(account => {
         this.addAccount(account);
       });
     } else {
       this.store.accounts = [];
       this.store.accountList = [];
     }
-    if ((_b = options == null ? void 0 : options.otherParams) == null ? void 0 : _b.cacheId) {
+    if (options?.otherParams?.cacheId) {
       this.openCache = options.otherParams.openCache;
       this.cacheId = options.otherParams.cacheId;
     }
-    if ((_c = options == null ? void 0 : options.otherParams) == null ? void 0 : _c.fatherModule) {
+    if (options?.otherParams?.fatherModule) {
       this.fatherModule = options.otherParams.fatherModule;
     }
   }
+
   /**
    * 创建账号并添加到列表中
    * @param account 账号信息
@@ -72,32 +57,28 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
    * @param type 添加类型
    */
   async createAccountAndAdd(account, needEmit = true, type) {
-    const tempAccountModule = this.store.accounts.find(
-      (a) => a.getId() === account.id
-    );
+    const tempAccountModule = this.store.accounts.find(a => a.getId() === account.id);
+    // 如果账号已经存在，则直接返回
     if (tempAccountModule) {
       return tempAccountModule;
     }
-    const newAccountList = [...this.store.accountList || []];
-    if (type === "unshift") {
+    const newAccountList = [...(this.store.accountList || [])];
+    if (type === 'unshift') {
       newAccountList.unshift(account);
     } else {
       newAccountList.push(account);
     }
     this.store.accountList = newAccountList;
-    const accountModule = new import_Account.AccountModule(`account_${account.id}`);
+    const accountModule = new _Account.AccountModule(`account_${account.id}`);
     this.core.registerModule(accountModule);
     accountModule.setAccountInfo(account);
-    if (type === "unshift") {
-      this.store.accounts = [accountModule, ...this.store.accounts || []];
+    if (type === 'unshift') {
+      this.store.accounts = [accountModule, ...(this.store.accounts || [])];
     } else {
-      this.store.accounts = [...this.store.accounts || [], accountModule];
+      this.store.accounts = [...(this.store.accounts || []), accountModule];
     }
     if (needEmit) {
-      await this.core.effects.emit(
-        import_types.AccountListHooks.OnAccountListUpdate,
-        this.store
-      );
+      await this.core.effects.emit(_types.AccountListHooks.OnAccountListUpdate, this.store);
     }
     return accountModule;
   }
@@ -106,32 +87,24 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
     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
-        );
+      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`);
       }
       this.store.accountList.push(account);
-      const accountModule = new import_Account.AccountModule(`account_${account.id}`);
+      const accountModule = new _Account.AccountModule(`account_${account.id}`);
       this.core.registerModule(accountModule);
       accountModule.setAccountInfo(account);
-      this.store.accounts = [...this.store.accounts || [], accountModule];
+      this.store.accounts = [...(this.store.accounts || []), accountModule];
       if (this.store.accounts.length === 1) {
         this.setActiveAccount(accountModule.getId());
       }
       currentAccountModule = accountModule;
-      await this.core.effects.emit(
-        import_types.AccountListHooks.OnAccountListUpdate,
-        this.store
-      );
+      await this.core.effects.emit(_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
-      );
+      this.store.error = error instanceof Error ? error.message : 'Failed to add account';
+      await this.core.effects.emit(_types.AccountListHooks.OnAccountListError, this.store.error);
     } finally {
       this.store.isLoading = false;
       return currentAccountModule;
@@ -146,99 +119,80 @@ 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
-      );
+      // this.store.accountList.forEach(account => {
+      //   if (account.id === id) {
+      //     Object.assign(account, updates)
+      //   }
+      // })
+      const index = this.store.accountList.findIndex(account => account.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(_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
-      );
+      this.store.error = error instanceof Error ? error.message : 'Failed to update account';
+      await this.core.effects.emit(_types.AccountListHooks.OnAccountListError, this.store.error);
     } finally {
       this.store.isLoading = false;
     }
   }
   async updateAccountListById(id, updates) {
-    this.store.accountList = this.store.accountList.map((account) => {
+    this.store.accountList = this.store.accountList.map(account => {
       if (account.id === id) {
         return updates;
       }
       return account;
     });
     this.core.effects.emit(`${this.name}:changed`, {
-      path: "accounts",
+      path: 'accounts',
       value: this.store.accountList
     });
   }
   async removeAccount(id) {
-    var _a;
     try {
       this.store.isLoading = true;
       this.store.error = null;
-      const index = this.store.accounts.findIndex((a) => a.getId() === id);
+      const index = this.store.accounts.findIndex(a => a.getId() === id);
       if (index === -1) {
         throw new Error(`Account with id ${id} not found`);
       }
       this.store.accounts[index].destroy();
-      this.store.accounts = [
-        ...(this.store.accounts || []).slice(0, index),
-        ...(this.store.accounts || []).slice(index + 1)
-      ];
-      this.store.accountList = this.store.accountList.filter(
-        (account) => account.id !== id
-      );
-      if (!this.getActiveAccount() || ((_a = this.getActiveAccount()) == null ? void 0 : _a.getId()) === id || this.store.accounts.length === 1) {
+      this.store.accounts = [...(this.store.accounts || []).slice(0, index), ...(this.store.accounts || []).slice(index + 1)];
+      this.store.accountList = this.store.accountList.filter(account => account.id !== id);
+
+      // 检测 如果被删除的是活跃账号，则默认把第一个账号设置为 activeAccount
+      if (!this.getActiveAccount() || this.getActiveAccount()?.getId() === id || this.store.accounts.length === 1) {
         this.setActiveAccount(this.store.accounts[0].getId());
       }
-      await this.core.effects.emit(
-        import_types.AccountListHooks.OnAccountListUpdate,
-        this.store
-      );
+      await this.core.effects.emit(_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
-      );
+      this.store.error = error instanceof Error ? error.message : 'Failed to remove account';
+      await this.core.effects.emit(_types.AccountListHooks.OnAccountListError, this.store.error);
     } finally {
       this.store.isLoading = false;
     }
   }
   getAccounts() {
-    return [...this.store.accounts || []];
+    return [...(this.store.accounts || [])];
   }
   getAccount(id) {
-    return this.store.accounts.find((account) => account.getId() === id) || null;
+    return this.store.accounts.find(account => account.getId() === id) || null;
   }
   async clearAccounts() {
     try {
       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(_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
-      );
+      this.store.error = error instanceof Error ? error.message : 'Failed to clear accounts';
+      await this.core.effects.emit(_types.AccountListHooks.OnAccountListError, this.store.error);
     } finally {
       this.store.isLoading = false;
     }
   }
   setActiveAccount(id) {
-    this.store.accounts.forEach((account) => {
+    this.store.accounts.forEach(account => {
       if (account.getId() === id) {
         account.setActive(true);
       } else {
@@ -247,82 +201,93 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
     });
   }
   getActiveAccount() {
-    return this.store.accounts.find((account) => account.isActive()) || null;
+    return this.store.accounts.find(account => account.isActive()) || null;
   }
   storeChange() {
     if (this.openCache) {
-      const store = (0, import_lodash_es.cloneDeep)(this.store);
-      store.accountList = store.accountList.filter(
-        (account, index, self) => index === self.findIndex((t) => t.id === account.id)
-      );
+      const store = (0, _lodashEs.cloneDeep)(this.store);
+      // store里的 accountList 要主动基于 id 做下去重，避免重复写入
+      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"]
+        cacheKey: ['accountList']
       });
     }
   }
+
   /**
    * 批量添加holder类型账号
    */
   async addHolderAccounts(params) {
-    const { holders, customerId, type = "push" } = params;
+    const {
+      holders,
+      customerId,
+      type = 'push'
+    } = params;
     const accountModules = [];
     for (const holder of holders) {
-      const account = (0, import_utils.createHolderAccount)(holder, customerId);
-      const accountModule = await this.createAccountAndAdd(
-        account,
-        false,
-        type
-      );
-      if (type === "unshift") {
+      const account = (0, _utils.createHolderAccount)(holder, customerId);
+      const accountModule = await this.createAccountAndAdd(account, false, type);
+      if (type === 'unshift') {
         accountModules.unshift(accountModule);
       } else {
         accountModules.push(accountModule);
       }
     }
-    await this.core.effects.emit(
-      import_types.AccountListHooks.OnAccountListUpdate,
-      this.store
-    );
+    await this.core.effects.emit(_types.AccountListHooks.OnAccountListUpdate, this.store);
     return accountModules;
   }
+
   /**
    * 获取客户列表
    * @param params 查询参数
    * @returns 客户列表
    */
   async getCustomerList(params = {}) {
-    const url = "/customer/es/data";
-    const { page = 1, pageSize = 20, keyword, ...otherParams } = 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 },
+        ...(keyword && {
+          keyword
+        }),
         ...otherParams
       };
       const res = await this.request.get(url, queryParams);
-      return (res == null ? void 0 : res.data) || [];
+      return 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";
+      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
    */
   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) || {};
+    const url = params.url || '/account/holder';
+    const {
+      form_id,
+      shop_id,
+      num,
+      skip,
+      customer_id
+    } = params?.query || {};
     try {
       const res = await this.request.get(url, {
         customer_id,
@@ -333,7 +298,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       });
       this.store.accountList = [];
       this.store.accounts = [];
-      if ((_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) == null ? void 0 : _b.length) {
+      if (res?.data?.list?.length) {
         await this.addHolderAccounts({
           holders: res.data.list,
           customerId: customer_id
@@ -344,10 +309,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
     }
   }
   getLoginAccount() {
-    return this.store.accounts.find((n) => n.isLogin());
+    return this.store.accounts.find(n => n.isLogin());
   }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  AccountListModule
-});
+}
+exports.AccountListModule = AccountListModule;

package/lib/modules/AccountList/types.js

@@ -1,33 +1,32 @@
-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);
+"use strict";
 
-// src/modules/AccountList/types.ts
-var types_exports = {};
-__export(types_exports, {
-  AccountListHooks: () => AccountListHooks
-});
-module.exports = __toCommonJS(types_exports);
-var AccountListHooks = /* @__PURE__ */ ((AccountListHooks2) => {
-  AccountListHooks2["OnAccountListUpdate"] = "accountList:onUpdate";
-  AccountListHooks2["OnAccountListError"] = "accountList:onError";
-  return AccountListHooks2;
-})(AccountListHooks || {});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  AccountListHooks
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
+exports.AccountListHooks = void 0;
+let AccountListHooks = exports.AccountListHooks = /*#__PURE__*/function (AccountListHooks) {
+  AccountListHooks["OnAccountListUpdate"] = "accountList:onUpdate";
+  AccountListHooks["OnAccountListError"] = "accountList:onError";
+  return AccountListHooks;
+}({});
+/**
+ * 账户列表查询参数
+ */
+/**
+ * 账户列表状态
+ */
+/**
+ * 账户列表模块 API
+ */
+/**
+ * 获取holder类型账户列表参数
+ */
+/**
+ * holder类型数据
+ */
+/**
+ * 获取客户列表参数
+ */
+/**
+ * 客户数据
+ */

package/lib/modules/AccountList/utils.js

@@ -1,39 +1,27 @@
-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);
+"use strict";
 
-// src/modules/AccountList/utils.ts
-var utils_exports = {};
-__export(utils_exports, {
-  createHolderAccount: () => createHolderAccount
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(utils_exports);
-var createHolderAccount = (holder, customerId) => {
+exports.createHolderAccount = void 0;
+/**
+ * 创建holder类型账号
+ * @param holder
+ * @param customer_id 账户id
+ * @returns
+ */
+const 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 }
+    avatar: 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
-});
+exports.createHolderAccount = createHolderAccount;

package/lib/modules/BaseModule.d.ts

@@ -14,9 +14,9 @@ export declare class BaseModule {
         store: any;
         cacheKey: string[];
     }): void;
-    effectsOn(eventType: string, callback: (payload: any) => void, force?: boolean): void;
+    effectsOn(eventType: string, callback: (payload: any) => void): () => void;
     effectsOff(eventType: string, callback: (payload: any) => void): void;
-    effectsOnce(eventType: string, callback: (payload: any) => void, force?: boolean): void;
+    effectsOnce(eventType: string, callback: (payload: any) => void): void;
     effectsEmit(eventType: string, payload: any): Promise<{
         status: boolean;
         data: any;