@pisell/private-materials 3.0.108 → 3.0.110

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;

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, useRef } from "react";
-import SearchLg from "@pisell/icon/es/SearchLg";
-import { Input, Button, Skeleton, Modal } 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";
@@ -37,7 +37,7 @@ import EmptyBooking from "../components/emptyBooking";
 import Footer from "../components/footer";
 import { formatProductBundle } from "../components/footer/utils";
 import { formatProductListByCategory, getProductTotalPrice } from "../utils";
-import { locales, getUniqueId } from "@pisell/utils";
+import { locales, getUniqueId } from '@pisell/utils';
 import "./index.less";
 import useEngineContext from "../../../hooks/useEngineContext";
 export var formatProducts = function formatProducts(values) {
@@ -50,11 +50,11 @@ export var formatProducts = function formatProducts(values) {
       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)
     };
@@ -76,7 +76,7 @@ var restoreProductOtherData = function restoreProductOtherData(data) {
         quantity: bundleItem.num,
         option: bundleItem.option.map(function (optionItem) {
           return _objectSpread(_objectSpread({}, optionItem), {}, {
-            name: optionItem.name["auto"],
+            name: optionItem.name['auto'],
             quantity: bundleItem.num,
             product_option_item_id: optionItem.option_group_item_id
           });
@@ -123,7 +123,7 @@ var Addons = Provider(function (props) {
     _useState4 = _slicedToArray(_useState3, 2),
     listLoading = _useState4[0],
     setListLoading = _useState4[1];
-  var _useState5 = useState(""),
+  var _useState5 = useState(''),
     _useState6 = _slicedToArray(_useState5, 2),
     search = _useState6[0],
     setSearch = _useState6[1];
@@ -138,7 +138,7 @@ var Addons = Provider(function (props) {
     interaction = _ref.interaction;
   useEffect(function () {
     dispatch({
-      type: "setState",
+      type: 'setState',
       payload: {
         setGlobalState: props.setGlobalState
       }
@@ -146,7 +146,7 @@ var Addons = Provider(function (props) {
   }, []);
   useEffect(function () {
     dispatch({
-      type: "setState",
+      type: 'setState',
       payload: _objectSpread({}, globalState)
     });
   }, [globalState]);
@@ -172,7 +172,7 @@ var Addons = Provider(function (props) {
   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 () {
+      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();
       });
     }
@@ -197,7 +197,7 @@ var Addons = Provider(function (props) {
           case 3:
             data = _context.sent;
             dispatch({
-              type: "setAddons",
+              type: 'setAddons',
               payload: {
                 value: formatProductValues(data || []),
                 load: true,
@@ -234,15 +234,16 @@ var Addons = Provider(function (props) {
             return state.apis.getProducts({
               skip: 1,
               num: 500,
-              extension_type: ["normal", "product_bundle", "product_package_ticket", "ticket"],
-              with: ["category"],
+              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_count: ["bundleGroup", "optionGroup"],
+              with_count: ['bundleGroup', 'optionGroup'],
+              order_by_string: 'sort:desc',
               _config: {
                 useCache: true
               }
@@ -251,7 +252,7 @@ var Addons = Provider(function (props) {
             data = _context2.sent;
             setListLoading(false);
             dispatch({
-              type: "setAddons",
+              type: 'setAddons',
               payload: {
                 originData: (data === null || data === void 0 ? void 0 : data.list) || []
               }
@@ -279,12 +280,12 @@ var Addons = Provider(function (props) {
     var _list = _toConsumableArray(state.addons.value);
 
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
-    var isEject = type === "detail" || item.bundle_group_count > 0;
+    var isEject = type === 'detail' || item.bundle_group_count > 0;
     state.action({
-      type: "pisell1.handleOpenProductModal",
+      type: 'pisell1.handleOpenProductModal',
       data: {
         id: item.id,
-        date: state.date.value.format("YYYY-MM-DD"),
+        date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
           option: false,
           session: false,
@@ -294,7 +295,7 @@ var Addons = Provider(function (props) {
         is_eject: isEject ? 1 : 0
       },
       callback: function callback(e) {
-        console.log("e", e);
+        console.log('e', e);
         var product = _objectSpread(_objectSpread({}, item), {}, {
           _id: getUniqueId(),
           _key: e.key,
@@ -319,7 +320,7 @@ var Addons = Provider(function (props) {
           _list.push(product);
         }
         dispatch({
-          type: "setAddons",
+          type: 'setAddons',
           payload: {
             value: _list,
             showModal: false,
@@ -365,7 +366,7 @@ var Addons = Provider(function (props) {
       });
     }
     dispatch({
-      type: "setAddons",
+      type: 'setAddons',
       payload: {
         value: _list,
         edit: true
@@ -411,8 +412,8 @@ var Addons = Provider(function (props) {
     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",
+        module: 'booking',
+        key: 'edit_order',
         data: {
           order_id: state.bookingId
         }
@@ -420,15 +421,15 @@ var Addons = Provider(function (props) {
     }
     if (state.channelDisabledEdit) {
       modal.warning({
-        okText: locales.getText("pisell2.text.ok"),
-        content: locales.getText("pisell2.text.terminal-edit-message")
+        okText: locales.getText('pisell2.text.ok'),
+        content: locales.getText('pisell2.text.terminal-edit-message')
       });
       return;
     }
     getProducts();
-    setSearch("");
+    setSearch('');
     dispatch({
-      type: "setAddons",
+      type: 'setAddons',
       payload: {
         showModal: true
       }
@@ -461,7 +462,7 @@ var Addons = Provider(function (props) {
       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 () {
@@ -483,10 +484,10 @@ var Addons = Provider(function (props) {
       return;
     }
     state.action({
-      type: "pisell1.handleOpenProductModal",
+      type: 'pisell1.handleOpenProductModal',
       data: {
         id: item.id,
-        date: state.date.value.format("YYYY-MM-DD"),
+        date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
           option: false,
           session: false,
@@ -508,12 +509,12 @@ var Addons = Provider(function (props) {
         var _total = getProductTotalPrice(product);
         product._extend.total = _total;
         var _list = _toConsumableArray(state.addons.value);
-        console.log("cacheItem", product);
+        console.log('cacheItem', product);
         _list = _list.map(function (d) {
           return d._id === product._id ? product : d;
         });
         dispatch({
-          type: "setAddons",
+          type: 'setAddons',
           payload: {
             value: _list,
             showModal: false,
@@ -526,12 +527,12 @@ var Addons = Provider(function (props) {
   };
   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 -32px"
+      margin: '0 -32px'
     }
   }, state.addons.value.map(function (d) {
     return /*#__PURE__*/React.createElement(ProductItem, {
@@ -545,13 +546,13 @@ var Addons = Provider(function (props) {
       }
     });
   })) : /*#__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
         }
@@ -567,7 +568,7 @@ var Addons = Provider(function (props) {
         marginTop: 16,
         height: 44
       },
-      placeholder: locales.getText("pisell2.text.search"),
+      placeholder: locales.getText('pisell2.text.search'),
       allowClear: true,
       value: search,
       onChange: function onChange(e) {

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

@@ -32,7 +32,7 @@ import { getProductExtend } from "./utils";
 import { formatProductListByCategory, getProductTotalPrice, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
-var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848];
+var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
 var Info = function Info() {
   var _state$service3, _state$service5, _state$service6, _state$service6$cache;
   var _useState = useState(''),
@@ -160,6 +160,7 @@ var Info = function Info() {
               open_quotation: 1,
               with_schedule: 1,
               with_count: ['bundleGroup', 'optionGroup'],
+              order_by_string: 'sort:desc',
               _config: {
                 useCache: true
               }

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

@@ -1,5 +1,23 @@
 export declare const getIsBundleOrCombination: (productDetail: any) => boolean;
 export declare const uniqueByField: (arr: any[], field: string) => any[];
 export declare const moveItemToFront: (arr: any[], targetId: string | number) => any[];
+/**
+ * @title:  判断两个时间是否在同一个时间段内
+ * @description:
+ * @param {number} time1 开始时间
+ * @param {number} time2 结束时间
+ * @param {number} interval 时间间隔
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:37
+ */
 export declare const isInterval: (time1: number, time2: number, interval?: number) => boolean;
+/**
+ * @title: 根据时间间隔格式化服务列表
+ * @description: 防止短时间内添加多个相同服务, 如果两个服务的时间间隔小于1秒，则合并为一个服务
+ * @param {any} list 服务列表
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:36
+ */
 export declare const formatServiceListByTime: (list: any[]) => any[];

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

@@ -35,18 +35,42 @@ export var moveItemToFront = function moveItemToFront(arr, targetId) {
   }
   return arr;
 };
+
+/**
+ * @title:  判断两个时间是否在同一个时间段内
+ * @description: 
+ * @param {number} time1 开始时间
+ * @param {number} time2 结束时间
+ * @param {number} interval 时间间隔
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:37
+ */
 export var isInterval = function isInterval(time1, time2) {
   var interval = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1000;
   return time2 - time1 < interval;
 };
+
+/**
+ * @title: 根据时间间隔格式化服务列表
+ * @description: 防止短时间内添加多个相同服务, 如果两个服务的时间间隔小于1秒，则合并为一个服务
+ * @param {any} list 服务列表
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:36
+ */
 export var formatServiceListByTime = function formatServiceListByTime(list) {
   try {
     var _list = _toConsumableArray(list);
     var length = _list.length;
+
+    // 如果只有一个服务，则直接返回
     if (length > 1) {
       var _list2, _list3;
       var start = (_list2 = _list[length - 2]) === null || _list2 === void 0 ? void 0 : _list2._time;
       var end = (_list3 = _list[length - 1]) === null || _list3 === void 0 ? void 0 : _list3._time;
+
+      // 如果两个服务都有time  并且在同一个时间段内，则合并为一个服务
       if (start && end && isInterval(start, end)) {
         _list.pop();
         return _list;

package/lib/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;

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

@@ -197,6 +197,7 @@ var Addons = (0, import_model.Provider)((props) => {
       open_quotation: 1,
       with_schedule: 0,
       with_count: ["bundleGroup", "optionGroup"],
+      order_by_string: "sort:desc",
       _config: {
         useCache: true
       }

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

@@ -60,7 +60,8 @@ var shopList = [
   6080,
   6978,
   7386,
-  6848
+  6848,
+  6305
 ];
 var Info = () => {
   var _a, _b, _c, _d;
@@ -131,6 +132,7 @@ var Info = () => {
       open_quotation: 1,
       with_schedule: 1,
       with_count: ["bundleGroup", "optionGroup"],
+      order_by_string: "sort:desc",
       _config: {
         useCache: true
       }

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

@@ -1,5 +1,23 @@
 export declare const getIsBundleOrCombination: (productDetail: any) => boolean;
 export declare const uniqueByField: (arr: any[], field: string) => any[];
 export declare const moveItemToFront: (arr: any[], targetId: string | number) => any[];
+/**
+ * @title:  判断两个时间是否在同一个时间段内
+ * @description:
+ * @param {number} time1 开始时间
+ * @param {number} time2 结束时间
+ * @param {number} interval 时间间隔
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:37
+ */
 export declare const isInterval: (time1: number, time2: number, interval?: number) => boolean;
+/**
+ * @title: 根据时间间隔格式化服务列表
+ * @description: 防止短时间内添加多个相同服务, 如果两个服务的时间间隔小于1秒，则合并为一个服务
+ * @param {any} list 服务列表
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:36
+ */
 export declare const formatServiceListByTime: (list: any[]) => any[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.108",
+  "version": "3.0.110",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,8 +60,8 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.27",
-    "@pisell/date-picker": "1.0.91",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "1.0.96"
   },
   "peerDependencies": {
     "react": "^18.0.0",