@pisell/materials 2.2.39 → 2.2.40

package/es/components/table/Table/utils.d.ts

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
+}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/lib/components/collapse/index.js

@@ -34,7 +34,28 @@ __export(collapse_exports, {
 module.exports = __toCommonJS(collapse_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
+var import_styled_components = __toESM(require("styled-components"));
 var import_index = require("./index.less");
+var CustomCollapse = (0, import_styled_components.default)(import_antd.Collapse)`
+  &.custom-collapse {
+    background-color: ${(props) => props.panelBackground || "#ffffff"};
+  }
+
+  // .ant-collapse-item {
+  //   background-color: ${(props) => props.panelBackground || "#ffffff"};
+  //   margin-bottom: ${(props) => props.panelMarginBottom || "0"};
+  //   border-radius: ${(props) => props.panelBorderRadius || "0"};
+  // }
+
+  // .pisell-lowcode-collapse-header {
+  //   background-color: ${(props) => props.panelBackground || "#ffffff"};
+  //   border-radius: ${(props) => props.panelBorderRadius || "0"} !important;
+  // }
+
+  .pisell-lowcode-collapse-content {
+    background-color: ${(props) => props.panelBackground || "#ffffff"};
+  }
+`;
 var Collapse = (props) => {
   const {
     panelBackground,
@@ -66,16 +87,21 @@ var Collapse = (props) => {
           },
           item == null ? void 0 : item.label
         ) : null,
-        style: panelStyle
+        children: item.children,
+        className: "custom-collapse-panel"
       };
     });
-  }, [items, headerColor, showHeader, headerFontSize, panelStyle]);
+  }, [items, headerColor, showHeader, headerFontSize]);
   return /* @__PURE__ */ import_react.default.createElement(
-    import_antd.Collapse,
+    CustomCollapse,
     {
       ...rest,
       expandIcon: expandIcon ? () => expandIcon : void 0,
-      items: itemsMap
+      items: itemsMap,
+      className: "custom-collapse",
+      panelBackground,
+      panelMarginBottom,
+      panelBorderRadius
     }
   );
 };

package/lib/components/productCard/components/Action/index.js

@@ -49,7 +49,7 @@ var Action = ({ item, onAction }) => {
         onAction();
       }
     },
-    item._actionText
+    item.actionText
   ));
 };
 var Action_default = Action;

package/lib/components/productCard/components/AmountFooter/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const Footer: ({ item, hideDivider, type }: any) => React.JSX.Element;
+declare const Footer: ({ item, hideDivider, type, isOnlyTotal }: any) => React.JSX.Element;
 export default Footer;

package/lib/components/productCard/components/AmountFooter/index.js

