@pisell/pisellos 0.0.37 → 0.0.39

package/dist/modules/Cart/utils.d.ts

@@ -19,7 +19,6 @@ export declare const createCartItemOrigin: () => {
     sub_type: null;
     duration: null;
     like_status: string;
-    relation_type: string;
     resources: null;
     schedule_id: number;
     start_date: null;

package/dist/modules/Cart/utils.js

@@ -38,8 +38,8 @@ export var createCartItemOrigin = function createCartItemOrigin() {
     // 资源相关
     // 资源状态 -固定
     like_status: "common",
-    // 资源类型 - 固定
-    relation_type: "form",
+    // 资源类型 - 固定--谭景琳备注：马天宇说现在平行资源是不传这个的
+    // relation_type: "form",
     // 所选资源
     resources: null,
     // 日程id - 固定
@@ -233,7 +233,7 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
         if (resource !== null && resource !== void 0 && (_resource$children = resource.children) !== null && _resource$children !== void 0 && _resource$children.length) {
           checkResourcesFormat(resource.children, childArr);
         }
-        arr.push({
+        var obj = {
           relation_type: "form",
           like_status: "common",
           id: resource.id,
@@ -242,9 +242,12 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
           form_id: resource.form_id,
           relation_id: resource.id,
           capacity: (resource === null || resource === void 0 ? void 0 : resource.capacity) || 0,
-          children: childArr,
           metadata: (resource === null || resource === void 0 ? void 0 : resource.metadata) || {} // 后端可以在这里挂一个前端用于计算的数据
-        });
+        };
+        if (childArr.length) {
+          obj.children = childArr;
+        }
+        arr.push(obj);
       });
     };
     checkResourcesFormat(resources, origin.resources);

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

@@ -1,10 +1,13 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { ScheduleModuleAPI } from './types';
+import { ScheduleModuleAPI, ScheduleAvailabilityDateItem, ScheduleItem } from './types';
 export declare class ScheduleModule extends BaseModule implements Module, ScheduleModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    setScheduleList(list: ScheduleItem[]): void;
+    setAvailabilityDateList(list: ScheduleAvailabilityDateItem[]): void;
+    getAvailabilityDateList(): ScheduleAvailabilityDateItem[];
 }

package/dist/modules/Schedule/index.js

@@ -51,6 +51,21 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+  }, {
+    key: "setScheduleList",
+    value: function setScheduleList(list) {
+      this.store.scheduleList = list;
+    }
+  }, {
+    key: "setAvailabilityDateList",
+    value: function setAvailabilityDateList(list) {
+      this.store.availabilityDateList = list;
+    }
+  }, {
+    key: "getAvailabilityDateList",
+    value: function getAvailabilityDateList() {
+      return this.store.availabilityDateList;
+    }
   }]);
   return ScheduleModule;
 }(BaseModule);

package/dist/modules/Schedule/types.d.ts

@@ -1,7 +1,12 @@
 import dayjs from "dayjs";
 export interface ScheduleState {
     scheduleList: ScheduleItem[];
+    availabilityDateList: ScheduleAvailabilityDateItem[];
 }
+export type ScheduleAvailabilityDateItem = {
+    date: string;
+    schedule_id: number[];
+};
 export interface ScheduleModuleAPI {
 }
 export type ScheduleItem = {

package/dist/modules/index.d.ts

@@ -10,3 +10,4 @@ export * from './Payment';
 export * from './Resource';
 export * from './Step';
 export * from './Summary';
+export * from './Schedule';

package/dist/modules/index.js

@@ -9,4 +9,5 @@ export * from "./Order";
 export * from "./Payment";
 export * from "./Resource";
 export * from "./Step";
-export * from "./Summary";
+export * from "./Summary";
+export * from "./Schedule";

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

@@ -5,7 +5,7 @@ import { BookingByStepState } from "./types";
 import { CartItem, IUpdateItemParams, ProductData } from "../../modules";
 import { Account } from "../../modules/Account/types";
 import { IStep } from "../../modules/Step/tyeps";
-import { TimeSliceItem, ResourceItem } from "./utils/resources";
+import { TimeSliceItem } from "./utils/resources";
 import { ITime } from "../../modules/Date/types";
 export declare class BookingByStepImpl extends BaseModule implements Module {
     protected defaultName: string;
@@ -33,12 +33,13 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         collection?: number | string[];
         schedule_ids?: number[];
     }): Promise<any>;
+    loadProductByScheduleDate(date: string): void;
     loadAllSchedule(): Promise<void>;
     loadAvailableDate({ startDate, endDate, custom_page_id }: {
         startDate: string;
         endDate: string;
         custom_page_id?: number;
-    }): Promise<any>;
+    }): Promise<void>;
     storeProduct(productData: ProductData): Promise<void>;
     addAccount(accounts: Account[]): Promise<void>;
     getAccounts(): Promise<(Account | null)[]>;
@@ -94,7 +95,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         id: number | undefined;
         _id: string;
         product: ProductData | undefined;
-        resources: ResourceItem[];
+        resources: import("./utils/resources").ResourceItem[];
         holder_id: string | number;
         holder_name: string | undefined;
     } | undefined;

