@pisell/materials 2.2.61 → 2.2.63

package/es/components/pisellAvatar/index.js

@@ -54,7 +54,7 @@ var PisellAvatar = function PisellAvatar(_ref) {
   var mergedStyle = _objectSpread(_objectSpread({}, style), {}, {
     width: sizeMap[size],
     height: sizeMap[size],
-    fontSize: children || icon ? fontSizeMap[size] : undefined,
+    fontSize: fontSizeMap[size],
     lineHeight: "".concat(sizeMap[size], "px"),
     borderRadius: shape === 'square' ? "".concat(borderRadius, "px") : '50%'
   });

package/es/components/pisellWalletPassCard/index.js

@@ -318,7 +318,7 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
         style: {
           width: '100%'
         },
-        max: 'redeem' === name ? originData.available_max_amount : undefined
+        max: 'redeem' === name ? originData === null || originData === void 0 ? void 0 : originData.available_max_amount : undefined
       });
     }
     return /*#__PURE__*/React.createElement(Input, {
@@ -339,7 +339,8 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
       width: 480,
       onOk: _onConfirmEdit,
       okText: getText('pisell-wallet-pass-card-confirm'),
-      cancelText: getText('pisell-wallet-pass-card-cancel')
+      cancelText: getText('pisell-wallet-pass-card-cancel'),
+      platform: "pc"
     }, /*#__PURE__*/React.createElement(Form, {
       form: form,
       layout: 'vertical',
@@ -367,7 +368,8 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
       },
       width: 480,
       className: "pisell-wallet-pass-card-detail-modal",
-      footer: null
+      footer: null,
+      platform: "pc"
     }, /*#__PURE__*/React.createElement(Form, {
       form: form2,
       disabled: true,

package/es/components/productCard/components/Time/components/SelectHolder/index.js

@@ -25,6 +25,10 @@ var SelectHolder = function SelectHolder(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     selectedValue = _useState2[0],
     setSelectedValue = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    open = _useState4[0],
+    setOpen = _useState4[1];
   useEffect(function () {
     setSelectedValue(value);
   }, [value]);
@@ -41,14 +45,16 @@ var SelectHolder = function SelectHolder(_ref) {
     e.preventDefault();
     e.stopPropagation();
     onAddHolder();
+    setOpen(false);
   };
-  console.log(lists, isShowAddHolderButton, addHolderButtonText, 'select-holder');
   var isError = useMemo(function () {
     if (!selectedValue && isErrorHolder) return true;
   }, [selectedValue, isErrorHolder]);
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode-product-card-select-holder ".concat(isError ? 'pisell-lowcode-product-card-select-holder-error' : '')
   }, /*#__PURE__*/React.createElement(Select, {
+    open: open,
+    onDropdownVisibleChange: setOpen,
     onClick: function onClick(e) {
       return e.stopPropagation();
     },
@@ -60,7 +66,7 @@ var SelectHolder = function SelectHolder(_ref) {
       return _onChange('');
     },
     value: selectedValue,
-    placeholder: locales.getText('pisell2.product.card.add.holder.placeholder')(''),
+    placeholder: locales.getText('pisell2.product.card.add.holder.placeholder')(addHolderButtonText),
     onChange: function onChange(val) {
       setSelectedValue(val);
       var item = lists.find(function (d) {

package/es/components/productCard/components/Time/components/SelectHolder/index.less

@@ -1,8 +1,6 @@
 .pisell-lowcode-product-card-select-holder {
   .pisell-lowcode-select {
-    min-width: 140px;
-    max-width: 100%;
-    width: auto;
+    width: 100%;
     .pisell-lowcode-select-selector {
       border-radius: 50px;
     }

package/es/components/productCard/components/Time/components/SelectResource/index.js

@@ -12,7 +12,7 @@ import React, { useCallback, useEffect, useState, useMemo } from 'react';
 import AlertTriangle from '@pisell/icon/es/AlertTriangle';
 import { locales } from '@pisell/utils';
 import { Select } from 'antd';
-import { isArr } from "@pisell/utils";
+import { isArr } from '@pisell/utils';
 import "./index.less";
 var SelectResource = function SelectResource(_ref) {
   var lists = _ref.lists,
@@ -95,6 +95,7 @@ var SelectResource = function SelectResource(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode-product-card-select-resource ".concat(isError ? 'pisell-lowcode-product-card-select-resource-error' : '')
   }, /*#__PURE__*/React.createElement(Select, {
+    disabled: props.disabled,
     mode: resourceMode,
     size: "large",
     showSearch: true,
@@ -109,6 +110,7 @@ var SelectResource = function SelectResource(_ref) {
       flex: 1
     },
     value: selectedValue,
+    placeholder: locales.getText('pisell2.product.card.add.holder.placeholder')(''),
     onChange: handleChange
   }, renderOptions()), isError ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode-product-select-resource-error"

package/es/components/productCard/components/Time/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Time: ({ item, isShowHolder, onLike, isShowChangeResource, changeResource, changeHolder, isShowChangeHolder, holderMode, onAddHolder, isShowAddHolderButton, onClearHolder, onClearResource, }: any) => JSX.Element | null;
 export default Time;

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

@@ -1,4 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -85,7 +86,7 @@ var Time = function Time(_ref) {
     if (!isShowChangeResource) {
       return item === null || item === void 0 ? void 0 : item.name;
     }
-    return /*#__PURE__*/React.createElement(SelectResource, {
+    return /*#__PURE__*/React.createElement(SelectResource, _extends({}, item, {
       lists: item === null || item === void 0 ? void 0 : item.lists,
       value: item === null || item === void 0 ? void 0 : item.id,
       onChange: changeResource,
@@ -95,7 +96,7 @@ var Time = function Time(_ref) {
       resourceErrorText: item === null || item === void 0 ? void 0 : item.resourceErrorText,
       resourceMode: item.resourceMode,
       maxLength: item.maxLength
-    });
+    }));
   }, [isShowChangeResource]);
   var likeAndResourceCom = useMemo(function () {
     if (isMultipleResource) {

package/es/components/productCard/index.js

@@ -54,7 +54,6 @@ var ProductCard = function ProductCard(props) {
   var useOpenNoteRef = useRef();
   var locale = (utils === null || utils === void 0 || (_utils$storage = utils.storage) === null || _utils$storage === void 0 ? void 0 : _utils$storage.get('umi_locale')) || localStorage.getItem('umi_locale');
   locales.init(localeTexts, locale || 'en');
-  console.log(dataSource, isShowImage, isShowNote, 'dataSource');
   var image = dataSource.image,
     bundle = dataSource.bundle,
     relation_products = dataSource.relation_products,

package/es/components/productCard/locales.d.ts

@@ -15,6 +15,7 @@ declare const _default: {
         'pisell2.product.card.view-less': string;
         'pisell2.product.card.add.holder.button.text': (val: string) => string;
         'pisell2.product.card.add.holder.placeholder': (val: string) => string;
+        'pisell2.product.card.hour.minute': (hour: number, minute: number) => string;
     };
     'zh-CN': {
         'pisell2.product.card.day': (val: number) => string;
@@ -32,6 +33,7 @@ declare const _default: {
         'pisell2.product.card.view-less': string;
         'pisell2.product.card.add.holder.button.text': (val: string) => string;
         'pisell2.product.card.add.holder.placeholder': (val: string) => string;
+        'pisell2.product.card.hour.minute': (hour: number, minute: number) => string;
     };
     'zh-HK': {
         'pisell2.product.card.day': (val: number) => string;
@@ -49,6 +51,7 @@ declare const _default: {
         'pisell2.product.card.view-less': string;
         'pisell2.product.card.add.holder.button.text': (val: string) => string;
         'pisell2.product.card.add.holder.placeholder': (val: string) => string;
+        'pisell2.product.card.hour.minute': (hour: number, minute: number) => string;
     };
 };
 export default _default;

package/es/components/productCard/locales.js

@@ -24,6 +24,9 @@ export default {
     },
     'pisell2.product.card.add.holder.placeholder': function pisell2ProductCardAddHolderPlaceholder(val) {
       return "Please select ".concat(val || '');
+    },
+    'pisell2.product.card.hour.minute': function pisell2ProductCardHourMinute(hour, minute) {
+      return "".concat(hour > 0 ? "".concat(hour, "h") : '').concat(hour > 0 && minute > 0 ? ' ' : '').concat(minute > 0 ? "".concat(minute, "min") : '');
     }
   },
   'zh-CN': {
@@ -51,6 +54,9 @@ export default {
     },
     'pisell2.product.card.add.holder.placeholder': function pisell2ProductCardAddHolderPlaceholder(val) {
       return "\u8BF7\u9009\u62E9".concat(val || '');
+    },
+    'pisell2.product.card.hour.minute': function pisell2ProductCardHourMinute(hour, minute) {
+      return "".concat(hour > 0 ? "".concat(hour, "\u5C0F\u65F6") : '').concat(minute > 0 ? "".concat(minute, "\u5206\u949F") : '');
     }
   },
   'zh-HK': {
@@ -78,6 +84,9 @@ export default {
     },
     'pisell2.product.card.add.holder.placeholder': function pisell2ProductCardAddHolderPlaceholder(val) {
       return "\u8ACB\u9078\u64C7".concat(val || '');
+    },
+    'pisell2.product.card.hour.minute': function pisell2ProductCardHourMinute(hour, minute) {
+      return "".concat(hour > 0 ? "".concat(hour, "\u5C0F\u6642") : '').concat(minute > 0 ? "".concat(minute, "\u5206\u9418") : '');
     }
   }
 };

package/es/components/productCard/utils.js

@@ -99,8 +99,18 @@ export var getServiceTime = function getServiceTime(item, currentDate) {
     var startDateTime = "".concat(startDate.format('YYYY-MM-DD'), " ").concat(startTime);
     var endDateTime = "".concat(endDate.format('YYYY-MM-DD'), " ").concat(endTime);
     var _duration = dayjs(endDateTime).diff(dayjs(startDateTime), item === null || item === void 0 ? void 0 : item.duration_type);
-    var _text = (item === null || item === void 0 ? void 0 : item.duration_type) === 'days' ? locales.getText('pisell2.product.card.day')(_duration) : locales.getText('pisell2.product.card.minute')(_duration);
-    return "".concat(dateTime, " (").concat(_duration).concat(_text, ")");
+    var durationText = '';
+    if ((item === null || item === void 0 ? void 0 : item.duration_type) === 'minutes') {
+      // 转为小时+分钟
+      var hours = Math.floor(_duration / 60);
+      var minutes = _duration % 60;
+      durationText = locales.getText('pisell2.product.card.hour.minute')(hours, minutes);
+    } else if ((item === null || item === void 0 ? void 0 : item.duration_type) === 'days') {
+      durationText = locales.getText('pisell2.product.card.day')(_duration);
+    } else {
+      durationText = "".concat(_duration);
+    }
+    return "".concat(dateTime, " (").concat(durationText, ")");
   }
   var _format = isEn ? 'ddd, DD/MM/YYYY' : 'YYYY-MM-DD，ddd';
 

package/lib/components/pisellAvatar/index.js

@@ -80,7 +80,7 @@ var PisellAvatar = ({
     ...style,
     width: sizeMap[size],
     height: sizeMap[size],
-    fontSize: children || icon ? fontSizeMap[size] : void 0,
+    fontSize: fontSizeMap[size],
     lineHeight: `${sizeMap[size]}px`,
     borderRadius: shape === "square" ? `${borderRadius}px` : "50%"
   };

package/lib/components/pisellWalletPassCard/index.js

@@ -289,7 +289,7 @@ var PisellWalletPassCard = (props) => {
           formatter: (value) => `$ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ","),
           parser: (value) => value == null ? void 0 : value.replace(/\$\s?|(,*)/g, ""),
           style: { width: "100%" },
-          max: "redeem" === name2 ? originData.available_max_amount : void 0
+          max: "redeem" === name2 ? originData == null ? void 0 : originData.available_max_amount : void 0
         }
       );
     }
@@ -307,7 +307,8 @@ var PisellWalletPassCard = (props) => {
         width: 480,
         onOk: _onConfirmEdit,
         okText: (0, import_locales.getText)("pisell-wallet-pass-card-confirm"),
-        cancelText: (0, import_locales.getText)("pisell-wallet-pass-card-cancel")
+        cancelText: (0, import_locales.getText)("pisell-wallet-pass-card-cancel"),
+        platform: "pc"
       },
       /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { form, layout: "vertical", style: { padding: "16px 0" } }, Array.isArray((_b = actions == null ? void 0 : actions.edit) == null ? void 0 : _b.fields) && actions.edit.fields.map((item) => {
         return /* @__PURE__ */ import_react.default.createElement(
@@ -339,7 +340,8 @@ var PisellWalletPassCard = (props) => {
         },
         width: 480,
         className: "pisell-wallet-pass-card-detail-modal",
-        footer: null
+        footer: null,
+        platform: "pc"
       },
       /* @__PURE__ */ import_react.default.createElement(
         import_antd.Form,

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

@@ -50,6 +50,7 @@ var SelectHolder = ({
   allowClear = false
 }) => {
   const [selectedValue, setSelectedValue] = (0, import_react.useState)();
+  const [open, setOpen] = (0, import_react.useState)(false);
   (0, import_react.useEffect)(() => {
     setSelectedValue(value);
   }, [value]);
@@ -57,13 +58,8 @@ var SelectHolder = ({
     e.preventDefault();
     e.stopPropagation();
     onAddHolder();
+    setOpen(false);
   };
-  console.log(
-    lists,
-    isShowAddHolderButton,
-    addHolderButtonText,
-    "select-holder"
-  );
   const isError = (0, import_react.useMemo)(() => {
     if (!selectedValue && isErrorHolder) return true;
   }, [selectedValue, isErrorHolder]);
@@ -75,6 +71,8 @@ var SelectHolder = ({
     /* @__PURE__ */ import_react.default.createElement(
       import_antd.Select,
       {
+        open,
+        onDropdownVisibleChange: setOpen,
         onClick: (e) => e.stopPropagation(),
         mode: holderMode,
         size: "large",
@@ -84,7 +82,7 @@ var SelectHolder = ({
         value: selectedValue,
         placeholder: import_utils.locales.getText(
           "pisell2.product.card.add.holder.placeholder"
-        )(""),
+        )(addHolderButtonText),
         onChange: (val) => {
           setSelectedValue(val);
           const item = lists.find((d) => d.id === val);

package/lib/components/productCard/components/Time/components/SelectHolder/index.less

@@ -1,8 +1,6 @@
 .pisell-lowcode-product-card-select-holder {
   .pisell-lowcode-select {
-    min-width: 140px;
-    max-width: 100%;
-    width: auto;
+    width: 100%;
     .pisell-lowcode-select-selector {
       border-radius: 50px;
     }

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

@@ -67,25 +67,28 @@ var SelectResource = ({
       return /* @__PURE__ */ import_react.default.createElement(import_antd.Select.Option, { value: d.id, key: d.id, ...d || {} }, /* @__PURE__ */ import_react.default.createElement("div", { style: { display: "flex", alignItems: "center", gap: "8px" } }, /* @__PURE__ */ import_react.default.createElement("span", null, d["label"]), (d == null ? void 0 : d.isError) ? /* @__PURE__ */ import_react.default.createElement(import_AlertTriangle.default, { style: { color: "#b42318", cursor: "pointer" } }) : null));
     });
   }, [lists]);
-  const handleChange = (0, import_react.useCallback)((val) => {
-    if (["multiple", "tags"].includes(resourceMode) && maxLength) {
-      if (value && value.length >= maxLength && val.length > value.length) {
-        return;
+  const handleChange = (0, import_react.useCallback)(
+    (val) => {
+      if (["multiple", "tags"].includes(resourceMode) && maxLength) {
+        if (value && value.length >= maxLength && val.length > value.length) {
+          return;
+        }
       }
-    }
-    setSelectedValue(val);
-    if (props.isParallelResource) {
-      const valueArray = (0, import_utils2.isArr)(val) ? val : [val];
-      return onChange({
-        value: valueArray,
-        options: valueArray.map((v) => resourceMap[v]),
-        resourceMode,
-        props
-      });
-    }
-    const item = resourceMap[val];
-    onChange(item);
-  }, [resourceMode, maxLength, value, onChange, props, resourceMap]);
+      setSelectedValue(val);
+      if (props.isParallelResource) {
+        const valueArray = (0, import_utils2.isArr)(val) ? val : [val];
+        return onChange({
+          value: valueArray,
+          options: valueArray.map((v) => resourceMap[v]),
+          resourceMode,
+          props
+        });
+      }
+      const item = resourceMap[val];
+      onChange(item);
+    },
+    [resourceMode, maxLength, value, onChange, props, resourceMap]
+  );
   const isError = (0, import_react.useMemo)(() => {
     if (!selectedValue && isErrorResource) return true;
   }, [selectedValue, isErrorResource]);
@@ -97,6 +100,7 @@ var SelectResource = ({
     /* @__PURE__ */ import_react.default.createElement(
       import_antd.Select,
       {
+        disabled: props.disabled,
         mode: resourceMode,
         size: "large",
         showSearch: true,
@@ -105,6 +109,9 @@ var SelectResource = ({
         onClick: (e) => e.stopPropagation(),
         style: { flex: 1 },
         value: selectedValue,
+        placeholder: import_utils.locales.getText(
+          "pisell2.product.card.add.holder.placeholder"
+        )(""),
         onChange: handleChange
       },
       renderOptions()

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Time: ({ item, isShowHolder, onLike, isShowChangeResource, changeResource, changeHolder, isShowChangeHolder, holderMode, onAddHolder, isShowAddHolderButton, onClearHolder, onClearResource, }: any) => JSX.Element | null;
 export default Time;

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

@@ -136,6 +136,7 @@ var Time = ({
       return /* @__PURE__ */ import_react.default.createElement(
         import_SelectResource.default,
         {
+          ...item2,
           lists: item2 == null ? void 0 : item2.lists,
           value: item2 == null ? void 0 : item2.id,
           onChange: changeResource,

package/lib/components/productCard/index.js

@@ -74,7 +74,6 @@ var ProductCard = (props) => {
   const useOpenNoteRef = (0, import_react.useRef)();
   const locale = ((_a = utils == null ? void 0 : utils.storage) == null ? void 0 : _a.get("umi_locale")) || localStorage.getItem("umi_locale");
   import_utils.locales.init(import_locales.default, locale || "en");
-  console.log(dataSource, isShowImage, isShowNote, "dataSource");
   const {
     image,
     bundle,

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

@@ -15,6 +15,7 @@ declare const _default: {
         'pisell2.product.card.view-less': string;
         'pisell2.product.card.add.holder.button.text': (val: string) => string;
         'pisell2.product.card.add.holder.placeholder': (val: string) => string;
+        'pisell2.product.card.hour.minute': (hour: number, minute: number) => string;
     };
     'zh-CN': {
         'pisell2.product.card.day': (val: number) => string;
@@ -32,6 +33,7 @@ declare const _default: {
         'pisell2.product.card.view-less': string;
         'pisell2.product.card.add.holder.button.text': (val: string) => string;
         'pisell2.product.card.add.holder.placeholder': (val: string) => string;
+        'pisell2.product.card.hour.minute': (hour: number, minute: number) => string;
     };
     'zh-HK': {
         'pisell2.product.card.day': (val: number) => string;
@@ -49,6 +51,7 @@ declare const _default: {
         'pisell2.product.card.view-less': string;
         'pisell2.product.card.add.holder.button.text': (val: string) => string;
         'pisell2.product.card.add.holder.placeholder': (val: string) => string;
+        'pisell2.product.card.hour.minute': (hour: number, minute: number) => string;
     };
 };
 export default _default;

package/lib/components/productCard/locales.js

@@ -38,7 +38,8 @@ var locales_default = {
     "pisell2.product.card.view-all": "View all",
     "pisell2.product.card.view-less": "View less",
     "pisell2.product.card.add.holder.button.text": (val) => `Add ${val || ""}`,
-    "pisell2.product.card.add.holder.placeholder": (val) => `Please select ${val || ""}`
+    "pisell2.product.card.add.holder.placeholder": (val) => `Please select ${val || ""}`,
+    "pisell2.product.card.hour.minute": (hour, minute) => `${hour > 0 ? `${hour}h` : ""}${hour > 0 && minute > 0 ? " " : ""}${minute > 0 ? `${minute}min` : ""}`
   },
   "zh-CN": {
     "pisell2.product.card.day": (val) => "天",
@@ -55,7 +56,8 @@ var locales_default = {
     "pisell2.product.card.view-all": "查看全部",
     "pisell2.product.card.view-less": "收起",
     "pisell2.product.card.add.holder.button.text": (val) => `添加${val || ""}`,
-    "pisell2.product.card.add.holder.placeholder": (val) => `请选择${val || ""}`
+    "pisell2.product.card.add.holder.placeholder": (val) => `请选择${val || ""}`,
+    "pisell2.product.card.hour.minute": (hour, minute) => `${hour > 0 ? `${hour}小时` : ""}${minute > 0 ? `${minute}分钟` : ""}`
   },
   "zh-HK": {
     "pisell2.product.card.day": (val) => "天",
@@ -72,6 +74,7 @@ var locales_default = {
     "pisell2.product.card.view-all": "查看全部",
     "pisell2.product.card.view-less": "收起",
     "pisell2.product.card.add.holder.button.text": (val) => `添加${val || ""}`,
-    "pisell2.product.card.add.holder.placeholder": (val) => `請選擇${val || ""}`
+    "pisell2.product.card.add.holder.placeholder": (val) => `請選擇${val || ""}`,
+    "pisell2.product.card.hour.minute": (hour, minute) => `${hour > 0 ? `${hour}小時` : ""}${minute > 0 ? `${minute}分鐘` : ""}`
   }
 };

package/lib/components/productCard/utils.js

@@ -97,9 +97,18 @@ var getServiceTime = (item, currentDate) => {
     }
     const startDateTime = `${startDate.format("YYYY-MM-DD")} ${startTime}`;
     const endDateTime = `${endDate.format("YYYY-MM-DD")} ${endTime}`;
-    const _duration = (0, import_dayjs.default)(endDateTime).diff((0, import_dayjs.default)(startDateTime), item == null ? void 0 : item.duration_type);
-    let text2 = (item == null ? void 0 : item.duration_type) === "days" ? import_utils.locales.getText("pisell2.product.card.day")(_duration) : import_utils.locales.getText("pisell2.product.card.minute")(_duration);
-    return `${dateTime} (${_duration}${text2})`;
+    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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "2.2.61",
+  "version": "2.2.63",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",