@pisell/private-materials 3.0.22 → 3.0.24

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

@@ -39,6 +39,7 @@ import { formatProductBundle } from "../components/footer/utils";
 import { formatProductListByCategory, getProductTotalPrice } from "../utils";
 import { locales, getUniqueId } from "@pisell/utils";
 import "./index.less";
+import useEngineContext from "../../../hooks/useEngineContext";
 export var formatProducts = function formatProducts(values) {
   var arr = [];
   arr = values.map(function (item) {
@@ -109,7 +110,7 @@ var formatProductValues = function formatProductValues(data) {
   });
 };
 var Addons = Provider(function (props) {
-  var _state$addons2, _state$addons4;
+  var _context$appHelper, _state$addons2, _state$addons4;
   var globalState = props.globalState;
   var _useContext = useContext(Context),
     state = _useContext.state,
@@ -122,6 +123,10 @@ var Addons = Provider(function (props) {
     _useState4 = _slicedToArray(_useState3, 2),
     search = _useState4[0],
     setSearch = _useState4[1];
+  var context = useEngineContext();
+  var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    isTerminal = _ref.isTerminal,
+    interaction = _ref.interaction;
   useEffect(function () {
     dispatch({
       type: "setState",
@@ -154,6 +159,14 @@ var Addons = Provider(function (props) {
       init();
     }
   }, [state.bookingDetail]);
+  useEffect(function () {
+    if (isTerminal !== null && isTerminal !== void 0 && isTerminal()) {
+      var _interaction$utils;
+      interaction === null || interaction === void 0 ? void 0 : (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 ? void 0 : _interaction$utils.mountFunction("booking", "refreshBookingDetailAddons", function () {
+        init();
+      });
+    }
+  }, [state]);
 
   /**
    * @title: 通过订单id 获取addons
@@ -163,7 +176,7 @@ var Addons = Provider(function (props) {
    * @Date: 2024-01-30 16:35
    */
   var getAddonsByOrderId = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -189,7 +202,7 @@ var Addons = Provider(function (props) {
       }, _callee);
     }));
     return function getAddonsByOrderId() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 
@@ -201,7 +214,7 @@ var Addons = Provider(function (props) {
    * @Date: 2024-01-30 16:36
    */
   var getProducts = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var data;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -234,7 +247,7 @@ var Addons = Provider(function (props) {
       }, _callee2);
     }));
     return function getProducts() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
 
@@ -374,6 +387,16 @@ var Addons = Provider(function (props) {
    * @Date: 2024-01-30 16:40
    */
   var handleOpenAdd = function handleOpenAdd() {
+    if (isTerminal !== null && isTerminal !== void 0 && isTerminal()) {
+      var _interaction$utils2, _interaction$utils2$p;
+      return interaction === null || interaction === void 0 ? void 0 : (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 ? void 0 : (_interaction$utils2$p = _interaction$utils2.postMessageToApp) === null || _interaction$utils2$p === void 0 ? void 0 : _interaction$utils2$p.call(_interaction$utils2, {
+        module: "booking",
+        key: "edit_order",
+        data: {
+          order_id: state.bookingId
+        }
+      });
+    }
     setSearch("");
     dispatch({
       type: "setAddons",

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

@@ -28,6 +28,7 @@ import { formatValues } from "./utils";
 import { getSumTotal, is_price_include_tax } from "./amount";
 import FooterMenus from "./FooterMenus";
 import "./index.less";
+import useEngineContext from "../../../../hooks/useEngineContext";
 
 /**
  * @title: 底部
@@ -38,7 +39,7 @@ import "./index.less";
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$addons2, _state$addons4, _state$bookingDetail3;
+  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$addons2, _state$addons4, _state$bookingDetail3;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -58,6 +59,10 @@ var Footer = function Footer(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     checkoutLoading = _useState6[0],
     setCheckoutLoading = _useState6[1];
+  var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    isTerminal = _context$appHelper$ut.isTerminal,
+    interaction = _context$appHelper$ut.interaction;
 
   // board 配置
   var params = useMemo(function () {
@@ -148,9 +153,22 @@ var Footer = function Footer(props) {
    */
   var goCheckout = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(order_id) {
+      var _interaction$utils, _interaction$utils$po;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", interaction === null || interaction === void 0 ? void 0 : (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 ? void 0 : (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 ? void 0 : _interaction$utils$po.call(_interaction$utils, {
+              module: 'booking',
+              key: 'booking_checkout',
+              data: {
+                order_id: order_id
+              }
+            }));
+          case 2:
             state.action({
               type: "pisell1.handlePayment",
               data: {
@@ -160,7 +178,7 @@ var Footer = function Footer(props) {
                 state === null || state === void 0 ? void 0 : state.callback();
               }
             });
-          case 1:
+          case 3:
           case "end":
             return _context.stop();
         }

package/es/components/booking/info/date/index.js

@@ -101,7 +101,7 @@ var DateCom = function DateCom() {
     bordered: false,
     suffixIcon: !modal.state.disabledEdit ? /*#__PURE__*/React.createElement(ChevronDown, null) : null,
     disabledDate: disabledDate,
-    format: modal.state.locale === "en" ? "dddd, MM DD YYYY" : "YYYY年MM月DD日",
+    format: modal.state.locale === "en" ? "dddd, DD MMM YYYY" : "YYYY年MM月DD日",
     value: modal.state.date.value,
     onChange: dateChange,
     disabled: modal.state.disabledEdit

package/es/components/booking/info/pet/index.js

@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useMemo, useState } from "react";
 import User01 from "@pisell/icon/es/User01";
 import { Context } from "../model";
-import { Avatar } from "antd";
+import { Avatar, Skeleton } from "antd";
 import "./index.less";
 import { locales } from "@pisell/utils";
 import FormsCom from "../../forms/forms";
@@ -327,6 +327,10 @@ var Pet = function Pet() {
   }, [state.bookingId, state.bookingDetail, params.form_id, params.type, (_state$client8 = state.client) === null || _state$client8 === void 0 ? void 0 : (_state$client8$value = _state$client8.value) === null || _state$client8$value === void 0 ? void 0 : _state$client8$value.id]);
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-pet-wraps"
+  }, /*#__PURE__*/React.createElement(Skeleton, {
+    loading: loading,
+    active: true,
+    round: true
   }, /*#__PURE__*/React.createElement(FormsCom, {
     hideTitle: true,
     watch: {
@@ -386,6 +390,6 @@ var Pet = function Pet() {
         margin: 0
       }
     }
-  }));
+  })));
 };
 export default Pet;

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

@@ -47,6 +47,7 @@ var import_utils = require("../components/footer/utils");
 var import_utils2 = require("../utils");
 var import_utils3 = require("@pisell/utils");
 var import_index = require("./index.less");
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var formatProducts = (values) => {
   let arr = [];
   arr = values.map((item) => {
@@ -118,11 +119,13 @@ var formatProductValues = (data) => {
   });
 };
 var Addons = (0, import_model.Provider)((props) => {
-  var _a, _b;
+  var _a, _b, _c;
   const { globalState } = props;
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [search, setSearch] = (0, import_react.useState)("");
+  const context = (0, import_useEngineContext.default)();
+  const { isTerminal, interaction } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   (0, import_react.useEffect)(() => {
     dispatch({
       type: "setState",
@@ -148,6 +151,18 @@ var Addons = (0, import_model.Provider)((props) => {
       init();
     }
   }, [state.bookingDetail]);
+  (0, import_react.useEffect)(() => {
+    var _a2;
+    if (isTerminal == null ? void 0 : isTerminal()) {
+      (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.mountFunction(
+        "booking",
+        "refreshBookingDetailAddons",
+        () => {
+          init();
+        }
+      );
+    }
+  }, [state]);
   const getAddonsByOrderId = async () => {
     setLoading(true);
     let data = await state.apis.getAddonsByOrderId();
@@ -271,12 +286,22 @@ var Addons = (0, import_model.Provider)((props) => {
       _list,
       search ? (item) => isIncludes(item.title) : void 0
     );
-  }, [search, (_a = state.addons) == null ? void 0 : _a.originData]);
+  }, [search, (_b = state.addons) == null ? void 0 : _b.originData]);
   const isEdit = (0, import_react.useMemo)(() => {
     var _a2;
     return (_a2 = state == null ? void 0 : state.addons) == null ? void 0 : _a2.edit;
-  }, [(_b = state == null ? void 0 : state.addons) == null ? void 0 : _b.edit]);
+  }, [(_c = state == null ? void 0 : state.addons) == null ? void 0 : _c.edit]);
   const handleOpenAdd = () => {
+    var _a2, _b2;
+    if (isTerminal == null ? void 0 : isTerminal()) {
+      return (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
+        module: "booking",
+        key: "edit_order",
+        data: {
+          order_id: state.bookingId
+        }
+      });
+    }
     setSearch("");
     dispatch({
       type: "setAddons",

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

@@ -43,23 +43,26 @@ var import_utils2 = require("./utils");
 var import_amount = require("./amount");
 var import_FooterMenus = __toESM(require("./FooterMenus"));
 var import_index = require("./index.less");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var Footer = (props) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   const { state, buttons, dispatch, source } = props;
   const [showDetail, setShowDetail] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [checkoutLoading, setCheckoutLoading] = (0, import_react.useState)(false);
+  const context = (0, import_useEngineContext.default)();
+  const { isTerminal, interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const params = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) || {};
-  }, [(_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject]);
+  }, [(_d = (_c = (_b = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.appointment_subject]);
   const addonsEdit = (0, import_react.useMemo)(() => {
     var _a2;
     if ((_a2 = state.addons) == null ? void 0 : _a2.edit) {
       return true;
     }
     return false;
-  }, [(_d = state.addons) == null ? void 0 : _d.edit]);
+  }, [(_e = state.addons) == null ? void 0 : _e.edit]);
   const infoEdit = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2;
     if (!state.bookingId) {
@@ -108,6 +111,16 @@ var Footer = (props) => {
     return false;
   }, [state, params]);
   const goCheckout = async (order_id) => {
+    var _a2, _b2;
+    if (isTerminal == null ? void 0 : isTerminal()) {
+      return (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
+        module: "booking",
+        key: "booking_checkout",
+        data: {
+          order_id
+        }
+      });
+    }
     state.action({
       type: "pisell1.handlePayment",
       data: {
@@ -392,7 +405,7 @@ var Footer = (props) => {
       }
     }
     return false;
-  }, [state.bookingId, state.bookingDetail, (_e = state.addons) == null ? void 0 : _e.load, state.renderType]);
+  }, [state.bookingId, state.bookingDetail, (_f = state.addons) == null ? void 0 : _f.load, state.renderType]);
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { title: false, round: true, loading: showFooter, active: true }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-total" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-total" }, totalText), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-arrears" }, arrearsText)), /* @__PURE__ */ import_react.default.createElement(
     "span",
     {
@@ -420,7 +433,7 @@ var Footer = (props) => {
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "order-total-item-border" }),
     /* @__PURE__ */ import_react.default.createElement("div", { className: "order-total-item" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "order-total-item-label" }, import_utils.locales.getText("pisell1.text.subtotal")), /* @__PURE__ */ import_react.default.createElement("span", { className: "order-total-item-value" }, (0, import_utils.formatAmount)(total.productAmount, 2, (state == null ? void 0 : state.amountSymbol) || "$"))),
