@pisell/private-materials 3.0.89 → 3.0.91

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

@@ -757,56 +757,6 @@ var Footer = function Footer(props) {
       return false;
     }
   }, [state.bookingDetail, total.notPaidAmount]);
-  var moreButton = useMemo(function () {
-    var arr = [];
-    if (!state.bookingId) {
-      return [];
-    }
-    if (source !== 'info') {
-      return [];
-    }
-    if (state.renderType === 'eventBooking') {
-      return [];
-    }
-    // 支付链接
-    if (state.bookingId && isShowPaymentLink) {
-      arr.push(actionMap.paymentLink);
-    }
-    if (transaction_habit_selection.button_rows == 1) {
-      if (state.appointment_status !== 'cancelled') {
-        if (!state.disabledEdit) {
-          arr.push(actionMap.sale);
-        }
-      }
-    }
-
-    // if (transaction_habit_selection.button_rows == 1) {
-    // 	if (isTerminal?.()) {
-    // 		arr.push(actionMap.print);
-    // 	}
-    // }
-    if (!isTeam) {
-      if (transaction_habit_selection.button_rows == 1) {
-        arr.push(actionMap.orderDetail);
-      }
-    }
-
-    // 退款
-    if (!isTeam) {
-      if (total.paidAmount > 0) {
-        arr.push(actionMap.refund);
-      }
-    }
-
-    // 重新预约
-    if (state.appointment_status !== 'cancelled') {
-      arr.push(actionMap.rebook);
-    }
-
-    // 取消订单
-    // arr.push(actionMap.cancelOrder);
-    return arr;
-  }, [state, total, isShowPaymentLink, source]);
   var _buttons = useMemo(function () {
     // 如果预约是取消状态,则不展示任何按钮
     if (state.appointment_status === 'cancelled') {
@@ -869,9 +819,12 @@ var Footer = function Footer(props) {
       if (isEdit) {
         _arr3.push(buttonMap.save);
       }
-      if (_arr3.length === 0) {
-        return [buttonMap.rebook];
-      }
+      // if (isTeam) {
+      //   if (arr.length === 0) {
+      //     return [buttonMap.rebook];
+      //   }
+      // }
+
       return _arr3;
     }
     if (source === 'addTime') {
@@ -881,6 +834,56 @@ var Footer = function Footer(props) {
     }
     return [];
   }, [buttons, total, isEdit, checkoutLoading, isDisabled, source, buttonMap, loading, isCheckout, state, isTeam]);
+  var moreButton = useMemo(function () {
+    var arr = [];
+    if (!state.bookingId) {
+      return [];
+    }
+    if (source !== 'info') {
+      return [];
+    }
+    if (state.renderType === 'eventBooking') {
+      return [];
+    }
+
+    // 如果外部没有按钮, 则rebook按钮放在外面
+    if (_buttons.length !== 0) {
+      // 支付链接
+      if (state.bookingId && isShowPaymentLink) {
+        arr.push(actionMap.paymentLink);
+      }
+    }
+    if (transaction_habit_selection.button_rows == 1) {
+      if (state.appointment_status !== 'cancelled') {
+        if (!state.disabledEdit) {
+          arr.push(actionMap.sale);
+        }
+      }
+    }
+
+    // if (transaction_habit_selection.button_rows == 1) {
+    // 	if (isTerminal?.()) {
+    // 		arr.push(actionMap.print);
+    // 	}
+    // }
+
+    if (!isTeam) {
+      if (transaction_habit_selection.button_rows == 1) {
+        arr.push(actionMap.orderDetail);
+      }
+      if (total.paidAmount > 0) {
+        arr.push(actionMap.refund);
+      }
+    }
+
+    // 重新预约
+    if (state.appointment_status !== 'cancelled') {
+      arr.push(actionMap.rebook);
+    }
+    // 取消订单
+    // arr.push(actionMap.cancelOrder);
+    return arr;
+  }, [state, total, isShowPaymentLink, source, _buttons.length]);
 
   /**
    * 是否只有定金支付
@@ -1138,7 +1141,7 @@ var Footer = function Footer(props) {
     dispatch: dispatch,
     source: source,
     menuChange: menuChange
-  }), _buttons), source === 'info' && state.bookingId && !state.disabledEdit && (transaction_habit_selection === null || transaction_habit_selection === void 0 ? void 0 : transaction_habit_selection.button_rows) == 2 ? /*#__PURE__*/React.createElement("div", {
+  }), _buttons.length ? _buttons : state.bookingId && isShowPaymentLink ? paymentLinkButton : null), source === 'info' && state.bookingId && !state.disabledEdit && (transaction_habit_selection === null || transaction_habit_selection === void 0 ? void 0 : transaction_habit_selection.button_rows) == 2 ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-footer-buttons",
     style: {
       marginTop: 12
@@ -1149,7 +1152,7 @@ var Footer = function Footer(props) {
     },
     size: "large",
     className: "pisell-lowcode__booking-footer-buttons-item"
-  }, actionMap.sale.label) : null, /*#__PURE__*/React.createElement(Button, {
+  }, actionMap.sale.label) : null, isTeam ? null : /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return handleOrderDetail();
     },

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

