@pisell/private-materials 6.11.151 → 6.11.153

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

@@ -977,7 +977,8 @@ var Footer = function Footer(props) {
                 orderTotalList: orderTotalList,
                 total: total,
                 showDetail: showDetail
-              }
+              },
+              existPayment: existPayment
             }; // 这里再做个比对 如果 新的 modalData 和 paymentModalData 一致，则不更新
             if (!(JSON.stringify(modalData) === JSON.stringify(paymentModalData))) {
               _context7.next = 12;

package/es/components/booking/components/footer/utils.js

@@ -730,7 +730,6 @@ export var getHasMultiDayProduct = function getHasMultiDayProduct(data) {
  * @Date: 2024-02-19 09:26
  */
 var formatBookings = function formatBookings(data, values) {
-  var _data$appointment_sta;
   // 是否是跨日预约
   var isDay = isDaysBooking(data);
   var isEvent = isEventBooking(data);
@@ -754,7 +753,7 @@ var formatBookings = function formatBookings(data, values) {
   }
   var dayParams = {};
   var eventOtherParams = data.eventOtherParams;
-  var appointmentStatus = (_data$appointment_sta = data.appointment_status) !== null && _data$appointment_sta !== void 0 ? _data$appointment_sta : 'new';
+  // const appointment_booking = data?.appointment_bookin
   var bookings = [];
   var obj = {};
 
@@ -766,19 +765,20 @@ var formatBookings = function formatBookings(data, values) {
     }
   });
   list.forEach(function (item) {
-    var _item$_extend52, _item$_extend57;
+    var _item$_extend53, _item$_extend58, _item$_extend59;
     // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
     if (item.isCustomItem) {
+      var _item$_extend52;
       bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
         product_id: 0,
         // 确保后端接收到的 product_id 为 0
-        appointment_status: appointmentStatus
+        appointment_status: (item === null || item === void 0 || (_item$_extend52 = item._extend) === null || _item$_extend52 === void 0 ? void 0 : _item$_extend52.appointment_status) || (data === null || data === void 0 ? void 0 : data.appointment_status) || 'new'
       }));
       return;
     }
 
     // 当前商品是跨日预约商品
