@pisell/private-materials 3.0.119 → 3.0.121

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

@@ -163,6 +163,13 @@ declare const _default: {
         'pisell2.text.terminal-edit-message': string;
         "pisell2.text.actions": string;
         "pisell2.text.add-client": string;
+        "pisell2.schedule.tab.all": string;
+        "pisell2.schedule.tab.surcharge": string;
+        "pisell2.schedule.tab.resources": string;
+        "pisell2.schedule.tab.products": string;
+        "pisell2.schedule.tab.events": string;
+        "pisell2.schedule.tab.quotation": string;
+        "pisell2.schedule.tab.open-hours": string;
         'pisell2.text.variant-client-change': string;
         'pisell2.text.variant-client-no-data': string;
         'page.event.booking.text.duplicate-enrollment': string;
@@ -172,6 +179,20 @@ declare const _default: {
             list: any[];
         }) => string;
         'page.event.booking.text.duplicate-enrollment-confirm': string;
+        'page.booking.text.unconfirmed-payements': string;
+        'page.booking.text.unconfirmed-payements.msg': string;
+        'page.booking.text.go-to-payments': string;
+        'page.booking.text.cancel-only': string;
+        'page.booking.text.refund': string;
+        'page.booking.text.confirm': string;
+        'page.booking.text.go-back': string;
+        'page.booking.text.cancel-booking': string;
+        'page.booking.text.cancel-booking.msg': string;
+        'page.booking.text.disabled-tickets': string;
+        'page.booking.text.paid.msg': (x: string) => string;
+        'page.booking.text.please-choose-an-option': string;
+        'page.booking.text.please-choose-an-option-1': string;
+        'page.booking.text.please-choose-an-option-2': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -337,6 +358,13 @@ declare const _default: {
         'page.booking.text.unlimited': string;
         "pisell2.text.actions": string;
         "pisell2.text.add-client": string;
+        "pisell2.schedule.tab.all": string;
+        "pisell2.schedule.tab.surcharge": string;
+        "pisell2.schedule.tab.resources": string;
+        "pisell2.schedule.tab.products": string;
+        "pisell2.schedule.tab.events": string;
+        "pisell2.schedule.tab.quotation": string;
+        "pisell2.schedule.tab.open-hours": string;
         'pisell2.text.variant-client-change': string;
         'pisell2.text.variant-client-no-data': string;
         'page.event.booking.text.duplicate-enrollment': string;
@@ -346,6 +374,20 @@ declare const _default: {
             list: any[];
         }) => string;
         'page.event.booking.text.duplicate-enrollment-confirm': string;
+        'page.booking.text.unconfirmed-payements': string;
+        'page.booking.text.unconfirmed-payements.msg': string;
+        'page.booking.text.go-to-payments': string;
+        'page.booking.text.cancel-only': string;
+        'page.booking.text.refund': string;
+        'page.booking.text.confirm': string;
+        'page.booking.text.go-back': string;
+        'page.booking.text.cancel-booking': string;
+        'page.booking.text.cancel-booking.msg': string;
+        'page.booking.text.disabled-tickets': string;
+        'page.booking.text.paid.msg': (x: string) => string;
+        'page.booking.text.please-choose-an-option': string;
+        'page.booking.text.please-choose-an-option-1': string;
+        'page.booking.text.please-choose-an-option-2': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -511,6 +553,13 @@ declare const _default: {
         'page.booking.text.unlimited': string;
         "pisell2.text.actions": string;
         "pisell2.text.add-client": string;
+        "pisell2.schedule.tab.all": string;
+        "pisell2.schedule.tab.surcharge": string;
+        "pisell2.schedule.tab.resources": string;
+        "pisell2.schedule.tab.products": string;
+        "pisell2.schedule.tab.events": string;
+        "pisell2.schedule.tab.quotation": string;
+        "pisell2.schedule.tab.open-hours": string;
         'pisell2.text.variant-client-change': string;
         'pisell2.text.variant-client-no-data': string;
         'page.event.booking.text.duplicate-enrollment': string;
@@ -520,6 +569,20 @@ declare const _default: {
             list: any[];
         }) => string;
         'page.event.booking.text.duplicate-enrollment-confirm': string;
