@pisell/private-materials 3.3.80 → 3.3.82

package/es/components/booking/info/service/serviceItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

package/es/components/booking/info/service/serviceList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/es/components/booking/info/service2/Lists.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

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

@@ -20,7 +20,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { getNoResource } from "../../mock";
 import { getErrorList, getProductTotalPrice } from "../../utils";
-import { locales } from '@pisell/utils';
+import { isArr, locales } from '@pisell/utils';
 import dayjs from 'dayjs';
 import { appointmentTypes, openingTime } from "./status";
 import { postMultiDay } from "../service/serve";
@@ -199,7 +199,9 @@ export var handleChangeHolder = function handleChangeHolder(products, currentIte
     if (item._id === currentItem._id) {
       return _objectSpread(_objectSpread({}, item), {}, {
         _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-          holder_id: other.id
+          holder_id: isArr(other) ? other.map(function (item) {
+            return item.id;
+          }) : item._extend.quantity > 1 ? [other.id] : other.id
         })
       });
     }
@@ -493,7 +495,8 @@ var getAllErrorList = function getAllErrorList(item) {
   var _ref4 = item._data || {},
     resourceMaps = _ref4.resourceMaps;
   var _ref5 = item._extend || {},
-    resource = _ref5.resource;
+    _ref5$resource = _ref5.resource,
+    resource = _ref5$resource === void 0 ? {} : _ref5$resource;
   var errorList = [];
   Object.entries(resource).forEach(function (_ref6) {
     var _ref7 = _slicedToArray(_ref6, 2),
@@ -513,7 +516,7 @@ var mapListItems = function mapListItems(items) {
     return {
       id: item.id || item.form_record_id,
       label: item.labelText,
-      isError: !item.usable
+      isError: !item.usable || item.unbound
     };
   });
 };
@@ -610,6 +613,8 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     actionText: locales.getText('page.booking.text.add-time'),
     isMultipleResource: true,
     multiResources: multiResources,
+    holderMaxCount: item === null || item === void 0 ? void 0 : item._extend.quantity,
+    holderMode: (item === null || item === void 0 ? void 0 : item._extend.quantity) > 1 ? 'multiple' : undefined,
     isErrorHolder: getIsSubjectRequire(state),
     addHolderButtonText: (formData === null || formData === void 0 || (_formData$ = formData[0]) === null || _formData$ === void 0 || (_formData$ = _formData$.form) === null || _formData$ === void 0 ? void 0 : _formData$.title) || "",
     holder_id: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id,

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

@@ -95,7 +95,7 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930];
+  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

package/es/components/booking/info2/service/actions/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

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

@@ -33,7 +33,7 @@ import { getProductExtend } from "./utils";
 import { formatProductListByCategory, getIsEject, getIsOnlySession, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
-import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
+import { getIsShowNumber } from "../../../../ticketBooking/utils";
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
 var Info = function Info(props) {
   var _state$client2, _state$service2, _state$service4, _state$service5;
@@ -255,7 +255,7 @@ var Info = function Info(props) {
           session: isSession,
           variant: true,
           package: true,
-          number: isNormalProductByDurationSchedule(item)
+          number: getIsShowNumber(item, state)
         },
         is_eject: isEject ? 1 : 0,
         isOnlySession: isOnlySession,

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -69,6 +69,16 @@ export declare const setDefaultResource: ({ cacheItem, resources }: any) => any;
  * @Date: 2024-09-19 20:26
  */
 export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any;
+/**
+ * @title: 将商品内关联的资源id还原成数据
+ * @description:
+ * @param {any} resourcesOriginMap
+ * @param {any} cacheItem
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-09-19 20:23
+ */
+export declare const getResourceByIds: (resourcesOriginMap: any, cacheItem: any, extraParams?: any) => any[];
 /**
  * @title: 预生成服务的 extend
  * @description:

package/es/components/booking/info2/service/addService/utils.js

@@ -179,14 +179,23 @@ export var formatResources = function formatResources(_ref5) {
       var _item = cloneDeep(item);
       _item.renderList = _item.renderList.map(function (d) {
         var res = formatResource(d, _cacheItem, function (newData) {
+          var unbound = !item.optional_resource.includes(newData.id) && !item.default_resource.includes(newData.id) && newData.id !== 0;
           return /*#__PURE__*/React.createElement("div", {
             className: "resource-option"
           }, /*#__PURE__*/React.createElement("div", {
             className: "like-wrap"
-          }), newData.labelText, !newData.usable && /*#__PURE__*/React.createElement(AlertTriangle, {
+          }), /*#__PURE__*/React.createElement("span", {
+            className: "resource-option-label-text"
+          }, newData.labelText), (!newData.usable || unbound) && /*#__PURE__*/React.createElement(AlertTriangle, {
             className: "resource-option-alert-icon"
           }));
         });
