@pisell/private-materials 6.6.5 → 6.6.7

package/lib/components/systemSettings/registry/utils/typeValidation.js

@@ -0,0 +1,228 @@
+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/components/systemSettings/registry/utils/typeValidation.ts
+var typeValidation_exports = {};
+__export(typeValidation_exports, {
+  parseDefaultValue: () => parseDefaultValue,
+  validateDefaultValue: () => validateDefaultValue
+});
+module.exports = __toCommonJS(typeValidation_exports);
+var validateString = (value) => {
+  if (value === null || value === void 0 || value === "") {
+    return { isValid: true };
+  }
+  if (typeof value === "string") {
+    return { isValid: true };
+  }
+  return {
+    isValid: false,
+    error: "默认值必须是字符串类型"
+  };
+};
+var validateInteger = (value) => {
+  if (value === null || value === void 0 || value === "") {
+    return { isValid: true };
+  }
+  if (typeof value === "number") {
+    if (!Number.isInteger(value)) {
+      return {
+        isValid: false,
+        error: "默认值必须是整数"
+      };
+    }
+    return { isValid: true };
+  }
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (trimmed === "") {
+      return { isValid: true };
+    }
+    const num = Number(trimmed);
+    if (isNaN(num) || !Number.isInteger(num)) {
+      return {
+        isValid: false,
+        error: "默认值必须是有效的整数"
+      };
+    }
+    return { isValid: true };
+  }
+  return {
+    isValid: false,
+    error: "默认值必须是有效的整数"
+  };
+};
+var validateFloat = (value) => {
+  if (value === null || value === void 0 || value === "") {
+    return { isValid: true };
+  }
+  if (typeof value === "number") {
+    if (!isFinite(value)) {
+      return {
+        isValid: false,
+        error: "默认值必须是有效的数字"
+      };
+    }
+    return { isValid: true };
+  }
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (trimmed === "") {
+      return { isValid: true };
+    }
+    const num = Number(trimmed);
+    if (isNaN(num) || !isFinite(num)) {
+      return {
+        isValid: false,
+        error: "默认值必须是有效的数字"
+      };
+    }
+    return { isValid: true };
+  }
+  return {
+    isValid: false,
+    error: "默认值必须是有效的数字"
+  };
+};
+var validateBoolean = (value) => {
+  if (value === null || value === void 0 || value === "") {
+    return { isValid: true };
+  }
+  if (typeof value === "string") {
+    const trimmed = value.trim().toLowerCase();
+    if (trimmed === "") {
+      return { isValid: true };
+    }
+    if (trimmed !== "true" && trimmed !== "false") {
+      return {
+        isValid: false,
+        error: "默认值必须是 true 或 false"
+      };
+    }
+    return { isValid: true };
+  }
+  if (typeof value === "boolean") {
+    return { isValid: true };
+  }
+  return {
+    isValid: false,
+    error: "默认值必须是 true 或 false"
+  };
+};
+var validateArray = (value) => {
+  if (value === null || value === void 0 || value === "") {
+    return { isValid: true };
+  }
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (trimmed === "") {
+      return { isValid: true };
+    }
+    try {
+      const parsed = JSON.parse(trimmed);
+      if (typeof parsed !== "object" || parsed === null) {
+        return {
+          isValid: false,
+          error: "默认值必须是有效的JSON对象或数组"
+        };
+      }
+      return { isValid: true };
+    } catch (error) {
+      return {
+        isValid: false,
+        error: "默认值必须是有效的JSON对象或数组"
+      };
+    }
+  }
+  if (typeof value === "object" && value !== null) {
+    return { isValid: true };
+  }
+  return {
+    isValid: false,
+    error: "默认值必须是有效的JSON对象或数组"
+  };
+};
+var validateDefaultValue = (fieldType, defaultValue) => {
+  if (!fieldType) {
+    return {
+      isValid: false,
+      error: "字段类型不能为空"
+    };
+  }
+  switch (fieldType.toLowerCase()) {
+    case "string":
+      return validateString(defaultValue);
+    case "integer":
+      return validateInteger(defaultValue);
+    case "float":
+      return validateFloat(defaultValue);
+    case "boolean":
+      return validateBoolean(defaultValue);
+    case "array":
+      return validateArray(defaultValue);
+    default:
+      return {
+        isValid: false,
+        error: `不支持的字段类型: ${fieldType}`
+      };
+  }
+};
+var parseDefaultValue = (fieldType, defaultValue) => {
+  if (defaultValue === null || defaultValue === void 0 || defaultValue === "") {
+    return null;
+  }
+  switch (fieldType.toLowerCase()) {
+    case "string":
+      return String(defaultValue);
+    case "integer":
+      if (typeof defaultValue === "string") {
+        const trimmed = defaultValue.trim();
+        if (trimmed === "") return null;
+        return parseInt(trimmed, 10);
+      }
+      return defaultValue;
+    case "float":
+      if (typeof defaultValue === "string") {
+        const trimmed = defaultValue.trim();
+        if (trimmed === "") return null;
+        return parseFloat(trimmed);
+      }
+      return defaultValue;
+    case "boolean":
+      if (typeof defaultValue === "string") {
+        const trimmed = defaultValue.trim().toLowerCase();
+        if (trimmed === "") return null;
+        return trimmed === "true";
+      }
+      return Boolean(defaultValue);
+    case "array":
+      if (typeof defaultValue === "string") {
+        const trimmed = defaultValue.trim();
+        if (trimmed === "") return null;
+        return JSON.parse(trimmed);
+      }
+      return defaultValue;
+    default:
+      return defaultValue;
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  parseDefaultValue,
+  validateDefaultValue
+});