@@ -34,28 +34,52 @@ __export(AmountFooter_exports, {
 module.exports = __toCommonJS(AmountFooter_exports);
 var import_react = __toESM(require("react"));
 var import_classnames = __toESM(require("classnames"));
+var import_antd = require("antd");
+var import_icons = require("@ant-design/icons");
 var import_utils = require("../Packages/utils");
 var import_Divider = __toESM(require("../Divider"));
 var import_index = require("./index.less");
 var import_utils2 = require("@pisell/utils");
 var prefix = "pisell-lowcode-";
-var Footer = ({ item, hideDivider, type }) => {
-  var _a, _b;
+var Footer = ({ item, hideDivider, type, isOnlyTotal }) => {
+  const { total, origin_total, symbol, tip, num, discount_reason } = item;
   const isDiscount = (0, import_react.useMemo)(() => {
-    if (!(item == null ? void 0 : item.hasOwnProperty("origin_total")))
+    if (!origin_total)
       return false;
-    return Number(item == null ? void 0 : item.total) != Number(item == null ? void 0 : item.origin_total);
-  }, [item]);
+    return Number(total) != Number(origin_total);
+  }, [total, origin_total]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, !hideDivider ? /* @__PURE__ */ import_react.default.createElement(import_Divider.default, { type: type !== "total" ? "inside" : "" }) : null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: (0, import_classnames.default)(
         `${prefix}packages-product-footer`,
-        hideDivider && `${prefix}packages-product-hide-divider-footer`
+        hideDivider && `${prefix}packages-product-hide-divider-footer`,
+        isOnlyTotal && `${prefix}packages-product-only-total-footer`
       )
     },
-    /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_utils._formatAmount)(item == null ? void 0 : item.total, item == null ? void 0 : item.symbol)), /* @__PURE__ */ import_react.default.createElement("span", null, `×${item == null ? void 0 : item.num}`), /* @__PURE__ */ import_react.default.createElement("span", { className: `${prefix}packages-product-footer-total` }, (0, import_utils._formatAmount)((item == null ? void 0 : item.total) * (item == null ? void 0 : item.num), item == null ? void 0 : item.symbol))),
-    isDiscount ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}packages-product-footer-discount` }, /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_utils._formatAmount)(item == null ? void 0 : item.origin_total, item == null ? void 0 : item.symbol)), /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_utils._formatAmount)((item == null ? void 0 : item.origin_total) * (item == null ? void 0 : item.num), item == null ? void 0 : item.symbol, 2))) : null
-  ), isDiscount && ((_a = item._extend) == null ? void 0 : _a.discount_reason) && type === "total" ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_Divider.default, null), /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-item-discount-reason` }, /* @__PURE__ */ import_react.default.createElement("span", null, `${import_utils2.locales.getText("pisell2.product.card.discount.reason")}: ${(_b = item._extend) == null ? void 0 : _b.discount_reason}`))) : null);
+    /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        className: (0, import_classnames.default)(`${prefix}packages-product-footer-price-wrap`)
+      },
+      !isOnlyTotal ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
+        "div",
+        {
+          className: (0, import_classnames.default)(`${prefix}packages-product-footer-price`)
+        },
+        /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_utils._formatAmount)(total, symbol)),
+        tip ? /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: import_utils2.locales.getText(tip), destroyTooltipOnHide: true }, /* @__PURE__ */ import_react.default.createElement(
+          import_icons.QuestionCircleOutlined,
+          {
+            style: { fontSize: "16px", color: "#1570ef" }
+          }
+        )) : null
+      ), /* @__PURE__ */ import_react.default.createElement("span", null, `×${num}`)) : null,
+      /* @__PURE__ */ import_react.default.createElement("span", { className: `${prefix}packages-product-footer-total` }, (0, import_utils._formatAmount)(total * num, symbol))
+    ),
+    isDiscount ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}packages-product-footer-discount` }, !isOnlyTotal ? /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_utils._formatAmount)(origin_total, symbol)) : null, /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_utils._formatAmount)(origin_total * num, symbol, 2))) : null
+  ), isDiscount && discount_reason && type === "total" ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_Divider.default, null), /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-item-discount-reason` }, /* @__PURE__ */ import_react.default.createElement("span", null, `${import_utils2.locales.getText(
+    "pisell2.product.card.discount.reason"
+  )}: ${discount_reason}`))) : null);
 };
 var AmountFooter_default = Footer;

package/lib/components/productCard/components/AmountFooter/index.less

@@ -12,6 +12,17 @@
       justify-content: space-between;
     }
   }
