@pisell/pisellos 0.0.122 → 0.0.124

package/dist/modules/Cart/index.js

@@ -216,6 +216,7 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "formatCartItem",
     value: function formatCartItem(params) {
+      var _tempCartItem;
       var _id = params._id,
         cartItem = params.cartItem,
         account = params.account,
@@ -226,11 +227,15 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         resources = params.resources,
         note = params.note,
         date = params.date,
-        relationForms = params.relationForms,
-        quantity = params.quantity;
+        relationForms = params.relationForms;
+      var quantity = params.quantity;
       var tempCartItem = this.store.list.find(function (i) {
         return i._id === _id;
       });
+      if (!quantity && (_tempCartItem = tempCartItem) !== null && _tempCartItem !== void 0 && _tempCartItem.num) {
+        var _tempCartItem2;
+        quantity = ((_tempCartItem2 = tempCartItem) === null || _tempCartItem2 === void 0 ? void 0 : _tempCartItem2.num) || 1;
+      }
       if (!tempCartItem) {
         throw new Error('[CartModule] 格式化数据到购物车失败，商品不存在');
       }

package/dist/modules/Discount/index.js

@@ -122,7 +122,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.post("/order/prepare/config", params);
             case 2:
               prepareConfig = _context3.sent;
-              goodPassList = this.uniqueByProductId(this.filterEnabledDiscountList((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []) || []) || [];
+              goodPassList = this.filterEnabledDiscountList((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []) || [];
               return _context3.abrupt("return", goodPassList);
             case 5:
             case "end":
@@ -153,7 +153,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 2:
               result = _context4.sent;
-              resultDiscountList = this.uniqueByProductId(this.filterEnabledDiscountList((result === null || result === void 0 ? void 0 : result.data) || []) || []) || [];
+              resultDiscountList = this.filterEnabledDiscountList((result === null || result === void 0 ? void 0 : result.data) || []) || [];
               return _context4.abrupt("return", resultDiscountList);
             case 5:
             case "end":

package/dist/solution/ShopDiscount/index.js

@@ -30,7 +30,6 @@ import { BaseModule } from "../../modules/BaseModule";
 import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
-import { uniqueById } from "./utils";
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ShopDiscountImpl, _BaseModule);
   var _super = _createSuper(ShopDiscountImpl);
@@ -278,7 +277,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             isManualSelect: !isSelected
           });
         }
-        return discount;
+        return _objectSpread(_objectSpread({}, discount), {}, {
+          isManualSelect: !(discount !== null && discount !== void 0 && discount.isSelected)
+        });
       });
 
       // 更新优惠券列表
@@ -451,9 +452,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           });
         }
       });
-      var newDiscountList = uniqueById([].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
+      var newDiscountList = [].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
         return !item.isDisabled;
-      }))), 'product_id');
+      })));
       (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 || _this$store$discount5.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;

package/lib/modules/Cart/index.js

@@ -133,10 +133,13 @@ var CartModule = class extends import_BaseModule.BaseModule {
       resources,
       note,
       date,
-      relationForms,
-      quantity
+      relationForms
     } = params;
+    let quantity = params.quantity;
     let tempCartItem = this.store.list.find((i) => i._id === _id);
+    if (!quantity && (tempCartItem == null ? void 0 : tempCartItem.num)) {
+      quantity = (tempCartItem == null ? void 0 : tempCartItem.num) || 1;
+    }
     if (!tempCartItem) {
       throw new Error("[CartModule] 格式化数据到购物车失败，商品不存在");
     }

package/lib/modules/Discount/index.js

@@ -73,10 +73,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       `/order/prepare/config`,
       params
     );
-    const goodPassList = this.uniqueByProductId(
-      this.filterEnabledDiscountList(
-        ((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || []
-      ) || []
+    const goodPassList = this.filterEnabledDiscountList(
+      ((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || []
     ) || [];
     return goodPassList;
   }
@@ -88,9 +86,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       available: 1,
       relation_product: 1
     });
-    const resultDiscountList = this.uniqueByProductId(
-      this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || []
-    ) || [];
+    const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountList;
   }
   filterEnabledDiscountList(discountList) {

package/lib/solution/ShopDiscount/index.js

@@ -27,7 +27,6 @@ var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
-var import_utils = require("./utils");
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -173,7 +172,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           isManualSelect: !isSelected
         };
       }
-      return discount;
+      return { ...discount, isManualSelect: !(discount == null ? void 0 : discount.isSelected) };
     });
     this.setDiscountList(newDiscountList);
     return this.calcDiscount(this.store.productList || [], {
@@ -288,13 +287,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         });
       }
     });
-    const newDiscountList = (0, import_utils.uniqueById)(
-      [
-        ...editModeDiscountList,
-        ...discountList.filter((item) => !item.isDisabled)
-      ],
-      "product_id"
-    );
+    const newDiscountList = [
+      ...editModeDiscountList,
+      ...discountList.filter((item) => !item.isDisabled)
+    ];
     (_a = this.store.discount) == null ? void 0 : _a.setDiscountList(newDiscountList);
     this.emitDiscountListChange(newDiscountList);
     return newDiscountList;

package/package.json

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