package/dist/solution/BookingByStep/index.js

@@ -89,7 +89,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   targetCacheData = data[this.otherParams.cacheId];
                 }
               }
-              moduleArr = ["accountList", "cart", "summary", "step", "products", "date", "order", "payment"];
+              moduleArr = ["accountList", "cart", "schedule", "summary", "step", "products", "date", "order", "payment"];
               moduleArr.forEach(function (step) {
                 var targetModule = createModule(step, _this2.name);
                 if (targetModule) {
@@ -207,7 +207,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return _loadProducts.apply(this, arguments);
       }
       return loadProducts;
-    }() // 加载当前店铺下所有 schedule
+    }()
+  }, {
+    key: "loadProductByScheduleDate",
+    value: function loadProductByScheduleDate(date) {
+      var scheduleList = this.store.schedule.getAvailabilityDateList();
+      var scheduleIds = scheduleList.filter(function (n) {
+        return n.date === date;
+      }).flatMap(function (n) {
+        return n.schedule_id;
+      });
+      this.loadProducts({
+        schedule_ids: scheduleIds
+      });
+    }
+
+    // 加载当前店铺下所有 schedule
   }, {
     key: "loadAllSchedule",
     value: function () {
@@ -220,7 +235,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return this.request.get("/schedule");
             case 2:
               scheduleList = _context3.sent;
-            case 3:
+              this.store.schedule.setScheduleList(scheduleList.data);
+            case 4:
             case "end":
               return _context3.stop();
           }
@@ -248,7 +264,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 3:
               res = _context4.sent;
-              return _context4.abrupt("return", res.data.list);
+              this.store.schedule.setAvailabilityDateList(res.data.date_list);
             case 5:
             case "end":
               return _context4.stop();

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, Product, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule } from "../../modules";
+import { ProductList, CartModule, Product, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from "../../modules";
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -12,6 +12,7 @@ export interface BookingByStepState {
     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/dist/solution/BookingByStep/types.js

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule } from "../../modules";
+import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, ScheduleModule } from "../../modules";
 export function createModule(moduleName, solutionName, name, version) {
   switch (moduleName) {
     case "cart":
@@ -17,6 +17,8 @@ export function createModule(moduleName, solutionName, name, version) {
       return new OrderModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case "payment":
       return new PaymentModule("".concat(solutionName, "_").concat(name || moduleName), version);
+    case "schedule":
+      return new ScheduleModule("".concat(solutionName, "_").concat(name || moduleName), version);
     default:
       throw new Error("Unknown module type: ".concat(moduleName));
   }

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

@@ -224,10 +224,23 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
       }, []);
       var default_resource = item.default_resource.reduce(function (childAcc, d) {
         if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
+          // 拼装组合资源的数据
+          var combiningResources = [];
+          if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
+            resourcesMap[d].combined_resource.resource_ids.forEach(function (id) {
+              if (resourcesMap[id]) {
+                combiningResources.push(resourcesMap[id]);
+              }
+            });
+          }
           childAcc.push(Object.assign({}, resourcesMap[d], {
             form_id: form_id,
             resourceType: item.type,
-            is_default: 1
+            is_default: 1,
+            children: combiningResources,
+            metadata: _objectSpread(_objectSpread({}, resourcesMap[d].metadata), {}, {
+              combined_resource: resourcesMap[d].combined_resource
+            })
           }));
         }
         return childAcc;

package/lib/modules/Cart/utils.d.ts

@@ -19,7 +19,6 @@ export declare const createCartItemOrigin: () => {
     sub_type: null;
     duration: null;
     like_status: string;
-    relation_type: string;
     resources: null;
     schedule_id: number;
     start_date: null;

package/lib/modules/Cart/utils.js

@@ -77,8 +77,8 @@ var createCartItemOrigin = () => {
     // 资源相关
     // 资源状态 -固定
     like_status: "common",
-    // 资源类型 - 固定
-    relation_type: "form",
+    // 资源类型 - 固定--谭景琳备注：马天宇说现在平行资源是不传这个的
+    // relation_type: "form",
     // 所选资源
     resources: null,
     // 日程id - 固定
@@ -220,7 +220,7 @@ var formatResourceToCartItemOrigin = (params) => {
         if ((_a = resource == null ? void 0 : resource.children) == null ? void 0 : _a.length) {
           checkResourcesFormat(resource.children, childArr);
         }
-        arr.push({
+        const obj = {
           relation_type: "form",
           like_status: "common",
           id: resource.id,
@@ -229,10 +229,13 @@ var formatResourceToCartItemOrigin = (params) => {
           form_id: resource.form_id,
           relation_id: resource.id,
           capacity: (resource == null ? void 0 : resource.capacity) || 0,
-          children: childArr,
           metadata: (resource == null ? void 0 : resource.metadata) || {}
           // 后端可以在这里挂一个前端用于计算的数据
-        });
+        };
+        if (childArr.length) {
+          obj.children = childArr;
+        }
+        arr.push(obj);
       });
     };
     checkResourcesFormat(resources, origin.resources);

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

@@ -1,10 +1,13 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { ScheduleModuleAPI } from './types';
+import { ScheduleModuleAPI, ScheduleAvailabilityDateItem, ScheduleItem } from './types';
 export declare class ScheduleModule extends BaseModule implements Module, ScheduleModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    setScheduleList(list: ScheduleItem[]): void;
+    setAvailabilityDateList(list: ScheduleAvailabilityDateItem[]): void;
+    getAvailabilityDateList(): ScheduleAvailabilityDateItem[];
 }

