@pisell/pisellos 0.0.100 → 0.0.102

package/dist/modules/Rules/index.js

@@ -107,7 +107,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }
 
       // 合并新旧折扣列表，并计算折扣结果
-      var mergedDiscountList = uniqueById([].concat(_toConsumableArray(oldDiscountList), _toConsumableArray(newDiscountList)));
+      var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(oldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList)

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

@@ -209,4 +209,13 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
     getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    /**
+     * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
+     *
+     * @param {string} cartItemId
+     * @param {string} resourceCode
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
+    getResourcesByCartItemAndCode(cartItemId: string, resourceCode: string): any;
 }

package/dist/solution/BookingByStep/index.js

@@ -2476,6 +2476,114 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return getProductTypeById;
     }()
+    /**
+     * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
+     *
+     * @param {string} cartItemId
+     * @param {string} resourceCode
+     * @return {*} 
+     * @memberof BookingByStepImpl
+     */
+  }, {
+    key: "getResourcesByCartItemAndCode",
+    value: function getResourcesByCartItemAndCode(cartItemId, resourceCode) {
+      var _cartItem$_productOri11, _cartItem$_productOri12;
+      var dateRange = this.store.date.getDateRange();
+      var resources = [];
+      if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
+        dateRange.forEach(function (n) {
+          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+        });
+      }
+      if (!resources.length) {
+        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();
+      var cartItem = cartItems.find(function (item) {
+        return item._id === cartItemId;
+      });
+      if (!cartItem) return [];
+      var selectedResources = [];
+      var formatCapacity = formatDefaultCapacitys({
+        capacity: (_cartItem$_productOri11 = cartItem._productOrigin) === null || _cartItem$_productOri11 === void 0 ? void 0 : _cartItem$_productOri11.capacity,
+        product_bundle: cartItem._origin.product.product_bundle
+      });
+      cartItem._origin.metadata.capacity = formatCapacity;
+      var currentCapacity = getSumCapacity({
+        capacity: formatCapacity
+      });
+      if (cartItem.holder_id) {
+        selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
+      } else {
+        selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
+      }
+      var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri12 = cartItem._productOrigin) === null || _cartItem$_productOri12 === void 0 || (_cartItem$_productOri12 = _cartItem$_productOri12.product_resource) === null || _cartItem$_productOri12 === void 0 ? void 0 : _cartItem$_productOri12.resources) || [], selectedResources, currentCapacity);
+      var targetResource = productResources.find(function (resource) {
+        return resource.code === resourceCode;
+      });
+      if (!targetResource) return [];
+      if (cartItem._origin.start_time) {
+        var startTime = dayjs("".concat(cartItem._origin.start_date, " ").concat(cartItem._origin.start_time));
+        var endTime = dayjs("".concat(cartItem._origin.end_date, " ").concat(cartItem._origin.end_time));
+        var resourcesUseableMap = {};
+        targetResource.renderList = targetResource.renderList.sort(function (a, b) {
+          var _a$metadata5, _b$metadata5;
+          var aIsCombined = ((_a$metadata5 = a.metadata) === null || _a$metadata5 === void 0 || (_a$metadata5 = _a$metadata5.combined_resource) === null || _a$metadata5 === void 0 ? void 0 : _a$metadata5.status) === 1;
+          var bIsCombined = ((_b$metadata5 = b.metadata) === null || _b$metadata5 === void 0 || (_b$metadata5 = _b$metadata5.combined_resource) === null || _b$metadata5 === void 0 ? void 0 : _b$metadata5.status) === 1;
+          if (aIsCombined && !bIsCombined) return 1;
+          if (!aIsCombined && bIsCombined) return -1;
+          return 0;
+        });
+        targetResource.renderList = targetResource.renderList.filter(function (m) {
+          var mTimes = m.times.filter(function (n) {
+            return !dayjs(n.start_at).isAfter(dayjs(startTime)) && !dayjs(n.end_at).isBefore(dayjs(endTime));
+          });
+          if (mTimes.length === 0) return false;
+          var canUseArr = mTimes.map(function (item) {
+            var _cartItem$_productOri13;
+            var res = getIsUsableByTimeItem({
+              timeSlice: {
+                start_time: startTime.format('HH:mm'),
+                end_time: endTime.format('HH:mm'),
+                start_at: startTime,
+                end_at: endTime
+              },
+              time: item,
+              resource: m,
+              currentCount: currentCapacity || 0,
+              resourcesUseableMap: resourcesUseableMap,
+              cut_off_time: (_cartItem$_productOri13 = cartItem._productOrigin) === null || _cartItem$_productOri13 === void 0 ? void 0 : _cartItem$_productOri13.cut_off_time
+            });
+            if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
+              resourcesUseableMap[m.id] = res.usable;
+            }
+            return res.usable;
+          });
+          if (m.onlyComputed) return false;
+          return !canUseArr.some(function (n) {
+            return n === false;
+          });
+        });
+      } else {
+        targetResource.renderList = targetResource.renderList.filter(function (n) {
+          var _cartItem$_productOri14;
+          var recordCount = n.capacity || 0;
+          if (n.onlyComputed) return false;
+          var timeSlots = getTimeSlicesByResource({
+            resource: n,
+            duration: ((_cartItem$_productOri14 = cartItem._productOrigin) === null || _cartItem$_productOri14 === void 0 || (_cartItem$_productOri14 = _cartItem$_productOri14.duration) === null || _cartItem$_productOri14 === void 0 ? void 0 : _cartItem$_productOri14.value) || 0,
+            split: 10,
+            currentDate: dateRange[0].date
+          });
+          return recordCount >= currentCapacity && timeSlots.length > 0;
+        });
+      }
+      return targetResource.renderList;
+    }
   }]);
   return BookingByStepImpl;
 }(BaseModule);

