@pisell/private-materials 6.1.33 → 6.1.35

package/es/components/booking/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/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/es/components/booking/components/footer/amount.js

@@ -18,8 +18,8 @@ export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_d
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var item = _step.value;
       var number = item.product_quantity || item.num;
-      var price = item.selling_price || item.payment_price || item.price;
-      total += Number(price) * Number(number);
+      var _price = item.selling_price || item.payment_price || item.price;
+      total += Number(_price) * Number(number);
     }
   } catch (err) {
     _iterator.e(err);
@@ -33,7 +33,7 @@ export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_d
  * @param state 
  * @returns 
  */
-var getProductAmount = function getProductAmount(state, isEdit) {
+var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
   var price = 0;
   var duration = 0;
   // 是否是跨日预约
@@ -103,7 +103,7 @@ var getProductAmount = function getProductAmount(state, isEdit) {
     }, 0);
   }
   return {
-    price: Number(price),
+    productExpectAmount: Number(price),
     duration: getDiscountTime(duration, isDay)
   };
 };
@@ -112,6 +112,7 @@ var getProductItemTax = function getProductItemTax(item, bookingDetail) {
   // 折扣后的金额 = 商品金额 - 商品折扣
   var productDiscountPrice = Number(item.total);
   // 店铺税 = 折扣后的金额 * 店铺税率 * 商品是否收税  (is_charge_tax 0 为不收税)
+  // todo: tax_rate 和 is_price_include_tax 优先从bookingDetail取,快照, 取不到从getData取, 
   var shopTax = productDiscountPrice * Number(bookingDetail.tax_rate) * Number(item.is_charge_tax);
   // 店铺税率  =  1 + 店铺税率 * 是否含税
   var shopTaxRate = 1 + bookingDetail.tax_rate * bookingDetail.is_price_include_tax;
@@ -131,6 +132,7 @@ var getProductItemTax = function getProductItemTax(item, bookingDetail) {
  * @Date: 2024-02-28 10:56
  */
 var getTotal = function getTotal(item) {
+  // 改为只使用item._extend.total,  不采用均摊逻辑. 税费的钱根据整单折扣的百分比进行换算
   return item._extend.payment_price !== undefined ? item._extend.payment_price : item._extend.total;
 };
 
@@ -140,12 +142,14 @@ var getTotal = function getTotal(item) {
  * @returns 
  */
 var getTax = function getTax(state, isEdit) {
-  var price = 0;
+  var tax = 0;
 
   // 新建不计算税费
   if (!state.bookingId || !state.bookingDetail) {
     return 0;
   }
+
+  // 详情时未编辑的状态下, 取后端的值
   if (!isEdit) {
     var _state$bookingDetail2;
     return Number((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.tax_fee);
@@ -156,7 +160,7 @@ var getTax = function getTax(state, isEdit) {
     try {
       for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
         var item = _step4.value;
-        price += getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
+        tax += getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
           total: getTotal(item),
           price: item._extend.price,
           quantity: item._extend.quantity
@@ -172,7 +176,7 @@ var getTax = function getTax(state, isEdit) {
     try {
       for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
         var _item2 = _step5.value;
-        price += getProductItemTax(_objectSpread(_objectSpread({}, _item2), {}, {
+        tax += getProductItemTax(_objectSpread(_objectSpread({}, _item2), {}, {
           total: getTotal(_item2),
           price: _item2._extend.price,
           quantity: _item2._extend.quantity
@@ -184,7 +188,9 @@ var getTax = function getTax(state, isEdit) {
       _iterator5.f();
     }
   }
-  return price;
+
+  // todo:  tax *  (1 - shopDiscount / productExpectAmount)
+  return tax;
 };
 var getPaySurchargeFee = function getPaySurchargeFee(state) {
   var bookingDetail = state.bookingDetail,
@@ -216,16 +222,20 @@ var getPaySurchargeFee = function getPaySurchargeFee(state) {
 // }
 
 /**
- * 其他金额
+ * 订单附加费
  * @param state 
  * @returns 
  */
-var getOtherAmount = function getOtherAmount(state) {
+var getSurchargeAmount = function getSurchargeAmount(state) {
   var bookingDetail = state.bookingDetail,
     bookingId = state.bookingId;
 
+  // todo:编辑场景下附加费计算问题?
   // 新增为 0
-  if (!bookingDetail || !bookingId) return 0;
+  if (!bookingDetail || !bookingId) {
+    return;
+  }
+  // 方案1: 只处理新增时, 编辑时附加费直接使用后端的数据.
   return Number(bookingDetail.surcharge_fee);
 };
 
@@ -263,35 +273,30 @@ export var is_price_include_tax = function is_price_include_tax(state) {
 var getExpectAmount = function getExpectAmount(_ref) {
   var price = _ref.price,
     tax = _ref.tax,
-    otherAmount = _ref.otherAmount,
+    surchargeAmount = _ref.surchargeAmount,
     shopDiscount = _ref.shopDiscount,
-    state = _ref.state,
-    isEdit = _ref.isEdit;
-  if (!isEdit) {
-    var _state$bookingDetail6;
-    return Number((_state$bookingDetail6 = state.bookingDetail) === null || _state$bookingDetail6 === void 0 ? void 0 : _state$bookingDetail6.expect_amount) || 0;
-  }
+    state = _ref.state;
   var _tax = tax;
 
-  // 新增时, 税费为0
-  if (state.bookingDetail && is_price_include_tax(state)) {
+  // 如果价格含税, 则将税费改为0
+  if (is_price_include_tax(state)) {
     _tax = 0;
   }
-  // 商品价格 + 税费 + 其他金额 - 整单折扣
-  return price + _tax + otherAmount - shopDiscount;
+  // 商品价格 + 税费 + 附加费 - 整单折扣
+  return price + _tax + surchargeAmount - shopDiscount;
 };
 var getTotalRefundAmount = function getTotalRefundAmount(state) {
-  var _state$bookingDetail7;
-  return Number((_state$bookingDetail7 = state.bookingDetail) === null || _state$bookingDetail7 === void 0 ? void 0 : _state$bookingDetail7.total_refund_amount) || 0;
+  var _state$bookingDetail6;
+  return Number((_state$bookingDetail6 = state.bookingDetail) === null || _state$bookingDetail6 === void 0 ? void 0 : _state$bookingDetail6.total_refund_amount) || 0;
 };
 var getShopDiscount = function getShopDiscount(state) {
-  var _state$bookingDetail8;
+  var _state$bookingDetail7;
   // 优先使用手动设置的折扣（字符串格式），否则使用bookingDetail中的折扣
-  return Number(state.shop_discount) || Number((_state$bookingDetail8 = state.bookingDetail) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.shop_discount) || 0;
+  return Number(state.shop_discount) || Number((_state$bookingDetail7 = state.bookingDetail) === null || _state$bookingDetail7 === void 0 ? void 0 : _state$bookingDetail7.shop_discount) || 0;
 };
 var getRoundingAmount = function getRoundingAmount(state) {
-  var _state$bookingDetail9;
-  return Number(state === null || state === void 0 || (_state$bookingDetail9 = state.bookingDetail) === null || _state$bookingDetail9 === void 0 ? void 0 : _state$bookingDetail9.rounding_amount) || 0;
+  var _state$bookingDetail8;
+  return Number(state === null || state === void 0 || (_state$bookingDetail8 = state.bookingDetail) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.rounding_amount) || 0;
 };
 var getSumTotalAmount = function getSumTotalAmount(_ref2) {
   var expectAmount = _ref2.expectAmount,
@@ -305,22 +310,27 @@ var getSumTotalAmount = function getSumTotalAmount(_ref2) {
  * @returns 
  */
 export var getSumTotal = function getSumTotal(state, isEdit) {
-  // 商品金额
-  var _getProductAmount = getProductAmount(state, isEdit),
-    price = _getProductAmount.price,
-    duration = _getProductAmount.duration;
+  // 商品总金额,   包含 商品折扣 报价单 子商品
+  var _getProductExpectAmou = getProductExpectAmount(state, isEdit),
+    productExpectAmount = _getProductExpectAmou.productExpectAmount,
+    duration = _getProductExpectAmou.duration;
 
-  // 舍入金额
-  var roundingAmount = getRoundingAmount(state);
+  // 整单折扣金额
+  var shopDiscount = getShopDiscount(state);
 
-  // 税费
-  var tax = getTax(state, isEdit);
+  // 舍入金额, 新增时不处理, 支付后才会产生
+  var roundingAmount = getRoundingAmount(state);
 
-  // 支付手续费
+  // 支付手续费, 新增时不处理, 支付后才会产生
   var paySurchargeFee = getPaySurchargeFee(state);
 
-  // 其他金额
-  var otherAmount = getOtherAmount(state);
+  // 订单附加费金额
+  var surchargeAmount = getSurchargeAmount(state);
+
+  // 算出整单折扣的百分比 shopDiscount / productExpectAmount
+
+  // 税费
+  var tax = getTax(state, isEdit);
 
   // 已付金额 (包含手续费)
   var paidAmount = getPaidAmount(state);
@@ -331,19 +341,19 @@ export var getSumTotal = function getSumTotal(state, isEdit) {
   // 退款金额
   var totalRefundAmount = getTotalRefundAmount(state);
 
-  // 整单折扣
-  var shopDiscount = getShopDiscount(state);
-
   // 总计(总订单金额) 商品金额 + 税费 + 附加费
   var expectAmount = getExpectAmount({
-    price: price,
+    price: productExpectAmount,
     tax: tax,
-    otherAmount: otherAmount,
+    surchargeAmount: surchargeAmount,
     shopDiscount: shopDiscount,
     state: state,
     isEdit: isEdit
   });
 
+  // 订单原价（不包含整单折扣的价格）
+  // const originExpectAmount = getExpectAmount({ price: productExpectAmount, tax, shopDiscount: 0, surchargeAmount, state, isEdit });
+
   // 订单原价（不包含整单折扣的价格）
   var originExpectAmount = getExpectAmount({
     price: price,
@@ -369,12 +379,12 @@ export var getSumTotal = function getSumTotal(state, isEdit) {
   // 欠款金额
   var dueAmount = notPaidAmount < 0 ? Number(formatAmount(notPaidAmount + totalRefundAmount, 2, '')) : 0;
   return {
-    productAmount: price,
+    productAmount: productExpectAmount,
     duration: duration,
     tax: tax,
     shopDiscount: shopDiscount,
     // taxText,
-    otherAmount: otherAmount,
+    otherAmount: surchargeAmount,
     sumTotalAmount: sumTotalAmount,
     paidAmount: paidAmount,
     notPaidAmount: notPaidAmount,
@@ -387,4 +397,20 @@ export var getSumTotal = function getSumTotal(state, isEdit) {
     roundingAmount: roundingAmount,
     originExpectAmount: originExpectAmount
   };
-};
+};
+
+/**
+ * 
+{
+  schedule[1,2,3,4];
+  products:{
+    // 全部 , 商品组 ,  指定商品
+  },
+
+  // productExpectAmount: 订单小计金额,  如果商品的规则是全部, 就不用一个一个的算商品的了,  productExpectAmount * 百分比 + 固定金额
+
+  // 百分比 + 固定金额
+
+  // 渠道
+}
+ */

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

@@ -62,6 +62,7 @@ var EditBookingModal = function EditBookingModal(props, ref) {
     return {
       open: function open(params) {
         console.log('change', params);
+        form.resetFields();
         setParams(params);
         setOpen(true);
       }
@@ -173,9 +174,7 @@ var EditBookingModal = function EditBookingModal(props, ref) {
     });
   }, [data]);
   var updateResource = function updateResource(resource) {
-    form.setFieldsValue({
-      resource: resource
-    });
+    form.setFieldValue('resource', resource);
   };
   var originCacheItem = useMemo(function () {
     if (!data) {
@@ -224,9 +223,9 @@ var EditBookingModal = function EditBookingModal(props, ref) {
     });
   }, [data, useToDate, useResource]);
   var initState = function initState() {
-    form.resetFields();
     setData(null);
     setOpen(false);
+    form.resetFields();
   };
   var onCancel = function onCancel() {
     initState();

package/es/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/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/es/components/booking/forms/single/RenderValueById.d.ts

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

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

@@ -1,24 +1,38 @@
-import React, { useEffect, useMemo } from "react";
-import { isArr, isUndefined } from "@pisell/utils";
-import { Tag } from "antd";
-import { useRequest } from "ahooks";
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useEffect, useMemo, useState } from 'react';
+import { isArr, isUndefined, locales } from '@pisell/utils';
+import { Iconfont } from '@pisell/materials';
+import { Tag, Tooltip } from 'antd';
+import { useRequest } from 'ahooks';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { getFormData } from "../serve";
+import "./index.less";
 var RenderValueById = function RenderValueById(props) {
-  var _field$setting, _field$setting6;
+  var _field$setting, _ref, _ref$toString, _field$setting6;
   var field = props.field,
     propsValue = props.value;
   var _useEngineContext = useEngineContext(),
     appHelper = _useEngineContext.appHelper;
+
+  // 关联表单展示数量
+  var _useState = useState(10),
+    _useState2 = _slicedToArray(_useState, 2),
+    displayCount = _useState2[0],
+    setDisplayCount = _useState2[1];
   var _getFormData = useRequest(getFormData, {
     manual: true,
-    cacheKey: "formOption-".concat((_field$setting = field.setting) === null || _field$setting === void 0 ? void 0 : _field$setting.linkedTable),
+    cacheKey: "formOption-".concat((_field$setting = field.setting) === null || _field$setting === void 0 ? void 0 : _field$setting.linkedTable, "-").concat((_ref = propsValue || []) === null || _ref === void 0 || (_ref$toString = _ref.toString) === null || _ref$toString === void 0 ? void 0 : _ref$toString.call(_ref)),
     staleTime: 500,
     cacheTime: 5000
   });
   var value = useMemo(function () {
     var v = propsValue;
-    if (field.filed_type === "form_to_form") {
+    if (field.filed_type === 'form_to_form') {
       if (isArr(propsValue)) {
         v = propsValue;
       } else if (propsValue !== null && propsValue !== void 0 && propsValue.form_ids) {
@@ -31,7 +45,7 @@ var RenderValueById = function RenderValueById(props) {
   }, [propsValue]);
   useEffect(function () {
     var _field$setting2;
-    if (field.filed_type === "form_to_form" && (_field$setting2 = field.setting) !== null && _field$setting2 !== void 0 && _field$setting2.linkedTable) {
+    if (field.filed_type === 'form_to_form' && (_field$setting2 = field.setting) !== null && _field$setting2 !== void 0 && _field$setting2.linkedTable) {
       var _field$setting3;
       _getFormData.run({
         form_record_ids: value,
@@ -43,7 +57,7 @@ var RenderValueById = function RenderValueById(props) {
   }, [field.filed_type, value]);
   var options = useMemo(function () {
     var _field$setting4, _field$setting5;
-    if (field.filed_type === "form_to_form" && field !== null && field !== void 0 && (_field$setting4 = field.setting) !== null && _field$setting4 !== void 0 && _field$setting4.linkedTable) {
+    if (field.filed_type === 'form_to_form' && field !== null && field !== void 0 && (_field$setting4 = field.setting) !== null && _field$setting4 !== void 0 && _field$setting4.linkedTable) {
       var _getFormData$data;
       return ((_getFormData$data = _getFormData.data) === null || _getFormData$data === void 0 || (_getFormData$data = _getFormData$data.data) === null || _getFormData$data === void 0 || (_getFormData$data = _getFormData$data.list) === null || _getFormData$data === void 0 ? void 0 : _getFormData$data.map(function (item) {
         return {
@@ -55,24 +69,61 @@ var RenderValueById = function RenderValueById(props) {
     return field === null || field === void 0 || (_field$setting5 = field.setting) === null || _field$setting5 === void 0 ? void 0 : _field$setting5.customTypeList;
   }, [field.filed_type, field === null || field === void 0 || (_field$setting6 = field.setting) === null || _field$setting6 === void 0 ? void 0 : _field$setting6.customTypeList, _getFormData.data]);
   if (isArr(value)) {
+    var _field$setting7;
+    // 是否是关联表单列表展示样式
+    var formListDisplay = (field === null || field === void 0 || (_field$setting7 = field.setting) === null || _field$setting7 === void 0 ? void 0 : _field$setting7.displayStyle) === 'list' && (field === null || field === void 0 ? void 0 : field.filed_type) === 'form_to_form';
     var _list = options === null || options === void 0 ? void 0 : options.filter(function (i) {
       return value === null || value === void 0 ? void 0 : value.includes((i === null || i === void 0 ? void 0 : i.id) || i.value);
     });
-    var _str = (_list === null || _list === void 0 ? void 0 : _list.map(function (i) {
+    var _str = !formListDisplay && (_list === null || _list === void 0 ? void 0 : _list.map(function (i) {
       var _appHelper$utils;
-      return /*#__PURE__*/React.createElement(Tag, null, appHelper === null || appHelper === void 0 || (_appHelper$utils = appHelper.utils) === null || _appHelper$utils === void 0 ? void 0 : _appHelper$utils.translationShop((i === null || i === void 0 ? void 0 : i.title) || (i === null || i === void 0 ? void 0 : i.label)));
-    })) || "-";
-    return /*#__PURE__*/React.createElement("span", null, _str || "-");
+      var title = appHelper === null || appHelper === void 0 || (_appHelper$utils = appHelper.utils) === null || _appHelper$utils === void 0 ? void 0 : _appHelper$utils.translationShop((i === null || i === void 0 ? void 0 : i.title) || (i === null || i === void 0 ? void 0 : i.label));
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        title: title
+      }, /*#__PURE__*/React.createElement(Tag, {
+        className: "pisell-lowcode__booking-form-link-tag-title"
+      }, title));
+    })) || '-';
+
+    // 如果列表式展示
+    if (formListDisplay) {
+      var displayList = (_list === null || _list === void 0 ? void 0 : _list.slice(0, displayCount)) || [];
+      _str = (displayList === null || displayList === void 0 ? void 0 : displayList.map(function (i, index) {
+        var _appHelper$utils2;
+        var title = appHelper === null || appHelper === void 0 || (_appHelper$utils2 = appHelper.utils) === null || _appHelper$utils2 === void 0 ? void 0 : _appHelper$utils2.translationShop((i === null || i === void 0 ? void 0 : i.title) || (i === null || i === void 0 ? void 0 : i.label));
+        return /*#__PURE__*/React.createElement("div", {
+          className: "pisell-lowcode__booking-form-link-to-list-item"
+        }, /*#__PURE__*/React.createElement("span", {
+          className: "pisell-lowcode__booking-form-link-to-list-item-index"
+        }, index + 1), /*#__PURE__*/React.createElement(Tooltip, {
+          title: title
+        }, /*#__PURE__*/React.createElement("span", {
+          className: "pisell-lowcode__booking-form-link-to-list-item-title"
+        }, title)));
+      })) || '-';
+    }
+    return /*#__PURE__*/React.createElement("span", {
+      className: formListDisplay ? 'pisell-lowcode__booking-form-link-to-list-wrap' : ''
+    }, _str || '-', formListDisplay && (_list === null || _list === void 0 ? void 0 : _list.length) > displayCount && /*#__PURE__*/React.createElement("div", {
+      className: "pisell-lowcode__booking-form-link-to-list-item-more",
+      onClick: function onClick() {
+        return setDisplayCount(function (prev) {
+          return Math.min(prev + 10, (_list === null || _list === void 0 ? void 0 : _list.length) || 0);
+        });
+      }
+    }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.text.form.link.to.another.record.more')), /*#__PURE__*/React.createElement(Iconfont, {
+      type: "icona-IconStroke"
+    })));
   }
   if (!isUndefined(value)) {
-    var _field$setting7, _appHelper$utils2, _item$, _item$2;
-    if ((field === null || field === void 0 ? void 0 : field.filed_type) === "select" && !(field !== null && field !== void 0 && (_field$setting7 = field.setting) !== null && _field$setting7 !== void 0 && _field$setting7.version)) {
-      return /*#__PURE__*/React.createElement("span", null, value || "-");
+    var _field$setting8, _appHelper$utils3, _item$, _item$2;
+    if ((field === null || field === void 0 ? void 0 : field.filed_type) === 'select' && !(field !== null && field !== void 0 && (_field$setting8 = field.setting) !== null && _field$setting8 !== void 0 && _field$setting8.version)) {
+      return /*#__PURE__*/React.createElement("span", null, value || '-');
     }
     var _item = options === null || options === void 0 ? void 0 : options.filter(function (i) {
       return (i === null || i === void 0 ? void 0 : i.id) == value;
     });
-    return (appHelper === null || appHelper === void 0 || (_appHelper$utils2 = appHelper.utils) === null || _appHelper$utils2 === void 0 ? void 0 : _appHelper$utils2.translationShop((_item === null || _item === void 0 || (_item$ = _item[0]) === null || _item$ === void 0 ? void 0 : _item$.title) || (_item === null || _item === void 0 || (_item$2 = _item[0]) === null || _item$2 === void 0 ? void 0 : _item$2.label))) || "-";
+    return (appHelper === null || appHelper === void 0 || (_appHelper$utils3 = appHelper.utils) === null || _appHelper$utils3 === void 0 ? void 0 : _appHelper$utils3.translationShop((_item === null || _item === void 0 || (_item$ = _item[0]) === null || _item$ === void 0 ? void 0 : _item$.title) || (_item === null || _item === void 0 || (_item$2 = _item[0]) === null || _item$2 === void 0 ? void 0 : _item$2.label))) || '-';
   }
   return null;
 };

package/es/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/es/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/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/es/components/booking/info/utils.js

@@ -95,7 +95,7 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType, business
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913, 8918, 6413];
+  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913, 8918, 6413, 8943];
 
   // 固定的shopId 或者安装 Resource Kit 应用，则认为是booking4Shop
   return booking4Shops.includes(shopId) || (businessUtils === null || businessUtils === void 0 ? void 0 : businessUtils.getAppByModal('resourcekit'));

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

@@ -278,7 +278,7 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
     var _loop2 = function _loop2() {
       var item = _step.value;
       var renderList = item.renderList.filter(function (d) {
-        return d.is_default == 1 || d.id === resourceId;
+        return d.id === resourceId;
       });
       var defaultOriginalResource = [];
       if (renderList.length === 0) {
@@ -584,7 +584,8 @@ export var getProductExtend = function getProductExtend(_ref11) {
         state: state
       });
       if (getDuration(_cacheItem === null || _cacheItem === void 0 ? void 0 : _cacheItem.duration) === 'flexible') {
-        _cacheItem._extend.duration = _cacheItem._data.timeObj.durationSlicesBasedOnTime[0].value;
+        var _cacheItem$_data$time;
+        _cacheItem._extend.duration = (_cacheItem$_data$time = _cacheItem._data.timeObj) === null || _cacheItem$_data$time === void 0 || (_cacheItem$_data$time = _cacheItem$_data$time.durationSlicesBasedOnTime) === null || _cacheItem$_data$time === void 0 || (_cacheItem$_data$time = _cacheItem$_data$time[0]) === null || _cacheItem$_data$time === void 0 ? void 0 : _cacheItem$_data$time.value;
 
         // 计算服务的开始和结束时间
         var _getServiceTimes = getServiceTimes({

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

@@ -338,7 +338,7 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
   // 下一个商品的扩展参数
   var _extend = {
     // 时长: 当前商品时长 > 第一个时长
-    duration: findNextDuration(cacheItem.duration, timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value)
+    duration: findNextDuration(cacheItem.duration, timeObj === null || timeObj === void 0 ? void 0 : timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value)
   };
 
   // 如果有上一个商品, 将上一个商品的某些参数 设置到新商品上
@@ -352,7 +352,8 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
     } else {
       // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
       if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
-        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+        var _timeObj$timeSlices;
+        _extend.start_time = timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices[(timeObj === null || timeObj === void 0 || (_timeObj$timeSlices = timeObj.timeSlices) === null || _timeObj$timeSlices === void 0 ? void 0 : _timeObj$timeSlices.length) - 1].value;
       } else {
         _extend.start_time = lastServerEndDate.format("HH:mm");
       }