+  &-packages-product-only-total-footer {
+    > div {
+      justify-content: end !important;
+    }
+  }
+
+  &-packages-product-footer-price {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+  }
 
   &-packages-product-footer-discount {
     font-size: 12px;

package/lib/components/productCard/components/Header/index.js

@@ -42,14 +42,22 @@ var import_index = require("./index.less");
 var prefix = "pisell-lowcode-";
 var Header = (props) => {
   const { isShowDelete, item, showImage, onDelete, disabledEdit } = props;
+  const {
+    id,
+    options,
+    bundle,
+    product_option_string,
+    image,
+    name,
+    price,
+    symbol
+  } = item;
   const showPrice = (0, import_react.useMemo)(() => {
-    var _a, _b;
-    return ((_a = item == null ? void 0 : item.bundle) == null ? void 0 : _a.length) > 0 || ((_b = item == null ? void 0 : item.options) == null ? void 0 : _b.length) > 0;
-  }, [item == null ? void 0 : item.bundle, item == null ? void 0 : item.options]);
+    return (bundle == null ? void 0 : bundle.length) > 0 || (options == null ? void 0 : options.length) > 0;
+  }, [bundle, options]);
   const headerCenterStyle = (0, import_react.useMemo)(() => {
-    var _a;
-    return ((_a = item == null ? void 0 : item.options) == null ? void 0 : _a.length) > 0 || (item == null ? void 0 : item.product_option_string);
-  }, [item == null ? void 0 : item.options, item == null ? void 0 : item.product_option_string]);
+    return (options == null ? void 0 : options.length) > 0 || product_option_string;
+  }, [options, product_option_string]);
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -72,11 +80,11 @@ var Header = (props) => {
     showImage ? /* @__PURE__ */ import_react.default.createElement(
       "img",
       {
-        src: import_utils.image.ali(item.cover, 64),
+        src: import_utils.image.ali(image, 64),
         className: `${prefix}product-header-cover`
       }
     ) : null,
-    (item == null ? void 0 : item.id) ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-right-wrap` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-title` }, /* @__PURE__ */ import_react.default.createElement("span", null, item == null ? void 0 : item.title), showPrice ? /* @__PURE__ */ import_react.default.createElement("span", { className: `${prefix}product-title-price` }, (0, import_utils.formatAmount)(item == null ? void 0 : item.price, 2, item == null ? void 0 : item.symbol)) : null), (item == null ? void 0 : item.product_option_string) ? /* @__PURE__ */ import_react.default.createElement("span", { className: `${prefix}product-title-variant` }, item == null ? void 0 : item.product_option_string) : null, /* @__PURE__ */ import_react.default.createElement(import_options.default, { options: item == null ? void 0 : item.options, amountSymbol: item == null ? void 0 : item.symbol })) : null
+    id ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-right-wrap` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-title` }, /* @__PURE__ */ import_react.default.createElement("span", null, name), showPrice ? /* @__PURE__ */ import_react.default.createElement("span", { className: `${prefix}product-title-price` }, (0, import_utils.formatAmount)(price, 2, symbol)) : null), product_option_string ? /* @__PURE__ */ import_react.default.createElement("span", { className: `${prefix}product-title-variant` }, product_option_string) : null, /* @__PURE__ */ import_react.default.createElement(import_options.default, { options, amountSymbol: symbol })) : null
   );
 };
 var Header_default = Header;

package/lib/components/productCard/components/MultiDay/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import './index.less';
+declare const MultiDay: ({ dataSource, hideDivider }: any) => React.JSX.Element;
+export default MultiDay;

package/lib/components/productCard/components/MultiDay/index.js

@@ -0,0 +1,72 @@
+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/productCard/components/MultiDay/index.tsx
+var MultiDay_exports = {};
+__export(MultiDay_exports, {
+  default: () => MultiDay_default
+});
+module.exports = __toCommonJS(MultiDay_exports);
+var import_react = __toESM(require("react"));
+var import_classnames = __toESM(require("classnames"));
+var import_Divider = __toESM(require("../Divider"));
+var import_AmountFooter = __toESM(require("../AmountFooter"));
+var import_utils = require("../../utils");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_index = require("./index.less");
+var import_utils2 = require("./utils");
+var prefix = "pisell-lowcode-";
+var MultiDay = ({ dataSource, hideDivider }) => {
+  var _a, _b;
+  const { items, symbol, locale } = dataSource;
+  let translationOriginal = (text) => "";
+  const context = (0, import_useEngineContext.default)();
+  translationOriginal = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.translationOriginal;
+  const lists = (0, import_react.useMemo)(() => {
+    if (!(items == null ? void 0 : items.length))
+      return [];
+    return (0, import_utils2.formatDateRanges)(items);
+  }, [items]);
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)(`${prefix}multi-day-wrap`) }, lists == null ? void 0 : lists.map((m, index) => {
+    return /* @__PURE__ */ import_react.default.createElement("div", { key: index }, /* @__PURE__ */ import_react.default.createElement(import_Divider.default, { type: "inside" }), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)(`${prefix}multi-day`) }, /* @__PURE__ */ import_react.default.createElement("div", null, (0, import_utils.formatMultiDayDate)({ ...m, locale })), /* @__PURE__ */ import_react.default.createElement(
+      import_AmountFooter.default,
+      {
+        item: { ...m, symbol },
+        hideDivider: true
+      }
+    )));
+  }), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)(`${prefix}multi-day-total-wrap`) }, /* @__PURE__ */ import_react.default.createElement(
+    import_AmountFooter.default,
+    {
+      item: { ...dataSource, num: 1 },
+      type: "total",
+      isOnlyTotal: true
+    }
+  )));
+};
+var MultiDay_default = MultiDay;

