@pisell/materials 3.0.64 → 3.0.66

package/lib/components/pisellModal/components/MobileModal/index.js

@@ -36,8 +36,45 @@ var import_react = __toESM(require("react"));
 var import_classnames = __toESM(require("classnames"));
 var import_PcModal = __toESM(require("../PcModal"));
 var import_index = require("./index.less");
+var modalCount = 0;
 var MobileModal = (props) => {
   const { wrapClassName, mobileModalHeight } = props;
+  const ref = import_react.default.useRef(null);
+  const prevOpenRef = (0, import_react.useRef)(props.open);
+  const isFirstRender = (0, import_react.useRef)(true);
+  (0, import_react.useEffect)(() => {
+    if (isFirstRender.current && props.open) {
+      modalCount++;
+      document.body.style.overflow = "hidden";
+    }
+    isFirstRender.current = false;
+  }, []);
+  (0, import_react.useEffect)(() => {
+    if (!isFirstRender.current && props.open !== prevOpenRef.current) {
+      if (props.open) {
+        modalCount++;
+        document.body.style.overflow = "hidden";
+      } else {
+        modalCount--;
+        if (modalCount <= 0) {
+          modalCount = 0;
+          document.body.style.overflow = "";
+        }
+      }
+      prevOpenRef.current = props.open;
+    }
+  }, [props.open]);
+  (0, import_react.useEffect)(() => {
+    return () => {
+      if (prevOpenRef.current) {
+        modalCount--;
+        if (modalCount <= 0) {
+          modalCount = 0;
+          document.body.style.overflow = "";
+        }
+      }
+    };
+  }, []);
   return /* @__PURE__ */ import_react.default.createElement(
     import_PcModal.default,
     {
@@ -56,7 +93,8 @@ var MobileModal = (props) => {
             }),
             style: {
               height: mobileModalHeight || "100%"
-            }
+            },
+            ref
           },
           node
         );

package/lib/components/pisellModal/components/MobileModal/index.less

@@ -17,14 +17,18 @@
       overflow: hidden;
       max-height: 90%;
       min-height: 200px;
+      display: flex;
+      flex-direction: column;
     }
     .pisell-lowcode-modal-content {
+      flex: 1;
       padding: 0;
       border-radius: 0;
       height: 100%;
       display: flex;
       flex-direction: column;
       max-height: none;
+      min-height: 200px;
       .pisell-lowcode-modal-close {
         padding: 10px;
         top: 8px;

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

@@ -1,6 +1,7 @@
 declare const _default: {
     en: {
         'pisell2.product.card.day': (val: number) => string;
+        'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.discount.reason': string;
         'pisell2.product.card.discount.note': string;
         'pisell2.product.card.discount.add.note': string;
@@ -14,6 +15,7 @@ declare const _default: {
     };
     'zh-CN': {
         'pisell2.product.card.day': (val: number) => string;
+        'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.discount.reason': string;
         'pisell2.product.card.discount.note': string;
         'pisell2.product.card.discount.add.note': string;
@@ -27,6 +29,7 @@ declare const _default: {
     };
     'zh-HK': {
         'pisell2.product.card.day': (val: number) => string;
+        'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.discount.reason': string;
         'pisell2.product.card.discount.note': string;
         'pisell2.product.card.discount.add.note': string;

package/lib/components/productCard/locales.js

@@ -24,7 +24,8 @@ __export(locales_exports, {
 module.exports = __toCommonJS(locales_exports);
 var locales_default = {
   "en": {
-    "pisell2.product.card.day": (val) => `${val > 1 ? "days" : "day"}`,
+    "pisell2.product.card.day": (val) => `${val > 1 ? " days" : " day"}`,
+    "pisell2.product.card.day.event": (val) => `${val > 1 ? " events" : " event"}`,
     "pisell2.product.card.discount.reason": "Discount reason",
     "pisell2.product.card.discount.note": "Note",
     "pisell2.product.card.discount.add.note": "Add note",
@@ -38,6 +39,7 @@ var locales_default = {
   },
   "zh-CN": {
     "pisell2.product.card.day": (val) => "天",
+    "pisell2.product.card.day.event": (val) => "个活动",
     "pisell2.product.card.discount.reason": "折扣原因",
     "pisell2.product.card.discount.note": "备注",
     "pisell2.product.card.discount.add.note": "添加备注",
@@ -51,6 +53,7 @@ var locales_default = {
   },
   "zh-HK": {
     "pisell2.product.card.day": (val) => "天",
+    "pisell2.product.card.day.event": (val) => "个活動",
     "pisell2.product.card.discount.reason": "折扣原因",
     "pisell2.product.card.discount.note": "備註",
     "pisell2.product.card.discount.add.note": "添加備註",

package/lib/components/productCard/utils.js

@@ -75,7 +75,7 @@ var getServiceTime = (item, currentDate) => {
   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);
-  const diffInDays = endDate.diff(startDate, "day");
+  const diffInDays = (item == null ? void 0 : item.custom_day_count) || endDate.diff(startDate, "day");
   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];
@@ -85,7 +85,11 @@ var getServiceTime = (item, currentDate) => {
     endDate = (0, import_dayjs.default)(`${item == null ? void 0 : item.end_date} ${item == null ? void 0 : item.end_time}`);
   }
   const date = `${startDate.format(_format)} ~ ${endDate.format(_format)}`;
-  const duration = `${diffInDays} ${import_utils.locales.getText("pisell2.product.card.day")(diffInDays)}`;
+  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 duration = `${diffInDays}${text}`;
   return `${date} (${duration})`;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

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