@pisell/private-materials 6.3.178 → 6.3.179

package/lib/components/venueBooking/components/Cart/index.js

@@ -43,7 +43,6 @@ var import_Voucher = __toESM(require("../Voucher"));
 var import_Deposit = __toESM(require("../Deposit"));
 var import_context = require("../../context");
 var import_buildCartHolderParams = require("../../../../utils/buildCartHolderParams");
-var import_buildCartHolderParams2 = require("../../../../utils/buildCartHolderParams");
 var import_utils2 = require("../../../appointmentBooking/utils");
 var import_index = require("./index.less");
 function Cart(props) {
@@ -100,7 +99,7 @@ function Cart(props) {
     return (items || []).map((item) => {
       var _a2, _b2;
       const holderConfig = (0, import_buildCartHolderParams.getVenueCartHolderConfig)(item);
-      const formData = holderMap == null ? void 0 : holderMap[holderConfig == null ? void 0 : holderConfig.resource_id];
+      const formData = (0, import_buildCartHolderParams.isHolderConfigEnabled)(holderConfig) ? holderMap == null ? void 0 : holderMap[holderConfig == null ? void 0 : holderConfig.resource_id] : {};
       const holderParams = (0, import_buildCartHolderParams.buildCartHolderParams)({
         item,
         holderConfig,
@@ -181,19 +180,21 @@ function Cart(props) {
     return false;
   };
   const handleCartChange = async (item, type, sourceItem) => {
-    var _a2, _b2, _c2, _d2, _e2;
+    var _a2, _b2, _c2, _d2;
     if (type === "add_holder") {
-      const formId = (_a2 = (0, import_buildCartHolderParams.getVenueCartHolderConfig)(item)) == null ? void 0 : _a2.resource_id;
+      const holderConfig = (0, import_buildCartHolderParams.getVenueCartHolderConfig)(item);
+      if (!(0, import_buildCartHolderParams.isHolderConfigEnabled)(holderConfig)) return;
+      const formId = holderConfig == null ? void 0 : holderConfig.resource_id;
       if (!formId) return;
-      const skuRelationFormId = (0, import_buildCartHolderParams2.getSkuRelationFormId)(holderMap, formId);
+      const skuRelationFormId = (0, import_buildCartHolderParams.getSkuRelationFormId)(holderMap, formId);
       return (0, import_utils2.openForm)({
         form_id: skuRelationFormId || formId,
         title: import_utils.locales.getText("pisell2.venue.create.form"),
-        utils: (_b2 = engineContext == null ? void 0 : engineContext.appHelper) == null ? void 0 : _b2.utils,
+        utils: (_a2 = engineContext == null ? void 0 : engineContext.appHelper) == null ? void 0 : _a2.utils,
         callback: async (res) => {
           var _a3, _b3, _c3, _d3;
           if ((res == null ? void 0 : res.status) === "success") {
-            const { formRecordId, formId: holderFormId } = (0, import_buildCartHolderParams2.handleCartHolderFormSuccess)({
+            const { formRecordId, formId: holderFormId } = (0, import_buildCartHolderParams.handleCartHolderFormSuccess)({
               res,
               formId,
               skuRelationFormId,
@@ -212,13 +213,13 @@ function Cart(props) {
       });
     }
     if (type === "change_holder") {
-      const customer = (0, import_utils2.getCustomer)((_c2 = engineContext == null ? void 0 : engineContext.appHelper) == null ? void 0 : _c2.utils);
+      const customer = (0, import_utils2.getCustomer)((_b2 = engineContext == null ? void 0 : engineContext.appHelper) == null ? void 0 : _b2.utils);
       const params = !sourceItem ? null : {
         customer_id: customer == null ? void 0 : customer.id,
         form_id: sourceItem == null ? void 0 : sourceItem.form_id,
         form_record: [sourceItem == null ? void 0 : sourceItem.form_record_id]
       };
-      venueBookingModule.setBookingHolder((_e2 = (_d2 = item == null ? void 0 : item._origin) == null ? void 0 : _d2.product) == null ? void 0 : _e2.bookingUuid, params);
+      venueBookingModule.setBookingHolder((_d2 = (_c2 = item == null ? void 0 : item._origin) == null ? void 0 : _c2.product) == null ? void 0 : _d2.bookingUuid, params);
       await refreshViewModel();
       return;
     }

package/lib/components/workSpaceList/components/Modal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

package/lib/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts

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

package/lib/plus/clientName/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { IClientNameProps } from './type';
 declare const ClientName: ({ className, dataSource, style }: IClientNameProps) => JSX.Element | null;

package/lib/plus/orderList/components/HandleActions.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const HandleActions: (props: {
     locales: any;
     __id?: string;

package/lib/plus/orderList/components/QuickFilter.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const QuickFilter: (props: {
     locales: any;
 }) => JSX.Element;

package/lib/plus/orderList/components/Reset.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const Reset: (props: {
     locales: any;
     setValueType: (value: any) => void;

package/lib/plus/orderList/components/Toolbar.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const Toolbar: (props: {
     locales: any;
     clearSelectedData: () => void;

package/lib/plus/pisellReservation/hooks/useReservationScheduleDebounced.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { ReservationScheduleBandValue } from '@pisell/materials';
 /**
  * @returns `schedule` 绑定日程带 UI；`debouncedSchedule` 绑定 sales / patch / 外部 onSearch。

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/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

@@ -23,6 +23,11 @@ export interface BuildCartHolderParamsOptions {
     /** 是否注入 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。
  *

package/lib/utils/buildCartHolderParams.js

@@ -25,11 +25,13 @@ __export(buildCartHolderParams_exports, {
   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);
@@ -64,7 +66,7 @@ var buildCartHolderParams = ({
   enabled = true
 }) => {
   var _a, _b, _c, _d;
-  if (!enabled) {
+  if (!enabled || !isHolderConfigEnabled(holderConfig)) {
     return {
       isShowChangeHolder: false,
       holders: []
@@ -75,7 +77,7 @@ var buildCartHolderParams = ({
   return {
     holder_id: holderId,
     isErrorHolder: !!(!holderId && (holderConfig == null ? void 0 : holderConfig.required)),
-    isShowChangeHolder: (holderConfig == null ? void 0 : holderConfig.status) === "enable",
+    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
@@ -102,7 +104,9 @@ var validateRequiredCartHolders = ({
   console.log(items, "items1111");
   const invalidItems = items.filter((item) => {
     const holderConfig = getHolderConfig(item);
-    if (!(holderConfig == null ? void 0 : holderConfig.required)) return false;
+    if (!isHolderConfigEnabled(holderConfig) || !(holderConfig == null ? void 0 : holderConfig.required)) {
+      return false;
+    }
     return !resolveCartItemHolderId(item);
   });
   return {
@@ -162,6 +166,7 @@ var handleCartHolderFormSuccess = ({
   getSkuRelationFormRecordId,
   getVenueCartHolderConfig,
   handleCartHolderFormSuccess,
+  isHolderConfigEnabled,
   resolveCartItemHolderId,
   validateRequiredCartHolders
 });

package/package.json

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