-    (((_f = state.bookingDetail) == null ? void 0 : _f.surcharge) || []).map((d) => {
+    (((_g = state.bookingDetail) == null ? void 0 : _g.surcharge) || []).map((d) => {
       return /* @__PURE__ */ import_react.default.createElement("div", { className: "order-total-item", key: d.id }, /* @__PURE__ */ import_react.default.createElement("span", { className: "order-total-item-label" }, d.name[state.locale]), /* @__PURE__ */ import_react.default.createElement("span", { className: "order-total-item-value" }, (0, import_utils.formatAmount)(d.amount, 2, (state == null ? void 0 : state.amountSymbol) || "$")));
     }),
     state.bookingId ? /* @__PURE__ */ import_react.default.createElement("div", { className: "order-total-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "order-total-item-label" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, import_utils.locales.getText("pisell1.text.tax")), /* @__PURE__ */ import_react.default.createElement("div", { className: "", style: { fontSize: 14 } }, taxText)), /* @__PURE__ */ import_react.default.createElement("span", { className: "order-total-item-value" }, (0, import_utils.formatAmount)(total.tax, 2, (state == null ? void 0 : state.amountSymbol) || "$"))) : null,

package/lib/components/booking/info/date/index.js

@@ -119,7 +119,7 @@ var DateCom = () => {
       bordered: false,
       suffixIcon: !modal.state.disabledEdit ? /* @__PURE__ */ import_react.default.createElement(import_ChevronDown.default, null) : null,
       disabledDate,
-      format: modal.state.locale === "en" ? "dddd, MM DD YYYY" : "YYYY年MM月DD日",
+      format: modal.state.locale === "en" ? "dddd, DD MMM YYYY" : "YYYY年MM月DD日",
       value: modal.state.date.value,
       onChange: dateChange,
       disabled: modal.state.disabledEdit

package/lib/components/booking/info/pet/index.js

@@ -213,7 +213,7 @@ var Pet = () => {
     params.type,
     (_f = (_e = state.client) == null ? void 0 : _e.value) == null ? void 0 : _f.id
   ]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-wraps" }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-wraps" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading, active: true, round: true }, /* @__PURE__ */ import_react.default.createElement(
     import_forms.default,
     {
       hideTitle: true,
@@ -268,6 +268,6 @@ var Pet = () => {
       },
       addButtonProps: { style: { margin: 0 } }
     }
-  ));
+  )));
 };
 var pet_default = Pet;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.22",
+  "version": "3.0.24",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",