-    var isMultiDay = (_item$_extend52 = item._extend) === null || _item$_extend52 === void 0 ? void 0 : _item$_extend52.groupId;
+    var isMultiDay = (_item$_extend53 = item._extend) === null || _item$_extend53 === void 0 ? void 0 : _item$_extend53.groupId;
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format('HH:mm');
@@ -792,9 +792,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend53, _item$_extend54, _item$_extend55, _item$_extend56;
-      var startDate = ((_item$_extend53 = item._extend) === null || _item$_extend53 === void 0 ? void 0 : _item$_extend53.startDate) || ((_item$_extend54 = item._extend) === null || _item$_extend54 === void 0 ? void 0 : _item$_extend54.start_date);
-      var endDate = ((_item$_extend55 = item._extend) === null || _item$_extend55 === void 0 ? void 0 : _item$_extend55.endDate) || ((_item$_extend56 = item._extend) === null || _item$_extend56 === void 0 ? void 0 : _item$_extend56.end_date);
+      var _item$_extend54, _item$_extend55, _item$_extend56, _item$_extend57;
+      var startDate = ((_item$_extend54 = item._extend) === null || _item$_extend54 === void 0 ? void 0 : _item$_extend54.startDate) || ((_item$_extend55 = item._extend) === null || _item$_extend55 === void 0 ? void 0 : _item$_extend55.start_date);
+      var endDate = ((_item$_extend56 = item._extend) === null || _item$_extend56 === void 0 ? void 0 : _item$_extend56.endDate) || ((_item$_extend57 = item._extend) === null || _item$_extend57 === void 0 ? void 0 : _item$_extend57.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -820,9 +820,9 @@ var formatBookings = function formatBookings(data, values) {
     // 跨日预约处理： 跨日预约所有数据都在list中， 每一组预约通过groupId进行分组
     // 通过obj 记录下每个GroupId第一次出现的时机，  第一次出现需要设置 metadata.multiDayPrices
     // 后续出现不需要设置 metadata.multiDayPrices. 节省体积
-    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend57 = item._extend) === null || _item$_extend57 === void 0 ? void 0 : _item$_extend57.groupId];
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend58 = item._extend) === null || _item$_extend58 === void 0 ? void 0 : _item$_extend58.groupId];
     var booking = _objectSpread(_objectSpread({
-      appointment_status: appointmentStatus,
+      appointment_status: (item === null || item === void 0 || (_item$_extend59 = item._extend) === null || _item$_extend59 === void 0 ? void 0 : _item$_extend59.appointment_status) || (data === null || data === void 0 ? void 0 : data.appointment_status) || 'new',
       schedule_event_id: item === null || item === void 0 ? void 0 : item.booking_id,
       product: formatProducts(item, undefined, list),
       relation_products: formatRelationDetails(item._extend.relation_details),
@@ -898,16 +898,16 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
   var allList = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   var list = allList.filter(function (item) {
-    var _item$_extend58;
+    var _item$_extend60;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend58 = item._extend) === null || _item$_extend58 === void 0 ? void 0 : _item$_extend58.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend60 = item._extend) === null || _item$_extend60 === void 0 ? void 0 : _item$_extend60.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend59;
-    if (!((_item$_extend59 = item._extend) !== null && _item$_extend59 !== void 0 && _item$_extend59.unique_identification_number)) {
+    var _item$_extend61;
+    if (!((_item$_extend61 = item._extend) !== null && _item$_extend61 !== void 0 && _item$_extend61.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -921,8 +921,8 @@ var formatNormalProducts = function formatNormalProducts(data) {
   var _data$service2;
   var allList = ((_data$service2 = data.service) === null || _data$service2 === void 0 ? void 0 : _data$service2.value) || [];
   allList.forEach(function (item) {
-    var _item$_extend60;
-    if (!((_item$_extend60 = item._extend) !== null && _item$_extend60 !== void 0 && _item$_extend60.unique_identification_number)) {
+    var _item$_extend62;
+    if (!((_item$_extend62 = item._extend) !== null && _item$_extend62 !== void 0 && _item$_extend62.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -1059,21 +1059,21 @@ export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var errorRowKey = '';
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend$holder_2, _item$_extend62;
+    var _item$_extend$holder_2, _item$_extend64;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && (!item._extend.holder_id || ((_item$_extend$holder_2 = item._extend.holder_id) === null || _item$_extend$holder_2 === void 0 ? void 0 : _item$_extend$holder_2.length) === 0)) {
-      var _item$_extend61;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend61 = item._extend) === null || _item$_extend61 === void 0 || (_item$_extend61 = _item$_extend61.other) === null || _item$_extend61 === void 0 ? void 0 : _item$_extend61.rowKey);
-      return true;
-    }
-    if (item._extend.quantity > 1 && ((_item$_extend62 = item._extend) === null || _item$_extend62 === void 0 || (_item$_extend62 = _item$_extend62.holder_id) === null || _item$_extend62 === void 0 ? void 0 : _item$_extend62.length) !== item._extend.quantity) {
       var _item$_extend63;
       errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend63 = item._extend) === null || _item$_extend63 === void 0 || (_item$_extend63 = _item$_extend63.other) === null || _item$_extend63 === void 0 ? void 0 : _item$_extend63.rowKey);
       return true;
     }
+    if (item._extend.quantity > 1 && ((_item$_extend64 = item._extend) === null || _item$_extend64 === void 0 || (_item$_extend64 = _item$_extend64.holder_id) === null || _item$_extend64 === void 0 ? void 0 : _item$_extend64.length) !== item._extend.quantity) {
+      var _item$_extend65;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend65 = item._extend) === null || _item$_extend65 === void 0 || (_item$_extend65 = _item$_extend65.other) === null || _item$_extend65 === void 0 ? void 0 : _item$_extend65.rowKey);
+      return true;
+    }
     return false;
   });
   var clientId = (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id;

package/es/components/checkout/PaymentModal.js

@@ -2215,7 +2215,7 @@ var PaymentModal = function PaymentModal(_ref19) {
     unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', executeIfActive( /*#__PURE__*/function () {
       var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(data) {
         var _data$response, _responseData$payment2;
-        var currentOrderId, orderInfo, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _interaction$utils6, _interaction$utils6$a, isToastMode, paymentResult;
+        var currentOrderId, orderInfo, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _orderPrintList, canPrintFlag, _orderPrintList2, lastPrintTime, now, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _interaction$utils6, _interaction$utils6$a, isToastMode, paymentResult;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
@@ -2267,53 +2267,69 @@ var PaymentModal = function PaymentModal(_ref19) {
                   }
                 });
               } else {
+                // 构造一个防重复池子
+                if (!window.orderPrintList) {
+                  window.orderPrintList = {};
+                }
+                canPrintFlag = true; // 如果订单打印过，看是否间隔两秒内，如果是则不打印
+                if ((_orderPrintList = window.orderPrintList) !== null && _orderPrintList !== void 0 && _orderPrintList[responseData.order_id]) {
+                  lastPrintTime = (_orderPrintList2 = window.orderPrintList) === null || _orderPrintList2 === void 0 ? void 0 : _orderPrintList2[responseData.order_id];
+                  now = new Date().getTime();
+                  if (now - lastPrintTime < 2000) {
+                    canPrintFlag = false;
+                  }
+                }
+                window.orderPrintList[responseData.order_id] = new Date().getTime();
                 // 打印订单完整信息
                 console.log('print_order_onOrderSynced>>>>', responseData);
                 logger === null || logger === void 0 || logger.addLog({
                   type: 'info',
                   title: 'print_order_onOrderSynced',
                   metadata: {
-                    responseData: responseData
+                    responseData: responseData,
+                    canPrintFlag: canPrintFlag
                   }
                 });
-                try {
-                  params = {
-                    type: '99',
-                    // 打印订单全部信息
-                    data: {
-                      order_id: responseData.order_id,
-                      machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                      small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data,
-                      machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
-                    }
-                  };
-                  console.log('print_order_onOrderSynced_params>>>>', params);
-                  logger === null || logger === void 0 || logger.addLog({
-                    type: 'info',
-                    title: 'print_order_onOrderSynced_params',
-                    metadata: {
-                      params: params
-                    }
-                  });
-                  nativePrint(params, function (res) {
-                    console.log('print_order_onOrderSynced_res>>>>', res);
+                if (canPrintFlag) {
+                  try {
+                    params = {
+                      type: '99',
+                      // 打印订单全部信息
+                      data: {
+                        order_id: responseData.order_id,
+                        machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
+                        small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data,
+                        machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
+                      }
+                    };
+                    console.log('print_order_onOrderSynced_params>>>>', params);
                     logger === null || logger === void 0 || logger.addLog({
                       type: 'info',
-                      title: 'print_order_onOrderSynced_res',
+                      title: 'print_order_onOrderSynced_params',
                       metadata: {
-                        res: res
+                        params: params
                       }
                     });
-                  });
-                } catch (error) {
-                  console.error('print_order_onOrderSynced_error>>>>', error);
-                  logger === null || logger === void 0 || logger.addLog({
-                    type: 'info',
-                    title: 'print_order_onOrderSynced_error',
-                    metadata: {
-                      error: error
-                    }
-                  });
+                    nativePrint(params, function (res) {
+                      console.log('print_order_onOrderSynced_res>>>>', res);
+                      logger === null || logger === void 0 || logger.addLog({
+                        type: 'info',
+                        title: 'print_order_onOrderSynced_res',
+                        metadata: {
+                          res: res
+                        }
+                      });
+                    });
+                  } catch (error) {
+                    console.error('print_order_onOrderSynced_error>>>>', error);
+                    logger === null || logger === void 0 || logger.addLog({
+                      type: 'info',
+                      title: 'print_order_onOrderSynced_error',
+                      metadata: {
+                        error: error
+                      }
+                    });
+                  }
                 }
               }
 

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

@@ -716,7 +716,8 @@ var Footer = (props) => {
               orderTotalList,
               total,
               showDetail
-            }
+            },
+            existPayment
           };
           if (JSON.stringify(modalData) === JSON.stringify(paymentModalData)) {
             return;

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

@@ -541,7 +541,6 @@ var formatBookings = (data, values) => {
   }
   let dayParams = {};
   const eventOtherParams = data.eventOtherParams;
-  const appointmentStatus = data.appointment_status ?? "new";
   let bookings = [];
   let obj = {};
   list.forEach((item) => {
@@ -551,17 +550,17 @@ var formatBookings = (data, values) => {
     }
   });
   list.forEach((item) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     if (item.isCustomItem) {
       bookings.push({
         ...item._extend,
         product_id: 0,
         // 确保后端接收到的 product_id 为 0
-        appointment_status: appointmentStatus
+        appointment_status: ((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.appointment_status) || (data == null ? void 0 : data.appointment_status) || "new"
       });
       return;
     }
-    const isMultiDay = (_a = item._extend) == null ? void 0 : _a.groupId;
+    const isMultiDay = (_b = item._extend) == null ? void 0 : _b.groupId;
     let start_date = item._extend.startDate.format("YYYY-MM-DD");
     let end_date = item._extend.endDate.format("YYYY-MM-DD");
     let end_time = item._extend.endDate.format("HH:mm");
@@ -571,8 +570,8 @@ var formatBookings = (data, values) => {
     }
     dayParams.holder = formatHolders(data, item, values);
     if (isDay) {
-      const startDate = ((_b = item._extend) == null ? void 0 : _b.startDate) || ((_c = item._extend) == null ? void 0 : _c.start_date);
-      const endDate = ((_d = item._extend) == null ? void 0 : _d.endDate) || ((_e = item._extend) == null ? void 0 : _e.end_date);
+      const startDate = ((_c = item._extend) == null ? void 0 : _c.startDate) || ((_d = item._extend) == null ? void 0 : _d.start_date);
+      const endDate = ((_e = item._extend) == null ? void 0 : _e.endDate) || ((_f = item._extend) == null ? void 0 : _f.end_date);
       const { startDateTime, endDateTime } = (0, import_utils4.formatDayTime)({
         startDate,
         endDate
@@ -588,9 +587,9 @@ var formatBookings = (data, values) => {
         "minutes"
       );
     }
-    const isSetGroupId = obj[(_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.groupId];
+    const isSetGroupId = obj[(_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.groupId];
     const booking = {
-      appointment_status: appointmentStatus,
+      appointment_status: ((_h = item == null ? void 0 : item._extend) == null ? void 0 : _h.appointment_status) || (data == null ? void 0 : data.appointment_status) || "new",
       schedule_event_id: item == null ? void 0 : item.booking_id,
       product: formatProducts(item, void 0, list),
       relation_products: formatRelationDetails(item._extend.relation_details),
@@ -626,7 +625,7 @@ var formatBookings = (data, values) => {
       newItem._extend.unique_identification_number = `${item._extend.unique_identification_number}_${i}`;
       if (i > 0) {
         newItem._extend.surcharge_rounding_remainder = void 0;
-        if (((_i = (_h = (_g = newItem._extend) == null ? void 0 : _g.other) == null ? void 0 : _h.bundle) == null ? void 0 : _i.length) > 0) {
+        if (((_k = (_j = (_i = newItem._extend) == null ? void 0 : _i.other) == null ? void 0 : _j.bundle) == null ? void 0 : _k.length) > 0) {
           newItem._extend.other.bundle.forEach((bundleItem) => {
             bundleItem.surcharge_rounding_remainder = void 0;
           });

package/lib/components/checkout/PaymentModal.js

@@ -1560,7 +1560,7 @@ var PaymentModal = ({
     unsubscribeRef.current = checkout.core.effects.on(
       "checkout:onOrderSynced",
       executeIfActive(async (data2) => {
-        var _a2, _b2, _c2, _d2, _e2;
+        var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
         const currentOrderId = checkout.getCurrentOrderId();
         const orderInfo2 = checkout.getCurrentOrderInfo();
         if (!orderInfo2 || !(orderInfo2 == null ? void 0 : orderInfo2.orderId)) return;
@@ -1588,52 +1588,67 @@ var PaymentModal = ({
               }
             });
           } else {
+            if (!window.orderPrintList) {
+              window.orderPrintList = {};
+            }
+            let canPrintFlag = true;
+            if ((_c2 = window.orderPrintList) == null ? void 0 : _c2[responseData.order_id]) {
+              const lastPrintTime = (_d2 = window.orderPrintList) == null ? void 0 : _d2[responseData.order_id];
+              const now = (/* @__PURE__ */ new Date()).getTime();
+              if (now - lastPrintTime < 2e3) {
+                canPrintFlag = false;
+              }
+            }
+            window.orderPrintList[responseData.order_id] = (/* @__PURE__ */ new Date()).getTime();
             console.log("print_order_onOrderSynced>>>>", responseData);
             logger == null ? void 0 : logger.addLog({
               type: "info",
               title: "print_order_onOrderSynced",
               metadata: {
-                responseData
+                responseData,
+                canPrintFlag
               }
             });
-            try {
-              const params = {
-                type: "99",
-                // 打印订单全部信息
-                data: {
-                  order_id: responseData.order_id,
-                  machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
-                  small_ticket_data: (_c2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c2.small_ticket_data,
-                  machine_code_print_info_v2: responseData == null ? void 0 : responseData.machine_code_print_info_v2
-                }
-              };
-              console.log("print_order_onOrderSynced_params>>>>", params);
-              logger == null ? void 0 : logger.addLog({
-                type: "info",
-                title: "print_order_onOrderSynced_params",
-                metadata: {
-                  params
-                }
-              });
-              nativePrint(params, (res) => {
-                console.log("print_order_onOrderSynced_res>>>>", res);
+            if (canPrintFlag) {
+              try {
+                const params = {
+                  type: "99",
+                  // 打印订单全部信息
+                  data: {
+                    order_id: responseData.order_id,
+                    machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
+                    small_ticket_data: (_e2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _e2.small_ticket_data,
+                    machine_code_print_info_v2: responseData == null ? void 0 : responseData.machine_code_print_info_v2
+                  }
+                };
+                console.log("print_order_onOrderSynced_params>>>>", params);
                 logger == null ? void 0 : logger.addLog({
                   type: "info",
-                  title: "print_order_onOrderSynced_res",
+                  title: "print_order_onOrderSynced_params",
                   metadata: {
-                    res
+                    params
                   }
                 });
-              });
-            } catch (error) {
-              console.error("print_order_onOrderSynced_error>>>>", error);
-              logger == null ? void 0 : logger.addLog({
-                type: "info",
-                title: "print_order_onOrderSynced_error",
-                metadata: {
-                  error
-                }
-              });
+                nativePrint(params, (res) => {
+                  console.log("print_order_onOrderSynced_res>>>>", res);
+                  logger == null ? void 0 : logger.addLog({
+                    type: "info",
+                    title: "print_order_onOrderSynced_res",
+                    metadata: {
+                      res
+                    }
+                  });
+                });
+              } catch (error) {
+                console.error("print_order_onOrderSynced_error>>>>", error);
+                logger == null ? void 0 : logger.addLog({
+                  type: "info",
+                  title: "print_order_onOrderSynced_error",
+                  metadata: {
+                    error
+                  }
+                });
+              }
             }
           }
           const statusClassName = (0, import_PaymentResultToastUtils.calculateStatusClassName)(paymentStatus);
@@ -1645,7 +1660,7 @@ var PaymentModal = ({
           if (isWebPos) {
             enabledAutoPrint = false;
           } else {
-            enabledAutoPrint = await ((_e2 = (_d2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d2.asyncDataManager) == null ? void 0 : _e2.call(_d2, {
+            enabledAutoPrint = await ((_g2 = (_f2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _f2.asyncDataManager) == null ? void 0 : _g2.call(_f2, {
               module: "get",
               key: "auto_print_receipt"
             }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.151",
+  "version": "6.11.153",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -67,10 +67,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/materials": "6.11.48",
-    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.8",
-    "@pisell/utils": "3.0.2"
+    "@pisell/utils": "3.0.2",
+    "@pisell/materials": "6.11.48",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/components/booking/editBookingModal/utils.d.ts

@@ -1,12 +0,0 @@
-export interface ResourceItem {
-    [key: string]: any;
-}
-/**
- * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
- * @description:
- * @param {object} resource
- * @return {*}
- * @Author: jinglin.tan
- */
-export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
-export declare const formatValues: (data: any, values: any) => any;

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

@@ -1,12 +0,0 @@
-export interface ResourceItem {
-    [key: string]: any;
-}
-/**
- * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
- * @description:
- * @param {object} resource
- * @return {*}
- * @Author: jinglin.tan
- */
-export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
-export declare const formatValues: (data: any, values: any) => any;