package/lib/components/productCard/components/MultiDay/index.less

@@ -0,0 +1,34 @@
+@pisell-prefix: pisell-lowcode;
+
+.@{pisell-prefix} {
+  &-multi-day-wrap {
+    margin-top: 16px;
+  }
+
+  &-multi-day {
+    color: var(--Gray-500, #667085);
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 20px;
+    display: flex;
+    flex-direction: column;
+  }
+
+  &-multi-day-total {
+    color: var(--Gray-900, #101828);
+    text-align: right;
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 20px;
+    display: flex;
+    flex-direction: column;
+  }
+
+  &-multi-day-total-discount {
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 18px;
+    text-decoration-line: line-through;
+    color: var(--Gray-500, #667085);
+  }
+}

package/lib/components/productCard/components/MultiDay/utils.d.ts

@@ -0,0 +1,14 @@
+interface InputItem {
+    start_date: string;
+    end_date: string;
+    total: number;
+    num: number;
+}
+interface OutputItem {
+    start_date: string;
+    end_date: string;
+    total: number;
+    num: number;
+}
+export declare function formatDateRanges(list: InputItem[]): OutputItem[];
+export {};

package/lib/components/productCard/components/MultiDay/utils.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/productCard/components/MultiDay/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  formatDateRanges: () => formatDateRanges
+});
+module.exports = __toCommonJS(utils_exports);
+var import_dayjs = __toESM(require("dayjs"));
+function formatDateRanges(list) {
+  const result = [];
+  let currentGroup = null;
+  list.forEach((item, index) => {
+    const currentStartDate = (0, import_dayjs.default)(item.start_date);
+    const currentEndDate = (0, import_dayjs.default)(item.end_date);
+    const currentTotal = item.total;
+    const currentNum = item.num;
+    if (!currentGroup) {
+      currentGroup = {
+        ...item,
+        start_date: currentStartDate.format("YYYY-MM-DD"),
+        end_date: currentEndDate.format("YYYY-MM-DD"),
+        total: currentTotal,
+        num: currentNum
+      };
+    } else {
+      const prevEndDate = (0, import_dayjs.default)(currentGroup.end_date);
+      if (currentTotal === currentGroup.total && prevEndDate.isSame(currentStartDate, "day")) {
+        currentGroup.end_date = currentEndDate.format("YYYY-MM-DD");
+        currentGroup.num += currentNum;
+      } else {
+        result.push(currentGroup);
+        currentGroup = {
+          ...item,
+          start_date: currentStartDate.format("YYYY-MM-DD"),
+          end_date: currentEndDate.format("YYYY-MM-DD"),
+          total: currentTotal,
+          num: currentNum
+        };
+      }
+    }
+    if (index === list.length - 1 && currentGroup) {
+      result.push(currentGroup);
+    }
+  });
+  return result;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatDateRanges
+});

package/lib/components/productCard/components/Packages/components/collapsibleList/utils.js

