@pisell/private-materials 3.3.24 → 3.3.25

package/es/components/booking/forms/single/index.js

@@ -20,6 +20,8 @@ import CollapsibleList from "../../components/collapsibleList";
 import "./index.less";
 import RenderValueById from "./RenderValueById";
 import useComponents from "../../../../hooks/useComponents";
+import dayjs from 'dayjs';
+import { formatDate } from "../../../../utils/date";
 var queryValueById = ['checkbox', 'radioButton', 'select', 'form_to_form'];
 
 /**
@@ -30,7 +32,7 @@ var queryValueById = ['checkbox', 'radioButton', 'select', 'form_to_form'];
  * @Date: 2024-01-30 17:06
  */
 var Single = function Single(_ref) {
-  var _form$form3, _form$form4;
+  var _form$form4, _form$form5;
   var value = _ref.value,
     onChange = _ref.onChange,
     form = _ref.form,
@@ -166,6 +168,53 @@ var Single = function Single(_ref) {
       }
     });
   }, [form]);
+  console.log('fff', form);
+  var ignoreValidity = useMemo(function () {
+    var _form$form;
+    return !(form !== null && form !== void 0 && (_form$form = form.form) !== null && _form$form !== void 0 && (_form$form = _form$form.setting) !== null && _form$form !== void 0 && _form$form.validity) || form.form.setting.validity.type === 'no_expiry';
+  }, [form === null || form === void 0 ? void 0 : form.form]);
+  var getExpireStatus = function getExpireStatus(expiredAt) {
+    if (ignoreValidity || !expiredAt) return null;
+    var now = dayjs();
+    // 将过期时间设置为当天的最后一秒
+    var expireDate = dayjs(expiredAt).endOf('day');
+    var diffDays = expireDate.diff(now, 'day');
+    // 格式化显示日期（不显示时间）
+    var cnDate = 'YYYY-MM-DD';
+    var enDate = 'DD/MM/YYYY';
+    var formattedDate = formatDate(expireDate, cnDate, enDate);
+    if (now.isAfter(expireDate)) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          color: '#999999',
+          fontSize: '14px',
+          lineHeight: '20px'
+        }
+      }, /*#__PURE__*/React.createElement(Tag, {
+        color: "red",
+        style: {
+          borderRadius: 16,
+          marginRight: 8
+        }
+      }, locales.getText('pisell2.text.status.expired')), locales.getText('pisell2.text.validity.expired')(formattedDate));
+    }
+    if (diffDays < 7) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          color: '#FFA940',
+          fontSize: '14px',
+          lineHeight: '20px'
+        }
+      }, locales.getText('pisell2.text.validity.expiring_soon')(formattedDate));
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: '#999999',
+        fontSize: '14px',
+        lineHeight: '20px'
+      }
+    }, locales.getText('pisell2.text.validity.valid_through')(formattedDate));
+  };
 
   /**
    * @title: 渲染字段
@@ -181,16 +230,16 @@ var Single = function Single(_ref) {
     }
     return /*#__PURE__*/React.createElement("div", {
       style: {
-        flex: 1,
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'space-between'
+        flex: 1
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: '#1B1B1B',
+        fontSize: 16,
+        fontWeight: 600,
+        lineHeight: '22px'
       }
-    }, item['main_field'] || item[form.option_key] || '-', item !== null && item !== void 0 && item.status ? item.status === 'valid' ? /*#__PURE__*/React.createElement(Tag, {
-      color: "#56c064"
-    }, locales.getText('pisell2.text.status.valid')) : /*#__PURE__*/React.createElement(Tag, {
-      color: "#d83963"
-    }, locales.getText('pisell2.text.status.expired')) : null);
+    }, item['main_field'] || item[form.option_key] || '-'), /*#__PURE__*/React.createElement("div", null, getExpireStatus(item.expired_at)));
   };
 
   /**
@@ -202,10 +251,10 @@ var Single = function Single(_ref) {
    * @Date: 2024-01-30 17:09
    */
   var _addButtonProps = useMemo(function () {
-    var _form$form, _form$form2;
+    var _form$form2, _form$form3;
     var obj = _objectSpread({
-      title: "".concat(locales.getText('pisell2.text.add-a'), " ").concat(((_form$form = form.form) === null || _form$form === void 0 ? void 0 : _form$form.title) || '-'),
-      subTitle: "".concat(locales.getText('pisell2.text.add-another'), " ").concat(((_form$form2 = form.form) === null || _form$form2 === void 0 ? void 0 : _form$form2.title) || '-')
+      title: "".concat(locales.getText('pisell2.text.add-a'), " ").concat(((_form$form2 = form.form) === null || _form$form2 === void 0 ? void 0 : _form$form2.title) || '-'),
+      subTitle: "".concat(locales.getText('pisell2.text.add-another'), " ").concat(((_form$form3 = form.form) === null || _form$form3 === void 0 ? void 0 : _form$form3.title) || '-')
     }, addButtonProps);
     // 表单和表格点击事件触发新增弹窗
     if (['form', 'table'].includes(form.type)) {
@@ -246,10 +295,10 @@ var Single = function Single(_ref) {
     previewItemRender: function previewItemRender(d) {
       return renderItem(d);
     },
-    name: ((_form$form3 = form.form) === null || _form$form3 === void 0 ? void 0 : _form$form3.title) || '-',
+    name: ((_form$form4 = form.form) === null || _form$form4 === void 0 ? void 0 : _form$form4.title) || '-',
     addButtonProps: _addButtonProps,
     drawerProps: _objectSpread({
-      title: "".concat(locales.getText('pisell2.text.select'), " ").concat(((_form$form4 = form.form) === null || _form$form4 === void 0 ? void 0 : _form$form4.title) || '-'),
+      title: "".concat(locales.getText('pisell2.text.select'), " ").concat(((_form$form5 = form.form) === null || _form$form5 === void 0 ? void 0 : _form$form5.title) || '-'),
       destroyOnClose: true
     }, drawerProps || {}),
     optionRender: _optionRender,

package/es/components/booking/info/pet/index.js

@@ -34,6 +34,7 @@ import "./index.less";
 import useAddHolder, { useFormDataConfig } from "../hooks/useAddHolder";
 import useGetHolderList from "../hooks/useGetHolderList";
 import dayjs from 'dayjs';
+import { formatDate } from "../../../../utils/date";
 var defaultParams = {
   skip: 1,
   num: 20,
@@ -558,7 +559,9 @@ var Pet = function Pet(props) {
     var expireDate = dayjs(expiredAt).endOf('day');
     var diffDays = expireDate.diff(now, 'day');
     // 格式化显示日期（不显示时间）
-    var formattedDate = expireDate.format('YYYY-MM-DD');
+    var cnDate = 'YYYY-MM-DD';
+    var enDate = 'DD/MM/YYYY';
+    var formattedDate = formatDate(expireDate, cnDate, enDate);
     if (now.isAfter(expireDate)) {
       return /*#__PURE__*/React.createElement("div", {
         style: {
@@ -574,7 +577,7 @@ var Pet = function Pet(props) {
         }
       }, locales.getText('pisell2.text.status.expired')), locales.getText('pisell2.text.validity.expired')(formattedDate));
     }
-    if (diffDays <= 7) {
+    if (diffDays < 7) {
       return /*#__PURE__*/React.createElement("div", {
         style: {
           color: '#FFA940',

package/es/components/productSelect/components/productGroup/index.less

@@ -11,7 +11,7 @@
   .group-row {
     .product-card {
       min-width: 363px;
-      max-width: 737px;
+      max-width: unset;
       box-sizing: border-box;
       margin-top: 12px;
     }

package/es/utils/date.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @title: 格式化时间
+ * @description:
+ * @param {Moment} date 时间
+ * @param {string} cnFormat 中文
+ * @param {string} enFormat 英文
+ * @return {*}
+ * @Author: Wzw
+ * @Date: 2022-07-28 11:57
+ */
+export declare const formatDate: (date: any, cnFormat?: string, enFormat?: string) => string;

package/es/utils/date.js

@@ -0,0 +1,49 @@
+import dayjs from "dayjs";
+import { getLocale } from "./locales";
+/**
+ * @title: 格式化时间
+ * @description:
+ * @param {Moment} date 时间
+ * @param {string} cnFormat 中文
+ * @param {string} enFormat 英文
+ * @return {*}
+ * @Author: Wzw
+ * @Date: 2022-07-28 11:57
+ */
+export var formatDate = function formatDate(date, cnFormat, enFormat) {
+  var _cnFormat = cnFormat || 'LL';
+  var _enFormat = enFormat || _cnFormat;
+  // 澳大利亚
+  // ll 20 Jul 2022
+  // LL 20 July 2022
+  // D MMM   20 July
+  // D MMMM  20 July
+
+  // 中国
+  // ll 2022年07月20日
+  // LL 2022年07月20日
+  // MMM Do   7月20日
+  // MMMM Do   07月20日
+  // 时分秒
+  // hh:mm:ss 05:01:41
+
+  // 一天内的时间段: Sunday, 6 July  ⋅  10:00 – 11:30
+  var format = _cnFormat;
+  var dayjs_local = 'zh-cn';
+  var umi_locale = getLocale();
+  // 中文环境切换moment语言为中文, 其他环境默认澳大利亚
+  if (umi_locale !== 'zh-CN' && umi_locale !== 'zh-HK') {
+    dayjs_local = 'en-au';
+    format = _enFormat;
+  }
+
+  // 繁体
+  if (umi_locale === 'zh-TW') {
+    dayjs_local = 'zh-tw';
+    format = _cnFormat;
+  }
+
+  // 设置moment语言
+  dayjs.locale(dayjs_local);
+  return dayjs(date).format(format);
+};

package/lib/components/booking/forms/single/index.js

@@ -41,6 +41,8 @@ var import_collapsibleList = __toESM(require("../../components/collapsibleList")
 var import_index = require("./index.less");
 var import_RenderValueById = __toESM(require("./RenderValueById"));
 var import_useComponents = __toESM(require("../../../../hooks/useComponents"));
+var import_dayjs = __toESM(require("dayjs"));
+var import_date = require("../../../../utils/date");
 var queryValueById = ["checkbox", "radioButton", "select", "form_to_form"];
 var Single = ({
   value,
@@ -138,6 +140,29 @@ var Single = ({
     },
     [form]
   );
+  console.log("fff", form);
+  const ignoreValidity = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
+    return !((_b2 = (_a2 = form == null ? void 0 : form.form) == null ? void 0 : _a2.setting) == null ? void 0 : _b2.validity) || form.form.setting.validity.type === "no_expiry";
+  }, [form == null ? void 0 : form.form]);
+  const getExpireStatus = (expiredAt) => {
+    if (ignoreValidity || !expiredAt) return null;
+    const now = (0, import_dayjs.default)();
+    const expireDate = (0, import_dayjs.default)(expiredAt).endOf("day");
+    const diffDays = expireDate.diff(now, "day");
+    let cnDate = "YYYY-MM-DD";
+    let enDate = "DD/MM/YYYY";
+    const formattedDate = (0, import_date.formatDate)(expireDate, cnDate, enDate);
+    if (now.isAfter(expireDate)) {
+      return /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#999999", fontSize: "14px", lineHeight: "20px" } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Tag, { color: "red", style: { borderRadius: 16, marginRight: 8 } }, import_utils.locales.getText("pisell2.text.status.expired")), import_utils.locales.getText("pisell2.text.validity.expired")(formattedDate));
+    }
+    if (diffDays < 7) {
+      return /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#FFA940", fontSize: "14px", lineHeight: "20px" } }, import_utils.locales.getText("pisell2.text.validity.expiring_soon")(
+        formattedDate
+      ));
+    }
+    return /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#999999", fontSize: "14px", lineHeight: "20px" } }, import_utils.locales.getText("pisell2.text.validity.valid_through")(formattedDate));
+  };
   const _optionRender = (item) => {
     if (optionRender) {
       return optionRender(item);
@@ -146,14 +171,11 @@ var Single = ({
       "div",
       {
         style: {
-          flex: 1,
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "space-between"
+          flex: 1
         }
       },
-      item["main_field"] || item[form.option_key] || "-",
-      (item == null ? void 0 : item.status) ? item.status === "valid" ? /* @__PURE__ */ import_react.default.createElement(import_antd.Tag, { color: "#56c064" }, import_utils.locales.getText("pisell2.text.status.valid")) : /* @__PURE__ */ import_react.default.createElement(import_antd.Tag, { color: "#d83963" }, import_utils.locales.getText("pisell2.text.status.expired")) : null
+      /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#1B1B1B", fontSize: 16, fontWeight: 600, lineHeight: "22px" } }, item["main_field"] || item[form.option_key] || "-"),
+      /* @__PURE__ */ import_react.default.createElement("div", null, getExpireStatus(item.expired_at))
     );
   };
   const _addButtonProps = (0, import_react.useMemo)(() => {

package/lib/components/booking/info/pet/index.js

@@ -48,6 +48,7 @@ var import_index = require("./index.less");
 var import_useAddHolder = __toESM(require("../hooks/useAddHolder"));
 var import_useGetHolderList = __toESM(require("../hooks/useGetHolderList"));
 var import_dayjs = __toESM(require("dayjs"));
+var import_date = require("../../../../utils/date");
 var defaultParams = {
   skip: 1,
   num: 20,
@@ -428,11 +429,13 @@ var Pet = (props) => {
     const now = (0, import_dayjs.default)();
     const expireDate = (0, import_dayjs.default)(expiredAt).endOf("day");
     const diffDays = expireDate.diff(now, "day");
-    const formattedDate = expireDate.format("YYYY-MM-DD");
+    let cnDate = "YYYY-MM-DD";
+    let enDate = "DD/MM/YYYY";
+    const formattedDate = (0, import_date.formatDate)(expireDate, cnDate, enDate);
     if (now.isAfter(expireDate)) {
       return /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#999999", fontSize: "14px", lineHeight: "20px" } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Tag, { color: "red", style: { borderRadius: 16, marginRight: 8 } }, import_utils.locales.getText("pisell2.text.status.expired")), import_utils.locales.getText("pisell2.text.validity.expired")(formattedDate));
     }
-    if (diffDays <= 7) {
+    if (diffDays < 7) {
       return /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#FFA940", fontSize: "14px", lineHeight: "20px" } }, import_utils.locales.getText("pisell2.text.validity.expiring_soon")(
         formattedDate
       ));

package/lib/components/productSelect/components/productGroup/index.less

@@ -11,7 +11,7 @@
   .group-row {
     .product-card {
       min-width: 363px;
-      max-width: 737px;
+      max-width: unset;
       box-sizing: border-box;
       margin-top: 12px;
     }

package/lib/utils/date.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @title: 格式化时间
+ * @description:
+ * @param {Moment} date 时间
+ * @param {string} cnFormat 中文
+ * @param {string} enFormat 英文
+ * @return {*}
+ * @Author: Wzw
+ * @Date: 2022-07-28 11:57
+ */
+export declare const formatDate: (date: any, cnFormat?: string, enFormat?: string) => string;

package/lib/utils/date.js

@@ -0,0 +1,57 @@
+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/utils/date.ts
+var date_exports = {};
+__export(date_exports, {
+  formatDate: () => formatDate
+});
+module.exports = __toCommonJS(date_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_locales = require("./locales");
+var formatDate = (date, cnFormat, enFormat) => {
+  let _cnFormat = cnFormat || "LL";
+  let _enFormat = enFormat || _cnFormat;
+  let format = _cnFormat;
+  let dayjs_local = "zh-cn";
+  const umi_locale = (0, import_locales.getLocale)();
+  if (umi_locale !== "zh-CN" && umi_locale !== "zh-HK") {
+    dayjs_local = "en-au";
+    format = _enFormat;
+  }
+  if (umi_locale === "zh-TW") {
+    dayjs_local = "zh-tw";
+    format = _cnFormat;
+  }
+  import_dayjs.default.locale(dayjs_local);
+  return (0, import_dayjs.default)(date).format(format);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatDate
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.24",
+  "version": "3.3.25",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
+    "@pisell/utils": "1.0.42",
     "@pisell/materials": "3.3.7",
-    "@pisell/date-picker": "3.0.2",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "1.0.42"
+    "@pisell/date-picker": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",