+        'page.booking.text.unconfirmed-payements': string;
+        'page.booking.text.unconfirmed-payements.msg': string;
+        'page.booking.text.go-to-payments': string;
+        'page.booking.text.cancel-only': string;
+        'page.booking.text.refund': string;
+        'page.booking.text.confirm': string;
+        'page.booking.text.go-back': string;
+        'page.booking.text.cancel-booking': string;
+        'page.booking.text.cancel-booking.msg': string;
+        'page.booking.text.disabled-tickets': string;
+        'page.booking.text.paid.msg': (x: string) => string;
+        'page.booking.text.please-choose-an-option': string;
+        'page.booking.text.please-choose-an-option-1': string;
+        'page.booking.text.please-choose-an-option-2': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -92,7 +92,7 @@ var locales_default = {
     "pisell2.text.status.confirmed": "Confirmed",
     "pisell2.text.status.arrived": "Arrived",
     "pisell2.text.status.started": "Started",
-    "pisell2.text.status.cancelled": "Cancelled",
+    "pisell2.text.status.cancelled": "Cancel",
     "pisell2.text.status.no_show": "No show",
     "pisell2.text.status.completed": "Completed",
     "pisell2.text.status.booking_id": "Booking ID",
@@ -207,6 +207,14 @@ var locales_default = {
     "pisell2.text.terminal-edit-message": "This operation cannot be performed. To proceed, please use the Pisell Terminal.",
     "pisell2.text.actions": "Actions",
     "pisell2.text.add-client": "Add customer",
+    // 日称tab
+    "pisell2.schedule.tab.all": "All",
+    "pisell2.schedule.tab.surcharge": "Surcharge",
+    "pisell2.schedule.tab.resources": "Resources",
+    "pisell2.schedule.tab.products": "Products",
+    "pisell2.schedule.tab.events": "Events",
+    "pisell2.schedule.tab.quotation": "Quotation",
+    "pisell2.schedule.tab.open-hours": "Open hours",
     "pisell2.text.variant-client-change": "Change",
     "pisell2.text.variant-client-no-data": "No record",
     "page.event.booking.text.duplicate-enrollment": "Duplicate Enrollment",
@@ -226,7 +234,21 @@ var locales_default = {
       });
       return `${customerName || ""} has already enrolled in the ${title} ${listStr.join(",")}, Are you sure you want to enroll again？`;
     },
