@pisell/pisellos 0.0.24 → 0.0.26

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

@@ -12,6 +12,7 @@ export declare class AccountListModule extends BaseModule implements Module {
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     addAccount(account: Account): Promise<void>;
     updateAccount(id: string, updates: Account): Promise<void>;
+    updateAccountListById(id: string | number, updates: Account): Promise<void>;
     removeAccount(id: string): Promise<void>;
     getAccounts(): AccountModule[];
     getAccount(id: string): AccountModule | null;

package/dist/modules/AccountList/index.js

@@ -200,52 +200,79 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
       return updateAccount;
     }()
   }, {
-    key: "removeAccount",
+    key: "updateAccountListById",
     value: function () {
-      var _removeAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(id) {
-        var index;
+      var _updateAccountListById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(id, updates) {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context4.prev = 0;
+              this.store.accountList = this.store.accountList.map(function (account) {
+                if (account.id === id) {
+                  return updates;
+                }
+                return account;
+              });
+              this.core.effects.emit("".concat(this.name, ":changed"), {
+                value: this.store.accountList
+              });
+            case 2:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function updateAccountListById(_x6, _x7) {
+        return _updateAccountListById.apply(this, arguments);
+      }
+      return updateAccountListById;
+    }()
+  }, {
+    key: "removeAccount",
+    value: function () {
+      var _removeAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(id) {
+        var index;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.prev = 0;
               this.store.isLoading = true;
               this.store.error = null;
               index = this.store.accounts.findIndex(function (a) {
                 return a.getId() === id;
               });
               if (!(index === -1)) {
-                _context4.next = 6;
+                _context5.next = 6;
                 break;
               }
               throw new Error("Account with id ".concat(id, " not found"));
             case 6:
-              this.store.accounts[index].destory();
+              this.store.accounts[index].destroy();
               this.store.accounts = [].concat(_toConsumableArray((this.store.accounts || []).slice(0, index)), _toConsumableArray((this.store.accounts || []).slice(index + 1)));
               this.store.accountList = this.store.accountList.filter(function (account) {
                 return account.id !== id;
               });
-              _context4.next = 11;
+              _context5.next = 11;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
             case 11:
-              _context4.next = 18;
+              _context5.next = 18;
               break;
             case 13:
-              _context4.prev = 13;
-              _context4.t0 = _context4["catch"](0);
-              this.store.error = _context4.t0 instanceof Error ? _context4.t0.message : 'Failed to remove account';
-              _context4.next = 18;
+              _context5.prev = 13;
+              _context5.t0 = _context5["catch"](0);
+              this.store.error = _context5.t0 instanceof Error ? _context5.t0.message : 'Failed to remove account';
+              _context5.next = 18;
               return this.core.effects.emit(AccountListHooks.OnAccountListError, this.store.error);
             case 18:
-              _context4.prev = 18;
+              _context5.prev = 18;
               this.store.isLoading = false;
-              return _context4.finish(18);
+              return _context5.finish(18);
             case 21:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this, [[0, 13, 18, 21]]);
+        }, _callee5, this, [[0, 13, 18, 21]]);
       }));
