@pisell/private-materials 3.0.27 → 3.0.29

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

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

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

@@ -13,7 +13,24 @@ declare class Request {
     };
 }
 export declare const request: Request;
+/**
+ * @title: 格式化持续时长用于展示
+ * @description:
+ * @param {number} service_times
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-04-26 14:00
+ */
 export declare const getDiscountTime: (service_times: number) => string;
+/**
+ * @title: 时间切片
+ * @description:
+ * @param {any} config
+ * @param {string} locale
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-04-26 13:59
+ */
 export declare const sliceDayIntoFiveMinutes: (config: any, locale: string) => {
     timeSlices: {
         label: string;
@@ -24,6 +41,26 @@ export declare const sliceDayIntoFiveMinutes: (config: any, locale: string) => {
         value: number;
     }[];
 };
+export declare const getNowTime: () => string;
+export declare const isNowTime: (time: string) => boolean;
+/**
+ * @title: 获取服务的开始时间, 如果是now 转换为当前的时间
+ * @description:
+ * @param {string} start_time
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-04-26 14:03
+ */
+export declare const getServeStartTime: (start_time: string) => string;
+/**
+ * @title: 格式化服务的 开始时间-结束时间-时长, 用于展示
+ * @description:
+ * @param {any} item
+ * @param {any} currentDate
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-04-26 14:04
+ */
 export declare const getServiceTime: (item: any, currentDate: any) => string;
 export declare const findNextSlice: ({ timeSlices, index, date }: {
     timeSlices: any[];

package/lib/components/booking/utils.js

@@ -41,11 +41,14 @@ __export(utils_exports, {
   getEndDate: () => getEndDate,
   getErrorList: () => getErrorList,
   getLastServer: () => getLastServer,
+  getNowTime: () => getNowTime,
   getProductTotalPrice: () => getProductTotalPrice,
+  getServeStartTime: () => getServeStartTime,
   getServerItemExtend: () => getServerItemExtend,
   getServiceTime: () => getServiceTime,
   getServiceTimes: () => getServiceTimes,
   getShopOpeningHours: () => getShopOpeningHours,
+  isNowTime: () => isNowTime,
   isWalkIn: () => isWalkIn,
   request: () => request,
   sliceDayIntoFiveMinutes: () => sliceDayIntoFiveMinutes
@@ -90,8 +93,8 @@ var sliceDayIntoFiveMinutes = (config, locale) => {
   const startTime = (0, import_dayjs.default)().startOf("day");
   const endTime = (0, import_dayjs.default)().endOf("day");
   const timeSlice = (config == null ? void 0 : config.value) || 5;
-  const timeSlices = [];
-  const durationSlicesBasedOnTime = [];
+  let timeSlices = [];
+  let durationSlicesBasedOnTime = [];
   let currentTime = startTime;
   while (currentTime.isBefore(endTime)) {
     const timeLabel = currentTime.format("hh:mm A");
@@ -116,8 +119,20 @@ var sliceDayIntoFiveMinutes = (config, locale) => {
   }
   return { timeSlices, durationSlicesBasedOnTime };
 };
+var getNowTime = () => {
+  return (0, import_dayjs.default)().format("HH:mm");
+};
+var isNowTime = (time) => {
+  return time === "now";
+};
+var getServeStartTime = (start_time) => {
+  if (isNowTime(start_time)) {
+    return getNowTime();
+  }
+  return start_time;
+};
 var getServiceTime = (item, currentDate) => {
-  const startDate = (0, import_dayjs.default)(currentDate.format("YYYY-MM-DD") + " " + item._extend.start_time);
+  const startDate = (0, import_dayjs.default)(currentDate.format("YYYY-MM-DD") + " " + getServeStartTime(item._extend.start_time));
   const startTime = startDate.format("HH:mm");
   const endTime = startDate.add(flexibleObj.getValue(item._extend.duration), "minute").format("HH:mm");
   const duration = getDiscountTime(flexibleObj.getValue(item._extend.duration));
@@ -130,8 +145,10 @@ var findNextSlice = ({
 }) => {
   const currentTimeValue = date || (0, import_dayjs.default)().format("HH:mm");
   for (let i = 0; i < timeSlices.length; i++) {
-    if (timeSlices[i].value >= currentTimeValue) {
-      return timeSlices[i].value;
+    if (timeSlices[i].value !== "now") {
+      if (timeSlices[i].value >= currentTimeValue) {
+        return timeSlices[i].value;
+      }
     }
   }
   return timeSlices[index].value;
@@ -190,7 +207,7 @@ var formatProductListByCategory = (list, filterItem) => {
 var formatTimes = (resourceItem, cacheItem) => {
   let usableTimes = [];
   let _resourceItem = { ...resourceItem };
-  const startDate = (0, import_dayjs.default)(cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + cacheItem._extend.start_time);
+  const startDate = (0, import_dayjs.default)(cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + getServeStartTime(cacheItem._extend.start_time));
   const isFlexible = flexibleObj.isFlexible(cacheItem._extend.duration);
   _resourceItem.times = _resourceItem.times.map((d) => {
     let isMaxLimitRange = false;
@@ -311,7 +328,7 @@ var getEndDate = (startDate, duration, endDate) => {
   return startDate.add(duration, "minute");
 };
 var getServiceTimes = (service) => {
-  const startDate = (0, import_dayjs.default)((0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + service._extend.start_time);
+  const startDate = (0, import_dayjs.default)((0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time));
   const endDate = startDate.add(flexibleObj.getValue(service._extend.duration), "minute");
   return {
     startDate,
@@ -357,7 +374,6 @@ var getErrorList = (resource, cacheItem) => {
       }
     }
   }
-  console.log(cacheItem, "cacheItem");
   return list;
 };
 var formatResource = (resourceItem, cacheItem, formatLabel) => {
@@ -404,7 +420,6 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
       _extend.start_time = lastServerEndDate.format("HH:mm");
     }
   } else {
-    _extend.resource = 0;
     let findNextSliceProps = {
       timeSlices: timeObj.timeSlices,
       index: 0,
@@ -421,7 +436,12 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
         _extend.resource = Number(resourceId);
       }
     }
-    _extend.start_time = findNextSlice(findNextSliceProps);
+    console.log("_extend", findNextSliceProps);
+    if (findNextSliceProps.date && findNextSliceProps.date !== "00:00") {
+      _extend.start_time = findNextSlice(findNextSliceProps);
+    } else {
+      _extend.start_time = "now";
+    }
   }
   _extend = {
     ..._extend,
@@ -479,11 +499,14 @@ var isWalkIn = (customer_id) => {
   getEndDate,
   getErrorList,
   getLastServer,
+  getNowTime,
   getProductTotalPrice,
+  getServeStartTime,
   getServerItemExtend,
   getServiceTime,
   getServiceTimes,
   getShopOpeningHours,
+  isNowTime,
   isWalkIn,
   request,
   sliceDayIntoFiveMinutes

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

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

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

@@ -25,6 +25,7 @@ declare const _default: {
         'pisell2.text.products.unsaved-back': string;
         'pisell2.text.products.unsaved-yes': string;
         'pisell2.text.products.max-participants-error': string;
+        'pisell2.text.schedules.create-new-schedule': string;
     };
     'zh-CN': {
         'pisell2.text.schedules.all-day': string;
@@ -52,6 +53,7 @@ declare const _default: {
         'pisell2.text.products.unsaved-back': string;
         'pisell2.text.products.unsaved-yes': string;
         'pisell2.text.products.max-participants-error': string;
+        'pisell2.text.schedules.create-new-schedule': string;
     };
     'zh-HK': {
         'pisell2.text.schedules.all-day': string;
@@ -79,6 +81,7 @@ declare const _default: {
         'pisell2.text.products.unsaved-back': string;
         'pisell2.text.products.unsaved-yes': string;
         'pisell2.text.products.max-participants-error': string;
+        'pisell2.text.schedules.create-new-schedule': string;
     };
 };
 export default _default;

package/lib/components/schedules/locales.js

@@ -48,7 +48,8 @@ var locales_default = {
     "pisell2.text.products.unsaved-content": "Navigating away without saving will discard your changes. Are you sure you want to proceed?",
     "pisell2.text.products.unsaved-back": "Go back",
     "pisell2.text.products.unsaved-yes": "Yes, discard",
-    "pisell2.text.products.max-participants-error": "Please set max participants"
+    "pisell2.text.products.max-participants-error": "Please set max participants",
+    "pisell2.text.schedules.create-new-schedule": "Create new schedule"
   },
   "zh-CN": {
     "pisell2.text.schedules.all-day": "全天",
@@ -75,7 +76,8 @@ var locales_default = {
     "pisell2.text.products.unsaved-content": "若不保存即离开，您所做的修改将会丢失。确定要继续吗？",
     "pisell2.text.products.unsaved-back": "返回",
     "pisell2.text.products.unsaved-yes": "是的，退出",
-    "pisell2.text.products.max-participants-error": "请设置最大参与人数"
+    "pisell2.text.products.max-participants-error": "请设置最大参与人数",
+    "pisell2.text.schedules.create-new-schedule": "创建新日程"
   },
   "zh-HK": {
     "pisell2.text.schedules.all-day": "全天",
@@ -102,6 +104,7 @@ var locales_default = {
     "pisell2.text.products.unsaved-content": "若不保即離開，您做的修改將會丟失。確定要繼續嗎？",
     "pisell2.text.products.unsaved-back": "返回",
     "pisell2.text.products.unsaved-yes": "是的，退出",
-    "pisell2.text.products.max-participants-error": "請設置最大參與人數"
+    "pisell2.text.products.max-participants-error": "請設置最大參與人數",
+    "pisell2.text.schedules.create-new-schedule": "創建新日程"
   }
 };

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

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

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/AddSchedules/index.js

@@ -39,18 +39,58 @@ var import_react = __toESM(require("react"));
 var import_customSelect = __toESM(require("../../../../../../booking/components/customSelect"));
 var import_model = require("../../../../../model");
 var import_serve = require("../../../../serve");
+var import_useComponents = __toESM(require("../../../../../../../hooks/useComponents"));
+var import_useEngineContext = __toESM(require("../../../../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
 var AddSchedules = ({ value, onChange, drawerContainer, isSelf }) => {
   var _a;
   const modalRef = (0, import_react.useRef)(null);
   const { state } = (0, import_react.useContext)(import_model.Context);
+  const { appHelper } = (0, import_useEngineContext.default)();
+  const createSchedules = (0, import_react.useRef)();
+  const AllCreateScheduleRef = (0, import_react.useRef)(null);
+  const [ScheduleCreateType, AllCreateSchedule] = (0, import_useComponents.default)({
+    components: ["ScheduleCreateType", "AllCreateSchedule"]
+  });
   const _getScheduleList = (0, import_ahooks.useRequest)(import_serve.getSchedules, {
     manual: true,
     onSuccess: (res) => {
     }
   });
   const onFinish = (e) => {
-    onChange(e);
+    var _a2;
+    const idMap = ((_a2 = _getScheduleList == null ? void 0 : _getScheduleList.data) == null ? void 0 : _a2.reduce((p, c) => {
+      return { ...p, [c.id]: c };
+    }, {})) || {};
+    onChange(e.map((item) => idMap[item.id]));
+  };
+  const handleCreateSchedule = () => {
+    var _a2, _b;
+    (_b = (_a2 = createSchedules.current) == null ? void 0 : _a2.open) == null ? void 0 : _b.call(_a2, {
+      getContainer: void 0
+    });
+  };
+  const handleAddSchedule = (data) => {
+    _getScheduleList.mutate((oldData) => [data, ...oldData || []]);
+    modalRef.current.setValue((v) => [...v, data]);
+    setTimeout(() => {
+      var _a2, _b;
+      (_b = (_a2 = document.getElementById(data.id)) == null ? void 0 : _a2.scrollIntoView) == null ? void 0 : _b.call(_a2, { block: "center", behavior: "smooth" });
+    });
+  };
+  const handleEdit = (e, id) => {
+    var _a2, _b;
+    e.stopPropagation();
+    (_b = (_a2 = AllCreateScheduleRef.current) == null ? void 0 : _a2.open) == null ? void 0 : _b.call(_a2, { id });
+  };
+  const handleChangeResData = (data) => {
+    _getScheduleList.mutate((oldData) => (oldData || []).map((item) => {
+      var _a2;
+      if (item.id === data.id) {
+        return { ...data, name: ((_a2 = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a2.translationShop(data.name)) || data.name };
+      }
+      return item;
+    }));
   };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Button,
@@ -73,9 +113,11 @@ var AddSchedules = ({ value, onChange, drawerContainer, isSelf }) => {
       ref: modalRef,
       rowKey: "id",
       options: isSelf ? _getScheduleList.data || [] : ((_a = state == null ? void 0 : state.schedules) == null ? void 0 : _a.list) || [],
+      createItemText: import_utils.locales.getText("pisell2.text.schedules.create-new-schedule"),
       loading: _getScheduleList.loading,
       value,
       onValueChange: onFinish,
+      handleCreateItem: handleCreateSchedule,
       isPreview: false,
       drawerProps: {
         title: import_utils.locales.getText("pisell2.text.schedules.assign-schedule"),
@@ -91,18 +133,37 @@ var AddSchedules = ({ value, onChange, drawerContainer, isSelf }) => {
       },
       mode: "multiple",
       optionRender: (item) => {
-        return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
+        return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__add-schedule-list-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__add-schedule-list-item-content" }, /* @__PURE__ */ import_react.default.createElement(
           "div",
           {
             className: "pisell-lowcode__add-schedule-list-item-color",
             style: { backgroundColor: item.color }
           }
-        ), item.name);
+        ), item.name), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__add-schedule-list-item-action-wrap" }, /* @__PURE__ */ import_react.default.createElement(
+          "div",
+          {
+            className: "pisell-lowcode__add-schedule-list-item-action-edit",
+            onClick: (e) => handleEdit(e, item.id)
+          },
+          import_utils.locales.getText("pisell2.text.edit")
+        )));
       },
       filterItem: (d, search) => {
         return d.name.toLowerCase().indexOf(search.toLowerCase()) !== -1;
       }
     }
+  ), ScheduleCreateType && /* @__PURE__ */ import_react.default.createElement(
+    ScheduleCreateType,
+    {
+      ref: createSchedules,
+      onChange: handleAddSchedule
+    }
+  ), AllCreateSchedule && /* @__PURE__ */ import_react.default.createElement(
+    AllCreateSchedule,
+    {
+      ref: AllCreateScheduleRef,
+      onChange: handleChangeResData
+    }
   ));
 };
 var AddSchedules_default = AddSchedules;

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/AddSchedules/index.less

@@ -1,3 +1,23 @@
+.pisell-lowcode__add-schedule-list-item {
+  display: flex;
+  flex: 1;
+  .pisell-lowcode__add-schedule-list-item-content {
+    flex: 1;
+    display: flex;
+    align-items: center;
+  }
+  .pisell-lowcode__add-schedule-list-item-action-wrap {
+    .pisell-lowcode__add-schedule-list-item-action-edit {
+      display: flex;
+      height: 48px;
+      padding: 0px 16px;
+      justify-content: center;
+      align-items: center;
+      border-radius: 30px;
+      border: 1px solid var(--Gray-true-300, #D5D5D5);
+    }
+  }
+}
 .pisell-lowcode__add-schedule-list-item-color {
   width: 12px;
   height: 12px;

package/lib/index.d.ts

@@ -12,3 +12,4 @@ export { default as BookingStartTime } from './components/booking/materiels/star
 export { default as BookingDuration } from './components/booking/materiels/duration';
 export { default as BookingContacts } from './components/booking/materiels/contacts';
 export { default as ProductExtension } from './components/productExtension';
+export { default as BookingDeposit } from './components/booking/deposit';

package/lib/index.js

@@ -32,6 +32,7 @@ __export(src_exports, {
   Booking: () => import_booking.default,
   BookingAddons: () => import_addons.default,
   BookingContacts: () => import_contacts.default,
+  BookingDeposit: () => import_deposit.default,
   BookingDuration: () => import_duration.default,
   BookingForms: () => import_forms.default,
   BookingInfo: () => import_info.default,
@@ -60,6 +61,7 @@ var import_startTime = __toESM(require("./components/booking/materiels/startTime
 var import_duration = __toESM(require("./components/booking/materiels/duration"));
 var import_contacts = __toESM(require("./components/booking/materiels/contacts"));
 var import_productExtension = __toESM(require("./components/productExtension"));
+var import_deposit = __toESM(require("./components/booking/deposit"));
 import_dayjs.default.extend(import_weekday.default);
 import_dayjs.default.extend(import_localeData.default);
 // Annotate the CommonJS export names for ESM import in node:
@@ -67,6 +69,7 @@ import_dayjs.default.extend(import_localeData.default);
   Booking,
   BookingAddons,
   BookingContacts,
+  BookingDeposit,
   BookingDuration,
   BookingForms,
   BookingInfo,

package/lowcode/booking-deposit/meta.ts

@@ -0,0 +1,93 @@
+
+import { ComponentMetadata, Snippet } from '@alilc/lowcode-types';
+
+const BookingDepositMeta: ComponentMetadata = {
+  "componentName": "BookingDeposit",
+  "title": "BookingDeposit",
+  "docUrl": "",
+  "screenshot": "",
+  "devMode": "proCode",
+  "npm": {
+    "package": "@pisell/private-materials",
+    "version": "1.0.4",
+    "exportName": "BookingDeposit",
+    "main": "src/index.ts",
+    "destructuring": true,
+    "subName": ""
+  },
+  "configure": {
+    "props": [
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "style",
+            "zh-CN": "style"
+          }
+        },
+        "name": "style",
+        "setter": {
+          "componentName": "MixedSetter",
+          "isRequired": true,
+          "props": {}
+        }
+      },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "globalState",
+            "zh-CN": "globalState"
+          }
+        },
+        "name": "globalState",
+        "setter": ["JsonSetter", "VariableSetter"],
+      },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "setGlobalState",
+            "zh-CN": "setGlobalState"
+          }
+        },
+        "name": "setGlobalState",
+        "setter": {
+          "componentName": "FunctionSetter",
+          "isRequired": true
+        }
+      },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "setState",
+            "zh-CN": "setState"
+          }
+        },
+        "name": "setState",
+        "setter": {
+          "componentName": "FunctionSetter",
+          "isRequired": true
+        }
+      },
+    ],
+    "supports": {},
+    "component": {}
+  }
+};
+const snippets: Snippet[] = [
+  {
+    "title": "BookingDeposit",
+    "screenshot": "",
+    "schema": {
+      "componentName": "BookingDeposit",
+      "props": {}
+    }
+  }
+];
+
+export default {
+  ...BookingDepositMeta,
+  snippets
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.27",
+  "version": "3.0.29",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -58,8 +58,8 @@
     "ahooks": "^3.7.6",
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
-    "@pisell/utils": "1.0.23",
     "@pisell/date-picker": "1.0.68",
+    "@pisell/utils": "1.0.23",
     "@pisell/icon": "0.0.8"
   },
   "peerDependencies": {