-    "page.event.booking.text.duplicate-enrollment-confirm": "Confirm"
+    "page.event.booking.text.duplicate-enrollment-confirm": "Confirm",
+    "page.booking.text.unconfirmed-payements": "Unconfirmed payements",
+    "page.booking.text.unconfirmed-payements.msg": "There are unconfirmed payments,  please confirm or void the payments first.",
+    "page.booking.text.go-to-payments": "Go to payments",
+    "page.booking.text.cancel-only": "Cancel only",
+    "page.booking.text.refund": "Refund",
+    "page.booking.text.confirm": "Confirm",
+    "page.booking.text.go-back": "Go back",
+    "page.booking.text.cancel-booking": "Cancel Booking",
+    "page.booking.text.cancel-booking.msg": "The action is irreversible. Please proceed with caution. ",
+    "page.booking.text.disabled-tickets": "All tickets will be disabled.",
+    "page.booking.text.paid.msg": (x) => `The related order is ${x === "paid" ? "paid" : "partially paid"}.`,
+    "page.booking.text.please-choose-an-option": "Please choose an option:",
+    "page.booking.text.please-choose-an-option-1": "Refund: Cancel the appointment and process a refund.",
+    "page.booking.text.please-choose-an-option-2": "Cancel only: Cancel the appointment without processing a refund. (You can still process a refund after cancellation if needed)"
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -294,7 +316,7 @@ var locales_default = {
     "pisell2.text.status.confirmed": "已确认",
     "pisell2.text.status.arrived": "已到达",
     "pisell2.text.status.started": "已开始",
-    "pisell2.text.status.cancelled": "已取消",
+    "pisell2.text.status.cancelled": "取消",
     "pisell2.text.status.no_show": "失约",
     "pisell2.text.status.completed": "已完成",
     "pisell2.text.status.booking_id": "预约 ID",
@@ -406,6 +428,14 @@ var locales_default = {
     "page.booking.text.unlimited": "无限制",
     "pisell2.text.actions": "操作选项",
     "pisell2.text.add-client": "添加客户",
+    // 日称tab
+    "pisell2.schedule.tab.all": "全部",
+    "pisell2.schedule.tab.surcharge": "附加费",
+    "pisell2.schedule.tab.resources": "资源",
+    "pisell2.schedule.tab.products": "商品",
+    "pisell2.schedule.tab.events": "活动",
+    "pisell2.schedule.tab.quotation": "报价单",
+    "pisell2.schedule.tab.open-hours": "营业时间",
     "pisell2.text.variant-client-change": "更改客户",
     "pisell2.text.variant-client-no-data": "暂无数据",
     "page.event.booking.text.duplicate-enrollment": "重复报名",
@@ -425,7 +455,21 @@ var locales_default = {
       });
       return `${customerName || ""}已报名${title} ${listStr.join(",")}, 确定要再次报名吗？`;
     },
-    "page.event.booking.text.duplicate-enrollment-confirm": "确认"
+    "page.event.booking.text.duplicate-enrollment-confirm": "确认",
+    "page.booking.text.unconfirmed-payements": "未确认的付款",
+    "page.booking.text.unconfirmed-payements.msg": "存在未确认的付款，请先确认收款或作废。",
+    "page.booking.text.go-to-payments": "前往收款界面",
+    "page.booking.text.cancel-only": "仅取消",
+    "page.booking.text.refund": "退款",
+    "page.booking.text.confirm": "确认",
+    "page.booking.text.go-back": "返回",
+    "page.booking.text.cancel-booking": "取消预约",
+    "page.booking.text.cancel-booking.msg": "该操作不可撤销，请谨慎操作。",
+    "page.booking.text.disabled-tickets": "所有票单将被禁用。",
+    "page.booking.text.paid.msg": (x) => `关联订单${x === "paid" ? "已支付" : "部分支付"}。`,
+    "page.booking.text.please-choose-an-option": "请选择：",
+    "page.booking.text.please-choose-an-option-1": "退款：取消预约，同时处理退款。",
+    "page.booking.text.please-choose-an-option-2": "仅取消：仅取消预约，但不进行退款处理。（您仍然可以在取消后再进行退款操作）"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -491,7 +535,7 @@ var locales_default = {
     "pisell2.text.status.confirmed": "已确認",
     "pisell2.text.status.arrived": "已到達",
     "pisell2.text.status.started": "已開始",
-    "pisell2.text.status.cancelled": "已取消",
+    "pisell2.text.status.cancelled": "取消",
     "pisell2.text.status.no_show": "失約",
     "pisell2.text.status.completed": "已完成",
     "pisell2.text.status.booking_id": "預約 ID",
@@ -605,6 +649,14 @@ var locales_default = {
     "page.booking.text.unlimited": "無限制",
     "pisell2.text.actions": "操作選項",
     "pisell2.text.add-client": "添加客戶",
+    // 日称tab
+    "pisell2.schedule.tab.all": "全部",
+    "pisell2.schedule.tab.surcharge": "附加費",
+    "pisell2.schedule.tab.resources": "資源",
+    "pisell2.schedule.tab.products": "商品",
+    "pisell2.schedule.tab.events": "活動",
+    "pisell2.schedule.tab.quotation": "報價單",
+    "pisell2.schedule.tab.open-hours": "營業時間",
     "pisell2.text.variant-client-change": "更改客戶",
     "pisell2.text.variant-client-no-data": "暫無數據",
     "page.event.booking.text.duplicate-enrollment": "重複報名",
@@ -624,6 +676,20 @@ var locales_default = {
       });
       return `${customerName || ""}已報名${title} ${listStr.join(",")}, 確定要再次報名嗎？`;
     },
