@pisell/private-materials 6.3.177 → 6.3.179

package/lib/plus/selectHolder/components/ErrorTip/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ErrorTip: ({ text }: any) => JSX.Element;
 export default ErrorTip;

package/lib/plus/skuOptionsSelection/components/NormalCard/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { RenderItemProps } from '../../../../pro/Selector/types';
 declare const NormalCard: (props: RenderItemProps & {
     parentDataSource: any;

package/lib/pro/Login2.0/locales.js

@@ -283,7 +283,7 @@ var locales_default = {
     "pisell-register2-complete-title": "注册完成!",
     "pisell-register2-redirecting": "正在重定向到您的帐户...",
     "pisell-login2-continue-with-email": "使用邮箱",
-    "pisell-login2-continue-with-phone": "使用手机号继续",
+    "pisell-login2-continue-with-phone": "使用手机",
     "pisell-login2-email-not-registered": "该邮箱未注册，请先注册",
     "pisell-login2-check-email-failed": "检查邮箱失败，请重试",
     "pisell-login2-continue-failed": "继续失败，请重试",

package/lib/pro/Selector/demo.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const SelectorDemo: () => JSX.Element;
 export default SelectorDemo;

package/lib/pro/pisellPaymentList/example.d.ts

@@ -4,6 +4,7 @@
  * 这个文件演示了如何使用 PisellPaymentList 和 PisellPaymentListItem 组件
  * 包括如何通过 Context 访问父组件配置
  */
+/// <reference types="react" />
 export declare const BasicExample: () => JSX.Element;
 export declare const ChildrenExample: () => JSX.Element;
 export declare const CustomItemExample: () => JSX.Element;

package/lib/utils/buildCartHolderParams.d.ts

@@ -0,0 +1,97 @@
+/** ProductCard Time 组件所需的 holder 展示字段 */
+export interface CartHolderParams {
+    holder_id?: number;
+    isErrorHolder?: boolean;
+    isShowChangeHolder?: boolean;
+    addHolderButtonText?: string;
+    holder_title?: string;
+    holders?: Array<{
+        id: any;
+        label: any;
+        [key: string]: any;
+    }>;
+}
+export interface BuildCartHolderParamsOptions {
+    /** 购物车行数据 */
+    item: any;
+    /** holder 配置，通常来自 item._productInit.holder_config 或 item._origin.product.holder_config */
+    holderConfig?: Record<string, any>;
+    /** getHolderFormMap 中对应 resource_id 的表单数据 */
+    formData?: Record<string, any>;
+    /** 多语言翻译函数 */
+    translation: (value: any) => string;
+    /** 是否注入 holder 字段，由业务侧决定（如预约商品 / 含 duration 的场地商品） */
+    enabled?: boolean;
+}
+/**
+ * holder_config 是否已开启。
+ * status 非 enable（如 disable）时，required、resource_id 视为脏数据，不参与校验与展示。
+ */
+export declare const isHolderConfigEnabled: (holderConfig?: Record<string, any>) => boolean;
+/**
+ * 从购物车行解析当前选中的 holder form_record_id。
+ *
+ * venueBooking：以 _origin.holder 为准（SDK 会原地更新 form_record）；
+ * 顶层 item.holder_id 可能是上一轮 UI 注入或 SDK 回灌的滞后值，不能优先于 _origin.holder。
+ */
+export declare const resolveCartItemHolderId: (item: any) => number | undefined;
+/**
+ * 根据 holderMap 与购物车行数据，构建 ProductCard 所需的 holder 展示字段。
+ * 供 appointmentBooking、venueBooking 等购物车场景复用。
+ */
+export declare const buildCartHolderParams: ({ item, holderConfig, formData, translation, enabled, }: BuildCartHolderParamsOptions) => CartHolderParams;
+/**
+ * 从 appointmentBooking 购物车行读取 holder_config
+ */
+export declare const getAppointmentCartHolderConfig: (item: any) => any;
+/**
+ * 从 venueBooking 购物车行读取 holder_config
+ */
+export declare const getVenueCartHolderConfig: (item: any) => any;
+export interface ValidateRequiredCartHoldersOptions {
+    items?: any[];
+    getHolderConfig?: (item: any) => Record<string, any>;
+    /** 是否校验该行，默认全部校验 */
+    shouldValidateItem?: (item: any) => boolean;
+}
+/**
+ * 校验购物车中 holder_config.required 的行是否已选择 holder。
+ */
+export declare const validateRequiredCartHolders: ({ items, getHolderConfig, }: ValidateRequiredCartHoldersOptions) => {
+    hasError: boolean;
+    invalidItems: any[];
+};
+export interface CartHolderFormModule {
+    appendFormRecord?: (params: {
+        record: any;
+    }) => void;
+    refreshAllHolderFormRecords?: (params: {
+        customer_id?: any;
+    }) => void;
+}
+export interface HandleCartHolderFormSuccessOptions {
+    res: any;
+    formId?: number | string;
+    skuRelationFormId: number;
+    utils: any;
+    module: CartHolderFormModule;
+}
+export interface CartHolderFormSuccessResult {
+    formRecordId: any;
+    mainField: any;
+    formId: any;
+}
+/**
+ * 从 holderMap 解析 minors 表单关联的 sku 关系表单 ID（form_to_form 隐藏字段的 linkedTable）。
+ */
+export declare const getSkuRelationFormId: (holderMap: Record<string, any>, formId?: number | string) => number;
+/**
+ * 从 form_to_form_value 中取最新创建的 form_record_id。
+ */
+export declare const getSkuRelationFormRecordId: (res: any) => any;
+/**
+ * 处理购物车添加 holder 表单提交成功后的公共逻辑。
+ * - minors 关联表单：刷新 holder 列表，取 form_to_form_value 中的 record id
+ * - 普通表单：appendFormRecord 并直接使用 form_record_id
+ */
+export declare const handleCartHolderFormSuccess: ({ res, formId, skuRelationFormId, utils, module, }: HandleCartHolderFormSuccessOptions) => CartHolderFormSuccessResult;

package/lib/utils/buildCartHolderParams.js

@@ -0,0 +1,172 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/buildCartHolderParams.ts
+var buildCartHolderParams_exports = {};
+__export(buildCartHolderParams_exports, {
+  buildCartHolderParams: () => buildCartHolderParams,
+  getAppointmentCartHolderConfig: () => getAppointmentCartHolderConfig,
+  getSkuRelationFormId: () => getSkuRelationFormId,
+  getSkuRelationFormRecordId: () => getSkuRelationFormRecordId,
+  getVenueCartHolderConfig: () => getVenueCartHolderConfig,
+  handleCartHolderFormSuccess: () => handleCartHolderFormSuccess,
+  isHolderConfigEnabled: () => isHolderConfigEnabled,
+  resolveCartItemHolderId: () => resolveCartItemHolderId,
+  validateRequiredCartHolders: () => validateRequiredCartHolders
+});
+module.exports = __toCommonJS(buildCartHolderParams_exports);
+var import_utils = require("../components/appointmentBooking/utils");
+var isHolderConfigEnabled = (holderConfig) => (holderConfig == null ? void 0 : holderConfig.status) === "enable";
+var toHolderRecordId = (value) => {
+  if (value == null || value === "") return void 0;
+  const id = Number(value);
+  return Number.isNaN(id) ? void 0 : id;
+};
+var resolveOriginHolderId = (holder) => {
+  const formRecord = holder == null ? void 0 : holder.form_record;
+  if (Array.isArray(formRecord)) {
+    for (const value of formRecord) {
+      const id = toHolderRecordId(value);
+      if (id != null) return id;
+    }
+  } else {
+    const id = toHolderRecordId(formRecord);
+    if (id != null) return id;
+  }
+  return toHolderRecordId(holder == null ? void 0 : holder.form_record_id);
+};
+var resolveCartItemHolderId = (item) => {
+  var _a;
+  const originHolder = (_a = item == null ? void 0 : item._origin) == null ? void 0 : _a.holder;
+  if (originHolder && typeof originHolder === "object") {
+    return resolveOriginHolderId(originHolder);
+  }
+  return toHolderRecordId(item == null ? void 0 : item.holder_id);
+};
+var buildCartHolderParams = ({
+  item,
+  holderConfig = {},
+  formData,
+  translation,
+  enabled = true
+}) => {
+  var _a, _b, _c, _d;
+  if (!enabled || !isHolderConfigEnabled(holderConfig)) {
+    return {
+      isShowChangeHolder: false,
+      holders: []
+    };
+  }
+  const records = (formData == null ? void 0 : formData.records) || [];
+  const holderId = resolveCartItemHolderId(item);
+  return {
+    holder_id: holderId,
+    isErrorHolder: !!(!holderId && (holderConfig == null ? void 0 : holderConfig.required)),
+    isShowChangeHolder: true,
+    addHolderButtonText: translation((_c = (_b = (_a = formData == null ? void 0 : formData.form) == null ? void 0 : _a.form) == null ? void 0 : _b.setting) == null ? void 0 : _c.title),
+    holder_title: holderId ? (_d = records.find(
+      (record) => Number(record == null ? void 0 : record.form_record_id) === holderId
+    )) == null ? void 0 : _d.main_field : "",
+    holders: records.map((record) => ({
+      ...record,
+      id: record == null ? void 0 : record.form_record_id,
+      label: record == null ? void 0 : record.main_field
+    }))
+  };
+};
+var getAppointmentCartHolderConfig = (item) => {
+  var _a;
+  return ((_a = item == null ? void 0 : item._productInit) == null ? void 0 : _a.holder_config) || {};
+};
+var getVenueCartHolderConfig = (item) => {
+  var _a, _b;
+  return ((_b = (_a = item == null ? void 0 : item._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.holder_config) || {};
+};
+var validateRequiredCartHolders = ({
+  items = [],
+  getHolderConfig = getVenueCartHolderConfig
+}) => {
+  console.log(items, "items1111");
+  const invalidItems = items.filter((item) => {
+    const holderConfig = getHolderConfig(item);
+    if (!isHolderConfigEnabled(holderConfig) || !(holderConfig == null ? void 0 : holderConfig.required)) {
+      return false;
+    }
+    return !resolveCartItemHolderId(item);
+  });
+  return {
+    hasError: invalidItems.length > 0,
+    invalidItems
+  };
+};
+var getSkuRelationFormId = (holderMap, formId) => {
+  var _a, _b, _c, _d, _e;
+  if (!formId) return 0;
+  const formData = holderMap == null ? void 0 : holderMap[formId];
+  if (((_b = (_a = formData == null ? void 0 : formData.form) == null ? void 0 : _a.form) == null ? void 0 : _b.form_type) !== "minors") return 0;
+  const detail = (_d = (_c = formData == null ? void 0 : formData.form) == null ? void 0 : _c.field) == null ? void 0 : _d.find(
+    (item) => item.filed_type === "form_to_form" && item.status === "hide"
+  );
+  return ((_e = detail == null ? void 0 : detail.setting) == null ? void 0 : _e.linkedTable) || 0;
+};
+var getSkuRelationFormRecordId = (res) => {
+  var _a, _b;
+  const formToFormValue = (_b = (_a = res == null ? void 0 : res.values) == null ? void 0 : _a.form_to_form_value) == null ? void 0 : _b[0];
+  const formDataValue = (formToFormValue == null ? void 0 : formToFormValue.form_data_value) || [];
+  return formDataValue[formDataValue.length - 1];
+};
+var handleCartHolderFormSuccess = ({
+  res,
+  formId,
+  skuRelationFormId,
+  utils,
+  module: module2
+}) => {
+  var _a, _b, _c, _d, _e;
+  let formRecordId = (_a = res == null ? void 0 : res.values) == null ? void 0 : _a.form_record_id;
+  let resolvedFormId = (_b = res == null ? void 0 : res.values) == null ? void 0 : _b.form_id;
+  if (formId && skuRelationFormId) {
+    const customer = (0, import_utils.getCustomer)(utils);
+    (_c = module2 == null ? void 0 : module2.refreshAllHolderFormRecords) == null ? void 0 : _c.call(module2, {
+      customer_id: customer == null ? void 0 : customer.id
+    });
+    formRecordId = getSkuRelationFormRecordId(res);
+    resolvedFormId = formId;
+  } else if (formId) {
+    (_d = module2 == null ? void 0 : module2.appendFormRecord) == null ? void 0 : _d.call(module2, {
+      record: res == null ? void 0 : res.values
+    });
+  }
+  return {
+    formRecordId,
+    mainField: (_e = res == null ? void 0 : res.values) == null ? void 0 : _e.main_field,
+    formId: resolvedFormId
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildCartHolderParams,
+  getAppointmentCartHolderConfig,
+  getSkuRelationFormId,
+  getSkuRelationFormRecordId,
+  getVenueCartHolderConfig,
+  handleCartHolderFormSuccess,
+  isHolderConfigEnabled,
+  resolveCartItemHolderId,
+  validateRequiredCartHolders
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.177",
+  "version": "6.3.179",
   "scripts": {
     "dev": "father dev",
     "build": "father build",