@@ -44,7 +44,8 @@ var renderBundles = (item, hidePrice, isShowPackageNote) => {
   let translationOriginal = (text) => "";
   const context = (0, import_useEngineContext.default)();
   translationOriginal = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.translationOriginal;
-  return /* @__PURE__ */ import_react.default.createElement("div", { key: item.id, className: `${prefix}packages-product-bundle-item` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}packages-product-bundle-info` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}packages-product-bundle-info-title` }, translationOriginal(item == null ? void 0 : item.title)), !hidePrice ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}packages-product-bundle-info-num` }, (0, import_utils._formatAmount)(item == null ? void 0 : item.price, item == null ? void 0 : item.symbol)) : null), /* @__PURE__ */ import_react.default.createElement(import_options.default, { options: item == null ? void 0 : item.option, amountSymbol: item == null ? void 0 : item.symbol }), /* @__PURE__ */ import_react.default.createElement(import_AmountFooter.default, { item }), isShowPackageNote ? /* @__PURE__ */ import_react.default.createElement(import_Note.default, { item, type: "inside" }) : null);
+  const { title, name, id, price, symbol, option } = item;
+  return /* @__PURE__ */ import_react.default.createElement("div", { key: id, className: `${prefix}packages-product-bundle-item` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}packages-product-bundle-info` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}packages-product-bundle-info-title` }, translationOriginal(title || name)), !hidePrice ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}packages-product-bundle-info-num` }, (0, import_utils._formatAmount)(price, symbol)) : null), /* @__PURE__ */ import_react.default.createElement(import_options.default, { options: option, amountSymbol: symbol }), /* @__PURE__ */ import_react.default.createElement(import_AmountFooter.default, { item }), isShowPackageNote ? /* @__PURE__ */ import_react.default.createElement(import_Note.default, { item, type: "inside" }) : null);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/productCard/components/Packages/components/options/index.js

@@ -55,7 +55,7 @@ var Options = ({ options, amountSymbol }) => {
           {
             className: `${prefix}packages-product-bundle-option-item-left-amount`
           },
-          /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_utils._formatAmount)(option == null ? void 0 : option.add_price, amountSymbol)),
+          /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_utils._formatAmount)(option == null ? void 0 : option.price, amountSymbol)),
           /* @__PURE__ */ import_react.default.createElement("span", null, "×"),
           /* @__PURE__ */ import_react.default.createElement("span", null, option == null ? void 0 : option.num)
         )
@@ -65,7 +65,7 @@ var Options = ({ options, amountSymbol }) => {
         {
           className: `${prefix}packages-product-bundle-option-item-amount`
         },
-        (0, import_utils._formatAmount)((option == null ? void 0 : option.add_price) * (option == null ? void 0 : option.num), amountSymbol)
+        (0, import_utils._formatAmount)((option == null ? void 0 : option.price) * (option == null ? void 0 : option.num), amountSymbol)
       )
     );
   })) : null;

package/lib/components/productCard/components/Packages/index.js