package/lib/modules/Schedule/index.js

@@ -34,6 +34,15 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     this.core = core;
     this.store = options == null ? void 0 : options.store;
   }
+  setScheduleList(list) {
+    this.store.scheduleList = list;
+  }
+  setAvailabilityDateList(list) {
+    this.store.availabilityDateList = list;
+  }
+  getAvailabilityDateList() {
+    return this.store.availabilityDateList;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Schedule/types.d.ts

@@ -1,7 +1,12 @@
 import dayjs from "dayjs";
 export interface ScheduleState {
     scheduleList: ScheduleItem[];
+    availabilityDateList: ScheduleAvailabilityDateItem[];
 }
+export type ScheduleAvailabilityDateItem = {
+    date: string;
+    schedule_id: number[];
+};
 export interface ScheduleModuleAPI {
 }
 export type ScheduleItem = {

package/lib/modules/index.d.ts

@@ -10,3 +10,4 @@ export * from './Payment';
 export * from './Resource';
 export * from './Step';
 export * from './Summary';
+export * from './Schedule';

package/lib/modules/index.js

@@ -28,6 +28,7 @@ __reExport(modules_exports, require("./Payment"), module.exports);
 __reExport(modules_exports, require("./Resource"), module.exports);
 __reExport(modules_exports, require("./Step"), module.exports);
 __reExport(modules_exports, require("./Summary"), module.exports);
+__reExport(modules_exports, require("./Schedule"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
@@ -41,5 +42,6 @@ __reExport(modules_exports, require("./Summary"), module.exports);
   ...require("./Payment"),
   ...require("./Resource"),
   ...require("./Step"),
-  ...require("./Summary")
+  ...require("./Summary"),
+  ...require("./Schedule")
 });

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

@@ -5,7 +5,7 @@ import { BookingByStepState } from "./types";
 import { CartItem, IUpdateItemParams, ProductData } from "../../modules";
 import { Account } from "../../modules/Account/types";
 import { IStep } from "../../modules/Step/tyeps";
-import { TimeSliceItem, ResourceItem } from "./utils/resources";
+import { TimeSliceItem } from "./utils/resources";
 import { ITime } from "../../modules/Date/types";
 export declare class BookingByStepImpl extends BaseModule implements Module {
     protected defaultName: string;
@@ -33,12 +33,13 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         collection?: number | string[];
         schedule_ids?: number[];
     }): Promise<any>;
+    loadProductByScheduleDate(date: string): void;
     loadAllSchedule(): Promise<void>;
     loadAvailableDate({ startDate, endDate, custom_page_id }: {
         startDate: string;
         endDate: string;
         custom_page_id?: number;
-    }): Promise<any>;
+    }): Promise<void>;
     storeProduct(productData: ProductData): Promise<void>;
     addAccount(accounts: Account[]): Promise<void>;
     getAccounts(): Promise<(Account | null)[]>;
@@ -94,7 +95,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         id: number | undefined;
         _id: string;
         product: ProductData | undefined;
-        resources: ResourceItem[];
+        resources: import("./utils/resources").ResourceItem[];
         holder_id: string | number;
         holder_name: string | undefined;
     } | undefined;

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", "summary", "step", "products", "date", "order", "payment"];
+    const moduleArr = ["accountList", "cart", "schedule", "summary", "step", "products", "date", "order", "payment"];
     moduleArr.forEach((step) => {
       var _a2, _b2;
       const targetModule = (0, import_types.createModule)(step, this.name);
@@ -148,9 +148,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     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 }) {
@@ -159,7 +165,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       end_date: endDate,
       custom_page_id
     });
-    return res.data.list;
+    this.store.schedule.setAvailabilityDateList(res.data.date_list);
   }
   async storeProduct(productData) {
     const activeAccount = this.getActiveAccount();

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, Product, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule } from "../../modules";
+import { ProductList, CartModule, Product, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from "../../modules";
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -12,6 +12,7 @@ export interface BookingByStepState {
     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

@@ -42,6 +42,8 @@ function createModule(moduleName, solutionName, name, version) {
       return new import_modules.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);
     default:
       throw new Error(`Unknown module type: ${moduleName}`);
   }

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

@@ -145,10 +145,23 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
       }, []);
       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]);
+              }
+            });
+          }
           childAcc.push(Object.assign({}, resourcesMap[d], {
             form_id,
             resourceType: item.type,
-            is_default: 1
+            is_default: 1,
+            children: combiningResources,
+            metadata: {
+              ...resourcesMap[d].metadata,
+              combined_resource: resourcesMap[d].combined_resource
+            }
           }));
         }
         return childAcc;

package/package.json

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