-    "page.event.booking.text.duplicate-enrollment-confirm": "確認"
+    "page.event.booking.text.duplicate-enrollment-confirm": "確認",
+    "page.booking.text.unconfirmed-payements": "未確認的付款",
+    "page.booking.text.unconfirmed-payements.msg": "存在未確認的付款，請先確認收款或作廢。",
+    "page.booking.text.go-to-payments": "前往收款界面",
+    "page.booking.text.cancel-only": "僅取消",
+    "page.booking.text.refund": "退款",
+    "page.booking.text.confirm": "確認",
+    "page.booking.text.go-back": "返回",
+    "page.booking.text.cancel-booking": "取消預約",
+    "page.booking.text.cancel-booking.msg": "該操作不可撤銷，請謹慎操作。",
+    "page.booking.text.disabled-tickets": "所有票單將被禁用。",
+    "page.booking.text.paid.msg": (x) => `關聯訂單${x === "paid" ? "已支付" : "部分支付"}。`,
+    "page.booking.text.please-choose-an-option": "請選擇：",
+    "page.booking.text.please-choose-an-option-1": "退款：取消預約，同時處理退款。",
+    "page.booking.text.please-choose-an-option-2": "僅取消：僅取消預約，但不進行退款處理。（您仍然可以在取消後再進行退款操作）"
   }
 };

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

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: (props: any) => JSX.Element;
+declare const Payments: any;
 export default Payments;

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

@@ -0,0 +1,12 @@
+import React from 'react';
+import './index.less';
+import { ScheduleItem } from '../../../type';
+declare type Item = any;
+interface RenderScheduleItemProps {
+    item?: Item;
+    onItemClick?: (item: ScheduleItem) => void;
+    onDelete?: (item: ScheduleItem) => void;
+    showDeleteIcon?: boolean;
+}
+declare const RenderScheduleItem: ({ item, onItemClick, onDelete, showDeleteIcon, }: RenderScheduleItemProps) => React.JSX.Element;
+export default RenderScheduleItem;

package/lib/components/schedules/components/ScheduleList/RenderScheduleItem/index.js

@@ -0,0 +1,77 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/schedules/components/ScheduleList/RenderScheduleItem/index.tsx
+var RenderScheduleItem_exports = {};
+__export(RenderScheduleItem_exports, {
+  default: () => RenderScheduleItem_default
+});
+module.exports = __toCommonJS(RenderScheduleItem_exports);
+var import_react = __toESM(require("react"));
+var import_AlertCircle = __toESM(require("@pisell/icon/es/AlertCircle"));
+var import_antd = require("antd");
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_index = require("./index.less");
+var import_XClose = __toESM(require("@pisell/icon/es/XClose"));
+var RenderScheduleItem = ({
+  item,
+  onItemClick,
+  onDelete,
+  showDeleteIcon
+}) => {
+  var _a;
+  const { appHelper } = (0, import_useEngineContext.default)();
+  return /* @__PURE__ */ import_react.default.createElement(
+    "div",
+    {
+      key: item.id,
+      className: "pisell-lowcode__schedule-list-item",
+      onClick: () => onItemClick == null ? void 0 : onItemClick(item)
+    },
+    /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        className: "pisell-lowcode__schedule-list-item-color",
+        style: { backgroundColor: item.color }
+      }
+    ),
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__schedule-list-item-content" }, (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.translationShop(item.name)),
+    item.conflict && /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: "Days conflict with another schedule" }, /* @__PURE__ */ import_react.default.createElement(import_AlertCircle.default, { className: "pisell-lowcode__schedule-list-item-conflict" })),
+    showDeleteIcon && /* @__PURE__ */ import_react.default.createElement(
+      import_XClose.default,
+      {
+        className: "pisell-lowcode__schedule-list-item-delete",
+        onClick: (e) => {
+          e.stopPropagation();
+          onDelete == null ? void 0 : onDelete(item);
+        }
+      }
+    )
+  );
+};
+var RenderScheduleItem_default = RenderScheduleItem;