package/lib/modules/Rules/index.js

@@ -58,10 +58,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
-    const mergedDiscountList = (0, import_utils.uniqueById)([
+    const mergedDiscountList = (0, import_utils.uniqueById)((0, import_utils.uniqueById)([
       ...oldDiscountList,
       ...newDiscountList
-    ]);
+    ]), "product_id");
     const result = this.calcDiscount({
       discountList: mergedDiscountList,
       productList: [...productList]

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

@@ -209,4 +209,13 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
     getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    /**
+     * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
+     *
+     * @param {string} cartItemId
+     * @param {string} resourceCode
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
+    getResourcesByCartItemAndCode(cartItemId: string, resourceCode: string): any;
 }

package/lib/solution/BookingByStep/index.js

@@ -1692,6 +1692,130 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     return "normal";
   }
+  /**
+   * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
+   *
+   * @param {string} cartItemId
+   * @param {string} resourceCode
+   * @return {*} 
+   * @memberof BookingByStepImpl
+   */
+  getResourcesByCartItemAndCode(cartItemId, resourceCode) {
+    var _a, _b, _c;
+    const dateRange = this.store.date.getDateRange();
+    const resources = [];
+    if (dateRange == null ? void 0 : dateRange.length) {
+      dateRange.forEach((n) => {
+        if (n.resource)
+          resources.push(...n.resource);
+      });
+    }
+    if (!resources.length) {
+      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();
+    const cartItem = cartItems.find((item) => item._id === cartItemId);
+    if (!cartItem)
+      return [];
+    let selectedResources = [];
+    const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+      capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
+      product_bundle: cartItem._origin.product.product_bundle
+    });
+    cartItem._origin.metadata.capacity = formatCapacity;
+    const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
+    if (cartItem.holder_id) {
+      selectedResources = (0, import_resources.getOthersSelectedResources)(
+        cartItems,
+        cartItem.holder_id,
+        resourcesMap
+      );
+    } else {
+      selectedResources = (0, import_resources.getOthersCartSelectedResources)(
+        cartItems,
+        cartItem._id,
+        resourcesMap
+      );
+    }
+    const productResources = (0, import_resources.getResourcesByProduct)(
+      resourcesMap,
+      ((_c = (_b = cartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
+      selectedResources,
+      currentCapacity
+    );
+    const targetResource = productResources.find((resource) => resource.code === resourceCode);
+    if (!targetResource)
+      return [];
+    if (cartItem._origin.start_time) {
+      const startTime = (0, import_dayjs.default)(
+        `${cartItem._origin.start_date} ${cartItem._origin.start_time}`
+      );
+      const endTime = (0, import_dayjs.default)(
+        `${cartItem._origin.end_date} ${cartItem._origin.end_time}`
+      );
+      const resourcesUseableMap = {};
+      targetResource.renderList = targetResource.renderList.sort((a, b) => {
+        var _a2, _b2, _c2, _d;
+        const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
+        const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
+        if (aIsCombined && !bIsCombined)
+          return 1;
+        if (!aIsCombined && bIsCombined)
+          return -1;
+        return 0;
+      });
+      targetResource.renderList = targetResource.renderList.filter((m) => {
+        const mTimes = m.times.filter((n) => {
+          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(startTime)) && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(endTime));
+        });
+        if (mTimes.length === 0)
+          return false;
+        const canUseArr = mTimes.map((item) => {
+          var _a2;
+          const res = (0, import_resources.getIsUsableByTimeItem)({
+            timeSlice: {
+              start_time: startTime.format("HH:mm"),
+              end_time: endTime.format("HH:mm"),
+              start_at: startTime,
+              end_at: endTime
+            },
+            time: item,
+            resource: m,
+            currentCount: currentCapacity || 0,
+            resourcesUseableMap,
+            cut_off_time: (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.cut_off_time
+          });
+          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
+            resourcesUseableMap[m.id] = res.usable;
+          }
+          return res.usable;
+        });
+        if (m.onlyComputed)
+          return false;
+        return !canUseArr.some((n) => n === false);
+      });
+    } else {
+      targetResource.renderList = targetResource.renderList.filter((n) => {
+        var _a2, _b2;
+        const recordCount = n.capacity || 0;
+        if (n.onlyComputed)
+          return false;
+        const timeSlots = (0, import_resources.getTimeSlicesByResource)({
+          resource: n,
+          duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 0,
+          split: 10,
+          currentDate: dateRange[0].date
+        });
+        return recordCount >= currentCapacity && timeSlots.length > 0;
+      });
+    }
+    return targetResource.renderList;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

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