+        // 平行资源日历拖拽需求
+        // 当拖入为绑定的资源中时，为了展示，会临时创建目标资源对应的resourceItem
+        // 但是在 item.optional_resource 中并不包含目标资源id
+        if (!item.optional_resource.includes(d.id) && !item.default_resource.includes(d.id) && d.id !== 0) {
+          res.unbound = true;
+        }
         renderListMaps[res.id] = res;
         return res;
       }).sort(function (a, b) {
@@ -356,10 +365,12 @@ export var setDefaultCapacitys = function setDefaultCapacitys(_ref7) {
  * @Author: zhiwei.Wang
  * @Date: 2024-09-19 20:23
  */
-var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem) {
+export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem, extraParams) {
   var _cacheItem$product_re;
   var _resources = _toConsumableArray((cacheItem === null || cacheItem === void 0 || (_cacheItem$product_re = cacheItem.product_resource) === null || _cacheItem$product_re === void 0 ? void 0 : _cacheItem$product_re.resources) || []);
-
+  var _ref8 = extraParams || {},
+    _ref8$extraResources = _ref8.extraResources,
+    extraResources = _ref8$extraResources === void 0 ? [] : _ref8$extraResources;
   // 过滤出开启的资源
   _resources = _resources.filter(function (d) {
     return d.status == 1;
@@ -371,6 +382,14 @@ var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem)
       var item = _step2.value;
       var form_id = item.id;
 
+      // 将未绑定的资源，也放入 SelectOption 列表，避免出现仅展示id的情况
+      var extraResourceIds = extraResources.filter(function (_extraItem) {
+        return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
+      }).map(function (_extraItem) {
+        return _extraItem.id;
+      });
+      extraResourceIds = Array.from(new Set(extraResourceIds));
+
       // 去重
       item.optional_resource = (item.optional_resource || []).filter(function (d) {
         return item.default_resource.indexOf(d) == -1;
@@ -393,7 +412,7 @@ var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem)
       };
 
       // 可选项
-      var optional_resource = item.optional_resource.map(function (d) {
+      var optional_resource = [].concat(_toConsumableArray(item.optional_resource), _toConsumableArray(extraResourceIds)).map(function (d) {
         if (!resourcesOriginMap[d]) {
           return null;
         }
@@ -454,10 +473,10 @@ var getIsAutoClose = function getIsAutoClose(cacheItem) {
       }
     }
   }
-  return Object.entries(cacheItem._extend.resource).every(function (_ref8) {
-    var _ref9 = _slicedToArray(_ref8, 2),
-      key = _ref9[0],
-      value = _ref9[1];
+  return Object.entries(cacheItem._extend.resource).every(function (_ref9) {
+    var _ref10 = _slicedToArray(_ref9, 2),
+      key = _ref10[0],
+      value = _ref10[1];
     return getAutoAllocationStorage(key) && (value === null || value === void 0 ? void 0 : value.length);
   });
 };
@@ -470,10 +489,10 @@ var getIsAutoClose = function getIsAutoClose(cacheItem) {
  * @Author: zhiwei.Wang
  * @Date: 2024-06-01 13:25
  */
-export var getProductExtend = function getProductExtend(_ref10) {
-  var cacheItem = _ref10.cacheItem,
-    state = _ref10.state,
-    isDisabledTime = _ref10.isDisabledTime;
+export var getProductExtend = function getProductExtend(_ref11) {
+  var cacheItem = _ref11.cacheItem,
+    state = _ref11.state,
+    isDisabledTime = _ref11.isDisabledTime;
   // 有endDate 说明是在编辑已经保存过的商品, 没有则是编辑还没保存过的商品
   var isNew = cacheItem.new || !cacheItem._extend.endDate;
   var _cacheItem = _objectSpread({}, cacheItem);
@@ -570,7 +589,19 @@ export var getProductExtend = function getProductExtend(_ref10) {
       _cacheItem._data.capacitys = cacheItem.capacity;
     }
     if (!_cacheItem._data.resourcesOrigin) {
-      _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem);
+      var extraResources = [];
+      // 日历中可以将预约拖入未绑定的资源中，需要兼容未绑定资源的 selectOption展示
+      if (Array.isArray(_cacheItem._extend.event_resources)) {
+        _cacheItem._extend.event_resources.forEach(function (_item) {
+          extraResources.push({
+            form_id: _item.form_id,
+            id: _item.relation_id
+          });
+        });
+      }
+      _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem, {
+        extraResources: extraResources
+      });
     }
     if (!_cacheItem._data.resources) {
       // 资源

package/es/components/booking/info2/service/editService/Resources/index.js

@@ -22,14 +22,22 @@ import { getErrorList } from "../../../utilsByBooking";
 import { isArray } from 'lodash';
 import { getAutoAllocationStorage, setAutoAllocationStorage } from "../utils";
 import { useUpdate } from 'ahooks';
-import { QuestionCircleOutlined } from "@ant-design/icons";
+import { QuestionCircleOutlined } from '@ant-design/icons';
 var Resources = function Resources(_ref, ref) {
   var _cacheItem$_data2, _cacheItem$_data4;
   var state = _ref.state,
     cacheItem = _ref.cacheItem,
     getCurrentCacheItem = _ref.getCurrentCacheItem,
     onChange = _ref.onChange,
-    value = _ref.value;
+    value = _ref.value,
+    _ref$config = _ref.config,
+    config = _ref$config === void 0 ? {
+      // 是否显示自动分配
+      autoAllocation: true,
+      // 是否显示资源错误图标
+      resourceErrorIcon: true,
+      disabled: false
+    } : _ref$config;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showError = _useState2[0],
@@ -144,7 +152,7 @@ var Resources = function Resources(_ref, ref) {
         relation_type: d.relation_type
       }), d[label]);
     });
-  }, []);
+  }, [config === null || config === void 0 ? void 0 : config.resourceErrorIcon]);
 
   /**
    * @title: 检查当前资源最小选择数量
@@ -193,6 +201,7 @@ var Resources = function Resources(_ref, ref) {
     }, /*#__PURE__*/React.createElement(Form.Item, {
       label: item.title,
       required: true,
+      labelCol: config === null || config === void 0 ? void 0 : config.labelCol,
       extra: showError && item.select_type.min > (cur === null || cur === void 0 ? void 0 : cur.length) ? /*#__PURE__*/React.createElement("span", {
         style: {
           color: '#ff4d4f'
@@ -201,13 +210,17 @@ var Resources = function Resources(_ref, ref) {
     }, /*#__PURE__*/React.createElement("div", {
       className: "resource-col"
     }, item.select_type.type === 'multiple' ? null : /*#__PURE__*/React.createElement(Button, {
-      className: "resource-col-like-wrap",
+      className: "resource-col-like-wrap ".concat(config !== null && config !== void 0 && config.disabled ? 'resource-col-like-wrap-disabled' : ''),
       onClick: function onClick() {
         var _cur$;
+        if (config !== null && config !== void 0 && config.disabled) {
+          return;
+        }
         setLikeStatus((cur === null || cur === void 0 || (_cur$ = cur[0]) === null || _cur$ === void 0 ? void 0 : _cur$.like_status) === 'like' ? 'common' : 'like', item.form_id, 'like_status');
       }
     }, /*#__PURE__*/React.createElement(Like, {
-      status: cur === null || cur === void 0 || (_cur$2 = cur[0]) === null || _cur$2 === void 0 ? void 0 : _cur$2.like_status
+      status: cur === null || cur === void 0 || (_cur$2 = cur[0]) === null || _cur$2 === void 0 ? void 0 : _cur$2.like_status,
+      className: "".concat(config !== null && config !== void 0 && config.disabled ? 'like-icon-disabled' : '')
     })), /*#__PURE__*/React.createElement(MaxLengthSelect, {
       className: "resource-col-select",
       size: "large",
@@ -228,15 +241,16 @@ var Resources = function Resources(_ref, ref) {
       showSearch: true,
       filterOption: function filterOption(str, option) {
         return ((option === null || option === void 0 ? void 0 : option.labelText) || '').toLowerCase().includes((str || '').toLowerCase());
-      }
-    }, renderOptions(item.renderList, 'id', 'label', 'resource')), /*#__PURE__*/React.createElement(Checkbox, {
+      },
+      disabled: config === null || config === void 0 ? void 0 : config.disabled
+    }, renderOptions(item.renderList, 'id', config !== null && config !== void 0 && config.resourceErrorIcon ? 'label' : 'labelText', 'resource')), config !== null && config !== void 0 && config.autoAllocation ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Checkbox, {
       checked: getIsAutoAllocation(item.form_id),
       onChange: function onChange(e) {
         handleCheckAutoAllocation(item.form_id, e.target.checked);
       }
     }), /*#__PURE__*/React.createElement(Tooltip, {
       title: locales.getText('page.booking.text.resource.check-auto-allocation-tip')
-    }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, null)))), state.renderType !== 'eventBooking' && (errors || []).map(function (d) {
+    }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, null))) : null)), state.renderType !== 'eventBooking' && (errors || []).map(function (d) {
       return /*#__PURE__*/React.createElement(Alert, {
         key: d.type,
         message: d.label,

package/es/components/booking/info2/service/editService/Resources/index.less

@@ -15,6 +15,12 @@
     .like-resource {}
   }
 
+  .resource-col-like-wrap-disabled,
+  .like-icon-disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+
   .resource-col-select {
     flex: 1;
   }

package/es/components/booking/info2/service/editService/ResourcesV2/MaxLengthSelect/index.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+import { SelectProps } from 'antd';
+interface MaxLengthSelectProps<T> extends SelectProps<T> {
+    maxLength: number;
+}
+declare const _default: import("react").ForwardRefExoticComponent<Partial<MaxLengthSelectProps<any>> & import("react").RefAttributes<unknown>>;
+export default _default;

package/es/components/booking/info2/service/editService/ResourcesV2/MaxLengthSelect/index.js

@@ -0,0 +1,26 @@
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+import { forwardRef, useImperativeHandle } from 'react';
+import { Select } from 'antd';
+var MaxLengthSelect = function MaxLengthSelect(props, ref) {
+  useImperativeHandle(ref, function () {
+    return {
+      onChange: handleChange
+    };
+  });
+  var handleChange = function handleChange(e, _option) {
+    if (props.onChange) {
+      if ((props.mode === 'multiple' || props.mode === 'tags') && props.maxLength) {
+        if (props.value && props.value.length >= props.maxLength && e.length > props.value.length) {
+          return;
+        }
+      }
+      props.onChange(e, _option);
+    }
+  };
+  return /*#__PURE__*/React.createElement(Select, _extends({}, props, {
+    onChange: handleChange,
+    popupMatchSelectWidth: false
+    // getPopupContainer={() => document.querySelector('#main') || document.body}
+  }), props.children);
+};
+export default /*#__PURE__*/forwardRef(MaxLengthSelect);

package/es/components/booking/info2/service/editService/ResourcesV2/index.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import './index.less';
+interface IResourcesProps {
+    [key: string]: any;
+    /** 展示资源的变动情况 */
+    originCacheItem: any;
+    originValue: any;
+}
+declare const _default: React.ForwardRefExoticComponent<Omit<IResourcesProps, "ref"> & React.RefAttributes<unknown>>;
+export default _default;