package/lib/components/schedules/components/ScheduleList/RenderScheduleItem/index.less

@@ -0,0 +1,38 @@
+.pisell-lowcode__schedule-list {
+  &-item {
+    display: flex;
+    align-items: center;
+    padding: 10px 16px;
+    border-radius: 8px;
+    border: 1px solid var(--Gray-true-100, #F5F5F5);
+    margin-bottom: 16px;
+    cursor: pointer;
+
+    &-color {
+      width: 12px;
+      height: 12px;
+      margin: 8px;
+      border-radius: 50%;
+    }
+
+    &-content {
+      color: var(--Gray-true-900, #141414);
+      font-size: 14px;
+      font-style: normal;
+      font-weight: 600;
+      line-height: 20px;
+      flex: 1;
+    }
+
+    &-conflict {
+      color: #D92D20;
+      font-size: 16px;
+    }
+
+    &-delete {
+      margin-left: 8px;
+      font-size: 16px;
+      color: #141414;
+    }
+  }
+}

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

@@ -1,7 +1,7 @@
-import React from "react";
-import { ButtonProps } from "antd";
-import { ScheduleItem } from "../../type";
-import "./index.less";
+import React from 'react';
+import { ButtonProps } from 'antd';
+import { ScheduleItem } from '../../type';
+import './index.less';
 declare type ScheduleListType = {
     dataSource: ScheduleItem[];
     onItemClick?: (item: ScheduleItem) => void;
@@ -10,6 +10,7 @@ declare type ScheduleListType = {
     loading?: boolean;
     className?: string;
     addButtonProps?: ButtonProps;
+    showTabs?: boolean;
 };
 /**
  * 日程列表 展示日程简略信息

package/lib/components/schedules/components/ScheduleList/index.js

@@ -35,10 +35,10 @@ module.exports = __toCommonJS(ScheduleList_exports);
 var import_react = __toESM(require("react"));
 var import_classnames = __toESM(require("classnames"));
 var import_antd = require("antd");
-var import_AlertCircle = __toESM(require("@pisell/icon/es/AlertCircle"));
-var import_XClose = __toESM(require("@pisell/icon/es/XClose"));
+var import_tabProduct = __toESM(require("../../../tabProduct"));
 var import_utils = require("@pisell/utils");
-var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_utils2 = require("../../schedules/utils");
+var import_RenderScheduleItem = __toESM(require("./RenderScheduleItem"));
 var import_index = require("./index.less");
 var ScheduleList = (props) => {
   const {
@@ -48,9 +48,12 @@ var ScheduleList = (props) => {
     onDelete,
     loading,
     className,
-    addButtonProps
+    addButtonProps,
+    showTabs
   } = props;
-  const { appHelper } = (0, import_useEngineContext.default)();
+  const renderList = (0, import_react.useMemo)(() => {
+    return (0, import_utils2.formatScheduleListByTabs)(dataSource);
+  }, [dataSource]);
   const content = (0, import_react.useMemo)(() => {
     if (dataSource.length === 0) {
       return /* @__PURE__ */ import_react.default.createElement(
@@ -61,37 +64,41 @@ var ScheduleList = (props) => {
         }
       );
     }
-    return dataSource.map((item) => {
-      var _a;
+    if (showTabs) {
       return /* @__PURE__ */ import_react.default.createElement(
-        "div",
+        import_tabProduct.default,
         {
-          key: item.id,
-          className: "pisell-lowcode__schedule-list-item",
-          onClick: () => onItemClick == null ? void 0 : onItemClick(item)
-        },
-        /* @__PURE__ */ import_react.default.createElement(
-          "div",
-          {
-            className: "pisell-lowcode__schedule-list-item-color",
-            style: { backgroundColor: item.color }
+          scrollDom: ".pisell-lowcode__schedules-module-content-wrap",
+          list: renderList,
+          name: "schedule",
+          renderItem: (item) => {
+            return /* @__PURE__ */ import_react.default.createElement(
+              import_RenderScheduleItem.default,
+              {
+                item,
+                key: item.id,
+                showDeleteIcon,
+                onItemClick: () => onItemClick == null ? void 0 : onItemClick(item),
+                onDelete: () => onDelete == null ? void 0 : onDelete(item)
+              }
+            );
           }
-        ),
-        /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__schedule-list-item-content" }, (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.translationShop(item.name)),
-        item.conflict && /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: "Days conflict with another schedule" }, /* @__PURE__ */ import_react.default.createElement(import_AlertCircle.default, { className: "pisell-lowcode__schedule-list-item-conflict" })),
-        showDeleteIcon && /* @__PURE__ */ import_react.default.createElement(
-          import_XClose.default,
+        }
+      );
+    } else {
+      return dataSource.map((item) => {
+        return /* @__PURE__ */ import_react.default.createElement(
+          import_RenderScheduleItem.default,
           {
-            className: "pisell-lowcode__schedule-list-item-delete",
-            onClick: (e) => {
-              e.stopPropagation();
-              onDelete == null ? void 0 : onDelete(item);
-            }
+            item,
+            showDeleteIcon,
+            onItemClick: () => onItemClick == null ? void 0 : onItemClick(item),
+            onDelete: () => onDelete == null ? void 0 : onDelete(item)
           }
-        )
-      );
-    });
-  }, [dataSource, showDeleteIcon]);
+        );
+      });
+    }
+  }, [dataSource, showDeleteIcon, showTabs]);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-lowcode__schedule-list", className) }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { active: true, round: true, loading }, content, addButtonProps ? /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { ...addButtonProps }) : null));
 };
 var ScheduleList_default = ScheduleList;