@@ -46,7 +46,7 @@ var Packages = ({ item, isShowPackageNote }) => {
     {
       list: bundle || [],
       renderItem: (items) => (0, import_utils2.renderBundles)(
-        { ...items, symbol: item == null ? void 0 : item.symbol, total: items == null ? void 0 : items.price },
+        { ...items, symbol: item == null ? void 0 : item.symbol },
         false,
         isShowPackageNote
       )

package/lib/components/productCard/components/Sales/index.js

@@ -38,8 +38,7 @@ var import_utils = require("../Packages/components/collapsibleList/utils");
 var import_index = require("./index.less");
 var prefix = "pisell-lowcode-";
 var Sales = ({ item, isShowNote }) => {
-  var _a;
-  let other_products = ((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.relation_details) || [];
+  let other_products = (item == null ? void 0 : item.relation_products) || [];
   other_products = other_products.map((p) => {
     return {
       ...p,

package/lib/components/productCard/components/Time/index.js

@@ -39,26 +39,29 @@ var import_Like = __toESM(require("./components/Like"));
 var import_index = require("./index.less");
 var prefix = "pisell-lowcode-";
 var Time = ({ item, isShowHolder, onLike }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  const {
+    start_date,
+    end_date,
+    holder_title,
+    resource_id,
+    relation_form_name,
+    like_status
+  } = item;
   const isShow = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2, _e2;
-    return ((_b2 = (_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.date) == null ? void 0 : _b2.value) || isShowHolder && ((_c2 = item == null ? void 0 : item._extend) == null ? void 0 : _c2.holder_title) || ((_d2 = item == null ? void 0 : item._extend) == null ? void 0 : _d2.resource) || ((_e2 = item == null ? void 0 : item._extend) == null ? void 0 : _e2.relation_form_name);
-  }, [item == null ? void 0 : item._extend, isShowHolder]);
-  return isShow ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_Divider.default, null), /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-time-wrap` }, ((_b = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.date) == null ? void 0 : _b.value) ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-date` }, (0, import_utils.getServiceTime)(item, (_c = item._extend) == null ? void 0 : _c.start_date)) : null, isShowHolder && ((_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.holder_title) ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-holder-wrap` }, item._extend.holder_title) : null, ((_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.resource) || ((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.relation_form_name) ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-technician` }, ((_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.resource) ? /* @__PURE__ */ import_react.default.createElement(
+    return start_date && end_date || isShowHolder && holder_title || resource_id || relation_form_name;
+  }, [start_date, isShowHolder, holder_title, resource_id]);
+  return isShow ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_Divider.default, null), /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-time-wrap` }, start_date && end_date ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-date` }, (0, import_utils.getServiceTime)(item, start_date)) : null, isShowHolder && holder_title ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-holder-wrap` }, holder_title) : null, resource_id || relation_form_name ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}product-technician` }, resource_id ? /* @__PURE__ */ import_react.default.createElement(
     import_Like.default,
     {
       style: { marginRight: 4 },
-      status: (_h = item._extend) == null ? void 0 : _h.like_status,
+      status: like_status,
       onLike: (e) => {
         onLike({
           ...item,
-          _extend: {
-            ...item._extend,
-            like_status: e
-          }
+          like_status: e
         });
       }
     }
-  ) : null, (_i = item == null ? void 0 : item._extend) == null ? void 0 : _i.relation_form_name) : null)) : null;
+  ) : null, relation_form_name) : null)) : null;
 };
 var Time_default = Time;

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

@@ -1,5 +1,5 @@
 import React from 'react';
 import { ProductCardTypes } from './types';
 import './index.less';
-declare const ProductCard: (props: ProductCardTypes) => React.JSX.Element;
+declare const ProductCard: React.FC<ProductCardTypes>;
 export default ProductCard;

package/lib/components/productCard/index.js

@@ -42,21 +42,23 @@ var import_Time = __toESM(require("./components/Time"));
 var import_Packages = __toESM(require("./components/Packages"));
 var import_Sales = __toESM(require("./components/Sales"));
 var import_AmountFooter = __toESM(require("./components/AmountFooter"));
+var import_MultiDay = __toESM(require("./components/MultiDay"));
 var import_Note = __toESM(require("./components/Note"));
 var import_Action = __toESM(require("./components/Action"));
 var import_useOpenNote = __toESM(require("./hooks/useOpenNote"));
 var import_locales = __toESM(require("./locales"));