@@ -491,42 +491,6 @@ var Footer = (props) => {
       return false;
     }
   }, [state.bookingDetail, total.notPaidAmount]);
-  const moreButton = (0, import_react.useMemo)(() => {
-    let arr = [];
-    if (!state.bookingId) {
-      return [];
-    }
-    if (source !== "info") {
-      return [];
-    }
-    if (state.renderType === "eventBooking") {
-      return [];
-    }
-    if (state.bookingId && isShowPaymentLink) {
-      arr.push(actionMap.paymentLink);
-    }
-    if (transaction_habit_selection.button_rows == 1) {
-      if (state.appointment_status !== "cancelled") {
-        if (!state.disabledEdit) {
-          arr.push(actionMap.sale);
-        }
-      }
-    }
-    if (!isTeam) {
-      if (transaction_habit_selection.button_rows == 1) {
-        arr.push(actionMap.orderDetail);
-      }
-    }
-    if (!isTeam) {
-      if (total.paidAmount > 0) {
-        arr.push(actionMap.refund);
-      }
-    }
-    if (state.appointment_status !== "cancelled") {
-      arr.push(actionMap.rebook);
-    }
-    return arr;
-  }, [state, total, isShowPaymentLink, source]);
   const _buttons = (0, import_react.useMemo)(() => {
     if (state.appointment_status === "cancelled") {
       return [buttonMap.rebook];
@@ -568,9 +532,6 @@ var Footer = (props) => {
       if (isEdit) {
         arr.push(buttonMap.save);
       }
-      if (arr.length === 0) {
-        return [buttonMap.rebook];
-      }
       return arr;
     }
     if (source === "addTime") {
@@ -592,6 +553,42 @@ var Footer = (props) => {
     state,
     isTeam
   ]);
+  const moreButton = (0, import_react.useMemo)(() => {
+    let arr = [];
+    if (!state.bookingId) {
+      return [];
+    }
+    if (source !== "info") {
+      return [];
+    }
+    if (state.renderType === "eventBooking") {
+      return [];
+    }
+    if (_buttons.length !== 0) {
+      if (state.bookingId && isShowPaymentLink) {
+        arr.push(actionMap.paymentLink);
+      }
+    }
+    if (transaction_habit_selection.button_rows == 1) {
+      if (state.appointment_status !== "cancelled") {
+        if (!state.disabledEdit) {
+          arr.push(actionMap.sale);
+        }
+      }
+    }
+    if (!isTeam) {
+      if (transaction_habit_selection.button_rows == 1) {
+        arr.push(actionMap.orderDetail);
+      }
+      if (total.paidAmount > 0) {
+        arr.push(actionMap.refund);
+      }
+    }
+    if (state.appointment_status !== "cancelled") {
+      arr.push(actionMap.rebook);
+    }
+    return arr;
+  }, [state, total, isShowPaymentLink, source, _buttons.length]);
   const isOnlyDeposit = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     if (((_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.deposit_payment_time) && ((_d2 = (_c2 = (_b2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _b2.payment_types) == null ? void 0 : _c2.every) == null ? void 0 : _d2.call(
@@ -782,7 +779,7 @@ var Footer = (props) => {
       source,
       menuChange
     }
-  ), _buttons), source === "info" && state.bookingId && !state.disabledEdit && (transaction_habit_selection == null ? void 0 : transaction_habit_selection.button_rows) == 2 ? /* @__PURE__ */ import_react.default.createElement(
+  ), _buttons.length ? _buttons : state.bookingId && isShowPaymentLink ? paymentLinkButton : null), source === "info" && state.bookingId && !state.disabledEdit && (transaction_habit_selection == null ? void 0 : transaction_habit_selection.button_rows) == 2 ? /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: "pisell-lowcode__booking-footer-buttons",
@@ -797,7 +794,7 @@ var Footer = (props) => {
       },
       actionMap.sale.label
     ) : null,
-    /* @__PURE__ */ import_react.default.createElement(
+    isTeam ? null : /* @__PURE__ */ import_react.default.createElement(
       import_antd2.Button,
       {
         onClick: () => handleOrderDetail(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.89",
+  "version": "3.0.91",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,7 +60,7 @@
     "rc-virtual-list": "^3.11.3",
     "@pisell/utils": "1.0.25",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.86"
+    "@pisell/date-picker": "1.0.87"
   },
   "peerDependencies": {
     "react": "^18.0.0",