@pisell/pisellos 0.0.497 → 0.0.499

package/dist/solution/VenueBooking/utils/timeSlot.js

@@ -226,7 +226,7 @@ export function buildTimeSlotGrid(params) {
       resources.push({
         resourceId: resource.resourceId,
         resourceFormId: resource.formId,
-        resourceName: mapping.resourceName,
+        resourceName: resource.main_field || mapping.resourceName,
         productId: mapping.productId,
         productTitle: mapping.productTitle,
         slots: slots

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

@@ -18,6 +18,7 @@ export declare class OpenDataModule extends BaseModule implements Module {
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     fetchOpenData(params: OpenDataFetchParams): Promise<OpenDataConfig>;
     getOpenData(): OpenDataConfig | null;
+    getLastFetchedAt(): number | null;
     checkAvailability(scheduleModule?: ScheduleModule): OpenDataAvailabilityResult;
     storeChange(): void;
 }

package/lib/modules/OpenData/index.js

@@ -87,6 +87,9 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
   getOpenData() {
     return this.store.data;
   }
+  getLastFetchedAt() {
+    return this.store.lastFetchedAt ?? null;
+  }
   checkAvailability(scheduleModule) {
     var _a;
     const scheduleList = scheduleModule ? scheduleModule.getScheduleListByIds(

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 4 | 2 | 3 | 6 | 5;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -34,6 +34,10 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private loginEffectDisposers;
     private customerLoginRefreshInFlight;
     private customerLoginRefreshIdInFlight;
+    private loadAllProductsInFlight;
+    private productsLoaded;
+    private loadOpenDataConfigInFlight;
+    private static readonly OPEN_DATA_CACHE_TTL;
     private getLoggerContext;
     private serializeError;
     private addVenueBookingLog;
@@ -64,6 +68,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         venueProducts: ProductData[];
         addonProducts: ProductData[];
     }>;
+    private _doLoadAllProducts;
     loadVenueProducts(): Promise<ProductData[]>;
     loadAddonProducts(): Promise<ProductData[]>;
     getVenueProducts(): ProductData[];

package/lib/solution/VenueBooking/index.js

@@ -74,7 +74,7 @@ function cloneCustomDepositData(customDepositData) {
     deposit_policy_data: Array.isArray(customDepositData.deposit_policy_data) ? [...customDepositData.deposit_policy_data] : []
   };
 }
-var VenueBookingImpl = class extends import_BaseModule.BaseModule {
+var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
     this.defaultName = "venueBooking";
@@ -105,6 +105,9 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
     this.loginEffectDisposers = [];
     this.customerLoginRefreshInFlight = null;
     this.customerLoginRefreshIdInFlight = null;
+    this.loadAllProductsInFlight = null;
+    this.productsLoaded = false;
+    this.loadOpenDataConfigInFlight = null;
   }
   getLoggerContext() {
     return {
@@ -423,6 +426,7 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
         await this.store.schedule.loadAllSchedule();
         this.injectScheduleResolverToQuotation();
       }
+      this.loadQuotations();
       await this.refreshItemRuleQuantityLimits();
       this.store.status = "ready";
       console.log("[VenueBooking] 初始化完成");
@@ -499,6 +503,14 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
   }
   // ─── 场地商品 & 附加商品 ───
   async loadAllProducts() {
+    if (this.loadAllProductsInFlight)
+      return this.loadAllProductsInFlight;
+    this.loadAllProductsInFlight = this._doLoadAllProducts().finally(() => {
+      this.loadAllProductsInFlight = null;
+    });
+    return this.loadAllProductsInFlight;
+  }
+  async _doLoadAllProducts() {
     var _a, _b, _c;
     this.logMethodStart("loadAllProducts");
     try {
@@ -526,6 +538,7 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
       }
       this.store.addonProducts.addProduct(addonList);
       this.resourceProductMap = (0, import_resource.buildResourceProductMap)(venueList);
+      this.productsLoaded = true;
       this.logMethodSuccess("loadAllProducts", {
         total: list.length,
         venueCount: venueList.length,
@@ -1241,6 +1254,12 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async getProductList() {
+    if (this.productsLoaded) {
+      return (0, import_utils.attachItemRuleLimitsToTopLevelProducts)(
+        this.getAddonProductsList(),
+        this.store.itemRuleQuantityLimits || []
+      );
+    }
     const result = await this.loadAllProducts();
     return (0, import_utils.attachItemRuleLimitsToTopLevelProducts)(
       result.addonProducts,
@@ -1251,13 +1270,25 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
   async loadOpenDataConfig() {
     if (!this.store.openData)
       throw new Error("openData 模块未初始化");
-    const openDataConfig = await this.store.openData.fetchOpenData({
+    const lastFetchedAt = this.store.openData.getLastFetchedAt();
+    const cachedData = this.store.openData.getOpenData();
+    if (cachedData && lastFetchedAt && Date.now() - lastFetchedAt < _VenueBookingImpl.OPEN_DATA_CACHE_TTL) {
+      this.otherParams.openData = cachedData;
+      return cachedData;
+    }
+    if (this.loadOpenDataConfigInFlight)
+      return this.loadOpenDataConfigInFlight;
+    this.loadOpenDataConfigInFlight = this.store.openData.fetchOpenData({
       scope: "board",
       target: "venue_booking+online_store",
       section_code: [...OPEN_DATA_SECTION_CODES]
+    }).then((openDataConfig) => {
+      this.otherParams.openData = openDataConfig;
+      return openDataConfig;
+    }).finally(() => {
+      this.loadOpenDataConfigInFlight = null;
     });
-    this.otherParams.openData = openDataConfig;
-    return openDataConfig;
+    return this.loadOpenDataConfigInFlight;
   }
   async loadRuntimeConfigs() {
     await this.loadOpenDataConfig();
@@ -1538,6 +1569,8 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
     return this.store.openData.checkAvailability(this.store.schedule);
   }
 };
+var VenueBookingImpl = _VenueBookingImpl;
+VenueBookingImpl.OPEN_DATA_CACHE_TTL = 5 * 60 * 1e3;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   VenueBookingImpl,

package/lib/solution/VenueBooking/utils/timeSlot.js

@@ -175,7 +175,7 @@ function buildTimeSlotGrid(params) {
     resources.push({
       resourceId: resource.resourceId,
       resourceFormId: resource.formId,
-      resourceName: mapping.resourceName,
+      resourceName: resource.main_field || mapping.resourceName,
       productId: mapping.productId,
       productTitle: mapping.productTitle,
       slots

package/package.json

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