@pisell/private-materials 3.0.42 → 3.0.44

package/es/components/booking/info/service/addService/index.js

@@ -17,21 +17,28 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useContext, useEffect, useMemo, useState } from "react";
+import React, { useContext, useEffect, useMemo, useState, useRef } from "react";
 import SearchLg from "@pisell/icon/es/SearchLg";
 import Drawer from "../../../components/drawer";
 import TabProduct from "../../../components/TabProduct";
 import { Context } from "../../model";
 import AddButton from "../../../components/addButton";
-import { Input } from "antd";
+import { Input, Skeleton } from "antd";
 import "./index.less";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../serve";
 import { getIsBundleOrCombination } from "../../utils";
-import { formatProductListByCategory, getProductTotalPrice, request } from "../../../utils";
+import { formatProductListByCategory, getProductTotalPrice, request, getCacheParams, deleteCacheParams } from "../../../utils";
 import { locales, getUniqueId } from "@pisell/utils";
+var shopList = [2886, 4422, 5538];
+var getCacheResourceId = function getCacheResourceId() {
+  var serviceParams = getCacheParams();
+  var resId = Number(serviceParams === null || serviceParams === void 0 ? void 0 : serviceParams.resource_id);
+  console.log("resIdresIdresId", resId);
+  return resId;
+};
 var Info = function Info() {
-  var _state$service2;
+  var _state$service2, _state$service3, _state$service3$cache;
   var _useState = useState(""),
     _useState2 = _slicedToArray(_useState, 2),
     search = _useState2[0],
@@ -43,8 +50,18 @@ var Info = function Info() {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
+  var searchRef = useRef();
   var context = useEngineContext();
   request.setRequest(context.appHelper.utils.request);
+
+  /**
+   * @title: 如果商品只有一个, 则自动设置默认商品
+   * @description:
+   * @param {any} list
+   * @return {*}
+   * @Author: zhiwei.Wang
+   * @Date: 2024-05-14 13:55
+   */
   var setDefaultService = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(list) {
       var _list, product, detail, isBundleOrCombination, _item;
@@ -129,24 +146,48 @@ var Info = function Info() {
       return _ref.apply(this, arguments);
     };
   }();
+
+  /**
+   * @title: 如果选择了资源, 则直接添加商品
+   * @description:
+   * @param {any} cacheItem
+   * @return {*}
+   * @Author: zhiwei.Wang
+   * @Date: 2024-05-14 14:02
+   */
+  var autoAddProduct = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(cacheItem) {
+      var resId, _cacheItem;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            resId = getCacheResourceId();
+            _cacheItem = _objectSpread({}, cacheItem);
+            deleteCacheParams();
+          case 3:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function autoAddProduct(_x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var getServices = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var _state$eventOtherPara;
       var data;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             setLoading(true);
-            _context2.next = 3;
+            _context3.next = 3;
             return state.apis.getServices({
               skip: 1,
               num: 500,
               extension_type: state.renderType === "eventBooking" ? undefined : ["product_appointment", "appointment_ticket"],
               with: ["category"],
-              // include_formula: "no",
-              // include_bundle: "no",
-              // include_option: "no",
-              // include_variant: "no",
               ids: state.renderType === "eventBooking" ? (_state$eventOtherPara = state.eventOtherParams) === null || _state$eventOtherPara === void 0 ? void 0 : _state$eventOtherPara.productIds : undefined,
               open_quotation: 1,
               with_schedule: 1,
@@ -156,7 +197,7 @@ var Info = function Info() {
               }
             });
           case 3:
-            data = _context2.sent;
+            data = _context3.sent;
             setLoading(false);
             setDefaultService(data === null || data === void 0 ? void 0 : data.list);
             dispatch({
@@ -167,12 +208,12 @@ var Info = function Info() {
             });
           case 7:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function getServices() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   var handleSelectService = function handleSelectService() {
@@ -184,6 +225,12 @@ var Info = function Info() {
         addModal: 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);
+    }
   };
   var handleSelectProduct = function handleSelectProduct(item, type) {
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
@@ -227,11 +274,20 @@ var Info = function Info() {
           cacheItem.new = 0;
         }
         console.log("_total", cacheItem);
+
+        // 如果已经有资源id,则不跳转详情页, 直接返回
+        // if (getCacheResourceId()) {
+        // 	autoAddProduct(cacheItem);
+        // 	return;
+        // }
+        var resId = getCacheResourceId();
+        cacheItem.autoClose = !!resId;
         dispatch({
           type: "setService",
           payload: {
             editModal: true,
-            cacheItem: cacheItem
+            cacheItem: cacheItem,
+            addModal: !cacheItem.autoClose
           }
         });
       }
@@ -251,10 +307,17 @@ var Info = function Info() {
     return state.service.value.length > 0;
   }, [state.service.value]);
   useEffect(function () {
-    if (state.modalOpen) {
-      // getServices();
+    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5;
+    // Salonip 不要这个
+
+    if (shopList.includes((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.global) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id)) {
+      return;
+    }
+    // 如果弹窗打开,并且是创建, 则自动打开选择服务的弹窗
+    if (state.modalOpen && !state.bookingId) {
+      handleSelectService();
     }
-  }, [state.modalOpen]);
+  }, [state.modalOpen, state.bookingId]);
   var showAddButton = useMemo(function () {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
@@ -283,7 +346,11 @@ var Info = function Info() {
       }
     });
   }, [state.renderType, showAddButton, isService, state.service.value, loading]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, addButton, /*#__PURE__*/React.createElement(Drawer, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : (_state$service3$cache = _state$service3.cacheItem) === null || _state$service3$cache === void 0 ? void 0 : _state$service3$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
+    loading: true,
+    active: true,
+    round: true
+  }), addButton, /*#__PURE__*/React.createElement(Drawer, {
     open: state.service.addModal,
     title: locales.getText("pisell2.text.select-service"),
     rootClassName: "booking-server-wrap",
@@ -298,6 +365,7 @@ var Info = function Info() {
     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,

package/es/components/booking/info/service/editService/index.js

@@ -35,7 +35,7 @@ import { sliceDayIntoFiveMinutes, formatResource, getErrorList, getServiceTimes,
 import Like from "../like";
 import { getNoResource } from "../../../mock";
 var Info = function Info() {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI4, _state$service$cacheI5, _state$service$cacheI6, _state$service$cacheI7;
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _state$service$cacheI5, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -252,7 +252,7 @@ var Info = function Info() {
             } else {
               // 如果只有一个资源,并且当前未选择,  则默认选中
               _useResource = 0;
-              if (_list.length === 2) {
+              if (_list.length === 2 && useResource !== 0) {
                 _useResource = _list[1].form_record_id;
               }
               form.setFieldsValue({
@@ -265,18 +265,25 @@ var Info = function Info() {
                 resources: _list
               }
             });
-            _context.next = 17;
+            setTimeout(function () {
+              var _state$service$cacheI;
+              // 当选中资源 或者 列表只有无资源的时候 那么直接返回
+              if ((_state$service$cacheI = state.service.cacheItem) !== null && _state$service$cacheI !== void 0 && _state$service$cacheI.autoClose || _list.length === 1 && useResource === 0) {
+                form.submit();
+              }
+            }, 200);
+            _context.next = 18;
             break;
-          case 15:
-            _context.prev = 15;
+          case 16:
+            _context.prev = 16;
             _context.t0 = _context["catch"](0);
-          case 17:
-            setResourceLoading(false);
           case 18:
+            setResourceLoading(false);
+          case 19:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 15]]);
+      }, _callee, null, [[0, 16]]);
     }));
     return function getResources(_x2) {
       return _ref.apply(this, arguments);
@@ -291,12 +298,12 @@ var Info = function Info() {
    * @Date: 2024-01-09 13:59
    */
   var handleDeleteProduct = function handleDeleteProduct() {
-    var _state$service$cacheI;
+    var _state$service$cacheI2;
     if (state.channelDisabledEdit) {
       return;
     }
     var _list = _toConsumableArray(state.service.value);
-    var _id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
+    var _id = (_state$service$cacheI2 = state.service.cacheItem) === null || _state$service$cacheI2 === void 0 ? void 0 : _state$service$cacheI2._id;
     _list = _list.filter(function (d) {
       return d._id !== _id;
     });
@@ -377,8 +384,8 @@ var Info = function Info() {
    * @Date: 2024-01-09 14:03
    */
   var getDiscount = function getDiscount() {
-    var _state$service$cacheI2;
-    var oPrice = Number(((_state$service$cacheI2 = state.service.cacheItem) === null || _state$service$cacheI2 === void 0 ? void 0 : _state$service$cacheI2._extend.origin_total) || 0);
+    var _state$service$cacheI3;
+    var oPrice = Number(((_state$service$cacheI3 = state.service.cacheItem) === null || _state$service$cacheI3 === void 0 ? void 0 : _state$service$cacheI3._extend.origin_total) || 0);
     var cPrice = Number(useTotal || 0);
     var discount = "";
     // 原价 = 现价 为无折扣
@@ -410,6 +417,7 @@ var Info = function Info() {
     var _currentResource$_ext2;
     var _list = _toConsumableArray(state.service.value);
     var _item = _objectSpread(_objectSpread({}, state.service.cacheItem), {}, {
+      autoClose: false,
       errorList: errorList
     });
     var _extend = _objectSpread(_objectSpread({}, _item._extend), values);
@@ -460,7 +468,8 @@ var Info = function Info() {
   var setEditData = useMemoizedFn(function () {
     if (state.service.editModal) {
       var cacheItem = state.service.cacheItem;
-      form.setFieldsValue(getServerItemExtend(state, cacheItem, timeObj));
+      var values = getServerItemExtend(state, cacheItem, timeObj);
+      form.setFieldsValue(values);
       if (state.renderType !== "eventBooking") {
         // 获取资源列表
         getResources();
@@ -479,8 +488,8 @@ var Info = function Info() {
    * @Date: 2024-01-09 14:06
    */
   var isReason = useMemo(function () {
-    var _state$service$cacheI3;
-    var oPrice = Number(((_state$service$cacheI3 = state.service.cacheItem) === null || _state$service$cacheI3 === void 0 ? void 0 : _state$service$cacheI3._extend.origin_total) || 0);
+    var _state$service$cacheI4;
+    var oPrice = Number(((_state$service$cacheI4 = state.service.cacheItem) === null || _state$service$cacheI4 === void 0 ? void 0 : _state$service$cacheI4._extend.origin_total) || 0);
     var cPrice = Number(useTotal || 0);
     // 原价 !== 现价
     return cPrice !== oPrice;
@@ -565,7 +574,8 @@ var Info = function Info() {
   }, [(_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : (_state$service5$cache = _state$service5.cacheItem) === null || _state$service5$cache === void 0 ? void 0 : (_state$service5$cache2 = _state$service5$cache._extend) === null || _state$service5$cache2 === void 0 ? void 0 : (_state$service5$cache3 = _state$service5$cache2.other) === null || _state$service5$cache3 === void 0 ? void 0 : _state$service5$cache3.bundle]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     zIndex: 1000,
-    open: state.service.editModal,
+    forceRender: true,
+    open: state.service.editModal && !((_state$service$cacheI5 = state.service.cacheItem) !== null && _state$service$cacheI5 !== void 0 && _state$service$cacheI5.autoClose),
     title: locales.getText("pisell2.text.edit-service"),
     onClose: function onClose() {
       dispatch({
@@ -632,8 +642,8 @@ var Info = function Info() {
       width: "100%"
     },
     min: 0,
-    max: ((_state$service$cacheI4 = state.service.cacheItem) === null || _state$service$cacheI4 === void 0 ? void 0 : (_state$service$cacheI5 = _state$service$cacheI4._extend) === null || _state$service$cacheI5 === void 0 ? void 0 : _state$service$cacheI5.origin_total) || 0,
-    placeholder: ((_state$service$cacheI6 = state.service.cacheItem) === null || _state$service$cacheI6 === void 0 ? void 0 : (_state$service$cacheI7 = _state$service$cacheI6._extend) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.origin_total) || "0"
+    max: ((_state$service$cacheI6 = state.service.cacheItem) === null || _state$service$cacheI6 === void 0 ? void 0 : (_state$service$cacheI7 = _state$service$cacheI6._extend) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.origin_total) || 0,
+    placeholder: ((_state$service$cacheI8 = state.service.cacheItem) === null || _state$service$cacheI8 === void 0 ? void 0 : (_state$service$cacheI9 = _state$service$cacheI8._extend) === null || _state$service$cacheI9 === void 0 ? void 0 : _state$service$cacheI9.origin_total) || "0"
   }))), /*#__PURE__*/React.createElement(Col, {
     span: 12
   }, /*#__PURE__*/React.createElement(Form.Item, {

package/es/components/booking/locales.d.ts

@@ -141,6 +141,7 @@ declare const _default: {
         'pisell2.text.deposit-delete-message-title': string;
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
+        "pisell2.text.stock": string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -284,6 +285,7 @@ declare const _default: {
         'pisell2.text.deposit-delete-message-title': string;
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
+        "pisell2.text.stock": string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -427,6 +429,7 @@ declare const _default: {
         'pisell2.text.deposit-delete-message-title': string;
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
+        "pisell2.text.stock": string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -1,7 +1,7 @@
 export default {
   "en": {
     'pisell2.text.select-addons': "Select addons",
-    'pisell2.text.addons': "Addons",
+    'pisell2.text.addons': "Sales",
     'pisell2.text.search': 'Search',
     'pisell2.text.view': 'View',
     'pisell2.text.edit': 'Edit',
@@ -155,7 +155,8 @@ export default {
     'pisell2.text.deposit-delete': "Delete deposit",
     'pisell2.text.deposit-delete-message-title': "Prompt",
     'pisell2.text.deposit-delete-message': "It cannot be restored after deletion. Please confirm the operation.",
-    'pisell2.text.deposit-paid': "Deposit paid"
+    'pisell2.text.deposit-paid': "Deposit paid",
+    "pisell2.text.stock": "Stock"
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -163,7 +164,7 @@ export default {
     'pisell2.text.amount-paid-on-order': '订单已付金额',
     'pisell2.text.please-select-the-customer-first': '请先选择客户',
     'pisell2.text.change': "更改",
-    'pisell2.text.addons': "附加商品",
+    'pisell2.text.addons': "销售",
     'pisell2.text.select-addons': "选择附加商品",
     'pisell2.text.search': '搜索',
     'pisell2.text.view': '查看',
@@ -318,7 +319,8 @@ export default {
     'pisell2.text.deposit-delete': "删除定金",
     'pisell2.text.deposit-delete-message-title': "提示",
     'pisell2.text.deposit-delete-message': "删除后不可恢复，请确认操作",
-    'pisell2.text.deposit-paid': "已付定金"
+    'pisell2.text.deposit-paid': "已付定金",
+    "pisell2.text.stock": "库存"
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -326,7 +328,7 @@ export default {
     'pisell2.text.amount-paid-on-order': '訂單已付金額',
     'pisell2.text.please-select-the-customer-first': '請先選擇客戶',
     'pisell2.text.change': '更改',
-    'pisell2.text.addons': "附加商品",
+    'pisell2.text.addons': "销售",
     'pisell2.text.select-addons': "選擇附加商品",
     'pisell2.text.search': '搜索',
     'pisell2.text.view': '查看',
@@ -481,6 +483,7 @@ export default {
     'pisell2.text.deposit-delete': "刪除定金",
     'pisell2.text.deposit-delete-message-title': "提示",
     'pisell2.text.deposit-delete-message': "刪除後不可恢復，請確認操作",
-    'pisell2.text.deposit-paid': "已付定金"
+    'pisell2.text.deposit-paid': "已付定金",
+    "pisell2.text.stock": "庫存"
   }
 };

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

@@ -70,11 +70,13 @@ export interface FormState {
     bookingId: string | number;
     bookingDetail: any;
     channelDisabledEdit: boolean;
-    renderType?: 'eventBooking';
+    renderType?: "eventBooking";
+    modalOpen?: boolean;
+    isTerminal?: boolean;
     eventOtherParams?: {
         relation_id: number;
         number: number;
-        registration_type: 'single' | 'all' | 'extra_include';
+        registration_type: "single" | "all" | "extra_include";
         start_date: string;
         start_time: string;
         end_date: string;

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

@@ -25,7 +25,7 @@ import EmptyBooking from "../components/emptyBooking";
 import "./index.less";
 import { locales } from "@pisell/utils";
 var Notes = Provider(function (props) {
-  var _modal$state4, _modal$state4$notes, _modal$state5, _modal$state$bookingD3, _modal$state$bookingD4;
+  var _modal$state5, _modal$state5$notes, _modal$state6, _modal$state$bookingD3, _modal$state$bookingD4;
   var globalState = props.globalState;
   var modal = useContext(Context);
   var _useState = useState(false),
@@ -82,12 +82,14 @@ var Notes = Provider(function (props) {
     });
   }, [globalState]);
   var noteChange = function noteChange(_ref2) {
+    var _modal$state, _modal$state$refreshD;
     var note = _ref2.note,
       status = _ref2.status,
       noteType = _ref2.noteType;
+    (_modal$state = modal.state) === null || _modal$state === void 0 ? void 0 : (_modal$state$refreshD = _modal$state.refreshData) === null || _modal$state$refreshD === void 0 ? void 0 : _modal$state$refreshD.call(_modal$state, {});
     if (noteType === "internal") {
-      var _modal$state;
-      var _list = _toConsumableArray((_modal$state = modal.state) === null || _modal$state === void 0 ? void 0 : _modal$state.notes.internalNotes);
+      var _modal$state2;
+      var _list = _toConsumableArray((_modal$state2 = modal.state) === null || _modal$state2 === void 0 ? void 0 : _modal$state2.notes.internalNotes);
       if (status == "add") {
         _list.push(note);
       }
@@ -131,15 +133,15 @@ var Notes = Provider(function (props) {
     }];
   }, [modal.state.bookingDetail]);
   var orderNote = useMemo(function () {
-    var _modal$state2, _modal$state2$notes, _modal$state3, _modal$state3$notes;
-    if (!((_modal$state2 = modal.state) !== null && _modal$state2 !== void 0 && (_modal$state2$notes = _modal$state2.notes) !== null && _modal$state2$notes !== void 0 && _modal$state2$notes.orderNote)) {
+    var _modal$state3, _modal$state3$notes, _modal$state4, _modal$state4$notes;
+    if (!((_modal$state3 = modal.state) !== null && _modal$state3 !== void 0 && (_modal$state3$notes = _modal$state3.notes) !== null && _modal$state3$notes !== void 0 && _modal$state3$notes.orderNote)) {
       return [];
     }
     return [{
       id: 0,
-      content: ((_modal$state3 = modal.state) === null || _modal$state3 === void 0 ? void 0 : (_modal$state3$notes = _modal$state3.notes) === null || _modal$state3$notes === void 0 ? void 0 : _modal$state3$notes.orderNote) || ""
+      content: ((_modal$state4 = modal.state) === null || _modal$state4 === void 0 ? void 0 : (_modal$state4$notes = _modal$state4.notes) === null || _modal$state4$notes === void 0 ? void 0 : _modal$state4$notes.orderNote) || ""
     }];
-  }, [(_modal$state4 = modal.state) === null || _modal$state4 === void 0 ? void 0 : (_modal$state4$notes = _modal$state4.notes) === null || _modal$state4$notes === void 0 ? void 0 : _modal$state4$notes.orderNote]);
+  }, [(_modal$state5 = modal.state) === null || _modal$state5 === void 0 ? void 0 : (_modal$state5$notes = _modal$state5.notes) === null || _modal$state5$notes === void 0 ? void 0 : _modal$state5$notes.orderNote]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState && /*#__PURE__*/React.createElement(TabPane, {
     header: locales.getText("pisell2.text.notes")
   }, !globalState.bookingId ? /*#__PURE__*/React.createElement(EmptyBooking, null) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(NoteBlock, {
@@ -172,7 +174,7 @@ var Notes = Provider(function (props) {
     title: "".concat(locales.getText("pisell2.text.status.internal-notes"), ":"),
     describe: locales.getText("pisell2.text.status.visible-only-to-your-team-members"),
     placeholder: locales.getText("pisell2.text.add-internal-notes"),
-    notes: ((_modal$state5 = modal.state) === null || _modal$state5 === void 0 ? void 0 : _modal$state5.notes.internalNotes) || [],
+    notes: ((_modal$state6 = modal.state) === null || _modal$state6 === void 0 ? void 0 : _modal$state6.notes.internalNotes) || [],
     isEdit: true,
     apis: modal.state.apis,
     bookingId: (_modal$state$bookingD3 = modal.state.bookingDetail) === null || _modal$state$bookingD3 === void 0 ? void 0 : (_modal$state$bookingD4 = _modal$state$bookingD3.bookings) === null || _modal$state$bookingD4 === void 0 ? void 0 : _modal$state$bookingD4.id,

package/es/components/booking/utils.js

@@ -564,9 +564,9 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
         findNextSliceProps.date = dayjs(str).format('HH:mm');
       }
       // 选中资源
-      var resourceId = serviceParams.resource_id;
-      if (resourceId) {
-        _extend.resource = Number(resourceId);
+      var resourceId = Number(serviceParams.resource_id);
+      if (resourceId || resourceId === 0) {
+        _extend.resource = resourceId;
       }
     }
     console.log("_extend", findNextSliceProps);

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

@@ -125,6 +125,7 @@ var Addons = (0, import_model.Provider)((props) => {
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [listLoading, setListLoading] = (0, import_react.useState)(false);
   const [search, setSearch] = (0, import_react.useState)("");
+  const searchRef = (0, import_react.useRef)();
   const context = (0, import_useEngineContext.default)();
   const { isTerminal, interaction } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   (0, import_react.useEffect)(() => {
@@ -319,6 +320,12 @@ var Addons = (0, import_model.Provider)((props) => {
         showModal: true
       }
     });
+    if (!state.isTerminal) {
+      setTimeout(() => {
+        var _a3, _b3;
+        (_b3 = (_a3 = searchRef.current) == null ? void 0 : _a3.focus) == null ? void 0 : _b3.call(_a3);
+      }, 100);
+    }
   };
   const _footer = (0, import_react.useMemo)(() => {
     if (state.disabledEdit) {
@@ -439,6 +446,7 @@ var Addons = (0, import_model.Provider)((props) => {
         header: /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-header" }, /* @__PURE__ */ import_react.default.createElement(
           import_antd.Input,
           {
+            ref: searchRef,
             prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
             style: { marginTop: 16, height: 44 },
             placeholder: import_utils3.locales.getText("pisell2.text.search"),

package/lib/components/booking/components/TabProduct/productItem/index.js

@@ -44,6 +44,12 @@ var ProductItem = ({
   style,
   className
 }) => {
+  const stockText = (0, import_react.useMemo)(() => {
+    if (item.is_track === 0) {
+      return false;
+    }
+    return `${item.stock_quantity} ${import_utils.locales.getText("pisell2.text.stock")}`;
+  }, [item.stock_quantity, item.is_track]);
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -66,7 +72,7 @@ var ProductItem = ({
         className: "server-product-title"
       },
       item.title
-    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-time" }, (0, import_utils2.getDiscountTime)(item.service_times)), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-price" }, (0, import_utils.formatAmount)(item.price, 2, amountSymbol)))
+    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-time" }, (0, import_utils2.getDiscountTime)(item.service_times)), stockText && /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-time" }, stockText), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-price" }, (0, import_utils.formatAmount)(item.price, 2, amountSymbol)))
   );
 };
 var productItem_default = ProductItem;

package/lib/components/booking/components/customSelect/index.d.ts

@@ -28,6 +28,7 @@ interface CustomSelectProps {
     onVirtualListScroll?: any;
     modalOpen?: boolean;
     closeCallback?: () => any;
+    autoFocus?: boolean;
 }
 declare const _default: React.ForwardRefExoticComponent<CustomSelectProps & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -71,8 +71,10 @@ var CustomSelect = (props, ref) => {
     onVirtualListScroll,
     loadMore,
     modalOpen,
-    closeCallback
+    closeCallback,
+    autoFocus
   } = props;
+  const searchRef = (0, import_react.useRef)();
   const [_value, set_value] = (0, import_react.useState)([]);
   const [search, setSearch] = (0, import_react.useState)("");
   const [open, setOpen] = (0, import_react.useState)(false);
@@ -106,6 +108,12 @@ var CustomSelect = (props, ref) => {
     }
     setOpen(true);
     initValue();
+    if (autoFocus) {
+      setTimeout(() => {
+        var _a, _b;
+        (_b = (_a = searchRef.current) == null ? void 0 : _a.focus) == null ? void 0 : _b.call(_a);
+      }, 100);
+    }
   };
   const _onValueChange = (_val) => {
     onValueChange(_val);
@@ -143,7 +151,7 @@ var CustomSelect = (props, ref) => {
         if (filterItem) {
           return filterItem(d, search);
         }
-        return isIncludes(d.key_name || "");
+        return isIncludes(d.main_field || "");
       });
     }
     return _list;
@@ -242,6 +250,7 @@ var CustomSelect = (props, ref) => {
       header: /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
         import_antd.Input,
         {
+          ref: searchRef,
           prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
           style: { marginTop: 16, height: 44 },
           placeholder: import_utils2.locales.getText("pisell2.text.search"),

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

@@ -41,22 +41,25 @@ var import_index = require("./index.less");
 var import_utils = require("@pisell/utils");
 var import_forms = __toESM(require("./forms"));
 var import_utils2 = require("../utils");
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var relation_type = "appointment_booking";
 var Forms = (0, import_model.Provider)((props) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const { globalState } = props;
   const [loading, setLoading] = (0, import_react.useState)(true);
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
+  const context = (0, import_useEngineContext.default)();
+  const { isTerminal } = ((_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]);
   (0, import_react.useEffect)(() => {
     var _a2, _b2;
     if (!!((_b2 = (_a2 = state.bookingDetail) == null ? void 0 : _a2.bookings) == null ? void 0 : _b2.id)) {
       geForms();
     }
-  }, [(_e = (_d = state.bookingDetail) == null ? void 0 : _d.bookings) == null ? void 0 : _e.id, (_g = (_f = state.client) == null ? void 0 : _f.value) == null ? void 0 : _g.id]);
+  }, [(_f = (_e = state.bookingDetail) == null ? void 0 : _e.bookings) == null ? void 0 : _f.id, (_h = (_g = state.client) == null ? void 0 : _g.value) == null ? void 0 : _h.id]);
   const getFormDataById = async (item) => {
     var _a2, _b2;
     let _params = {
@@ -188,7 +191,10 @@ var Forms = (0, import_model.Provider)((props) => {
         value: state.form.value,
         onChange: onValueChange,
         addCallback,
-        client: state.client.value
+        client: state.client.value,
+        customSelectProps: {
+          autoFocus: !state.isTerminal
+        }
       }
     )
   ) : null);