@pisell/pisellos 0.0.38 → 2.0.1

package/lib/solution/BookingByStep/index.js

@@ -68,7 +68,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         targetCacheData = data[this.otherParams.cacheId];
       }
     }
-    const moduleArr = ["accountList", "cart", "schedule", "summary", "step", "products", "date", "order", "payment"];
+    const moduleArr = ["accountList", "cart", "summary", "step", "products", "date", "order", "payment"];
     moduleArr.forEach((step) => {
       var _a2, _b2;
       const targetModule = (0, import_types.createModule)(step, this.name);
@@ -88,7 +88,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.core.effects.emit(import_types.BookingByStepHooks.onInited, {});
-    this.loadAllSchedule();
   }
   // 初始化step
   initStep(stepList) {
@@ -124,15 +123,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   async loadProducts({
     category_ids = [],
     product_ids = [],
-    collection = [],
-    schedule_ids = []
+    collection = []
   }) {
     const productsData = await this.request.post(
       `/product/query`,
       {
         open_quotation: 1,
         open_bundle: 1,
-        extension_type: ["product_appointment", "appointment_ticket", "session_product"],
+        extension_type: ["product_appointment", "appointment_ticket"],
         with: ["category", "collection"],
         status: "published",
         num: 500,
@@ -140,33 +138,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         category_ids,
         ids: product_ids,
         collection,
-        front_end_cache_id: this.cacheId,
-        schedule_ids
+        front_end_cache_id: this.cacheId
       },
       { useCache: true }
     );
     this.store.products.addProduct(productsData.data.list);
     return productsData.data.list;
   }
-  loadProductByScheduleDate(date) {
-    const scheduleList = this.store.schedule.getAvailabilityDateList();
-    const scheduleIds = scheduleList.filter((n) => n.date === date).flatMap((n) => n.schedule_id);
-    this.loadProducts({ schedule_ids: scheduleIds });
-  }
-  // 加载当前店铺下所有 schedule
-  async loadAllSchedule() {
-    const scheduleList = await this.request.get(`/schedule`);
-    this.store.schedule.setScheduleList(scheduleList.data);
-  }
-  // ui 层提供日期的起始范围，返回一个起始范围内日期的可用情况
-  async loadAvailableDate({ startDate, endDate, custom_page_id }) {
-    const res = await this.request.get(`/schedule/product/availability`, {
-      start_date: startDate,
-      end_date: endDate,
-      custom_page_id
-    });
-    this.store.schedule.setAvailabilityDateList(res.data.date_list);
-  }
   async storeProduct(productData) {
     const activeAccount = this.getActiveAccount();
     if (!activeAccount) {
@@ -326,18 +304,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     cartItems.forEach((item) => {
       var _a;
       if (item.holder_id !== (targetCartItem == null ? void 0 : targetCartItem.holder_id)) {
-        const resources = (_a = item._origin.resources) == null ? void 0 : _a.filter((m) => {
-          return !targetCartItem._origin.resources.some((targetRes) => {
-            var _a2, _b;
-            if (targetRes.id === m.id)
-              return true;
-            if (((_a2 = targetRes.metadata.combined_resource) == null ? void 0 : _a2.status) === 1 && targetRes.metadata.combined_resource.resource_ids.includes(m.id))
-              return true;
-            if (((_b = m.metadata.combined_resource) == null ? void 0 : _b.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id))
-              return true;
-            return false;
-          });
-        });
+        const resources = (_a = item._origin.resources) == null ? void 0 : _a.filter(
+          (m) => !targetCartItem._origin.resources.some((targetRes) => targetRes.id === m.id)
+        );
         this.store.cart.updateItem({
           _id: item._id,
           resources
@@ -397,13 +366,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = this.store.cart.getItems();
     const arr = [];
     cartItems.forEach((cartItem) => {
-      var _a, _b, _c;
-      if (!cartItem.holder_id)
-        return;
-      const selectedResources = (0, import_resources.getOthersSelectedResources)(cartItems, cartItem.holder_id, resourcesMap);
-      const formatCapacity = (0, import_resources.formatDefaultCapacitys)({ capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity, product_bundle: cartItem._origin.product.product_bundle });
-      const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
-      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 productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, cartItem, cartItems);
       arr.push({
         id: cartItem.id,
         // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
@@ -419,7 +382,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 给单个购物车里的商品获取资源列表
   getResourcesListByCartItem(id) {
-    var _a, _b, _c;
     const cartItems = this.store.cart.getItems();
     const dateRange = this.store.date.getDateRange();
     const resources = [];
@@ -428,16 +390,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         resources.push(...n.resource);
     });
     const resourcesMap = (0, import_utils.getResourcesMap)(resources);
+    const arr = [];
     const targetCartItem = cartItems.find((n) => n._id === id);
     if (!targetCartItem) {
       throw new Error(`没有找到${id}购物车商品`);
     }
-    if (!targetCartItem.holder_id)
-      return;
-    const selectedResources = (0, import_resources.getOthersSelectedResources)(cartItems, targetCartItem.holder_id, resourcesMap);
-    const formatCapacity = (0, import_resources.formatDefaultCapacitys)({ capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity, product_bundle: targetCartItem._origin.product.product_bundle });
-    const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
-    const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, ((_c = (_b = targetCartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [], selectedResources, currentCapacity);
+    const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, targetCartItem, cartItems);
     if (productResources) {
       return {
         id: targetCartItem.id,
@@ -466,7 +424,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
     return timeSlots;
   }
-  // 自动分派可用的资源-单种资源类型——此方法目前未使用，未经验证
+  // 自动分派可用的资源-单种资源类型
   autoSelectResource({
     resourceProductData,
     resources,
@@ -518,9 +476,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     holder_id,
     resources_code,
     timeSlots,
-    countMap,
-    capacity
+    countMap
   }) {
+    var _a, _b, _c;
     const dateRange = this.store.date.getDateRange();
     const cartItems = this.store.cart.getItems();
     const accountCartItems = cartItems.filter((n) => n.holder_id === holder_id) || [];
@@ -530,13 +488,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       };
     }
     let duration = accountCartItems.reduce((acc, n) => {
-      var _a, _b;
-      return acc + (((_b = (_a = n._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0);
+      var _a2, _b2;
+      return acc + (((_b2 = (_a2 = n._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) ?? 0);
     }, 0);
+    let durationType = ((_c = (_b = (_a = accountCartItems[0]) == null ? void 0 : _a._productOrigin) == null ? void 0 : _b.duration) == null ? void 0 : _c.type) ?? "minutes";
     const resources = [];
     accountCartItems.forEach((item) => {
-      var _a, _b, _c;
-      (_c = (_b = (_a = item._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) == null ? void 0 : _c.forEach((n) => {
+      var _a2, _b2, _c2;
+      (_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
         }
@@ -551,7 +510,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             timeSlice: timeSlots,
             time: item,
             resource: n,
-            currentCount: recordCount + (capacity || 0)
+            currentCount: recordCount + 1
           });
           return res.usable;
         });
@@ -571,8 +530,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         resourcesMap,
         duration,
         currentDate: dateRange[0].date,
-        split: 10,
-        capacity
+        split: 10
       });
       if (!timeSlots2) {
         return;
@@ -596,20 +554,19 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const selectResourcesMap = {};
     this.store.accountList.getAccounts().forEach((account) => {
       const cartItems = this.store.cart.getCartByAccount(account.getId());
+      const allCartItems = this.store.cart.getItems();
       let recordTimeSlots = (0, import_lodash_es.cloneDeep)(timeSlots);
       cartItems.forEach((item, index) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
-        const formatCapacity = (0, import_resources.formatDefaultCapacitys)({ capacity: (_a = item._productOrigin) == null ? void 0 : _a.capacity, product_bundle: item._origin.product.product_bundle });
-        const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
+        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
         if (timeSlots) {
           if (index !== 0 && recordTimeSlots) {
             let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
-              ((_c = (_b = item._productOrigin) == null ? void 0 : _b.duration) == null ? void 0 : _c.value) ?? 0,
-              ((_e = (_d = item._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.type) ?? "minutes"
+              ((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0,
+              ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes"
             );
             let end_at = start_at.add(
-              ((_g = (_f = item._productOrigin) == null ? void 0 : _f.duration) == null ? void 0 : _g.value) ?? 0,
-              ((_i = (_h = item._productOrigin) == null ? void 0 : _h.duration) == null ? void 0 : _i.type) ?? "minutes"
+              ((_f = (_e = item._productOrigin) == null ? void 0 : _e.duration) == null ? void 0 : _f.value) ?? 0,
+              ((_h = (_g = item._productOrigin) == null ? void 0 : _g.duration) == null ? void 0 : _h.type) ?? "minutes"
             );
             recordTimeSlots = {
               start_time: start_at.format("HH:mm"),
@@ -622,17 +579,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             holder_id: item.holder_id,
             resources_code,
             timeSlots: recordTimeSlots,
-            countMap: selectResourcesMap,
-            capacity: currentCapacity
+            countMap: selectResourcesMap
           });
           if (res == null ? void 0 : res.selectedResource) {
             if (!selectResourcesMap[res.selectedResource.id]) {
-              selectResourcesMap[res.selectedResource.id] = currentCapacity;
+              selectResourcesMap[res.selectedResource.id] = 1;
             } else {
-              selectResourcesMap[res.selectedResource.id] += currentCapacity;
+              selectResourcesMap[res.selectedResource.id]++;
             }
-            res.selectedResource.capacity = currentCapacity;
-            (0, import_resources.checkSubResourcesCapacity)(res.selectedResource);
+            console.log(this.store.cart.getItems());
+            res.selectedResource.capacity = 1;
             this.store.cart.updateItem({
               _id: item._id,
               // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
@@ -643,23 +599,19 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 res.selectedResource
               ]
             });
+            console.log(this.store.cart.getItems());
           } else {
             errorList.push(item._id);
           }
         } else {
-          const allCartItems = this.store.cart.getItems();
-          if (!item.holder_id)
-            return;
-          const selectedResources = (0, import_resources.getOthersSelectedResources)(allCartItems, item.holder_id, resourcesMap);
-          const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, ((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || [], selectedResources, currentCapacity);
-          const targetRenderList = (_l = productResources.find((n) => n.code === resources_code)) == null ? void 0 : _l.renderList;
+          const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, item, allCartItems);
+          const targetRenderList = (_i = productResources.find((n) => n.code === resources_code)) == null ? void 0 : _i.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
-            if ((_m = item._origin.resources) == null ? void 0 : _m.some((n) => n.form_id === targetRenderList[0].form_id)) {
+            if ((_j = item._origin.resources) == null ? void 0 : _j.some((n) => n.form_id === targetRenderList[0].form_id)) {
               return;
             }
             const targetResource = targetRenderList[0];
-            targetResource.capacity = currentCapacity;
-            (0, import_resources.checkSubResourcesCapacity)(targetResource);
+            targetResource.capacity = 1;
             this.store.cart.updateItem({
               _id: item._id,
               resources: [
@@ -669,7 +621,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 targetResource
               ]
             });
-            console.log(account, "已分配");
           } else {
             errorList.push(item._id);
           }
@@ -755,12 +706,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   clearCacheByModule(module2) {
   }
-  async openProductDetail(productId) {
-    const targetProduct = await this.store.products.getProduct(productId);
-    if (targetProduct) {
-      this.store.currentProduct = targetProduct;
-    }
-  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -1,4 +1,13 @@
-import { ProductList, CartModule, Product, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from "../../modules";
+import { ProductList, CartModule } from "../../modules";
+import { AccountModule } from "../../modules/Account";
+import { AccountListModule } from "../../modules/AccountList";
+import { DateModule } from "../../modules/Date";
+import { GuestListModule } from "../../modules/Guests";
+import { OrderModule } from "../../modules/Order";
+import { PaymentModule } from "../../modules/Payment";
+import { ResourceListModule } from "../../modules/Resource";
+import { StepModule } from "../../modules/Step";
+import { SummaryModule } from "../../modules/Summary";
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -11,8 +20,6 @@ export interface BookingByStepState {
     accountList: AccountListModule;
     order: OrderModule;
     payment: PaymentModule;
-    currentProduct: Product;
-    schedule: ScheduleModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/lib/solution/BookingByStep/types.js

@@ -24,26 +24,30 @@ __export(types_exports, {
 });
 module.exports = __toCommonJS(types_exports);
 var import_modules = require("../../modules");
+var import_AccountList = require("../../modules/AccountList");
+var import_Date = require("../../modules/Date");
+var import_Order = require("../../modules/Order");
+var import_Payment = require("../../modules/Payment");
+var import_Step = require("../../modules/Step");
+var import_Summary = require("../../modules/Summary");
 function createModule(moduleName, solutionName, name, version) {
   switch (moduleName) {
     case "cart":
       return new import_modules.CartModule(`${solutionName}_${name || moduleName}`, version);
     case "summary":
-      return new import_modules.SummaryModule(`${solutionName}_${name || moduleName}`, version);
+      return new import_Summary.SummaryModule(`${solutionName}_${name || moduleName}`, version);
     case "step":
-      return new import_modules.StepModule(`${solutionName}_${name || moduleName}`, version);
+      return new import_Step.StepModule(`${solutionName}_${name || moduleName}`, version);
     case "products":
       return new import_modules.ProductList(`${solutionName}_${name || moduleName}`, version);
     case "date":
-      return new import_modules.DateModule(`${solutionName}_${name || moduleName}`, version);
+      return new import_Date.DateModule(`${solutionName}_${name || moduleName}`, version);
     case "accountList":
-      return new import_modules.AccountListModule(`${solutionName}_${name || moduleName}`, version);
+      return new import_AccountList.AccountListModule(`${solutionName}_${name || moduleName}`, version);
     case "order":
-      return new import_modules.OrderModule(`${solutionName}_${name || moduleName}`, version);
+      return new import_Order.OrderModule(`${solutionName}_${name || moduleName}`, version);
     case "payment":
-      return new import_modules.PaymentModule(`${solutionName}_${name || moduleName}`, version);
-    case "schedule":
-      return new import_modules.ScheduleModule(`${solutionName}_${name || moduleName}`, version);
+      return new import_Payment.PaymentModule(`${solutionName}_${name || moduleName}`, version);
     default:
       throw new Error(`Unknown module type: ${moduleName}`);
   }

package/lib/solution/BookingByStep/utils/resources.d.ts

@@ -45,7 +45,8 @@ export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, curren
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getResourcesByProduct: (resourcesMap: Record<string, ResourceItem>, resources: ResourceItem[], selectedResources: number[], capacity?: number) => ResourceItem[];
+export declare const getResourcesByProduct: (resourcesMap: Record<string, ResourceItem>, cartItem: CartItem, cartList: CartItem[]) => ResourceItem[];
+export declare const getSumCapacity: () => number;
 /**
  * @title: 获取资源列表
  * @description:
@@ -66,12 +67,11 @@ export declare const formatResources: ({ booking, resources }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate }: {
     resource: ResourceItem;
     duration: number;
     split: number;
     currentDate: DateType | string;
-    capacity?: number | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -100,52 +100,11 @@ export declare const getResourcesByIds: (resourcesMap: Record<string, ResourceIt
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
     currentDate: DateType | string;
     split: number;
-    capacity?: number | undefined;
 }) => any[];
-/**
- * @title: 获取其他人的已选资源
- * @description:
- * @param {CartItem[]} cartItems
- * @param {number | string} accountId
- * @return {*}
- * @Author: jinglin.tan
- */
-export declare const getOthersSelectedResources: (cartItems: CartItem[], accountId: number | string, resourcesMap: Record<string, ResourceItem>) => number[];
-interface CapacityItem {
-    id: number;
-    value: number;
-    name: string;
-}
-/**
- * @title: 基于选择的商品格式化容量
- * @description:
- * @param {any} param1
- * @return {*}
- * @Author: zhiwei.Wang
- */
-export declare const formatDefaultCapacitys: ({ capacity, product_bundle }: any) => CapacityItem[];
-/**
- * @title: 获取总容量
- * @description:
- * @param {object} capacity 为 formatDefaultCapacitys()的结果
- * @return {*}
- * @Author: zhiwei.Wang
- */
-export declare const getSumCapacity: ({ capacity }: {
-    capacity: CapacityItem[];
-}) => number;
-/**
- * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
- * @description:
- * @param {object} resource
- * @return {*}
- * @Author: jinglin.tan
- */
-export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
 export {};

package/lib/solution/BookingByStep/utils/resources.js

@@ -29,11 +29,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/BookingByStep/utils/resources.ts
 var resources_exports = {};
 __export(resources_exports, {
-  checkSubResourcesCapacity: () => checkSubResourcesCapacity,
-  formatDefaultCapacitys: () => formatDefaultCapacitys,
   formatResources: () => formatResources,
   getIsUsableByTimeItem: () => getIsUsableByTimeItem,
-  getOthersSelectedResources: () => getOthersSelectedResources,
   getResourcesByIds: () => getResourcesByIds,
   getResourcesByProduct: () => getResourcesByProduct,
   getSumCapacity: () => getSumCapacity,
@@ -114,54 +111,41 @@ var getIsUsableByTimeItem = ({ timeSlice, time, resource, currentCount = 1 }) =>
   status.usable = true;
   return status;
 };
-var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacity = 1) => {
-  return (resources || []).reduce((acc, item) => {
+var getResourcesByProduct = (resourcesMap, cartItem, cartList) => {
+  var _a;
+  const product = cartItem._productOrigin;
+  return (((_a = product == null ? void 0 : product.product_resource) == null ? void 0 : _a.resources) || []).reduce((acc, item) => {
     if ((item == null ? void 0 : item.status) == 1) {
       const form_id = item.id;
       item.optional_resource = (item.optional_resource || []).filter(
         (d) => item.default_resource.indexOf(d) == -1
       );
-      let optional_resource = item.optional_resource.reduce((childAcc, d) => {
-        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
-          const combiningResources = [];
-          if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
-            resourcesMap[d].combined_resource.resource_ids.forEach((id) => {
-              if (resourcesMap[id]) {
-                combiningResources.push(resourcesMap[id]);
-              }
+      const selectedResources = cartList.reduce((acc2, d) => {
+        var _a2;
+        if (d.holder_id !== cartItem.holder_id) {
+          if ((_a2 = d._origin) == null ? void 0 : _a2.resources) {
+            d._origin.resources.forEach((n) => {
+              acc2.push(n.id);
             });
           }
+        }
+        return acc2;
+      }, []);
+      let optional_resource = item.optional_resource.reduce((childAcc, d) => {
+        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
           childAcc.push(Object.assign({}, resourcesMap[d], {
             form_id,
-            resourceType: item.type,
-            children: combiningResources,
-            metadata: {
-              ...resourcesMap[d].metadata,
-              combined_resource: resourcesMap[d].combined_resource
-            }
+            resourceType: item.type
           }));
         }
         return childAcc;
       }, []);
       let default_resource = item.default_resource.reduce((childAcc, d) => {
-        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
-          const combiningResources = [];
-          if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
-            resourcesMap[d].combined_resource.resource_ids.forEach((id) => {
-              if (resourcesMap[id]) {
-                combiningResources.push(resourcesMap[id]);
-              }
-            });
-          }
+        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
           childAcc.push(Object.assign({}, resourcesMap[d], {
             form_id,
             resourceType: item.type,
-            is_default: 1,
-            children: combiningResources,
-            metadata: {
-              ...resourcesMap[d].metadata,
-              combined_resource: resourcesMap[d].combined_resource
-            }
+            is_default: 1
           }));
         }
         return childAcc;
@@ -179,6 +163,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
     return acc;
   }, []);
 };
+var getSumCapacity = () => {
+  return 1;
+};
 var formatResources = ({ booking, resources }) => {
   try {
     let _list = [...resources];
@@ -208,8 +195,7 @@ var getTimeSlicesByResource = ({
   resource,
   duration,
   split = 10,
-  currentDate = (0, import_dayjs.default)(),
-  capacity
+  currentDate = (0, import_dayjs.default)()
 }) => {
   const { times } = resource;
   const timeSlices = [];
@@ -233,7 +219,7 @@ var getTimeSlicesByResource = ({
         timeSlice,
         time,
         resource,
-        currentCount: capacity || 1
+        currentCount: getSumCapacity()
       });
       if (_status.usable) {
         timeSlices.push({
@@ -270,95 +256,19 @@ var getTimeSlicesByResources = ({
   resourcesMap,
   duration,
   currentDate,
-  split,
-  capacity
+  split
 }) => {
   let resources = getResourcesByIds(resourcesMap, resourceIds);
   let timeSliceList = resources.reduce((acc, item) => {
-    return acc.concat(getTimeSlicesByResource({ resource: item, duration, split, currentDate, capacity }));
+    return acc.concat(getTimeSlicesByResource({ resource: item, duration, split, currentDate }));
   }, []);
   let intersection = getTimesIntersection(timeSliceList, resources.length);
   return intersection;
 };
-var getOthersSelectedResources = (cartItems, accountId, resourcesMap) => {
-  return cartItems.reduce((acc, d) => {
-    var _a;
-    if (d.holder_id !== accountId) {
-      if ((_a = d._origin) == null ? void 0 : _a.resources) {
-        d._origin.resources.forEach((n) => {
-          if (n.metadata.combined_resource && n.metadata.combined_resource.status === 1) {
-            if (n.metadata.combined_resource.resource_ids.some((m) => acc.includes(m))) {
-              return acc;
-            }
-            acc.push(...n.metadata.combined_resource.resource_ids);
-          } else {
-            Object.values(resourcesMap).forEach((m) => {
-              if (m.combined_resource && m.combined_resource.status === 1) {
-                if (m.combined_resource.resource_ids.includes(n.id)) {
-                  acc.push(m.id);
-                }
-              }
-            });
-          }
-          acc.push(n.id);
-        });
-      }
-    }
-    return acc;
-  }, []);
-};
-var formatDefaultCapacitys = ({ capacity, product_bundle }) => {
-  if ((capacity == null ? void 0 : capacity.type) === "package") {
-    return (product_bundle || []).map((d) => {
-      const id = d.bundle_product_id;
-      const item = ((capacity == null ? void 0 : capacity.package) || []).find(
-        (item2) => item2.product_id === id
-      );
-      return {
-        id,
-        value: item ? d.num || 0 : 0,
-        name: (item == null ? void 0 : item.name) || (d == null ? void 0 : d.title)
-      };
-    });
-  }
-  if ((capacity == null ? void 0 : capacity.type) === "custom") {
-    return ((capacity == null ? void 0 : capacity.custom) || []).map((d) => {
-      return {
-        id: d.id,
-        value: d.min,
-        name: d.name
-      };
-    });
-  }
-  return [{ id: 0, value: 1, name: "" }];
-};
-var getSumCapacity = ({ capacity }) => {
-  let sum = 0;
-  for (let item of capacity || []) {
-    sum += item.value;
-  }
-  return sum;
-};
-var checkSubResourcesCapacity = (resource) => {
-  if (resource.children && resource.children.length) {
-    let countCapacity = resource.capacity;
-    resource.children.forEach((child) => {
-      if (child.capacity <= countCapacity) {
-        countCapacity -= child.capacity;
-      } else {
-        child.capacity = countCapacity;
-        countCapacity = 0;
-      }
-    });
-  }
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  checkSubResourcesCapacity,
-  formatDefaultCapacitys,
   formatResources,
   getIsUsableByTimeItem,
-  getOthersSelectedResources,
   getResourcesByIds,
   getResourcesByProduct,
   getSumCapacity,

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.38",
+  "version": "2.0.1",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
     "docs": "typedoc --out docs src/index.ts",
     "sync": "node sync.js",
     "prepublishOnly": "npm run build",
-    "deploy": "yarn run build && yarn run changeset && yarn run version && npm run release"
+    "deploy": "yarn run build && yarn run changeset && yarn run version && yarn run release"
   },
   "repository": {
     "type": "git",