@pisell/private-materials 3.0.165 → 3.0.167

package/es/components/productExtension/fields/SelectResourcesTable/index.js

@@ -13,10 +13,10 @@ 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, { useState, useMemo, useEffect } from "react";
-import { Select } from "antd";
+import React, { useState, useMemo, useEffect } from 'react';
+import { Select } from 'antd';
 // import {} from '@pisell/materials'
-import { locales } from "@pisell/utils";
+import { locales } from '@pisell/utils';
 import { getFormTypes, getAllResource } from "./server";
 import "./index.less";
 var sortArrayByOrder = function sortArrayByOrder(arr1, arr2, reverse) {
@@ -38,26 +38,35 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
     setData = _useState2[1];
+
+  /**
+   * @title: 获取数据
+   * @description:
+   * @return {*}
+   * @Author: zhiwei.Wang
+   * @Date: 2024-11-04 17:07
+   */
   var _getData = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _getFormTypes, _getAllResource, _yield$Promise$all, _yield$Promise$all2, forms, resources, _data;
+      var _getFormTypes, _getAllResource, _yield$Promise$all, _yield$Promise$all2, forms, resources, defaultResourceId, _data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            // 获取资源分类
             _getFormTypes = getFormTypes({
-              type: "manual",
+              type: 'manual',
               num: 500,
               skip: 1,
-              status: "published"
+              status: 'published'
             }, {
               useCache: true
-            });
+            }); // 获取资源列表
             _getAllResource = getAllResource({
               num: 500,
               skip: 1
             }, {
               useCache: true
-            });
+            }); // 合并请求
             _context.next = 4;
             return Promise.all([_getFormTypes, _getAllResource]);
           case 4:
@@ -65,11 +74,24 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
             _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
             forms = _yield$Promise$all2[0];
             resources = _yield$Promise$all2[1];