package/lib/components/systemSettings/registry/utils/validators.js

@@ -0,0 +1,54 @@
+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/components/systemSettings/registry/utils/validators.ts
+var validators_exports = {};
+__export(validators_exports, {
+  createPrefixedAppIdentifierValidator: () => createPrefixedAppIdentifierValidator
+});
+module.exports = __toCommonJS(validators_exports);
+var createPrefixedAppIdentifierValidator = (sectionCode) => {
+  return (_, value) => {
+    if (!value) {
+      return Promise.resolve();
+    }
+    const expectedPrefix = `${sectionCode}.`;
+    if (!value.startsWith(expectedPrefix)) {
+      return Promise.reject(new Error(`键必须以 "${expectedPrefix}" 开头`));
+    }
+    const remainingPart = value.substring(expectedPrefix.length);
+    if (!remainingPart) {
+      return Promise.reject(new Error("键不能只包含前缀"));
+    }
+    const validPattern = /^[a-z0-9._]+$/;
+    if (!validPattern.test(remainingPart)) {
+      return Promise.reject(new Error("键只能包含小写字母、数字、点、下划线"));
+    }
+    if (remainingPart.startsWith(".") || remainingPart.startsWith("_") || remainingPart.endsWith(".") || remainingPart.endsWith("_")) {
+      return Promise.reject(new Error("键不能以点或下划线开头或结尾"));
+    }
+    if (remainingPart.includes("..") || remainingPart.includes("__") || remainingPart.includes("._") || remainingPart.includes("_.")) {
+      return Promise.reject(new Error("键不能包含连续的点或下划线"));
+    }
+    return Promise.resolve();
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createPrefixedAppIdentifierValidator
+});

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -66,7 +66,7 @@ var productListSetting = {
   isStock: 0
 };
 var AddSerivce = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const {
     onEdit,
     state,
@@ -75,6 +75,9 @@ var AddSerivce = (props) => {
     productDisplayConfig
   } = props;
   const context = (0, import_useEngineContext.default)();
+  const {
+    getData
+  } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const notAvailableRef = (0, import_react.useRef)(null);
   import_utils2.request.setRequest(context.appHelper.utils.request);
   const isActive = (0, import_IsActiveContext.useIsActive)();
@@ -86,9 +89,9 @@ var AddSerivce = (props) => {
     dispatch
   });
   const isBooking4 = (0, import_utils5.isBooking4Shop)(
-    ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id),
+    ((_d = (_c = (_b = context.appHelper) == null ? void 0 : _b.utils) == null ? void 0 : _c.getData) == null ? void 0 : _d.call(_c, "shop_id")) || ((_i = (_h = (_g = (_f = (_e = context.appHelper.utils.store) == null ? void 0 : _e.getState) == null ? void 0 : _f.call(_e)) == null ? void 0 : _g.global) == null ? void 0 : _h.globalConfig) == null ? void 0 : _i.id),
     state == null ? void 0 : state.renderType,
-    (_i = context.appHelper.utils) == null ? void 0 : _i.businessUtils
+    (_j = context.appHelper.utils) == null ? void 0 : _j.businessUtils
   );
   const [currentProduct, setCurrentProduct] = (0, import_react.useState)(null);
   const [firstLoading, setFirstLoading] = (0, import_react.useState)(true);
@@ -133,11 +136,11 @@ var AddSerivce = (props) => {
   const menuList = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.menu_list_tab) == null ? void 0 : _c2.menu_list) || [];