-      function removeAccount(_x6) {
+      function removeAccount(_x8) {
         return _removeAccount.apply(this, arguments);
       }
       return removeAccount;
@@ -265,34 +292,34 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearAccounts",
     value: function () {
-      var _clearAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _clearAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context5.prev = 0;
+              _context6.prev = 0;
               this.store.isLoading = true;
               this.store.error = null;
               this.store.accounts = [];
-              _context5.next = 6;
+              _context6.next = 6;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
             case 6:
-              _context5.next = 13;
+              _context6.next = 13;
               break;
             case 8:
-              _context5.prev = 8;
-              _context5.t0 = _context5["catch"](0);
-              this.store.error = _context5.t0 instanceof Error ? _context5.t0.message : 'Failed to clear accounts';
-              _context5.next = 13;
+              _context6.prev = 8;
+              _context6.t0 = _context6["catch"](0);
+              this.store.error = _context6.t0 instanceof Error ? _context6.t0.message : 'Failed to clear accounts';
+              _context6.next = 13;
               return this.core.effects.emit(AccountListHooks.OnAccountListError, this.store.error);
             case 13:
-              _context5.prev = 13;
+              _context6.prev = 13;
               this.store.isLoading = false;
-              return _context5.finish(13);
+              return _context6.finish(13);
             case 16:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this, [[0, 8, 13, 16]]);
+        }, _callee6, this, [[0, 8, 13, 16]]);
       }));
       function clearAccounts() {
         return _clearAccounts.apply(this, arguments);

package/dist/modules/BaseModule.d.ts

@@ -7,7 +7,7 @@ export declare class BaseModule {
     isSolution: boolean;
     protected core: PisellCore;
     constructor(name?: string, version?: string);
-    destory(): void;
+    destroy(): void;
     checkSaveCache({ cacheId, fatherModule, store, cacheKey }: {
         cacheId: string | undefined;
         fatherModule: string | undefined;

package/dist/modules/BaseModule.js

@@ -18,8 +18,8 @@ export var BaseModule = /*#__PURE__*/function () {
     this.version = version || this.defaultVersion;
   }
   _createClass(BaseModule, [{
-    key: "destory",
-    value: function destory() {
+    key: "destroy",
+    value: function destroy() {
       this.core.effects.offByModuleDestroy(this.name);
       this.core.unregisterModule(this);
     }

package/dist/modules/Cart/index.js

@@ -61,6 +61,7 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options.store;
+              debugger;
               if (Array.isArray((_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.list)) {
                 this.store.list = options.initialState.list;
                 this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
@@ -79,20 +80,20 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
               this.request = core.getPlugin("request");
               this.window = core.getPlugin("window");
               if (this.request) {
-                _context.next = 9;
+                _context.next = 10;
                 break;
               }
               throw new Error("购物车模块需要 request 插件支持");
-            case 9:
+            case 10:
               if (this.window) {
-                _context.next = 11;
+                _context.next = 12;
                 break;
               }
               throw new Error("购物车模块需要 window 插件支持");
-            case 11:
+            case 12:
               // this.store.temp = {};
               console.log("[CartModule] 初始化完成");
-            case 12:
+            case 13:
             case "end":
               return _context.stop();
           }
@@ -115,6 +116,7 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              debugger;
               account = params.account, product = params.product, bundle = params.bundle, options = params.options; // 生成一个唯一的 ID
               cartItem = {
                 _id: getUniqueId(),
@@ -141,9 +143,9 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
               this.store.list = items;
 
               // 触发事件
-              _context2.next = 8;
+              _context2.next = 9;
               return this.core.effects.emit("".concat(this.name, ":onAddItem"), cartItem);
-            case 8:
+            case 9:
             case "end":
               return _context2.stop();
           }

package/dist/solution/BookingByStep/index.d.ts

@@ -78,7 +78,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 从购物车中按类别删除信息
      */
     deleteCartItemInfo(types: "resource" | "time"): void;
-    destory(): void;
+    destroy(): void;
     getResourcesList(): any[];
     getResourcesListByCartItem(id: string | number): {
         id: number | undefined;

package/dist/solution/BookingByStep/index.js

@@ -75,6 +75,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("bookingByStep解决方案需要 request 插件支持");
             case 9:
+              debugger;
+
               // 如果有传 cacheid，默认需要收集上面这些模块里用户操作选中的数据
               // 并且在上面 registerModule 的时候，读取 sessionStroage 里的数据，塞进默认值
               targetCacheData = {};
@@ -105,7 +107,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.core.effects.emit(BookingByStepHooks.onInited, {});
-            case 14:
+            case 15:
             case "end":
               return _context.stop();
           }
@@ -485,9 +487,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             case 0:
               account = this.store.accountList.getAccount(accountId);
               if (!account) {
-                _context11.next = 7;
+                _context11.next = 8;
                 break;
               }
+              this.store.accountList.updateAccountListById(account.getId(), accountInfo);
               account.setAccountInfo(accountInfo);
               // 然后去购物车，把原先关联了 holder_id 为 accountId 的商品，替换为 holder_id = accountInfo.id
               cartItems = this.store.cart.getItems();
@@ -499,11 +502,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   });
                 }
               });
-              _context11.next = 8;
+              _context11.next = 9;
               break;
-            case 7:
-              throw new Error("\u6CA1\u6709\u627E\u5230".concat(accountId, "\u8D26\u6237"));
             case 8:
+              throw new Error("\u6CA1\u6709\u627E\u5230".concat(accountId, "\u8D26\u6237"));
+            case 9:
             case "end":
               return _context11.stop();
           }
@@ -718,15 +721,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       this.store.cart.deleteCartItemInfo(types);
     }
   }, {
-    key: "destory",
-    value: function destory() {
+    key: "destroy",
+    value: function destroy() {
       var _this$store$cart, _this$store$step, _this$store$products, _this$store$guests, _this$store$date, _this$store$accountLi;
-      (_this$store$cart = this.store.cart) === null || _this$store$cart === void 0 || _this$store$cart.destory();
-      (_this$store$step = this.store.step) === null || _this$store$step === void 0 || _this$store$step.destory();
-      (_this$store$products = this.store.products) === null || _this$store$products === void 0 || _this$store$products.destory();
-      (_this$store$guests = this.store.guests) === null || _this$store$guests === void 0 || _this$store$guests.destory();
-      (_this$store$date = this.store.date) === null || _this$store$date === void 0 || _this$store$date.destory();
-      (_this$store$accountLi = this.store.accountList) === null || _this$store$accountLi === void 0 || _this$store$accountLi.destory();
+      (_this$store$cart = this.store.cart) === null || _this$store$cart === void 0 || _this$store$cart.destroy();
+      (_this$store$step = this.store.step) === null || _this$store$step === void 0 || _this$store$step.destroy();
+      (_this$store$products = this.store.products) === null || _this$store$products === void 0 || _this$store$products.destroy();
+      (_this$store$guests = this.store.guests) === null || _this$store$guests === void 0 || _this$store$guests.destroy();
+      (_this$store$date = this.store.date) === null || _this$store$date === void 0 || _this$store$date.destroy();
+      (_this$store$accountLi = this.store.accountList) === null || _this$store$accountLi === void 0 || _this$store$accountLi.destroy();
       this.core.effects.offByModuleDestroy(this.name);
       this.core.unregisterModule(this);
     }
@@ -1023,7 +1026,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }
           } else {
             var _productResources$fin;
-            debugger;
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var productResources = getResourcesByProduct(resourcesMap, item, allCartItems);
             // 自动选择 productResources 中对应 resources_code 的资源
@@ -1044,7 +1046,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       });
-      debugger;
       return {
         errorList: errorList
       };
