@pisell/pisellos 2.1.160 → 2.1.161

package/lib/solution/VenueBooking/index.js

@@ -54,8 +54,6 @@ var import_utils3 = require("../../modules/Order/utils");
 var import_Order = require("../../modules/Order");
 var import_types4 = require("../RegisterAndLogin/types");
 var import_decimal = __toESM(require("decimal.js"));
-var import_Holder = require("../../modules/Holder");
-var import_utils4 = require("../../modules/Holder/utils");
 __reExport(VenueBooking_exports, require("./types"), module.exports);
 var OPEN_DATA_SECTION_CODES = [
   "basic",
@@ -255,42 +253,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
     return null;
   }
-  resolveHolderCustomerId() {
-    var _a, _b;
-    const customer = JSON.parse(((_b = (_a = this.window) == null ? void 0 : _a.getLocalStorage) == null ? void 0 : _b.call(_a, "customer")) || "{}");
-    if (customer == null ? void 0 : customer.id)
-      return Number(customer.id);
-    return void 0;
-  }
-  /**
-   * 按商品 holder_config 预加载表单数据到 holderMap。
-   * appointment_booking 在加购时触发；venueBooking 在商品加载后预加载，避免 getHolderFormMap 为空。
-   */
-  async preloadHolderForms(products) {
-    var _a, _b, _c, _d;
-    if (!this.store.holder || !products.length)
-      return;
-    const seenFormIds = /* @__PURE__ */ new Set();
-    for (const item of products) {
-      const holderConfig = (0, import_utils4.getProductHolderConfig)((_a = item == null ? void 0 : item._origin) == null ? void 0 : _a.product);
-      if (!holderConfig)
-        continue;
-      const formId = (0, import_utils4.getFormIdFromHolderConfig)(holderConfig);
-      if (seenFormIds.has(formId))
-        continue;
-      seenFormIds.add(formId);
-      try {
-        await this.store.holder.ensureFormByProduct({
-          product: ((_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) || {},
-          customer_id: this.resolveHolderCustomerId(),
-          shop_id: (_d = (_c = item == null ? void 0 : item._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.shop_id,
-          useCache: true
-        });
-      } catch (error) {
-        console.error("[VenueBooking] 预加载 holder 表单失败", { formId, error });
-      }
-    }
-  }
   clearLoginEffectListeners() {
     for (const dispose of this.loginEffectDisposers) {
       dispose();
@@ -337,12 +299,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     this.customerLoginRefreshIdInFlight = params.customerId;
     const refreshTask = (async () => {
       var _a;
-      if (this.store.holder) {
-        await this.store.holder.refreshAllFormRecords({
-          customer_id: params.customerId,
-          useCache: false
-        });
-      }
       if (this.store.quotation) {
         await this.store.quotation.loadQuotations({
           channel: (_a = this.otherParams) == null ? void 0 : _a.channel
@@ -370,7 +326,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async initialize(core, options = {}) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     this.logMethodStart("initialize");
     this.core = core;
     this.initializeOptions = options || {};
@@ -495,42 +451,20 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         cacheId: (_g = this.otherParams) == null ? void 0 : _g.cacheId
       }
     });
-    let holderCacheState;
-    if ((_h = this.otherParams) == null ? void 0 : _h.cacheId) {
-      const sessionData = this.window.sessionStorage.getItem(this.name);
-      if (sessionData) {
-        try {
-          const data = JSON.parse(sessionData);
-          holderCacheState = (_i = data[this.otherParams.cacheId]) == null ? void 0 : _i[`${this.name}_holder`];
-        } catch {
-        }
-      }
-    }
-    const holderModule = new import_Holder.HolderModule(`${this.name}_holder`);
-    this.store.holder = holderModule;
-    this.core.registerModule(holderModule, {
-      initialState: holderCacheState,
-      otherParams: {
-        ...this.otherParams,
-        fatherModule: this.name,
-        openCache: !!((_j = this.otherParams) == null ? void 0 : _j.cacheId),
-        cacheId: (_k = this.otherParams) == null ? void 0 : _k.cacheId
-      }
-    });
     if (this.store.scanOrderLogger) {
       this.store.scanOrderLogger.setContext(this.getLoggerContext());
     }
     this.registerCustomerLoginListeners();
     console.log("[VenueBooking] 初始化开始");
     try {
-      await ((_l = this.store.order) == null ? void 0 : _l.recalculateSummary({ createIfMissing: false }));
-      (_m = this.store.order) == null ? void 0 : _m.persistTempOrder();
+      await ((_h = this.store.order) == null ? void 0 : _h.recalculateSummary({ createIfMissing: false }));
+      (_i = this.store.order) == null ? void 0 : _i.persistTempOrder();
       await this.loadRuntimeConfigs();
       if (this.store.schedule) {
         await this.store.schedule.loadAllSchedule();
         this.injectScheduleResolverToQuotation();
-        (_o = this.store.quotation) == null ? void 0 : _o.loadQuotations({
-          channel: (_n = this.otherParams) == null ? void 0 : _n.channel
+        (_k = this.store.quotation) == null ? void 0 : _k.loadQuotations({
+          channel: (_j = this.otherParams) == null ? void 0 : _j.channel
         });
       }
       await this.refreshItemRuleQuantityLimits();
@@ -617,7 +551,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     return this.loadAllProductsInFlight;
   }
   async _doLoadAllProducts() {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     this.logMethodStart("loadAllProducts");
     try {
       if (!this.store.venueProducts)
@@ -646,10 +580,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       }
       this.store.addonProducts.addProduct(addonList);
       this.resourceProductMap = (0, import_resource.buildResourceProductMap)(venueList);
-      if (this.store.order) {
-        const products = ((_e = (_d = this.store.order) == null ? void 0 : _d.getOrderProducts) == null ? void 0 : _e.call(_d)) || [];
-        await this.preloadHolderForms(products);
-      }
       this.productsLoaded = true;
       this.logMethodSuccess("loadAllProducts", {
         total: list.length,
@@ -1042,7 +972,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
    * 同一场地下不同商品互不干扰，各自单独 reconcile。
    */
   async reconcileOrderForResourceProduct(resourceId, productId, slots) {
-    var _a, _b;
     const mappings = this.resourceProductMap.get(resourceId);
     if (!mappings || !mappings.length || !this.store.order)
       return;
@@ -1056,10 +985,10 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     );
     tempOrder.bookings = (tempOrder.bookings || []).filter(
       (b) => {
-        var _a2, _b2, _c, _d;
-        if (!((_a2 = b.metadata) == null ? void 0 : _a2.venue_booking))
+        var _a, _b, _c, _d;
+        if (!((_a = b.metadata) == null ? void 0 : _a.venue_booking))
           return true;
-        if (String((_b2 = b.metadata) == null ? void 0 : _b2.resource_id) !== String(resourceId))
+        if (String((_b = b.metadata) == null ? void 0 : _b.resource_id) !== String(resourceId))
           return true;
         const bookingProductId = ((_c = b.metadata) == null ? void 0 : _c.product_id) ?? ((_d = b == null ? void 0 : b.product) == null ? void 0 : _d.product_id);
         if (bookingProductId == null)
@@ -1151,10 +1080,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
               product_option_item: [],
               discount_list: [],
               custom_deposit_data: customDepositData,
-              metadata: {},
-              holder_config: venueProduct == null ? void 0 : venueProduct.holder_config,
-              bookingUuid,
-              shop_id: (venueProduct == null ? void 0 : venueProduct.shop_id) || 0
+              metadata: {}
             },
             sub_type: "minutes",
             duration,
@@ -1185,8 +1111,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       });
       tempOrder.bookings.push(booking);
     }
-    const products = ((_b = (_a = this.store.order) == null ? void 0 : _a.getOrderProducts) == null ? void 0 : _b.call(_a)) || [];
-    await this.preloadHolderForms(products);
     this.store.order.applyDiscount();
     await this.store.order.recalculateSummary({ createIfMissing: true });
     this.store.order.persistTempOrder();
@@ -1973,57 +1897,15 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   setBookingHolder(bookingUid, holder) {
-    var _a, _b, _c, _d;
-    if (!this.store.order)
-      return;
-    const tempOrder = this.store.order.ensureTempOrder();
-    const booking = (_a = tempOrder.bookings) == null ? void 0 : _a.find(
-      (b) => {
-        var _a2;
-        return ((_a2 = b.metadata) == null ? void 0 : _a2.unique_identification_number) === bookingUid;
-      }
-    );
+    var _a;
+    const order = this.getTempOrder();
+    const booking = (_a = order == null ? void 0 : order.bookings) == null ? void 0 : _a.find((b) => {
+      var _a2;
+      return ((_a2 = b.metadata) == null ? void 0 : _a2.unique_identification_number) === bookingUid;
+    });
     if (booking) {
       booking.holder = holder;
     }
-    for (const product of tempOrder.products) {
-      const productBookingUid = ((_b = product.metadata) == null ? void 0 : _b.booking_uid) ?? ((_d = (_c = product._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.bookingUuid);
-      if (String(productBookingUid) !== String(bookingUid))
-        continue;
-      const origin = product._origin && typeof product._origin === "object" ? product._origin : {};
-      origin.holder = holder;
-      product._origin = origin;
-    }
-    this.store.order.notifyTempOrderChanged();
-  }
-  /**
-   * 获取 holder 表单 map
-   */
-  getHolderFormMap() {
-    if (!this.store.holder)
-      throw new Error("[VenueBooking] holder 模块未初始化");
-    return this.store.holder.getHolderFormMap();
-  }
-  /**
-   * UI 层触发：按当前 holderMap 批量刷新所有表单的 records
-   */
-  async refreshAllHolderFormRecords(params) {
-    if (!this.store.holder)
-      throw new Error("[VenueBooking] holder 模块未初始化");
-    const customer_id = (params == null ? void 0 : params.customer_id) ?? this.resolveHolderCustomerId();
-    return this.store.holder.refreshAllFormRecords({
-      ...params,
-      customer_id,
-      useCache: (params == null ? void 0 : params.useCache) ?? false
-    });
-  }
-  /**
-   * 添加表单记录
-   */
-  appendFormRecord(params) {
-    if (!this.store.holder)
-      throw new Error("[VenueBooking] holder 模块未初始化");
-    return this.store.holder.appendFormRecord(params);
   }
   // ─── OpenData 可用性 ───
   async checkOpenDataAvailability() {

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

@@ -1,6 +1,5 @@
 import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, DateModule, ScheduleModule, QuotationModule, OpenDataModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
-import { HolderModule } from '../../modules/Holder';
 export type { ScanOrderOrderProductIdentity, ScanOrderOrderProduct, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder, ScanOrderSubmitPayload, } from '../ScanOrder/types';
 export declare enum VenueBookingHooks {
     onInited = "venueBooking:onInited",
@@ -146,7 +145,6 @@ export interface VenueBookingState {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
-    holder?: HolderModule;
 }
 export interface VenueBookingLoggerRuntimeConfig {
     provider?: ScanOrderLoggerProviderType;

package/lib/types/index.d.ts

@@ -6,7 +6,6 @@ export interface Plugin {
     version: string;
     initialize: () => Promise<void> | void;
     destroy?: () => Promise<void> | void;
-    getLocalStorage?: (key: string) => string | null;
 }
 export interface PluginOptions {
     dependencies?: string[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.160",
+  "version": "2.1.161",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md}\"",
     "changeset": "changeset",
     "version": "changeset version",
-    "release": "changeset publish && npm run sync && git push",
+    "release": "changeset publish --registry=https://registry.npmjs.com/ && npm run sync && git push",
     "example": "npx parcel-bundler examples/index.html",
     "docs": "typedoc --out docs src/index.ts",
     "sync": "node sync.js",

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

@@ -1,48 +0,0 @@
-import { Module, PisellCore, ModuleOptions } from '../../types';
-import { BaseModule } from '../BaseModule';
-import { IFormInfo, IFormRecord, IFormItemData, IFetchFormInfoParams, IFetchFormRecordsParams, IAddFormRecordParams, IAppendFormRecordParams, IEnsureFormDataParams, IEnsureFormByProductParams, IRefreshAllFormRecordsParams, HolderModuleAPI, HolderFormMap } from './types';
-export * from './types';
-export * from './utils';
-export declare class HolderModule extends BaseModule implements Module, HolderModuleAPI {
-    protected defaultName: string;
-    protected defaultVersion: string;
-    private store;
-    private request;
-    private cacheId;
-    private openCache;
-    private fatherModule;
-    private isLoading;
-    private error;
-    /** 已加载过表单数据的 form_id 缓存标记 */
-    private loadedFormIds;
-    private window;
-    constructor(name?: string, version?: string);
-    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
-    /** 统一提交 formMap，仅此处触发 store changed */
-    private commitFormMap;
-    /** 通知 UI 刷新（数据未变但需要 re-read 的场景） */
-    private notifyFormMapChanged;
-    getHolderFormMap(): HolderFormMap;
-    getHolderFormData(formId: number | string): IFormItemData | undefined;
-    setFormData(formId: number | string, data: Partial<IFormItemData>): void;
-    private ensureFormItem;
-    private hasFormData;
-    private patchFormMap;
-    fetchFormInfo(params: IFetchFormInfoParams): Promise<IFormInfo | IFormInfo[]>;
-    fetchRecords(params: IFetchFormRecordsParams): Promise<any>;
-    ensureFormData(params: IEnsureFormDataParams): Promise<IFormItemData>;
-    ensureFormByProduct(params: IEnsureFormByProductParams): Promise<IFormItemData | null>;
-    addFormRecord(params: IAddFormRecordParams): Promise<any>;
-    /**
-     * UI 层自行请求添加接口后，将返回记录合并到 holderMap 对应 form_id 的 records 中
-     */
-    appendFormRecord(params: IAppendFormRecordParams): IFormRecord;
-    removeFormRecord(formId: number | string, formRecordId: number): void;
-    clearFormData(formId?: number | string): void;
-    /**
-     * 登录后按当前 holderMap 批量刷新所有表单的 records。
-     * 遍历 holderMap，从 form.form 中读取 form_id、shop_id，结合 customer_id 重新拉取记录。
-     */
-    refreshAllFormRecords(params?: IRefreshAllFormRecordsParams): Promise<HolderFormMap>;
-    storeChange(path?: string): void;
-}