@pisell/private-materials 6.1.33 → 6.1.34

package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts

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

package/lib/components/appointmentBooking/components/Content/index.d.ts

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

package/lib/components/appointmentBooking/components/Header/index.d.ts

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

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

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

package/lib/components/booking/components/TabProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/lib/components/booking/components/TabProduct/productItem/index.d.ts

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

package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

package/lib/components/booking/components/collapsibleList/utils.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

package/lib/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

package/lib/components/booking/components/footer/amount.d.ts

@@ -10,7 +10,7 @@ export declare const getSumTotal: (state: any, isEdit: boolean) => {
     duration: string;
     tax: number;
     shopDiscount: number;
-    otherAmount: number;
+    otherAmount: number | undefined;
     sumTotalAmount: number;
     paidAmount: number;
     notPaidAmount: number;
@@ -23,3 +23,18 @@ export declare const getSumTotal: (state: any, isEdit: boolean) => {
     roundingAmount: number;
     originExpectAmount: number;
 };
+/**
+ *
+{
+  schedule[1,2,3,4];
+  products:{
+    // 全部 , 商品组 ,  指定商品
+  },
+
+  // productExpectAmount: 订单小计金额,  如果商品的规则是全部, 就不用一个一个的算商品的了,  productExpectAmount * 百分比 + 固定金额
+
+  // 百分比 + 固定金额
+
+  // 渠道
+}
+ */ 

package/lib/components/booking/components/footer/amount.js

@@ -31,14 +31,14 @@ var getRelationDetailsTotal = (relation_details) => {
   let total = 0;
   for (let item of relation_details) {
     const number = item.product_quantity || item.num;
-    const price = item.selling_price || item.payment_price || item.price;
-    total += Number(price) * Number(number);
+    const price2 = item.selling_price || item.payment_price || item.price;
+    total += Number(price2) * Number(number);
   }
   return total;
 };
-var getProductAmount = (state, isEdit) => {
+var getProductExpectAmount = (state, isEdit) => {
   var _a, _b;
-  let price = 0;
+  let price2 = 0;
   let duration = 0;
   const isDay = (0, import_utils3.isDayBooking)(state);
   if (isEdit) {
@@ -46,24 +46,24 @@ var getProductAmount = (state, isEdit) => {
       for (let item of state == null ? void 0 : state.service.value) {
         if (isDay || (0, import_utils3.isNormalProductByDurationSchedule)(item)) {
           const quantity = item._extend.quantity || 1;
-          price += Number(item._extend.total) * Number(quantity);
+          price2 += Number(item._extend.total) * Number(quantity);
           const _duration = (0, import_utils3.isDayBookingProduct)(item, state) ? item._extend.duration : 0;
           duration += _duration;
         } else {
           const quantity = item._extend.quantity || 1;
-          price += Number(item._extend.total) * Number(quantity);
-          price += getRelationDetailsTotal(item._extend.relation_details || []);
+          price2 += Number(item._extend.total) * Number(quantity);
+          price2 += getRelationDetailsTotal(item._extend.relation_details || []);
           duration += import_utils.flexibleObj.getValue(item._extend.duration);
         }
       }
       if (!isDay) {
         for (let item of state.addons.value) {
-          price += Number(item._extend.total) * item._extend.quantity;
+          price2 += Number(item._extend.total) * item._extend.quantity;
         }
       }
     }
   } else {
-    price = Number((_a = state.bookingDetail) == null ? void 0 : _a.product_expect_amount);
+    price2 = Number((_a = state.bookingDetail) == null ? void 0 : _a.product_expect_amount);
     let services = ((_b = state == null ? void 0 : state.service) == null ? void 0 : _b.value) || [];
     duration = services.reduce((pre, cur) => {
       var _a2;
@@ -78,25 +78,25 @@ var getProductAmount = (state, isEdit) => {
     }, 0);
   }
   return {
-    price: Number(price),
+    productExpectAmount: Number(price2),
     duration: (0, import_utils.getDiscountTime)(duration, isDay)
   };
 };
 var getProductItemTax = (item, bookingDetail) => {
-  let price = 0;
+  let price2 = 0;
   const productDiscountPrice = Number(item.total);
   const shopTax = productDiscountPrice * Number(bookingDetail.tax_rate) * Number(item.is_charge_tax);
   const shopTaxRate = 1 + bookingDetail.tax_rate * bookingDetail.is_price_include_tax;
   const res = shopTax / shopTaxRate * item.quantity;
-  price += res;
-  return price;
+  price2 += res;
+  return price2;
 };
 var getTotal = (item) => {
   return item._extend.payment_price !== void 0 ? item._extend.payment_price : item._extend.total;
 };
 var getTax = (state, isEdit) => {
   var _a;
-  let price = 0;
+  let tax = 0;
   if (!state.bookingId || !state.bookingDetail) {
     return 0;
   }
@@ -105,7 +105,7 @@ var getTax = (state, isEdit) => {
   }
   if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
     for (let item of state == null ? void 0 : state.service.value) {
-      price += getProductItemTax(
+      tax += getProductItemTax(
         {
           ...item,
           total: getTotal(item),
@@ -116,7 +116,7 @@ var getTax = (state, isEdit) => {
       );
     }
     for (let item of state.addons.value) {
-      price += getProductItemTax({
+      tax += getProductItemTax({
         ...item,
         total: getTotal(item),
         price: item._extend.price,
@@ -124,16 +124,18 @@ var getTax = (state, isEdit) => {
       }, state.bookingDetail);
     }
   }
-  return price;
+  return tax;
 };
 var getPaySurchargeFee = (state) => {
   const { bookingDetail, bookingId } = state;
   if (!bookingDetail || !bookingId) return 0;
   return Number(bookingDetail.pay_processing_fee) + Number(bookingDetail.gateway_fee);
 };
-var getOtherAmount = (state) => {
+var getSurchargeAmount = (state) => {
   const { bookingDetail, bookingId } = state;
-  if (!bookingDetail || !bookingId) return 0;
+  if (!bookingDetail || !bookingId) {
+    return;
+  }
   return Number(bookingDetail.surcharge_fee);
 };
 var getPaidAmount = (state) => {
@@ -152,16 +154,12 @@ var is_price_include_tax = (state) => {
   var _a;
   return (_a = state.bookingDetail) == null ? void 0 : _a.is_price_include_tax;
 };
-var getExpectAmount = ({ price, tax, otherAmount, shopDiscount, state, isEdit }) => {
-  var _a;
-  if (!isEdit) {
-    return Number((_a = state.bookingDetail) == null ? void 0 : _a.expect_amount) || 0;
-  }
+var getExpectAmount = ({ price: price2, tax, surchargeAmount, shopDiscount, state }) => {
   let _tax = tax;
-  if (state.bookingDetail && is_price_include_tax(state)) {
+  if (is_price_include_tax(state)) {
     _tax = 0;
   }
-  return price + _tax + otherAmount - shopDiscount;
+  return price2 + _tax + surchargeAmount - shopDiscount;
 };
 var getTotalRefundAmount = (state) => {
   var _a;
@@ -179,28 +177,28 @@ var getSumTotalAmount = ({ expectAmount, roundingAmount }) => {
   return expectAmount + roundingAmount;
 };
 var getSumTotal = (state, isEdit) => {
-  const { price, duration } = getProductAmount(state, isEdit);
+  const { productExpectAmount, duration } = getProductExpectAmount(state, isEdit);
+  const shopDiscount = getShopDiscount(state);
   const roundingAmount = getRoundingAmount(state);
-  const tax = getTax(state, isEdit);
   const paySurchargeFee = getPaySurchargeFee(state);
-  const otherAmount = getOtherAmount(state);
+  const surchargeAmount = getSurchargeAmount(state);
+  const tax = getTax(state, isEdit);
   const paidAmount = getPaidAmount(state);
   const orderPaidAmount = getOrderPaidAmount(state);
   const totalRefundAmount = getTotalRefundAmount(state);
-  const shopDiscount = getShopDiscount(state);
-  const expectAmount = getExpectAmount({ price, tax, otherAmount, shopDiscount, state, isEdit });
+  const expectAmount = getExpectAmount({ price: productExpectAmount, tax, surchargeAmount, shopDiscount, state, isEdit });
   const originExpectAmount = getExpectAmount({ price, tax, shopDiscount: 0, otherAmount, state, isEdit });
   const sumTotalAmount = getSumTotalAmount({ expectAmount, roundingAmount });
   const notPaidAmount = Number((0, import_utils2.formatAmount)(sumTotalAmount, 2, "")) - orderPaidAmount;
   const actualPaidAmount = paidAmount;
   const dueAmount = notPaidAmount < 0 ? Number((0, import_utils2.formatAmount)(notPaidAmount + totalRefundAmount, 2, "")) : 0;
   return {
-    productAmount: price,
+    productAmount: productExpectAmount,
     duration,
     tax,
     shopDiscount,
     // taxText,
-    otherAmount,
+    otherAmount: surchargeAmount,
     sumTotalAmount,
     paidAmount,
     notPaidAmount,

package/lib/components/booking/components/formItemChildrenWrap/index.d.ts

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

package/lib/components/booking/editBookingModal/index.js

@@ -60,6 +60,7 @@ var EditBookingModal = (props, ref) => {
     return {
       open: (params2) => {
         console.log("change", params2);
+        form.resetFields();
         setParams(params2);
         setOpen(true);
       }
@@ -159,9 +160,7 @@ var EditBookingModal = (props, ref) => {
     });
   }, [data]);
   const updateResource = (resource) => {
-    form.setFieldsValue({
-      resource
-    });
+    form.setFieldValue("resource", resource);
   };
   const originCacheItem = (0, import_react.useMemo)(() => {
     if (!data) {
@@ -211,9 +210,9 @@ var EditBookingModal = (props, ref) => {
     };
   }, [data, useToDate, useResource]);
   const initState = () => {
-    form.resetFields();
     setData(null);
     setOpen(false);
+    form.resetFields();
   };
   const onCancel = () => {
     initState();

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

package/lib/components/booking/forms/single/RenderValueById.d.ts

@@ -1,3 +1,4 @@
+import './index.less';
 interface RenderValueByIdProps {
     field: any;
     value: any;

package/lib/components/booking/forms/single/RenderValueById.js

@@ -34,17 +34,20 @@ __export(RenderValueById_exports, {
 module.exports = __toCommonJS(RenderValueById_exports);
 var import_react = __toESM(require("react"));
 var import_utils = require("@pisell/utils");
+var import_materials = require("@pisell/materials");
 var import_antd = require("antd");
 var import_ahooks = require("ahooks");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_serve = require("../serve");
+var import_index = require("./index.less");
 var RenderValueById = (props) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const { field, value: propsValue } = props;
   const { appHelper } = (0, import_useEngineContext.default)();
+  const [displayCount, setDisplayCount] = (0, import_react.useState)(10);
   const _getFormData = (0, import_ahooks.useRequest)(import_serve.getFormData, {
     manual: true,
-    cacheKey: `formOption-${(_a = field.setting) == null ? void 0 : _a.linkedTable}`,
+    cacheKey: `formOption-${(_a = field.setting) == null ? void 0 : _a.linkedTable}-${(_c = (_b = propsValue || []) == null ? void 0 : _b.toString) == null ? void 0 : _c.call(_b)}`,
     staleTime: 500,
     cacheTime: 5e3
   });
@@ -81,24 +84,49 @@ var RenderValueById = (props) => {
       }))) || [];
     }
     return (_e2 = field == null ? void 0 : field.setting) == null ? void 0 : _e2.customTypeList;
-  }, [field.filed_type, (_b = field == null ? void 0 : field.setting) == null ? void 0 : _b.customTypeList, _getFormData.data]);
+  }, [field.filed_type, (_d = field == null ? void 0 : field.setting) == null ? void 0 : _d.customTypeList, _getFormData.data]);
   if ((0, import_utils.isArr)(value)) {
+    const formListDisplay = ((_e = field == null ? void 0 : field.setting) == null ? void 0 : _e.displayStyle) === "list" && (field == null ? void 0 : field.filed_type) === "form_to_form";
     let _list = options == null ? void 0 : options.filter((i) => {
       return value == null ? void 0 : value.includes((i == null ? void 0 : i.id) || i.value);
     });
-    let _str = (_list == null ? void 0 : _list.map((i) => {
+    let _str = !formListDisplay && (_list == null ? void 0 : _list.map((i) => {
       var _a2;
-      return /* @__PURE__ */ import_react.default.createElement(import_antd.Tag, null, (_a2 = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a2.translationShop((i == null ? void 0 : i.title) || (i == null ? void 0 : i.label)));
+      const title = (_a2 = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a2.translationShop((i == null ? void 0 : i.title) || (i == null ? void 0 : i.label));
+      return /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title }, /* @__PURE__ */ import_react.default.createElement(import_antd.Tag, { className: "pisell-lowcode__booking-form-link-tag-title" }, title));
     })) || "-";
-    return /* @__PURE__ */ import_react.default.createElement("span", null, _str || "-");
+    if (formListDisplay) {
+      const displayList = (_list == null ? void 0 : _list.slice(0, displayCount)) || [];
+      _str = (displayList == null ? void 0 : displayList.map((i, index) => {
+        var _a2;
+        const title = (_a2 = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a2.translationShop((i == null ? void 0 : i.title) || (i == null ? void 0 : i.label));
+        return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-form-link-to-list-item" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-form-link-to-list-item-index" }, index + 1), /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-form-link-to-list-item-title" }, title)));
+      })) || "-";
+    }
+    return /* @__PURE__ */ import_react.default.createElement(
+      "span",
+      {
+        className: formListDisplay ? "pisell-lowcode__booking-form-link-to-list-wrap" : ""
+      },
+      _str || "-",
+      formListDisplay && (_list == null ? void 0 : _list.length) > displayCount && /* @__PURE__ */ import_react.default.createElement(
+        "div",
+        {
+          className: "pisell-lowcode__booking-form-link-to-list-item-more",
+          onClick: () => setDisplayCount((prev) => Math.min(prev + 10, (_list == null ? void 0 : _list.length) || 0))
+        },
+        /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.text.form.link.to.another.record.more")),
+        /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "icona-IconStroke" })
+      )
+    );
   }
   if (!(0, import_utils.isUndefined)(value)) {
-    if ((field == null ? void 0 : field.filed_type) === "select" && !((_c = field == null ? void 0 : field.setting) == null ? void 0 : _c.version)) {
+    if ((field == null ? void 0 : field.filed_type) === "select" && !((_f = field == null ? void 0 : field.setting) == null ? void 0 : _f.version)) {
       return /* @__PURE__ */ import_react.default.createElement("span", null, value || "-");
     }
     let _item = options == null ? void 0 : options.filter((i) => (i == null ? void 0 : i.id) == value);
-    return ((_f = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _f.translationShop(
-      ((_d = _item == null ? void 0 : _item[0]) == null ? void 0 : _d.title) || ((_e = _item == null ? void 0 : _item[0]) == null ? void 0 : _e.label)
+    return ((_i = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _i.translationShop(
+      ((_g = _item == null ? void 0 : _item[0]) == null ? void 0 : _g.title) || ((_h = _item == null ? void 0 : _item[0]) == null ? void 0 : _h.label)
     )) || "-";
   }
   return null;

package/lib/components/booking/forms/single/index.less

@@ -1,3 +1,69 @@
 .attachment-item {
   width: 100%;
-}
+}
+
+.pisell-lowcode__booking-form-link-tag-title {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: inline-block;
+  max-width: 100%;
+}
+
+.pisell-lowcode__booking-form-link-to-list-wrap {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+
+
+  .pisell-lowcode__booking-form-link-to-list-item-more {
+    padding: 4px 6px;
+    color: #705dff;
+    font-size: 14px;
+    cursor: pointer;
+    background-color: #f9fafb;
+    border-radius: 8px;
+    border: 1px solid #eaecf0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 4px;
+  }
+
+  .pisell-lowcode__booking-form-link-to-list-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    background-color: #f9fafb;
+    padding: 12px 14px;
+    border-radius: 8px;
+    border: 1px solid #eaecf0;
+    color: #101828;
+    font-size: 16px;
+    font-weight: 500;
+    white-space: normal;
+
+    .pisell-lowcode__booking-form-link-to-list-item-index {
+      padding: 0 5px;
+      min-width: 20px;
+      min-height: 20px;
+      line-height: 20px;
+      border-radius: 20px;
+      font-size: 14px;
+      font-weight: 600;
+      background-color: #705dff;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: #fff;
+    }
+
+    .pisell-lowcode__booking-form-link-to-list-item-title {
+      flex: 1;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      display: block;
+    }
+  }
+}

package/lib/components/booking/forms/table/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/lib/components/booking/info/addServiceVariant/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/lib/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

package/lib/components/booking/info/notes/index.d.ts

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

package/lib/components/booking/info/service/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
 export default Lists;

package/lib/components/booking/info/service/like/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

package/lib/components/booking/info/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/lib/components/booking/info/service2/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

package/lib/components/booking/info/service2/utils.d.ts

@@ -248,4 +248,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

package/lib/components/booking/info/utils.js

@@ -145,7 +145,8 @@ var isBooking4Shop = (shopId, renderType, businessUtils) => {
     8824,
     8913,
     8918,
-    6413
+    6413,
+    8943
   ];
   return booking4Shops.includes(shopId) || (businessUtils == null ? void 0 : businessUtils.getAppByModal("resourcekit"));
 };

package/lib/components/booking/info2/service/addService/utils.js

@@ -233,7 +233,7 @@ var setDefaultResource = ({ cacheItem, resources }) => {
   let resourceId = Number(serviceParams == null ? void 0 : serviceParams.resource_id);
   for (let item of resources) {
     const renderList = item.renderList.filter(
-      (d) => d.is_default == 1 || d.id === resourceId
+      (d) => d.id === resourceId
     );
     let defaultOriginalResource = [];
     if (renderList.length === 0) {
@@ -384,7 +384,7 @@ var getIsAutoClose = (cacheItem) => {
   );
 };
 var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g;
   const isNew = cacheItem.new || !cacheItem._extend.endDate;
   let _cacheItem = { ...cacheItem };
   const resourcesOriginMap = state.service.resourcesOriginMap || {};
@@ -432,7 +432,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
         state
       });
       if ((0, import_utils.getDuration)(_cacheItem == null ? void 0 : _cacheItem.duration) === "flexible") {
-        _cacheItem._extend.duration = _cacheItem._data.timeObj.durationSlicesBasedOnTime[0].value;
+        _cacheItem._extend.duration = (_e = (_d = (_c = _cacheItem._data.timeObj) == null ? void 0 : _c.durationSlicesBasedOnTime) == null ? void 0 : _d[0]) == null ? void 0 : _e.value;
         const { startDate, endDate } = (0, import_utils.getServiceTimes)({
           _extend: _cacheItem._extend
         });
@@ -466,7 +466,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
         {
           extraResources,
           //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
-          resourceTab: (_d = (_c = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.resource_tab,
+          resourceTab: (_g = (_f = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _f.config) == null ? void 0 : _g.resource_tab,
           resourcesOrigin: state.service.resourcesOrigin
         }
       );

package/lib/components/booking/info2/service/editService/index.js

@@ -638,7 +638,11 @@ var Info = (_, ref) => {
     ));
   }, [(_G = state.service.resourcesOrigin) == null ? void 0 : _G.length, isNormalProduct]);
   console.log("render edit");
-  console.log(state.service.editModal && !((_H = state.service.cacheItem) == null ? void 0 : _H.autoClose), performance.now() - window.pp1, "打开商品1");
+  console.log(
+    state.service.editModal && !((_H = state.service.cacheItem) == null ? void 0 : _H.autoClose),
+    performance.now() - window.pp1,
+    "打开商品1"
+  );
   const [val, setVal] = (0, import_react.useState)(false);
   (0, import_react.useEffect)(() => {
     if (isShowTimeAndResource) {

package/lib/components/booking/info2/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/lib/components/booking/info2/utilsByBooking.js

@@ -211,7 +211,7 @@ var getAppointmentTimingPreference = (state) => {
   return ((_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.information_tab) == null ? void 0 : _c.appointment_timing_preference) || "sequential";
 };
 var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   if (cacheItem == null ? void 0 : cacheItem.isCustomItem) {
     return {
       duration: null
@@ -224,7 +224,7 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
     // 时长: 当前商品时长 > 第一个时长
     duration: (0, import_utils2.findNextDuration)(
       cacheItem.duration,
-      timeObj.durationSlicesBasedOnTime,
+      timeObj == null ? void 0 : timeObj.durationSlicesBasedOnTime,
       (_b = cacheItem == null ? void 0 : cacheItem.duration) == null ? void 0 : _b.value
     )
   };
@@ -235,7 +235,7 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
       _extend.start_time = lastServerStartDate.format("HH:mm");
     } else {
       if ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
-        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+        _extend.start_time = timeObj == null ? void 0 : timeObj.timeSlices[((_c = timeObj == null ? void 0 : timeObj.timeSlices) == null ? void 0 : _c.length) - 1].value;
       } else {
         _extend.start_time = lastServerEndDate.format("HH:mm");
       }
@@ -268,7 +268,7 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
   const { startDate, endDate } = (0, import_utils2.getServiceTimes)({ _extend });
   _extend.startDate = startDate;
   _extend.endDate = endDate;
-  const session = (_d = (_c = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.session;
+  const session = (_e = (_d = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.session;
   if ((0, import_utils2.isSessionProduct)(cacheItem) && session) {
     _extend.start_date = session.start_at;
     _extend.startDate = session.start_at;

package/lib/components/booking/locales.d.ts

@@ -299,6 +299,7 @@ declare const _default: {
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': string;
         'pisell2.booking.notes.placeholder': string;
+        'pisell2.text.form.link.to.another.record.more': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -600,6 +601,7 @@ declare const _default: {
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': string;
         'pisell2.booking.notes.placeholder': string;
+        'pisell2.text.form.link.to.another.record.more': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -901,6 +903,7 @@ declare const _default: {
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': string;
         'pisell2.booking.notes.placeholder': string;
+        'pisell2.text.form.link.to.another.record.more': string;
     };
 };
 export default _default;