@@ -1087,7 +1088,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           duration = accountDuration;
         }
       });
-      debugger;
       var timeSlots = getTimeSlicesByResources({
         resourceIds: resourceIds,
         resourcesMap: resourcesMap,

package/dist/solution/ShopDiscount/index.js

@@ -165,7 +165,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           targetCacheData = data[this.options.otherParams.cacheId];
         }
       }
-
+      debugger;
       // 注册优惠模块
       var discount = new DiscountModule("".concat(this.name, "_discount"));
       this.core.registerModule(discount, {

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

@@ -12,6 +12,7 @@ export declare class AccountListModule extends BaseModule implements Module {
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     addAccount(account: Account): Promise<void>;
     updateAccount(id: string, updates: Account): Promise<void>;
+    updateAccountListById(id: string | number, updates: Account): Promise<void>;
     removeAccount(id: string): Promise<void>;
     getAccounts(): AccountModule[];
     getAccount(id: string): AccountModule | null;

package/lib/modules/AccountList/index.js

@@ -109,6 +109,15 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       this.store.isLoading = false;
     }
   }
+  async updateAccountListById(id, updates) {
+    this.store.accountList = this.store.accountList.map((account) => {
+      if (account.id === id) {
+        return updates;
+      }
+      return account;
+    });
+    this.core.effects.emit(`${this.name}:changed`, { value: this.store.accountList });
+  }
   async removeAccount(id) {
     try {
       this.store.isLoading = true;
@@ -117,7 +126,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       if (index === -1) {
         throw new Error(`Account with id ${id} not found`);
       }
-      this.store.accounts[index].destory();
+      this.store.accounts[index].destroy();
       this.store.accounts = [
         ...(this.store.accounts || []).slice(0, index),
         ...(this.store.accounts || []).slice(index + 1)

package/lib/modules/BaseModule.d.ts

@@ -7,7 +7,7 @@ export declare class BaseModule {
     isSolution: boolean;
     protected core: PisellCore;
     constructor(name?: string, version?: string);
-    destory(): void;
+    destroy(): void;
     checkSaveCache({ cacheId, fatherModule, store, cacheKey }: {
         cacheId: string | undefined;
         fatherModule: string | undefined;

package/lib/modules/BaseModule.js

@@ -30,7 +30,7 @@ var BaseModule = class {
     this.name = name || this.defaultName;
     this.version = version || this.defaultVersion;
   }
-  destory() {
+  destroy() {
     this.core.effects.offByModuleDestroy(this.name);
     this.core.unregisterModule(this);
   }

package/lib/modules/Cart/index.js

@@ -42,6 +42,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
     var _a, _b, _c;
     this.core = core;
     this.store = options.store;
+    debugger;
     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);
@@ -69,6 +70,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 添加商品到购物车
    */
   async addItem(params) {
+    debugger;
     const { account, product, bundle, options } = params;
     let cartItem = {
       _id: (0, import_utils.getUniqueId)(),

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

@@ -78,7 +78,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 从购物车中按类别删除信息
      */
     deleteCartItemInfo(types: "resource" | "time"): void;
-    destory(): void;
+    destroy(): void;
     getResourcesList(): any[];
     getResourcesListByCartItem(id: string | number): {
         id: number | undefined;

package/lib/solution/BookingByStep/index.js

@@ -59,6 +59,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (!this.request) {
       throw new Error("bookingByStep解决方案需要 request 插件支持");
     }
+    debugger;
     let targetCacheData = {};
     if ((_a = this.otherParams) == null ? void 0 : _a.cacheId) {
       const sessionData = this.window.sessionStorage.getItem(this.name);
@@ -238,6 +239,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   async setLoginAccount(accountId, accountInfo) {
     const account = this.store.accountList.getAccount(accountId);
     if (account) {
+      this.store.accountList.updateAccountListById(account.getId(), accountInfo);
       account.setAccountInfo(accountInfo);
       const cartItems = this.store.cart.getItems();
       cartItems.forEach((item) => {
@@ -335,14 +337,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   deleteCartItemInfo(types) {
     this.store.cart.deleteCartItemInfo(types);
   }
-  destory() {
+  destroy() {
     var _a, _b, _c, _d, _e, _f;
-    (_a = this.store.cart) == null ? void 0 : _a.destory();
-    (_b = this.store.step) == null ? void 0 : _b.destory();
-    (_c = this.store.products) == null ? void 0 : _c.destory();
-    (_d = this.store.guests) == null ? void 0 : _d.destory();
-    (_e = this.store.date) == null ? void 0 : _e.destory();
-    (_f = this.store.accountList) == null ? void 0 : _f.destory();
+    (_a = this.store.cart) == null ? void 0 : _a.destroy();
+    (_b = this.store.step) == null ? void 0 : _b.destroy();
+    (_c = this.store.products) == null ? void 0 : _c.destroy();
+    (_d = this.store.guests) == null ? void 0 : _d.destroy();
+    (_e = this.store.date) == null ? void 0 : _e.destroy();
+    (_f = this.store.accountList) == null ? void 0 : _f.destroy();
     this.core.effects.offByModuleDestroy(this.name);
     this.core.unregisterModule(this);
   }
@@ -572,7 +574,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             errorList.push(item._id);
           }
         } else {
-          debugger;
           const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, item, allCartItems);
           const targetRenderList = (_a = productResources.find((n) => n.code === resources_code)) == null ? void 0 : _a.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
@@ -591,7 +592,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     });
-    debugger;
     return { errorList };
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
@@ -624,7 +624,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         duration = accountDuration;
       }
     });
-    debugger;
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
       resourcesMap,

package/lib/solution/ShopDiscount/index.js

@@ -91,6 +91,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         targetCacheData = data[this.options.otherParams.cacheId];
       }
     }
+    debugger;
     const discount = new import_Discount.DiscountModule(`${this.name}_discount`);
     this.core.registerModule(discount, {
       initialState: targetCacheData == null ? void 0 : targetCacheData[discount.name],

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",