@pisell/private-materials 3.3.24 → 3.3.26

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/appointmentBooking/components/Cart/Item/index.d.ts

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

package/lib/components/appointmentBooking/components/Content/index.d.ts

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

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

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

package/lib/components/booking/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/components/footer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

package/lib/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/forms/single/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

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/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/lib/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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/booking/info/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {

package/lib/components/booking/info/utils.js

@@ -104,7 +104,7 @@ var isBooking4Shop = (shopId, renderType) => {
   if (renderType === "eventBooking") {
     return false;
   }
-  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 6813];
+  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 6813, 8609, 8610, 8782];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

package/lib/components/booking/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -105,11 +104,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/unknow.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

package/lib/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps } from './const';
 import './index.less';
 declare const _default: (props: PosProps) => JSX.Element | null;

package/lib/components/eftposPay/pay.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

package/lib/components/eftposPay/store/index.d.ts

@@ -297,7 +297,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | undefined;
+        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | undefined;
         action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;

package/lib/components/eventBooking/components/bookingDetailModal/components/Schedule.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Schedule: () => JSX.Element;
 export default Schedule;

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

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

package/lib/components/pay/toC/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -25,11 +24,4 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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/components/ruleSetting/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

package/lib/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/schedules/utils.js

@@ -27,8 +27,8 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var Request = class {
+  request = {};
   constructor() {
-    this.request = {};
   }
   setRequest(val) {
     this.request = val;

package/lib/components/wallet/Detail/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    addWalletCard: any;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    walletDetailState: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/DiscountCard/model.d.ts

@@ -1,14 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: number;
-    setup?: 'menu' | 'list' | 'detail' | string;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/PointCard/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: number;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/RechargeableCard/model.d.ts

@@ -1,29 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    selectedGiftOptionId: string | null;
-    cardList: Array<{
-        id: string;
-        name: string;
-        price: number;
-    }>;
-    selectedItem: {
-        id?: string;
-        gift_price?: number;
-        price?: number;
-        name?: string;
-        variant_id?: string;
-    };
-    productId?: string;
-    detailId?: string;
-    total: string | number;
-    rechargeModalOpen: boolean;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/Voucher/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: 0;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IWalletListItemProps } from './serve';
 export interface WalletCardItemProps {
     id: string;
@@ -27,11 +26,4 @@ export interface WalletListProps {
     currentSearchListItemCode?: string;
     [key: string]: any;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    global_wallet: WalletListProps;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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.26",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,9 +60,9 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/materials": "3.3.7",
-    "@pisell/date-picker": "3.0.2",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "1.0.42"
+    "@pisell/utils": "1.0.42",
+    "@pisell/date-picker": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",