package/lib/components/schedules/hooks/useSchedulesDataSource.js

@@ -28,7 +28,7 @@ var import_serve = require("../schedules/serve");
 var useSchedulesDataSource = (params) => {
   const { scheduleIds } = params || {};
   const [dataSource, setDataSource] = (0, import_react.useState)([]);
-  const { loading, run, refresh } = (0, import_ahooks.useRequest)(import_serve.getScheduleList, {
+  const { loading, run, refresh } = (0, import_ahooks.useRequest)(import_serve.postScheduleList, {
     manual: true,
     onSuccess: (result, params2) => {
       if (result.status) {
@@ -37,7 +37,13 @@ var useSchedulesDataSource = (params) => {
     }
   });
   (0, import_react.useEffect)(() => {
-    run({ ids: scheduleIds, skip: 1, num: 1e3 });
+    run({
+      ids: scheduleIds,
+      skip: 1,
+      num: 500,
+      with: ["relation", "timeSlot"],
+      with_count: ["relation", "order"]
+    });
   }, [scheduleIds]);
   return {
     loading,

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

@@ -1,5 +1,5 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 interface ProductListProps {
     loading: boolean;
     list: any[];

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

@@ -1,6 +1,6 @@
-import React from "react";
-import { ScheduleItem } from "../../type";
-import "./index.less";
+import React from 'react';
+import { ScheduleItem } from '../../type';
+import './index.less';
 declare type AllSchedulesPropsType = {
     onOpenDetail?: (id?: number) => void;
     dataSource: ScheduleItem[];

package/lib/components/schedules/schedules/AllSchedules/index.js

@@ -51,9 +51,10 @@ var AllSchedules = (props) => {
     {
       loading,
       dataSource: showDataSource,
-      onItemClick: (item) => onOpenDetail == null ? void 0 : onOpenDetail(item.id)
+      onItemClick: (item) => onOpenDetail == null ? void 0 : onOpenDetail(item.id),
+      showTabs: true
     }
-  )), /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
+  )), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__schedules-module-add-button-wrap" }, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Button,
     {
       className: "pisell-lowcode__schedules-module-add-button",

package/lib/components/schedules/schedules/AllSchedules/index.less

@@ -2,13 +2,21 @@
   height: 100%;
   display: flex;
   flex-direction: column;
+  overflow-y: auto;
+  padding: 0 32px;
   .pisell-lowcode__schedules-module-header {
-    padding: 16px 32px;
+    padding: 16px 0 0;
   }
   .pisell-lowcode__schedules-module-content {
-    padding: 20px 32px;
+    padding: 0;
     flex: 1;
-    overflow: auto;
+    overflow:initial;
+  }
+  .pisell-lowcode__schedules-module-add-button-wrap{
+    position: sticky;
+    bottom: 0;
+    z-index: 1;
+    background: #fff
   }
   .pisell-lowcode__schedules-module-add-button {
     margin: 24px 32px;

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

@@ -4,6 +4,13 @@ export declare const getScheduleList: (params: {
     num: number;
     ids?: number[];
 }) => Promise<ResponseListData<ScheduleItem[]>>;
+export declare const postScheduleList: (params: {
+    skip: number;
+    num: number;
+    ids?: number[];
+    with?: Array<string>;
+    with_count?: Array<string>;
+}) => Promise<ResponseListData<ScheduleItem[]>>;
 export declare const deleteSchedule: (params: {
     id: number;
 }) => Promise<ResponseListData<ScheduleItem[]>>;

package/lib/components/schedules/schedules/serve.js

@@ -20,14 +20,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var serve_exports = {};
 __export(serve_exports, {
   deleteSchedule: () => deleteSchedule,
-  getScheduleList: () => getScheduleList
+  getScheduleList: () => getScheduleList,
+  postScheduleList: () => postScheduleList
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
 var getScheduleList = async (params) => await import_utils.request.getRequest().get("/shop/schedule", params);
+var postScheduleList = async (params) => await import_utils.request.getRequest().post("/shop/schedule/v2", params);
 var deleteSchedule = async (params) => await import_utils.request.getRequest().remove(`/shop/schedule/${params.id}`);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   deleteSchedule,
-  getScheduleList
+  getScheduleList,
+  postScheduleList
 });

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

@@ -48,3 +48,25 @@ export declare const formatScheduleResult: (schedule: ScheduleItem) => {
 export declare const calcScheduleDateRange: (schedule: ScheduleItem) => any[];
 export declare const calcCalendarDataBySchedules: (schedules: ScheduleItem[]) => unknown[];
 export declare const calcMinTimeMaxTimeBySchedules: (schedules: ScheduleItem[], scheduleAllMap: FormState["schedules"]["scheduleAllMap"], selectDate?: string) => {};
+/**
+ * @title: 格式化日程数据
+ * @description:
+ * @param {Array} relation 资源列表
+ * @param {string} table_type 关联表类型
+ * @param {string} item_type 资源类型
+ * @param {boolean} isExcluded 是否排除
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-09-04 11:54
+ */
+export declare const formatScheduleData: (relation: Array<any>, table_type?: string, item_type?: string, isExcluded?: boolean) => any;
+/**
+ * @title: 格式化日程为二维结构
+ * @description:
+ * @param {any} list
+ * @param {any} filterItem
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-07-29 19:28
+ */
+export declare const formatScheduleListByTabs: (list: any, filterItem?: any) => unknown[];