@pisell/private-materials 3.3.70 → 3.3.72

package/lib/components/ticketBooking/locales.js

@@ -23,7 +23,7 @@ __export(locales_exports, {
 });
 module.exports = __toCommonJS(locales_exports);
 var locales_default = {
-  "en": {
+  en: {
     "pisell2.ticket-booking.info": "Info",
     "pisell2.ticket-booking.notes": "Notes",
     "pisell2.ticket-booking.forms": "Forms",
@@ -71,7 +71,13 @@ var locales_default = {
     "pisell2.ticket-booking.add-to-cart": "Added to Cart",
     "pisell2.ticket-booking.not-available-title": "Sorry, Not available at current time.",
     "pisell2.ticket-booking.not-available-ok": "OK",
-    "pisell2.ticket-booking.in-cart": (number) => `${number} in cart`
+    "pisell2.ticket-booking.in-cart": (number) => `${number} in cart`,
+    "pisell2.product.card.cart-items": (number) => `${number}items`,
+    "pisell2.product.card.subtotal": "Subtotal",
+    "pisell2.product.card.hour.minute": (hour, minute) => `${hour > 0 ? `${hour}h` : ""}${hour > 0 && minute > 0 ? " " : ""}${minute > 0 ? `${minute}min` : ""}`,
+    "pisell2.product.card.day": (val) => `${val > 1 ? " days" : " day"}`,
+    "pisell2.product.card.day.event": (val) => `${val > 1 ? " events" : " event"}`,
+    "pisell2.product.card.minute": (val) => `${val > 1 ? " minutes" : " minute"}`
   },
   "zh-CN": {
     "pisell2.ticket-booking.info": "信息",
@@ -121,7 +127,13 @@ var locales_default = {
     "pisell2.ticket-booking.add-to-cart": "已加入购物车",
     "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售时间。",
     "pisell2.ticket-booking.not-available-ok": "好的",
-    "pisell2.ticket-booking.in-cart": (number) => `已有${number}件`
+    "pisell2.product.card.cart-items": (number) => `${number}件商品`,
+    "pisell2.product.card.subtotal": "小计",
+    "pisell2.ticket-booking.in-cart": (number) => `已有${number}件`,
+    "pisell2.product.card.hour.minute": (hour, minute) => `${hour > 0 ? `${hour}小时` : ""}${minute > 0 ? `${minute}分钟` : ""}`,
+    "pisell2.product.card.day": (val) => "天",
+    "pisell2.product.card.day.event": (val) => "个活动",
+    "pisell2.product.card.minute": (val) => "分钟"
   },
   "zh-HK": {
     "pisell2.ticket-booking.info": "資訊",
@@ -171,6 +183,12 @@ var locales_default = {
     "pisell2.ticket-booking.add-to-cart": "已加入购物车",
     "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售時間。",
     "pisell2.ticket-booking.not-available-ok": "好的",
-    "pisell2.ticket-booking.in-cart": (number) => `已有${number}件`
+    "pisell2.ticket-booking.in-cart": (number) => `已有${number}件`,
+    "pisell2.product.card.cart-items": (number) => `${number}件商品`,
+    "pisell2.product.card.subtotal": "小計",
+    "pisell2.product.card.hour.minute": (hour, minute) => `${hour > 0 ? `${hour}小時` : ""}${minute > 0 ? `${minute}分鐘` : ""}`,
+    "pisell2.product.card.day": (val) => "天",
+    "pisell2.product.card.day.event": (val) => "个活動",
+    "pisell2.product.card.minute": (val) => "分鐘"
   }
 };

package/lib/components/ticketBooking/utils/formatProductMessage.d.ts

@@ -0,0 +1,2 @@
+declare const formatProductMessage: (product: any, utils: any) => string;
+export default formatProductMessage;

package/lib/components/ticketBooking/utils/formatProductMessage.js

@@ -0,0 +1,84 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/ticketBooking/utils/formatProductMessage.ts
+var formatProductMessage_exports = {};
+__export(formatProductMessage_exports, {
+  default: () => formatProductMessage_default
+});
+module.exports = __toCommonJS(formatProductMessage_exports);
+var import_utils = require("@pisell/utils");
+var import_formatTime = require("./formatTime");
+var formatProductMessage = (product, utils) => {
+  const {
+    product_option_string,
+    options,
+    bundle,
+    currency_symbol,
+    start_date,
+    end_date,
+    holder_id,
+    holders,
+    multiResources
+  } = product;
+  let str = "";
+  if (start_date && end_date) {
+    str += `${(0, import_formatTime.getServiceTime)(product, start_date, utils)} 
+`;
+  }
+  if (holder_id && Array.isArray(holders)) {
+    const targetHolder = holders.find((holder) => holder.id === holder_id);
+    if (targetHolder == null ? void 0 : targetHolder.label) {
+      str += `${targetHolder.label} 
+`;
+    }
+  }
+  if (Array.isArray(multiResources) && multiResources.length > 0) {
+    multiResources.forEach((resource) => {
+      const { id: ids, lists } = resource;
+      if (Array.isArray(ids)) {
+        ids.forEach((id) => {
+          const targetRes = lists.find((l) => l.id === id);
+          if (targetRes == null ? void 0 : targetRes.label) str += `${targetRes == null ? void 0 : targetRes.label} 
+`;
+        });
+      } else {
+        const targetRes = lists.find((l) => l.id === ids);
+        if (targetRes == null ? void 0 : targetRes.label) str += `${targetRes == null ? void 0 : targetRes.label} 
+`;
+      }
+    });
+  }
+  if (product_option_string) str += `${product_option_string}
+`;
+  if (Array.isArray(options) && options.length) {
+    options.forEach((opt) => {
+      str += `${opt.name}  ${(0, import_utils.formatAmount)(opt == null ? void 0 : opt.price, 2, currency_symbol)} x ${opt.num}
+`;
+    });
+  }
+  if (Array.isArray(bundle) && bundle.length) {
+    bundle.forEach((item) => {
+      str += `${item.title} 
+`;
+      str += `${(0, import_utils.formatAmount)(item.price, 2, currency_symbol)} x ${item.num}`;
+    });
+  }
+  return str;
+};
+var formatProductMessage_default = formatProductMessage;

package/lib/components/ticketBooking/utils/formatTime.d.ts

@@ -0,0 +1,31 @@
+import 'dayjs/locale/zh-cn';
+import 'dayjs/locale/en';
+import 'dayjs/locale/zh-tw';
+/**
+ * @title: 是否英文
+ * @description:
+ * @param {any} item
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-28 22:49
+ */
+export declare const isEn: (item: any) => boolean;
+/**
+ * @title: 跨日预约时间
+ * @description:
+ * @param {any} item
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-28 22:50
+ */
+export declare const formatMultiDayDate: (item: any) => 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, utils: any) => string;

package/lib/components/ticketBooking/utils/formatTime.js

@@ -0,0 +1,139 @@
+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/ticketBooking/utils/formatTime.ts
+var formatTime_exports = {};
+__export(formatTime_exports, {
+  formatMultiDayDate: () => formatMultiDayDate,
+  getServiceTime: () => getServiceTime,
+  isEn: () => isEn
+});
+module.exports = __toCommonJS(formatTime_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_utils = require("@pisell/utils");
+var import_zh_cn = require("dayjs/locale/zh-cn");
+var import_en = require("dayjs/locale/en");
+var import_zh_tw = require("dayjs/locale/zh-tw");
+var isEn = (item) => {
+  const locale = (item == null ? void 0 : item.locale) || "en-US";
+  const _isEn = locale === "en-US" || locale === "en";
+  const localeTypes = {
+    "en-US": "en",
+    "zh-CN": "zh-cn",
+    "zh-HK": "zh-tw"
+  };
+  import_dayjs.default.locale(localeTypes[locale]);
+  return _isEn;
+};
+var formatMultiDayDate = (item) => {
+  const _isEn = isEn(item);
+  const startDate = (0, import_dayjs.default)(item == null ? void 0 : item.start_date);
+  const endDate = (0, import_dayjs.default)(item == null ? void 0 : item.end_date);
+  const _format = _isEn ? "ddd, DD/MM/YYYY" : "YYYY-MM-DD，ddd";
+  const date = `${startDate.format(_format)} ~ ${endDate.format(_format)}`;
+  return date;
+};
+var getServiceTime = (item, currentDate, utils) => {
+  var _a, _b, _c, _d;
+  if (!(0, import_dayjs.default)(currentDate).isValid()) return "";
+  const locale = (item == null ? void 0 : item.locale) || ((_a = utils == null ? void 0 : utils.storage) == null ? void 0 : _a.get("umi_locale")) || "en-US";
+  const isEn2 = locale === "en-US" || locale === "en";
+  const localeTypes = {
+    "en-US": "en",
+    "zh-CN": "zh-cn",
+    "zh-HK": "zh-tw"
+  };
+  import_dayjs.default.locale(localeTypes[locale]);
+  let startDate = (0, import_dayjs.default)(item == null ? void 0 : item.start_date);
+  let endDate = (0, import_dayjs.default)(item == null ? void 0 : item.end_date);
+  let diffInDays = (item == null ? void 0 : item.custom_day_count) || endDate.diff(startDate, "day");
+  if (item == null ? void 0 : item.duration_type) {
+    const sameDay = startDate.isSame(endDate, "day");
+    const dateFormat = isEn2 ? "DD/MM/YYYY" : "YYYY-MM-DD";
+    const timeFormat = "HH:mm";
+    const startTime = (item == null ? void 0 : item.start_time) || startDate.format(timeFormat);
+    const endTime = (item == null ? void 0 : item.end_time) || endDate.format(timeFormat);
+    let dateTime = "";
+    if (sameDay) {
+      if (isEn2) {
+        dateTime = `${startTime} ~ ${endTime} ${startDate.format(dateFormat)}`;
+      } else {
+        dateTime = `${startDate.format(dateFormat)} ${startTime} ~ ${endTime}`;
+      }
+    } else {
+      if (isEn2) {
+        dateTime = `${startTime} ${startDate.format(dateFormat)} ~ ${endTime} ${endDate.format(dateFormat)}`;
+      } else {
+        dateTime = `${startDate.format(dateFormat)} ${startTime} ~ ${endDate.format(dateFormat)} ${endTime}`;
+      }
+    }
+    const startDateTime = `${startDate.format("YYYY-MM-DD")} ${startTime}`;
+    const endDateTime = `${endDate.format("YYYY-MM-DD")} ${endTime}`;
+    let _duration = (0, import_dayjs.default)(endDateTime).diff((0, import_dayjs.default)(startDateTime), item == null ? void 0 : item.duration_type);
+    let durationText = "";
+    if ((item == null ? void 0 : item.duration_type) === "minutes") {
+      const hours = Math.floor(_duration / 60);
+      const minutes = _duration % 60;
+      durationText = import_utils.locales.getText("pisell2.product.card.hour.minute")(hours, minutes);
+    } else if ((item == null ? void 0 : item.duration_type) === "days") {
+      durationText = import_utils.locales.getText("pisell2.product.card.day")(_duration);
+    } else {
+      durationText = `${_duration}`;
+    }
+    return `${dateTime} (${durationText})`;
+  }
+  let _format = isEn2 ? "ddd, DD/MM/YYYY" : "YYYY-MM-DD，ddd";
+  if ((item == null ? void 0 : item.hasOwnProperty("format")) && ((_b = item == null ? void 0 : item.format) == null ? void 0 : _b.length) > 0) {
+    _format = isEn2 ? (_c = item == null ? void 0 : item.format) == null ? void 0 : _c[0] : (_d = item == null ? void 0 : item.format) == null ? void 0 : _d[1];
+  }
+  if (item == null ? void 0 : item.show_time) {
+    startDate = (0, import_dayjs.default)((item == null ? void 0 : item.start_time) ? `${item == null ? void 0 : item.start_date} ${item == null ? void 0 : item.start_time}` : startDate.format("YYYY-MM-DD HH:mm"));
+    endDate = (0, import_dayjs.default)((item == null ? void 0 : item.end_time) ? `${item == null ? void 0 : item.end_date} ${item == null ? void 0 : item.end_time}` : endDate.format("YYYY-MM-DD HH:mm"));
+  }
+  if ((item == null ? void 0 : item.duration_type) === "minutes") {
+    diffInDays = endDate.diff(startDate, "minute");
+  }
+  const date = `${startDate.format(_format)} ~ ${endDate.format(_format)}`;
+  let text = import_utils.locales.getText("pisell2.product.card.day")(diffInDays);
+  if (item == null ? void 0 : item.custom_day_count) {
+    text = import_utils.locales.getText("pisell2.product.card.day.event")(diffInDays);
+  }
+  const textTypes = {
+    "minutes": import_utils.locales.getText("pisell2.product.card.minute")(diffInDays),
+    "event": import_utils.locales.getText("pisell2.product.card.day.event")(diffInDays)
+  };
+  text = (textTypes == null ? void 0 : textTypes[item == null ? void 0 : item.duration_type]) || text;
+  let duration = `${diffInDays}${text}`;
+  return `${date} (${duration})`;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatMultiDayDate,
+  getServiceTime,
+  isEn
+});

package/lib/components/ticketBooking/utils/index.d.ts

@@ -12,8 +12,12 @@ export declare const restoreProductOtherData: (data: any) => {
     product_variant_id: number;
     quantity: number;
 } | undefined;
-export declare const addService: (list: any[], addItem: any) => {
+export declare const addService: (list: any[], addItem: any, state: any) => {
     list: any[];
     quantity: any;
 };
 export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;
+export declare const getCartProductOverlay: (state: any) => any;
+export declare const getIsOverlayProduct: (item: any, state: any) => any;
+export declare const getIsShowNumber: (item: any, state: any) => any;
+export declare const genServiceKey: (item: any) => string;

package/lib/components/ticketBooking/utils/index.js

@@ -33,8 +33,12 @@ __export(utils_exports, {
   addServiceScroll: () => addServiceScroll,
   formatBookingList: () => formatBookingList,
   formatDateToStr: () => formatDateToStr,
+  genServiceKey: () => genServiceKey,
+  getCartProductOverlay: () => getCartProductOverlay,
   getDefaultStartParam: () => getDefaultStartParam,
   getDisabledEdit: () => getDisabledEdit,
+  getIsOverlayProduct: () => getIsOverlayProduct,
+  getIsShowNumber: () => getIsShowNumber,
   getNextTimeSlice: () => getNextTimeSlice,
   restoreProductOtherData: () => restoreProductOtherData
 });
@@ -124,23 +128,29 @@ var restoreProductOtherData = (data) => {
   };
 };
 var isSameProduct = (a, b) => {
-  var _a, _b, _c, _d;
-  return ((_b = (_a = a._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.rowKey) === ((_d = (_c = b._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.rowKey);
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  if ((0, import_utils.isNormalProductByDurationSchedule)(a) && (0, import_utils.isNormalProductByDurationSchedule)(b)) {
+    return ((_b = (_a = a._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.rowKey) === ((_d = (_c = b._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.rowKey);
+  }
+  return ((_f = (_e = a._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.rowKey) === ((_h = (_g = b._extend) == null ? void 0 : _g.other) == null ? void 0 : _h.rowKey) && a._serviceKey === b._serviceKey;
 };
-var addService = (list, addItem) => {
+var addService = (list, addItem, state) => {
   let value = list;
   let count;
-  if (!(0, import_utils.isNormalProductByDurationSchedule)(addItem)) {
+  if (!(0, import_utils.isNormalProductByDurationSchedule)(addItem) && !getIsOverlayProduct(addItem, state)) {
     value.push(addItem);
     count = addItem._extend.quantity;
   } else {
     let isNotSame = true;
+    let isSetCount = false;
     value = list.map((item) => {
       var _a, _b, _c;
-      if (isSameProduct(item, addItem)) {
+      const isGoodPassDiscountProduct = (item.discount_list || []).some((item2) => item2.type === "good_pass");
+      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct) {
         isNotSame = false;
         const quantity = (((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.quantity) || 1) + (((_b = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _b.quantity) || 1);
         count = quantity;
+        isSetCount = true;
         return {
           ...item,
           _extend: {
@@ -183,14 +193,47 @@ var addServiceScroll = (rowKey, cacheItem) => {
     }
   });
 };
+var getCartProductOverlay = (state) => {
+  var _a, _b, _c;
+  return ((_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.cart_product_overlay) || { type: "product_all" };
+};
+var getIsOverlayProduct = (item, state) => {
+  const { type, product_ids } = getCartProductOverlay(state);
+  if (type === "product_all") {
+    return true;
+  }
+  return product_ids.includes(item.product_id || item.id);
+};
+var getIsShowNumber = (item, state) => {
+  const isBookingTicket2 = state.isBookingTicket2;
+  return (0, import_utils.isNormalProductByDurationSchedule)(item) || isBookingTicket2 && getIsOverlayProduct(item, state);
+};
+var genServiceKey = (item) => {
+  var _a, _b, _c;
+  const product_id = item.product_id;
+  const durationKey = (_a = item._extend) == null ? void 0 : _a.duration;
+  const start_time = (_b = item._extend) == null ? void 0 : _b.start_time;
+  const total = (_c = item._extend) == null ? void 0 : _c.total;
+  let resourceKey = "";
+  Object.values(item._extend.resource).forEach((resources) => {
+    resources.forEach((resource) => {
+      resourceKey += `${resource.relation_id}`;
+    });
+  });
+  return `${product_id}-${durationKey}-${resourceKey}-${start_time}-${total}`;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addService,
   addServiceScroll,
   formatBookingList,
   formatDateToStr,
+  genServiceKey,
+  getCartProductOverlay,
   getDefaultStartParam,
   getDisabledEdit,
+  getIsOverlayProduct,
+  getIsShowNumber,
   getNextTimeSlice,
   restoreProductOtherData
 });

package/lib/components/wallet/hooks/useWalletCard.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IWalletListItemProps } from '../serve';
 /**
  * 钱包卡片Hook的参数

package/lib/components/workSpaceList/components/Modal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

package/lib/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './../../index.less';
 declare const Search: () => JSX.Element;
 export default Search;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.70",
+  "version": "3.3.72",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,8 +60,8 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
+    "@pisell/materials": "3.3.27",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "3.3.28",
     "@pisell/date-picker": "3.0.2"
   },
   "peerDependencies": {