@pisell/private-materials 3.0.13 → 3.0.14-5.gray

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

@@ -5,7 +5,7 @@
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:33
  */
-import "./index.less";
+import './index.less';
 export interface InfoProps {
     title?: string;
     style?: any;
@@ -13,5 +13,5 @@ export interface InfoProps {
     setGlobalState: any;
 }
 export declare const formatProducts: (values: any) => any;
-declare const Addons: (props: any) => JSX.Element;
+declare const Addons: any;
 export default Addons;

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

@@ -25,9 +25,9 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * @Date: 2024-01-30 16:33
  */
 
-import React, { useContext, useEffect, useMemo, useState } from "react";
-import SearchLg from "@pisell/icon/es/SearchLg";
-import { Input, Button } from "antd";
+import React, { useContext, useEffect, useMemo, useState, useRef } from 'react';
+import SearchLg from '@pisell/icon/es/SearchLg';
+import { Input, Button, Skeleton, Modal } from 'antd';
 import Drawer from "../components/drawer";
 import TabPane from "../components/tabPane";
 import { Context, Provider } from "./model";
@@ -35,27 +35,58 @@ import ProductItem from "../components/TabProduct/selectProductItem";
 import TabProduct from "../components/TabProduct";
 import EmptyBooking from "../components/emptyBooking";
 import Footer from "../components/footer";
-import { formatProductListByCategory } from "../utils";
-import { locales } from "@pisell/utils";
+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) {
+    var _item$_extend, _item$_extend2, _item$_extend2$other;
     return {
       order_detail_id: item.order_detail_id || 0,
-      num: item.quantity,
-      price: item.price,
+      num: item._extend.quantity,
+      price: item._extend.price,
       product_id: item.id,
       discount_amount: 0,
-      product_discount_reason: "",
+      product_discount_reason: '',
       is_charge_tax: item.is_charge_tax,
-      note: "",
-      discountway: "num",
-      discount_type: "discount"
+      note: '',
+      discountway: 'num',
+      discount_type: 'discount',
+      bundle_edit: (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle_edit,
+      product_bundle: formatProductBundle((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : (_item$_extend2$other = _item$_extend2.other) === null || _item$_extend2$other === void 0 ? void 0 : _item$_extend2$other.bundle)
     };
   });
   return arr;
 };
+var restoreProductOtherData = function restoreProductOtherData(data) {
+  var detail = data;
+  return {
+    product_id: detail.product_id,
+    option: [],
+    bundle: (detail.product_bundle || []).map(function (bundleItem) {
+      return _objectSpread(_objectSpread({}, bundleItem), {}, {
+        title: bundleItem.bundle_title,
+        group_id: bundleItem.bundle_group_id,
+        id: bundleItem.bundle_id,
+        product_id: bundleItem.bundle_product_id,
+        bundle_variant_id: bundleItem.bundle_variant_id,
+        quantity: bundleItem.num,
+        option: bundleItem.option.map(function (optionItem) {
+          return _objectSpread(_objectSpread({}, optionItem), {}, {
+            name: optionItem.name['auto'],
+            quantity: bundleItem.num,
+            product_option_item_id: optionItem.option_group_item_id
+          });
+        })
+      });
+    }),
+    product_variant_id: 0,
+    quantity: Number(detail.product_quantity)
+  };
+};
 
 // 格式化商品列表
 var formatProductValues = function formatProductValues(data) {
@@ -65,13 +96,21 @@ var formatProductValues = function formatProductValues(data) {
       title: d.product_title,
       quantity: d.product_quantity,
       cover: d.product_cover,
-      price: Number(d.selling_price),
+      price: Number(d.source_product_price),
+      _extend: {
+        total: Number(d.selling_price),
+        payment_price: Number(d.payment_price),
+        price: Number(d.source_product_price),
+        quantity: d.product_quantity,
+        bundle_edit: 0,
+        other: restoreProductOtherData(d)
+      },
       payment_price: Number(d.payment_price)
     });
   });
 };
 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,