-  }, [(_j = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _j.config]);
+  }, [(_k = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _k.config]);
   const customerId = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return ((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id) || void 0;
-  }, [(_l = (_k = state.client) == null ? void 0 : _k.value) == null ? void 0 : _l.id]);
+  }, [(_m = (_l = state.client) == null ? void 0 : _l.value) == null ? void 0 : _m.id]);
   const scanAddService = (0, import_ahooks.useMemoizedFn)((list, code) => {
     let newService = [...state.service.value];
     list.forEach((item) => {
@@ -202,7 +205,7 @@ var AddSerivce = (props) => {
     }
   );
   const processAddService = (0, import_ahooks.useMemoizedFn)(async (item, _detail, e, notShowToast, startDate, endDate) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m, _n, _o, _p;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2, _n, _o, _p, _q, _r, _s, _t;
     const other = JSON.parse(JSON.stringify(e));
     other.session = e.session;
     let cacheItem = {
@@ -210,13 +213,16 @@ var AddSerivce = (props) => {
       product_id: item.id,
       _id: (0, import_utils.getUniqueId)(),
       _key: e.key,
+      is_price_include_tax: getData("is_price_include_tax"),
       _extend: {
         start_date: startDate,
         quantity: (e == null ? void 0 : e.quantity) || 1,
         price: _detail.price,
         product_name: item.title,
         other,
-        end_date: endDate
+        end_date: endDate,
+        isFormSubject: ((_d2 = (_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) == null ? void 0 : _d2.type) === "form",
+        isNormalProduct: (0, import_utils4.isNormalProductByDurationSchedule)(item)
       },
       new: 1
     };
@@ -225,7 +231,7 @@ var AddSerivce = (props) => {
     cacheItem._extend.origin_total = _total;
     const _isEdit = !!stateRef.current.service.cacheItem;
     if (_isEdit) {
-      cacheItem._id = (_a2 = stateRef.current.service.cacheItem) == null ? void 0 : _a2._id;
+      cacheItem._id = (_e2 = stateRef.current.service.cacheItem) == null ? void 0 : _e2._id;
       cacheItem.new = 0;
     }
     if (renderMode === "current") {
@@ -249,12 +255,12 @@ var AddSerivce = (props) => {
         cacheItem = (0, import_utils8.concatBookings)(cacheItem);
       }
     };
-    if (!(0, import_utils4.isNormalProductByDurationSchedule)(cacheItem) && (!cacheItem._extend.holder_id || !cacheItem._extend.holder_id.length) && !(0, import_utils2.isWalkIn)((_c2 = (_b2 = state.client) == null ? void 0 : _b2.value) == null ? void 0 : _c2.id) && ((_g2 = (_f2 = (_e2 = (_d2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _d2.config) == null ? void 0 : _e2.basic) == null ? void 0 : _f2.appointment_subject) == null ? void 0 : _g2.show_hold_on_add_cart) !== 0) {
+    if (!(0, import_utils4.isNormalProductByDurationSchedule)(cacheItem) && (!cacheItem._extend.holder_id || !cacheItem._extend.holder_id.length) && !(0, import_utils2.isWalkIn)((_g2 = (_f2 = state.client) == null ? void 0 : _f2.value) == null ? void 0 : _g2.id) && ((_k2 = (_j2 = (_i2 = (_h2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _h2.config) == null ? void 0 : _i2.basic) == null ? void 0 : _j2.appointment_subject) == null ? void 0 : _k2.show_hold_on_add_cart) !== 0) {
       const res = await handleAddHolder(cacheItem);
       if (res && res.length > 0) {
         cacheItem._extend.holder_id = res;
       } else {
-        if (((_j2 = (_i2 = (_h2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _h2.config) == null ? void 0 : _i2.basic) == null ? void 0 : _j2.subject_require) === "require") {
+        if (((_n = (_m2 = (_l2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _l2.config) == null ? void 0 : _m2.basic) == null ? void 0 : _n.subject_require) === "require") {
           return;
         }
       }
@@ -286,7 +292,7 @@ var AddSerivce = (props) => {
         })
       );
       try {
-        if (((_o = (_n = (_m = (_l2 = (_k2 = context.appHelper.utils.store) == null ? void 0 : _k2.getState) == null ? void 0 : _l2.call(_k2)) == null ? void 0 : _m.global) == null ? void 0 : _n.globalConfig) == null ? void 0 : _o.id) === 2155) {
+        if (((_s = (_r = (_q = (_p = (_o = context.appHelper.utils.store) == null ? void 0 : _o.getState) == null ? void 0 : _p.call(_o)) == null ? void 0 : _q.global) == null ? void 0 : _r.globalConfig) == null ? void 0 : _s.id) === 2155) {
           const val = _list == null ? void 0 : _list.map((s) => {
             return {
               product_id: s == null ? void 0 : s.product_id,
@@ -331,7 +337,7 @@ var AddSerivce = (props) => {
         }
       });
     } else {
-      (_p = window.openBookingEditModal) == null ? void 0 : _p.call(window);
+      (_t = window.openBookingEditModal) == null ? void 0 : _t.call(window);
       if (isMultiDay) {
         await getMultiDayCacheItem(true);
       }

package/lib/components/ticketBooking/components/addServiceVariant/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 interface AddServiceVariantProps {
     globalState: any;

package/lib/components/ticketBooking/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductDisplayConfig, ProductDisplayPresetKey } from './components/ProductDisplayAdapter/types';
 import './index.less';
 interface TicketBookingProps {

package/lib/components/ticketBooking/utils/index.d.ts

@@ -47,7 +47,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "wallet" | "walletPass" | "product" | "local_product";
+    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;
@@ -79,7 +79,11 @@ export declare const rulesHooks: {
         num: any;
         quantity: any;
         vouchersApplicable: any;
+        holder_id: any;
+        isNeedHolder: any;
         startDate: any;
+        bundle: any;
+        options: any;
     };
     setProduct(product: Record<string, any>, values: {
         total: number;

package/lib/components/ticketBooking/utils/index.js

@@ -188,12 +188,17 @@ var addService = (list, addItem, state, isMultiDay) => {
     let isNotSame = true;
     let isSetCount = false;
     value = list.map((item) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e;
       const isGoodPassDiscountProduct = (item.discount_list || []).some((item2) => item2.type === "good_pass");
       const isEdit = item == null ? void 0 : item.edit;
-      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit) {
+      const bundleDiscountList = [];
+      (((_b = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []).forEach((item2) => {
+        bundleDiscountList.push(...(item2 == null ? void 0 : item2.discount_list) || []);
+      });
+      const isGoodPassBundleProduct = bundleDiscountList.some((item2) => item2.type === "good_pass");
+      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit && !isGoodPassBundleProduct) {
         isNotSame = false;
-        const quantity = (((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.quantity) || 1) + (((_b = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _b.quantity) || 1);
+        const quantity = (((_c = item == null ? void 0 : item._extend) == null ? void 0 : _c.quantity) || 1) + (((_d = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _d.quantity) || 1);
         count = quantity;
         isSetCount = true;
         return {
@@ -202,7 +207,7 @@ var addService = (list, addItem, state, isMultiDay) => {
             ...item._extend,
             quantity,
             other: {
-              ...((_c = item._extend) == null ? void 0 : _c.other) || {},
+              ...((_e = item._extend) == null ? void 0 : _e.other) || {},
               quantity
             }
           }
@@ -346,18 +351,23 @@ var getShopDiscountKey = (osKey) => {
 var rulesHooks = {
   // 获取商品关键信息
   getProduct(product) {
+    var _a, _b, _c, _d, _e, _f;
     const detail = {
       booking_id: product.booking_id,
       id: product.id,
       _id: product._id,
-      price: product.price,
+      price: product._extend.price,
       total: product._extend.total,
       discount_list: product.discount_list,
       origin_total: product._extend.origin_total,
       num: product._extend.quantity,
       quantity: product._extend.quantity || 1,
       vouchersApplicable: product.vouchersApplicable,
-      startDate: product._extend.startDate
+      holder_id: (_a = product._extend) == null ? void 0 : _a.holder_id,
+      isNeedHolder: product._extend.isFormSubject && !product._extend.isNormalProduct,
+      startDate: (_b = product._extend) == null ? void 0 : _b.startDate,
+      bundle: ((_d = (_c = product._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.bundle) || [],
+      options: ((_f = (_e = product._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.option) || []
     };
     return detail;
   },
@@ -368,7 +378,12 @@ var rulesHooks = {
       discount_list: values.discount_list,
       _extend: {
         ...product._extend,
+        other: {
+          ...product._extend.other,
+          ..."bundle" in values ? { bundle: values.bundle } : {}
+        },
         ..."total" in values ? { total: values.total } : {},
+        ..."main_product_selling_price" in values ? { main_product_selling_price: values.main_product_selling_price } : {},
         ..."quantity" in values ? { quantity: values.quantity } : {}
       }
     };

package/lib/components/walletList/index.d.ts

@@ -1,28 +1,3 @@
-import React from 'react';
 import './index.less';
-declare module 'react' {
-    interface HTMLAttributes<T> {
-        role?: string;
-    }
-}
-declare global {
-    namespace JSX {
-        interface IntrinsicElements {
-            div: React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> & {
-                children?: React.ReactNode;
-                onClick?: React.MouseEventHandler<HTMLDivElement>;
-                onMouseDown?: React.MouseEventHandler<HTMLDivElement>;
-                onMouseUp?: React.MouseEventHandler<HTMLDivElement>;
-                onTouchStart?: React.TouchEventHandler<HTMLDivElement>;
-                onTouchEnd?: React.TouchEventHandler<HTMLDivElement>;
-                role?: string;
-            };
-            img: React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>;
-            span: React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement> & {
-                children?: React.ReactNode;
-            };
-        }
-    }
-}
 declare const WalletList: (props: any) => JSX.Element;
 export default WalletList;