+var import_status = require("./status");
 var import_index = require("./index.less");
 import_utils.locales.init(import_locales.default, localStorage.getItem("umi_locale") || "en");
 var ProductCard = (props) => {
-  var _a, _b;
+  var _a;
   const {
-    dataSource,
-    isShowImage = true,
-    isShowHolder = true,
-    isShowNote = true,
-    isShowDelete = true,
-    isShowPackageNote = true,
+    dataSource = import_status.defaultValue.dataSource,
+    isShowImage = import_status.defaultValue.isShowImage,
+    isShowHolder = import_status.defaultValue.isShowHolder,
+    isShowNote = import_status.defaultValue.isShowNote,
+    isShowDelete = import_status.defaultValue.isShowDelete,
+    isShowPackageNote = import_status.defaultValue.isShowPackageNote,
     onAction,
     onDelete,
     onNote,
@@ -65,21 +67,31 @@ var ProductCard = (props) => {
     ...other
   } = props;
   const useOpenNoteRef = (0, import_react.useRef)();
+  console.log(dataSource, isShowImage, isShowNote, "dataSource");
+  const {
+    image,
+    bundle,
+    relation_products,
+    _id,
+    isShowAction,
+    actionText,
+    errorMessage,
+    isNormalProduct
+  } = dataSource;
   const showImage = (0, import_react.useMemo)(() => {
-    return isShowImage && (dataSource == null ? void 0 : dataSource.cover);
-  }, [isShowImage, dataSource == null ? void 0 : dataSource.cover]);
+    return isShowImage && image;
+  }, [isShowImage, image]);
   const hideDivider = (0, import_react.useMemo)(() => {
-    var _a2, _b2;
-    return ((_a2 = dataSource == null ? void 0 : dataSource.bundle) == null ? void 0 : _a2.length) || ((_b2 = dataSource == null ? void 0 : dataSource.relation_details) == null ? void 0 : _b2.length);
-  }, [dataSource == null ? void 0 : dataSource.bundle, dataSource == null ? void 0 : dataSource.relation_details]);
+    return (bundle == null ? void 0 : bundle.length) || (relation_products == null ? void 0 : relation_products.length);
+  }, [bundle, relation_products]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_cardPro.default,
     {
       className: (0, import_classnames.default)("pisell-lowcode-product-card", {
         ["pisell-lowcode-product-card-image"]: !showImage,
-        ["pisell-lowcode-normal-product-card"]: !showImage && !((_b = (_a = dataSource == null ? void 0 : dataSource._extend) == null ? void 0 : _a.date) == null ? void 0 : _b.value)
+        ["pisell-lowcode-normal-product-card"]: !showImage && isNormalProduct
       }),
-      key: dataSource == null ? void 0 : dataSource._id
+      key: _id
     },
     /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
       "div",
@@ -103,17 +115,17 @@ var ProductCard = (props) => {
           }
         }
       ),
-      (dataSource == null ? void 0 : dataSource._extend) ? /* @__PURE__ */ import_react.default.createElement(
+      /* @__PURE__ */ import_react.default.createElement(
         import_Time.default,
         {
           item: dataSource,
           isShowHolder,
           onLike: (item) => onLike == null ? void 0 : onLike(item)
         }
-      ) : null,
+      ),
       /* @__PURE__ */ import_react.default.createElement(import_Packages.default, { item: dataSource, isShowPackageNote }),
       /* @__PURE__ */ import_react.default.createElement(import_Sales.default, { item: dataSource, isShowNote }),
-      /* @__PURE__ */ import_react.default.createElement(
+      ((_a = dataSource.items) == null ? void 0 : _a.length) ? /* @__PURE__ */ import_react.default.createElement(import_MultiDay.default, { dataSource, hideDivider }) : /* @__PURE__ */ import_react.default.createElement(
         import_AmountFooter.default,
         {
           item: dataSource,
@@ -133,11 +145,11 @@ var ProductCard = (props) => {
           }
         }
       ) : null,
-      (dataSource == null ? void 0 : dataSource._showAction) && (dataSource == null ? void 0 : dataSource._actionText) ? /* @__PURE__ */ import_react.default.createElement(import_Action.default, { item: dataSource, onAction: () => onAction == null ? void 0 : onAction(dataSource) }) : null,
-      (dataSource == null ? void 0 : dataSource._errorMessage) ? /* @__PURE__ */ import_react.default.createElement(
+      isShowAction && actionText ? /* @__PURE__ */ import_react.default.createElement(import_Action.default, { item: dataSource, onAction: () => onAction == null ? void 0 : onAction(dataSource) }) : null,
+      errorMessage ? /* @__PURE__ */ import_react.default.createElement(
         import_antd.Alert,
         {
-          message: dataSource._errorMessage,
+          message: errorMessage,
           type: "warning",
           showIcon: true,
           className: "pisell-lowcode-product-card-error"