@@ -80,13 +119,26 @@ var Addons = Provider(function (props) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
-  var _useState3 = useState(""),
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    search = _useState4[0],
-    setSearch = _useState4[1];
+    listLoading = _useState4[0],
+    setListLoading = _useState4[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    search = _useState6[0],
+    setSearch = _useState6[1];
+  var searchRef = useRef();
+  var context = useEngineContext();
+  var _Modal$useModal = Modal.useModal(),
+    _Modal$useModal2 = _slicedToArray(_Modal$useModal, 2),
+    modal = _Modal$useModal2[0],
+    contextHolder = _Modal$useModal2[1];
+  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",
+      type: 'setState',
       payload: {
         setGlobalState: props.setGlobalState
       }
@@ -94,7 +146,7 @@ var Addons = Provider(function (props) {
   }, []);
   useEffect(function () {
     dispatch({
-      type: "setState",
+      type: 'setState',
       payload: _objectSpread({}, globalState)
     });
   }, [globalState]);
@@ -107,7 +159,6 @@ var Addons = Provider(function (props) {
    * @Date: 2024-01-30 16:34
    */
   var init = function init() {
-    getProducts();
     getAddonsByOrderId();
   };
   useEffect(function () {
@@ -117,6 +168,16 @@ var Addons = Provider(function (props) {
     }
   }, [state.bookingDetail]);
 
+  // 这里暂时不用了, 用页面上的 refreshBookingDetail 统一更新
+  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
    * @description:
@@ -125,7 +186,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) {
@@ -136,7 +197,7 @@ var Addons = Provider(function (props) {
           case 3:
             data = _context.sent;
             dispatch({
-              type: "setAddons",
+              type: 'setAddons',
               payload: {
                 value: formatProductValues(data || []),
                 load: true,
@@ -151,7 +212,7 @@ var Addons = Provider(function (props) {
       }, _callee);
     }));
     return function getAddonsByOrderId() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 
@@ -163,40 +224,47 @@ 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) {
           case 0:
-            _context2.next = 2;
+            setListLoading(true);
+            _context2.next = 3;
             return state.apis.getProducts({
               skip: 1,
               num: 500,
-              extension_type: ["normal"],
-              with: ["category"],
-              include_formula: "no",
-              include_bundle: "no",
-              include_option: "no",
-              include_variant: "no",
+              extension_type: ['normal', 'product_bundle', 'product_package_ticket', 'ticket'],
+              with: ['category'],
+              // include_formula: "no",
+              // include_bundle: "no",
+              // include_option: "no",
+              // include_variant: "no",
               open_quotation: 1,
-              with_schedule: 0
+              with_schedule: 0,
+              with_count: ['bundleGroup', 'optionGroup'],
+              order_by_string: 'sort:desc',
+              _config: {
+                useCache: true
+              }
             });
-          case 2:
+          case 3:
             data = _context2.sent;
+            setListLoading(false);
             dispatch({
-              type: "setAddons",
+              type: 'setAddons',
               payload: {
                 originData: (data === null || data === void 0 ? void 0 : data.list) || []
               }
             });
-          case 4:
+          case 6:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
     return function getProducts() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
 
@@ -208,28 +276,58 @@ var Addons = Provider(function (props) {
    * @Author: zhiwei.Wang
    * @Date: 2024-01-30 16:36
    */
-  var handleAddProduct = function handleAddProduct(item) {
+  var handleAddProduct = function handleAddProduct(item, type) {
     var _list = _toConsumableArray(state.addons.value);
-    var _item = _list.find(function (d) {
-      return d.id === item.id;
-    });
 
-    // 如果已添加, 则数量+1
-    if (_item) {
-      _item.quantity = _item.quantity + 1;
-    } else {
-      // 否则 push
-      _list.push(_objectSpread(_objectSpread({}, item), {}, {
-        quantity: 1
-      }));
-    }
-    dispatch({
-      type: "setAddons",
-      payload: {
-        value: _list,
-        showModal: false,
-        // 编辑态
-        edit: true
+    // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
+    var isEject = type === 'detail' || item.bundle_group_count > 0;
+    state.action({
+      type: 'pisell1.handleOpenProductModal',
+      data: {
+        id: item.id,
+        date: state.date.value.format('YYYY-MM-DD'),
+        showConfig: {
+          option: false,
+          session: false,
+          variant: false,
+          package: true
+        },
+        is_eject: isEject ? 1 : 0
+      },
+      callback: function callback(e) {
+        console.log('e', e);
+        var product = _objectSpread(_objectSpread({}, item), {}, {
+          _id: getUniqueId(),
+          _key: e.key,
+          _extend: {
+            price: item.price,
+            other: e,
+            quantity: 1
+          },
+          quantity: 1
+        });
+        var _total = getProductTotalPrice(product);
+        product._extend.total = _total;
+        var _item = _list.find(function (d) {
+          return d._extend.other.key === e.key;
+        });
+
+        // 如果已添加, 则数量+1
+        if (_item) {
+          _item._extend.quantity = _item.quantity + 1;
+        } else {
+          // 否则 push
+          _list.push(product);
+        }
+        dispatch({
+          type: 'setAddons',
+          payload: {
+            value: _list,
+            showModal: false,
+            // 编辑态
+            edit: true
+          }
+        });
       }
     });
   };
@@ -252,15 +350,23 @@ var Addons = Provider(function (props) {
         return d.id !== item.id;
       });
     } else {
+      var _item$_extend3;
       var _item = _objectSpread(_objectSpread({}, item), {}, {
-        quantity: Number(e.target.value)
+        _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
+          quantity: Number(e.target.value)
+        })
       });
+      var _total = getProductTotalPrice(_item);
+      _item._extend.total = _total;
+      if (((_item$_extend3 = _item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.bundle_edit) !== undefined) {
+        _item._extend.bundle_edit = 1;
+      }
       _list = _list.map(function (d) {
         return d.id === item.id ? _item : d;
       });
     }
     dispatch({
-      type: "setAddons",
+      type: 'setAddons',
       payload: {
         value: _list,
         edit: true
@@ -303,13 +409,37 @@ var Addons = Provider(function (props) {
    * @Date: 2024-01-30 16:40
    */
   var handleOpenAdd = function handleOpenAdd() {
-    setSearch("");
+    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
+        }
+      });
+    }
+    if (state.channelDisabledEdit) {
+      modal.warning({
+        okText: locales.getText('pisell2.text.ok'),
+        content: locales.getText('pisell2.text.terminal-edit-message')
+      });
+      return;
+    }
+    getProducts();
+    setSearch('');
     dispatch({
-      type: "setAddons",
+      type: 'setAddons',
       payload: {
         showModal: true
       }
     });
+    if (!state.isTerminal) {
+      setTimeout(function () {
+        var _searchRef$current, _searchRef$current$fo;
+        (_searchRef$current = searchRef.current) === null || _searchRef$current === void 0 ? void 0 : (_searchRef$current$fo = _searchRef$current.focus) === null || _searchRef$current$fo === void 0 ? void 0 : _searchRef$current$fo.call(_searchRef$current);
+      }, 100);
+    }
   };
 
   /**
@@ -325,16 +455,14 @@ var Addons = Provider(function (props) {
     if (state.disabledEdit) {
       return [];
     }
-    if (state.channelDisabledEdit) {
-      return [];
-    }
+
     // 添加按钮
     var arr = [/*#__PURE__*/React.createElement(Button, {
       className: "pisell-lowcode__booking-footer-buttons-item",
       type: "default",
       disabled: loading,
       onClick: handleOpenAdd
-    }, locales.getText("pisell2.text.add"))];
+    }, locales.getText('pisell2.text.add'))];
     return arr;
   }, [state, isEdit, loading]);
   var footer = useMemo(function () {
@@ -347,14 +475,64 @@ var Addons = Provider(function (props) {
       source: "addons"
     });
   }, [state, _footer]);
+  var editProductDetail = function editProductDetail(item) {
+    // 如果禁止编辑, 则不展示任何按钮
+    if (state.disabledEdit) {
+      return;
+    }
+    if (state.channelDisabledEdit) {
+      return;
+    }
+    state.action({
+      type: 'pisell1.handleOpenProductModal',
+      data: {
+        id: item.id,
+        date: state.date.value.format('YYYY-MM-DD'),
+        showConfig: {
+          option: false,
+          session: false,
+          variant: false,
+          package: true
+        },
+        value: item._extend.other
+      },
+      callback: function callback(e) {
+        var _product$_extend;
+        var product = _objectSpread(_objectSpread({}, item), {}, {
+          _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
+            other: e
+          })
+        });
+        if (((_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.bundle_edit) !== undefined) {
+          product._extend.bundle_edit = 1;
+        }
+        var _total = getProductTotalPrice(product);
+        product._extend.total = _total;
+        var _list = _toConsumableArray(state.addons.value);
+        console.log('cacheItem', product);
+        _list = _list.map(function (d) {
+          return d._id === product._id ? product : d;
+        });
+        dispatch({
+          type: 'setAddons',
+          payload: {
+            value: _list,
+            showModal: false,
+            // 编辑态
+            edit: true
+          }
+        });
+      }
+    });
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TabPane, {
     loading: loading,
-    header: locales.getText("pisell2.text.addons"),
+    header: locales.getText('pisell2.text.addons'),
     footer: footer
   }, !state.bookingId ? /*#__PURE__*/React.createElement(EmptyBooking, null) : /*#__PURE__*/React.createElement(React.Fragment, null, state.addons.value.length ? /*#__PURE__*/React.createElement("div", {
     className: "",
     style: {
-      margin: "0 -16px"
+      margin: '0 -32px'
     }
   }, state.addons.value.map(function (d) {
     return /*#__PURE__*/React.createElement(ProductItem, {
@@ -362,18 +540,19 @@ var Addons = Provider(function (props) {
       item: d,
       key: d.id,
       amountSymbol: state.amountSymbol,
+      onClick: editProductDetail,
       onChangeQuantity: function onChangeQuantity(e) {
         _onChangeQuantity(e, d);
       }
     });
   })) : /*#__PURE__*/React.createElement(EmptyBooking, {
-    description: locales.getText("pisell1.text.no-addons")
+    description: locales.getText('pisell1.text.no-addons')
   }), /*#__PURE__*/React.createElement(Drawer, {
     open: state.addons.showModal,
-    title: locales.getText("pisell2.text.addons"),
+    title: locales.getText('pisell2.text.addons'),
     onClose: function onClose() {
       dispatch({
-        type: "setAddons",
+        type: 'setAddons',
         payload: {
           showModal: false
         }
@@ -383,12 +562,13 @@ var Addons = Provider(function (props) {
     header: /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-service-header"
     }, /*#__PURE__*/React.createElement(Input, {
+      ref: searchRef,
       prefix: /*#__PURE__*/React.createElement(SearchLg, null),
       style: {
         marginTop: 16,
         height: 44
       },
-      placeholder: locales.getText("pisell2.text.search"),
+      placeholder: locales.getText('pisell2.text.search'),
       allowClear: true,
       value: search,
       onChange: function onChange(e) {
@@ -397,11 +577,18 @@ var Addons = Provider(function (props) {
     }))
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-body"
+  }, /*#__PURE__*/React.createElement(Skeleton, {
+    loading: listLoading,
+    active: true,
+    round: true,
+    style: {
+      padding: 20
+    }
   }, /*#__PURE__*/React.createElement(TabProduct, {
     scrollDom: ".booking-addons-wrap .pisell-lowcode-drawer-body",
     list: renderList,
     amountSymbol: state.amountSymbol,
     onChange: handleAddProduct
-  }))))));
+  })))))), contextHolder);
 });
 export default Addons;

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

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -3,7 +3,7 @@ import "./index.less";
 interface TabProductProps {
     list: any[];
     amountSymbol: string;
-    onChange: (item: any) => void;
+    onChange: (item: any, type: "select" | "detail") => void;
     scrollDom?: string;
 }
 declare const TabProduct: (props: TabProductProps) => React.JSX.Element;