+            // 需要默认选择的资源
+            defaultResourceId = getDefaultResourceId();
             _data = (forms || []).reduce(function (arr, item) {
+              // 根据资源分类,找到该分类下的所有资源
               var currentResource = (resources || []).filter(function (relation) {
                 return relation.form_id === item.id;
               });
               if (currentResource.length > 0) {
+                // 设置默认资源
+                if (defaultResourceId && currentResource.some(function (d) {
+                  return d.id == defaultResourceId;
+                })) {
+                  // 返回上层
+                  _onChange([defaultResourceId], item.id);
+                  // 清空默认值
+                  removeDefaultResourceId();
+                  defaultResourceId = undefined;
+                }
                 arr.push(_objectSpread(_objectSpread({
                   label: item.title,
                   key: item.id,
@@ -82,7 +104,7 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
               return arr;
             }, []);
             setData(_data);
-          case 10:
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -92,6 +114,29 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+
+  /**
+   * @title: 获取默认选择的资源
+   * @description:
+   * @return {*}
+   * @Author: zhiwei.Wang
+   * @Date: 2024-11-04 17:09
+   */
+  var getDefaultResourceId = function getDefaultResourceId() {
+    var _serviceParams;
+    var serviceParams = sessionStorage.getItem('pisell2.eventBooking.serviceParams');
+    if (serviceParams) {
+      serviceParams = JSON.parse(serviceParams);
+    }
+    var resource_id = (_serviceParams = serviceParams) === null || _serviceParams === void 0 ? void 0 : _serviceParams.resource_id;
+    if (resource_id) {
+      resource_id = Number(resource_id);
+    }
+    return resource_id;
+  };
+  var removeDefaultResourceId = function removeDefaultResourceId() {
+    sessionStorage.setItem('pisell2.eventBooking.serviceParams', '');
+  };
   var _dataSource = useMemo(function () {
     if (value) {
       // 创建一个排序键对象
@@ -136,10 +181,11 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(_value);
   };
+  console.log('value', value);
   var columns = useMemo(function () {
     return [{
-      title: locales.getText("pisell2.text.product-extension.resource-type"),
-      dataIndex: "title",
+      title: locales.getText('pisell2.text.product-extension.resource-type'),
+      dataIndex: 'title',
       value: value,
       data: data,
       width: 100
@@ -163,23 +209,23 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
     // 	},
     // },
     {
-      title: locales.getText("pisell2.text.product-extension.options"),
-      dataIndex: "form_id",
+      title: locales.getText('pisell2.text.product-extension.options'),
+      dataIndex: 'form_id',
       render: function render(form_id, record, index) {
         var cur = value === null || value === void 0 ? void 0 : value.find(function (d) {
           return d.form_id === form_id;
         });
         return /*#__PURE__*/React.createElement(Select, {
           style: {
-            width: "100%"
+            width: '100%'
           },
           mode: "multiple",
           value: (cur === null || cur === void 0 ? void 0 : cur.form_record_ids) || [],
           options: record.options,
           popupMatchSelectWidth: false,
           fieldNames: {
-            label: "title",
-            value: "id"
+            label: 'title',
+            value: 'id'
           },
           onChange: function onChange(val) {
             _onChange(val, form_id);
@@ -200,13 +246,13 @@ var SelectResourcesTable = function SelectResourcesTable(_ref) {
     className: "",
     dragSort: true,
     onSortChange: sortChange,
-    rowKey: "form_id",
+    rowKey: 'form_id',
     columns: columns,
     dataSource: _dataSource,
     pagination: false,
     virtual: false,
     scroll: {
-      x: "auto"
+      x: 'auto'
     }
   });
 };

package/es/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: (props: any) => JSX.Element;
 export default Schedules;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,7 +68,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

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

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

@@ -44,13 +44,14 @@ var translationOriginal = (text) => "";
 var formatCapacityToChildrenData = (data) => {
   const map = {};
   data.forEach((item) => {
-    if (!map[item.id]) {
-      map[item.id] = {
+    const name = translationOriginal(item.name) || "default";
+    if (!map[name]) {
+      map[name] = {
         label: !item.id ? import_utils.locales.getText("pisell2.booking.dashboard.default") : translationOriginal(item.name) || "",
         value: 0
       };
     }
-    map[item.id].value = (map[item.id].value || 0) + (item.value || 0);
+    map[name].value = (map[name].value || 0) + (item.value || 0);
   });
   return Object.values(map).sort((a, b) => b.label.localeCompare(a.label));
 };

package/lib/components/booking/forms/model.d.ts

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

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

@@ -83,7 +83,7 @@ var isBooking4Shop = (shopId, renderType) => {
   if (renderType === "eventBooking") {
     return false;
   }
-  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007];
+  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320];
   return booking4Shops.includes(shopId);
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -90,7 +90,7 @@ var getFlexibleOption = ({
   slice,
   durationProps
 }) => {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f;
   const _durationProps = durationProps || getDurationProps({
     cacheItem,
     useStartTime,
@@ -102,7 +102,7 @@ var getFlexibleOption = ({
     let endDate = (0, import_utils.getEndDate)(
       _durationProps.startDate,
       _duration,
-      ((_a = _durationProps.usableTime) == null ? void 0 : _a.end_at) ? (0, import_dayjs.default)((_b = _durationProps.usableTime) == null ? void 0 : _b.end_at) : null
+      ((_c = (_b = (_a = _durationProps.usableTime) == null ? void 0 : _a._extend) == null ? void 0 : _b.usableTime) == null ? void 0 : _c.end_at) ? (0, import_dayjs.default)((_f = (_e = (_d = _durationProps.usableTime) == null ? void 0 : _d._extend) == null ? void 0 : _e.usableTime) == null ? void 0 : _f.end_at) : null
     );
     let timeValue = endDate.diff(_durationProps.startDate, "minute");
     return {
@@ -197,6 +197,7 @@ var setDefaultResource = ({ cacheItem, resources }) => {
   for (let item of resources) {
     let defaultResource = item.renderList.filter((d) => d.is_default == 1 || d.id === resourceId).map((d) => {
       return {
+        ...d,
         relation_type: d.relation_type,
         form_id: item.form_id,
         relation_id: d.id,
@@ -324,11 +325,13 @@ var getProductExtend = ({ cacheItem, state }) => {
       resources: _cacheItem._data.resources
     });
     if ((0, import_utils.getDuration)(_cacheItem == null ? void 0 : _cacheItem.duration)) {
-      _cacheItem._data._timeObj = getTimeObj({
-        cacheItem,
+      _cacheItem._data.timeObj = getTimeObj({
+        cacheItem: _cacheItem,
+        useStartTime: _cacheItem._extend.start_time,
         currentResource: _cacheItem._extend.resource,
         state
       });
+      _cacheItem._extend.duration = _cacheItem._data.timeObj.durationSlicesBasedOnTime[0].value;
     }
     _cacheItem.autoClose = getIsAutoClose(_cacheItem);
     if (_cacheItem._extend.bundle_edit !== void 0) {
@@ -336,13 +339,6 @@ var getProductExtend = ({ cacheItem, state }) => {
     }
     _cacheItem._time = (/* @__PURE__ */ new Date()).getTime();
   } else {
-    if (!_cacheItem._data._timeObj) {
-      _cacheItem._data._timeObj = getTimeObj({
-        cacheItem,
-        currentResource: _cacheItem._extend.resource,
-        state
-      });
-    }
     if (!_cacheItem._data.capacitys) {
       _cacheItem._data.capacitys = cacheItem.capacity;
     }
@@ -360,6 +356,12 @@ var getProductExtend = ({ cacheItem, state }) => {
       _cacheItem._data.resources = list;
       _cacheItem._data.resourceMaps = maps;
     }
+    _cacheItem._data.timeObj = getTimeObj({
+      cacheItem: _cacheItem,
+      useStartTime: _cacheItem._extend.start_time,
+      currentResource: _cacheItem._extend.resource,
+      state
+    });
   }
   console.log("_cacheItem_cacheItem", _cacheItem);
   return _cacheItem;

package/lib/components/booking/info2/service/editService/index.js

@@ -50,7 +50,7 @@ var import_utilsByBooking = require("../../utilsByBooking");
 var import_utils4 = require("../addService/utils");
 var submitLock = false;
 var Info = (_, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useResource = import_antd.Form.useWatch("resource", form);
@@ -94,9 +94,14 @@ var Info = (_, ref) => {
     });
   }, [durationProps, import_utils.locales.locale]);
   const timeObj = (0, import_react.useMemo)(() => {
-    var _a2, _b2;
-    return (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._data.timeObj;
-  }, [(_e = (_d = state.service) == null ? void 0 : _d.cacheItem) == null ? void 0 : _e._data.timeObj]);
+    return (0, import_utils4.getTimeObj)({
+      durationProps,
+      useStartTime,
+      currentResource,
+      state,
+      useDuration
+    });
+  }, [durationProps, useStartTime, currentResource, state, useDuration]);
   (0, import_react.useEffect)(() => {
     try {
       if (useDuration.indexOf("flexible_") == 0) {
@@ -206,7 +211,7 @@ var Info = (_, ref) => {
     let oPrice = Number(((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend.origin_total) || 0);
     let cPrice = Number(useTotal || 0);
     return cPrice !== oPrice;
-  }, [useTotal, (_g = (_f = state.service.cacheItem) == null ? void 0 : _f._extend) == null ? void 0 : _g.origin_total]);
+  }, [useTotal, (_e = (_d = state.service.cacheItem) == null ? void 0 : _d._extend) == null ? void 0 : _e.origin_total]);
   const getResources = () => {
     let res = (0, import_utils4.formatResources)({
       cacheItem: getCurrentCacheItem(),
@@ -269,18 +274,18 @@ var Info = (_, ref) => {
   }, [state.service.editModal, state.isBookingCreatePage]);
   (0, import_react.useEffect)(() => {
     getDiscount();
-  }, [useTotal, (_i = (_h = state.service.cacheItem) == null ? void 0 : _h._extend) == null ? void 0 : _i.origin_total]);
+  }, [useTotal, (_g = (_f = state.service.cacheItem) == null ? void 0 : _f._extend) == null ? void 0 : _g.origin_total]);
   const isDiscount = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     if (!((_a2 = state.service) == null ? void 0 : _a2.cacheItem)) {
       return false;
     }
     return useTotal != ((_c2 = (_b2 = state.service) == null ? void 0 : _b2.cacheItem) == null ? void 0 : _c2._extend.origin_total);
-  }, [useTotal, (_k = (_j = state.service) == null ? void 0 : _j.cacheItem) == null ? void 0 : _k._extend.origin_total]);
+  }, [useTotal, (_i = (_h = state.service) == null ? void 0 : _h.cacheItem) == null ? void 0 : _i._extend.origin_total]);
   const bundles = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
-  }, [(_o = (_n = (_m = (_l = state.service) == null ? void 0 : _l.cacheItem) == null ? void 0 : _m._extend) == null ? void 0 : _n.other) == null ? void 0 : _o.bundle]);
+  }, [(_m = (_l = (_k = (_j = state.service) == null ? void 0 : _j.cacheItem) == null ? void 0 : _k._extend) == null ? void 0 : _l.other) == null ? void 0 : _m.bundle]);
   const handleEdit = (e) => {
     const item = state.service.cacheItem;
     let values = form.getFieldsValue();
@@ -348,14 +353,14 @@ var Info = (_, ref) => {
     };
   });
   console.log("state.service.value", state.service.value);
-  const SelectTime = (_p = window.BaseMaterials) == null ? void 0 : _p.SelectTime;
+  const SelectTime = (_n = window.BaseMaterials) == null ? void 0 : _n.SelectTime;
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
       titleNoWrap: true,
       zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
-      open: state.service.editModal && !((_q = state.service.cacheItem) == null ? void 0 : _q.autoClose),
+      open: state.service.editModal && !((_o = state.service.cacheItem) == null ? void 0 : _o.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         dispatch({
@@ -368,7 +373,7 @@ var Info = (_, ref) => {
         });
       }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_t = (_s = (_r = state.service) == null ? void 0 : _r.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), !state.isBookingCreatePage && /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_r = (_q = (_p = state.service) == null ? void 0 : _p.cacheItem) == null ? void 0 : _q._extend) == null ? void 0 : _r.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), !state.isBookingCreatePage && /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
       import_collapsibleList.default,
       {
         style: { marginTop: bundles.length ? "8px" : 0 },
@@ -391,8 +396,8 @@ var Info = (_, ref) => {
           precision: 2,
           style: { width: "100%" },
           min: 0,
-          max: ((_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.origin_total) || 0,
-          placeholder: ((_x = (_w = state.service.cacheItem) == null ? void 0 : _w._extend) == null ? void 0 : _x.origin_total) || "0"
+          max: ((_t = (_s = state.service.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.origin_total) || 0,
+          placeholder: ((_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.origin_total) || "0"
         }
       )
     )), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
@@ -432,7 +437,7 @@ var Info = (_, ref) => {
       SelectTime ? /* @__PURE__ */ import_react.default.createElement(
         SelectTime,
         {
-          slice: (_B = (_A = (_z = (_y = state.bookingConfig) == null ? void 0 : _y.config) == null ? void 0 : _z.basic) == null ? void 0 : _A.service_time) == null ? void 0 : _B.value,
+          slice: (_z = (_y = (_x = (_w = state.bookingConfig) == null ? void 0 : _w.config) == null ? void 0 : _x.basic) == null ? void 0 : _y.service_time) == null ? void 0 : _z.value,
           timePickerProps: {
             style: { width: "100%" }
           },
@@ -477,7 +482,7 @@ var Info = (_, ref) => {
       {
         type: "primary",
         className: "pisell-lowcode__booking-service-body-edit-footer-apple",
-        disabled: !((_C = state.service.resourcesOrigin) == null ? void 0 : _C.length),
+        disabled: !((_A = state.service.resourcesOrigin) == null ? void 0 : _A.length),
         onClick: () => {
           form.submit();
         }

package/lib/components/booking/info2/utilsByBooking.js

@@ -70,6 +70,7 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
   const currentCount = getSumCapacity({ cacheItem });
   const eventList = time.event_list || [];
   let endDate = null;
+  let isCalcCount = true;
   if (isFlexible) {
     if (eventList.length) {
       timeStartDate = eventList.reduce((max, event) => {
@@ -78,6 +79,11 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
       }, (0, import_dayjs.default)(eventList[0].end_at));
     }
     isDateRange = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
+    if (!isDateRange && eventList.length) {
+      isCalcCount = false;
+      isDateRange = true;
+      isCountRange = false;
+    }
   } else {
     endDate = startDate.add(import_utils2.flexibleObj.getValue(cacheItem._extend.duration), "minute");
     const isTimeRange = startDate.isAfter(timeStartDate) && endDate.isBefore(timeEndDate);
@@ -85,21 +91,23 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
       isDateRange = true;
     }
   }
-  let conflict = (time.event_list || []).filter((d) => {
-    return isConflict({ start_at: d.start_at, end_at: d.end_at }, { start_at: startDate, end_at: endDate });
-  });
-  if (resourceItem.resourceType === "single") {
-    if (conflict.length === 0) {
-      isCountRange = true;
-    } else {
-      isCountRange = false;
-    }
-  } else {
-    let conflictCount = getUseableEventCount(conflict, resourceItem.capacity);
-    if (currentCount <= conflictCount) {
-      isCountRange = true;
+  if (isCalcCount) {
+    let conflict = (time.event_list || []).filter((d) => {
+      return isConflict({ start_at: d.start_at, end_at: d.end_at }, { start_at: startDate, end_at: endDate });
+    });
+    if (resourceItem.resourceType === "single") {
+      if (conflict.length === 0) {
+        isCountRange = true;
+      } else {
+        isCountRange = false;
+      }
     } else {
-      isCountRange = false;
+      let conflictCount = getUseableEventCount(conflict, resourceItem.capacity);
+      if (currentCount <= conflictCount) {
+        isCountRange = true;
+      } else {
+        isCountRange = false;
+      }
     }
   }
   const isUsable = isDateRange && isCountRange;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,5 +1,5 @@
-import { SelectProps } from "antd";
-import React from "react";
+import { SelectProps } from 'antd';
+import React from 'react';
 interface DurationProps extends SelectProps {
     locale?: string;
     slice?: number;

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

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => any;
+declare const Notes: any;
 export default Notes;

package/lib/components/booking/notes/model.d.ts

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

package/lib/components/booking/payments/model.d.ts

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

package/lib/components/productExtension/fields/SelectResourcesTable/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare const SelectResourcesTable: ({ value, onChange }: any) => React.JSX.Element;
 export default SelectResourcesTable;

package/lib/components/productExtension/fields/SelectResourcesTable/index.js

@@ -60,11 +60,17 @@ var SelectResourcesTable = ({ value, onChange }) => {
       _getFormTypes,
       _getAllResource
     ]);
+    let defaultResourceId = getDefaultResourceId();
     let _data = (forms || []).reduce((arr, item) => {
       const currentResource = (resources || []).filter(
         (relation) => relation.form_id === item.id
       );
       if (currentResource.length > 0) {
+        if (defaultResourceId && currentResource.some((d) => d.id == defaultResourceId)) {
+          _onChange([defaultResourceId], item.id);
+          removeDefaultResourceId();
+          defaultResourceId = void 0;
+        }
         arr.push({
           label: item.title,
           key: item.id,
@@ -79,6 +85,22 @@ var SelectResourcesTable = ({ value, onChange }) => {
     }, []);
     setData(_data);
   };
+  const getDefaultResourceId = () => {
+    let serviceParams = sessionStorage.getItem(
+      "pisell2.eventBooking.serviceParams"
+    );
+    if (serviceParams) {
+      serviceParams = JSON.parse(serviceParams);
+    }
+    let resource_id = serviceParams == null ? void 0 : serviceParams.resource_id;
+    if (resource_id) {
+      resource_id = Number(resource_id);
+    }
+    return resource_id;
+  };
+  const removeDefaultResourceId = () => {
+    sessionStorage.setItem("pisell2.eventBooking.serviceParams", "");
+  };
   const _dataSource = (0, import_react.useMemo)(() => {
     if (value) {
       let sortOrder = {};
@@ -112,6 +134,7 @@ var SelectResourcesTable = ({ value, onChange }) => {
     }
     onChange == null ? void 0 : onChange(_value);
   };
+  console.log("value", value);
   const columns = (0, import_react.useMemo)(() => {
     return [
       {

package/lib/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: (props: any) => JSX.Element;
 export default Schedules;

package/lib/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,7 +68,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.165",
+  "version": "3.0.167",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,9 +60,9 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
-    "@pisell/date-picker": "1.0.100",
+    "@pisell/materials": "3.0.50",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "3.0.50"
+    "@pisell/date-picker": "1.0.100"
   },
   "peerDependencies": {
     "react": "^18.0.0",