@pisell/pisellos 1.0.14 → 1.0.16

package/dist/modules/AccountList/index.js

@@ -303,7 +303,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeAccount",
     value: function () {
       var _removeAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
-        var index;
+        var _this$getActiveAccoun, index;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -324,26 +324,31 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               this.store.accountList = this.store.accountList.filter(function (account) {
                 return account.id !== id;
               });
-              _context6.next = 11;
+
+              // 检测 如果被删除的是活跃账号，则默认把第一个账号设置为 activeAccount
+              if (((_this$getActiveAccoun = this.getActiveAccount()) === null || _this$getActiveAccoun === void 0 ? void 0 : _this$getActiveAccoun.getId()) === id) {
+                this.setActiveAccount(this.store.accounts[0].getId());
+              }
+              _context6.next = 12;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
-            case 11:
-              _context6.next = 18;
+            case 12:
+              _context6.next = 19;
               break;
-            case 13:
-              _context6.prev = 13;
+            case 14:
+              _context6.prev = 14;
               _context6.t0 = _context6["catch"](0);
               this.store.error = _context6.t0 instanceof Error ? _context6.t0.message : 'Failed to remove account';
-              _context6.next = 18;
+              _context6.next = 19;
               return this.core.effects.emit(AccountListHooks.OnAccountListError, this.store.error);
-            case 18:
-              _context6.prev = 18;
+            case 19:
+              _context6.prev = 19;
               this.store.isLoading = false;
-              return _context6.finish(18);
-            case 21:
+              return _context6.finish(19);
+            case 22:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[0, 13, 18, 21]]);
+        }, _callee6, this, [[0, 14, 19, 22]]);
       }));
       function removeAccount(_x9) {
         return _removeAccount.apply(this, arguments);

package/dist/modules/Rules/index.js

@@ -401,7 +401,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === 'good_pass';
 
         // 需要拆分出来的数量
-        var splitCount = isNeedSplit ? Math.min(product.quantity, applicableDiscounts.filter(function (item) {
+        var splitCount = isNeedSplit ? Math.min(product.quantity || product.num || 1, applicableDiscounts.filter(function (item) {
           return (item.tag || item.type) === 'good_pass';
         }).length) : 1;
         var arr = [];

package/dist/solution/BookingByStep/index.js

@@ -1410,17 +1410,27 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           resources.push.apply(resources, _toConsumableArray(_this10.store.date.getResourcesListByDate(n.date) || []));
         });
       }
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
+
       // 如果此时 resources 为空，视作购物车里已经有了 dateRange 数据，此时 dateList 里明确就是那一天的数据
       if (!resources.length) {
-        var dateList = this.store.date.getDateList();
-        dateList.forEach(function (n) {
-          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+        // 如果此时购物车里已经有了开始时间，则直接取那天的数据即可
+        var firstDateCartItem = cartItems === null || cartItems === void 0 ? void 0 : cartItems.find(function (n) {
+          return n.start_date;
         });
+        if (firstDateCartItem !== null && firstDateCartItem !== void 0 && firstDateCartItem.start_date) {
+          var dateResources = this.store.date.getResourcesListByDate(firstDateCartItem.start_date);
+          resources.push.apply(resources, _toConsumableArray(dateResources || []));
+        } else {
+          var dateList = this.store.date.getDateList();
+          dateList.forEach(function (n) {
+            if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+          });
+        }
       }
       var resourcesMap = getResourcesMap(cloneDeep(resources));
-      var cartItems = this.store.cart.getItems().filter(function (n) {
-        return !isNormalProduct(n._productOrigin);
-      });
       var arr = [];
       cartItems.forEach(function (cartItem) {
         var _cartItem$_productOri;

package/lib/modules/AccountList/index.js

@@ -179,6 +179,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
     });
   }
   async removeAccount(id) {
+    var _a;
     try {
       this.store.isLoading = true;
       this.store.error = null;
@@ -194,6 +195,9 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       this.store.accountList = this.store.accountList.filter(
         (account) => account.id !== id
       );
+      if (((_a = this.getActiveAccount()) == null ? void 0 : _a.getId()) === id) {
+        this.setActiveAccount(this.store.accounts[0].getId());
+      }
       await this.core.effects.emit(
         import_types.AccountListHooks.OnAccountListUpdate,
         this.store

package/lib/modules/Rules/index.js

@@ -279,7 +279,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return;
       }
       const isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === "good_pass";
-      const splitCount = isNeedSplit ? Math.min(product.quantity, applicableDiscounts.filter((item) => (item.tag || item.type) === "good_pass").length) : 1;
+      const splitCount = isNeedSplit ? Math.min(product.quantity || product.num || 1, applicableDiscounts.filter((item) => (item.tag || item.type) === "good_pass").length) : 1;
       const arr = [];
       if (splitCount < product.quantity && isNeedSplit) {
         arr.push(this.hooks.setProduct(originProduct, {

package/lib/solution/BookingByStep/index.js

@@ -820,15 +820,21 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         resources.push(...this.store.date.getResourcesListByDate(n.date) || []);
       });
     }
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     if (!resources.length) {
-      const dateList = this.store.date.getDateList();
-      dateList.forEach((n) => {
-        if (n.resource)
-          resources.push(...n.resource);
-      });
+      const firstDateCartItem = cartItems == null ? void 0 : cartItems.find((n) => n.start_date);
+      if (firstDateCartItem == null ? void 0 : firstDateCartItem.start_date) {
+        const dateResources = this.store.date.getResourcesListByDate(firstDateCartItem.start_date);
+        resources.push(...dateResources || []);
+      } else {
+        const dateList = this.store.date.getDateList();
+        dateList.forEach((n) => {
+          if (n.resource)
+            resources.push(...n.resource);
+        });
+      }
     }
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const arr = [];
     cartItems.forEach((cartItem) => {
       var _a, _b, _c, _d, _e, _f;

package/package.json

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