@pisell/materials 6.12.65 → 6.12.67

package/lib/components/pisellFloorMapLayout/components/FloorMapSelectionZoneElement.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 //#region src/components/pisellFloorMapLayout/components/FloorMapSelectionZoneElement.d.ts
 interface FloorMapSelectionZoneElementProps {
   /** 选区名称；为空时展示「未命名选区」占位 */

package/lib/components/pisellGridPro/GridView/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { GridViewProps } from "./type.js";
 //#region src/components/pisellGridPro/GridView/index.d.ts
 declare const GridView: (props: GridViewProps) => JSX.Element;

package/lib/components/pisellGridPro/ToolBar/type.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 //#region src/components/pisellGridPro/ToolBar/type.d.ts
 interface ToolBarProps {
   className?: string;

package/lib/components/pisellInput/components/BankCard/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellContextType } from "../../../pisell-config-provider/context.js";
 import { InputProps } from "antd";
 //#region src/components/pisellInput/components/BankCard/index.d.ts

package/lib/components/pisellInput/components/Copy/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellContextType } from "../../../pisell-config-provider/context.js";
 import { ButtonProps, InputProps } from "antd";
 

package/lib/components/pisellInput/components/SecurityCode/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellContextType } from "../../../pisell-config-provider/context.js";
 import { InputProps } from "antd";
 //#region src/components/pisellInput/components/SecurityCode/index.d.ts

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellContextType } from "../pisell-config-provider/context.js";
 import { BankCardProps } from "./components/BankCard/index.js";
 import { SecurityCodeProps } from "./components/SecurityCode/index.js";

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SpinProps } from "antd";
 //#region src/components/pisellLoading/index.d.ts
 type MaskType = {

package/lib/components/pisellMenu/types.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { MenuProps } from "antd";
 
 //#region src/components/pisellMenu/types.d.ts

package/lib/components/pisellQuickFilter/type.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FilterItemProps } from "../filter/types.js";
 import { FormInstance } from "antd";
 

package/lib/components/pisellRecordBoard/shellFrame/Calendar/PisellRecordBoardCalendarView.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { RecordBoardCalendarProps } from "../../types.js";
 
 //#region src/components/pisellRecordBoard/shellFrame/Calendar/PisellRecordBoardCalendarView.d.ts

package/lib/components/pisellReservationSchedule/PisellReservationSchedule.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellReservationScheduleProps } from "./types.js";
 //#region src/components/pisellReservationSchedule/PisellReservationSchedule.d.ts
 /**

package/lib/components/pisellReservationScheduleBand/PisellReservationScheduleBand.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellReservationScheduleBandProps } from "./types.js";
 //#region src/components/pisellReservationScheduleBand/PisellReservationScheduleBand.d.ts
 /**

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellSortProps } from "./type.js";
 
 //#region src/components/pisellSort/index.d.ts

package/lib/components/pisellTimeNavigator/PisellTimeNavigator.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellTimeNavigatorProps } from "./types.js";
 //#region src/components/pisellTimeNavigator/PisellTimeNavigator.d.ts
 /**

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellContextType } from "../pisell-config-provider/context.js";
 import { TooltipPropsWithTitle } from "antd/es/tooltip";
 //#region src/components/pisellTooltip/index.d.ts

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { UploadProps } from "antd";
 //#region src/components/pisellUpload/index.d.ts
 interface PisellUploadProps extends UploadProps {

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

@@ -1,4 +1,5 @@
 import React from "react";
+import { WalletPassValidity } from "@pisell/utils";
 //#region src/components/pisellWalletPassCard/index.d.ts
 interface FormatOption {
   /** 原始 DOM 元素 */
@@ -58,6 +59,8 @@ interface PisellWalletPassCardProps {
   validDateBySchedule?: boolean;
   /** 日程列表 */
   scheduleList?: any[];
+  /** 卡自身的原始有效日期，与使用日程共同决定展示范围 */
+  walletValidity?: WalletPassValidity;
   /** 是否展示右上角详情按钮 */
   showDetail?: boolean;
   /** 是否展示qrCode */

package/lib/components/pisellWalletPassCard/index.js

@@ -43,7 +43,7 @@ const PisellWalletPassCard = (props) => {
 			if (pressTimer) clearTimeout(pressTimer);
 		};
 	}, [pressTimer]);
-	const { id, type, code, qrCode, balance, formattedBalance, disabledReason, name, storeName, redeem, validDate, disabled, active = false, cover, balanceTitle, redeemTitle, showCover = true, showDetail = true, showBalance = true, showRedeem = true, showName = true, showCode = true, showStoreName = true, showValidDate = true, showQrCode = true, showBalanceSymbol = true, showDisabledReason = true, showDiscount = false, discount, showActions, actions, beforeEdit, onBeforeEditAmount, onConfirmEdit, onConfirmEditAmount, onDetail, useExternalDetail = false, originData, style = {}, mode = "multiple", showActiveIcon, enableEditAmount, showStatus, cardStatus, nameTitleStyle, formatBalance, formatBalanceTitle, formatRedeem, formatRedeemTitle, maxRedeem, showHolderName = true, holder, onSetHolder, validDateBySchedule, scheduleList } = props;
+	const { id, type, code, qrCode, balance, formattedBalance, disabledReason, name, storeName, redeem, validDate, disabled, active = false, cover, balanceTitle, redeemTitle, showCover = true, showDetail = true, showBalance = true, showRedeem = true, showName = true, showCode = true, showStoreName = true, showValidDate = true, showQrCode = true, showBalanceSymbol = true, showDisabledReason = true, showDiscount = false, discount, showActions, actions, beforeEdit, onBeforeEditAmount, onConfirmEdit, onConfirmEditAmount, onDetail, useExternalDetail = false, originData, style = {}, mode = "multiple", showActiveIcon, enableEditAmount, showStatus, cardStatus, nameTitleStyle, formatBalance, formatBalanceTitle, formatRedeem, formatRedeemTitle, maxRedeem, showHolderName = true, holder, onSetHolder, validDateBySchedule, scheduleList, walletValidity } = props;
 	(0, react.useEffect)(() => {
 		document.body.id = "body";
 	}, []);
@@ -136,12 +136,22 @@ const PisellWalletPassCard = (props) => {
 		};
 	}();
 	const formatValidDate = (0, react.useMemo)(() => {
-		if (validDateBySchedule && scheduleList && (scheduleList === null || scheduleList === void 0 ? void 0 : scheduleList.length) > 0) return /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, require_index.getText("pisell-wallet-pass-card-valid"), " ", (0, _pisell_utils.getScheduleSummary)(scheduleList, config === null || config === void 0 ? void 0 : config.locale) || validDate);
+		if (validDateBySchedule && scheduleList && (scheduleList === null || scheduleList === void 0 ? void 0 : scheduleList.length) > 0) {
+			var _walletValidity$start, _ref2, _walletValidity$expir, _walletValidity$expir2;
+			return /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, require_index.getText("pisell-wallet-pass-card-valid"), " ", (0, _pisell_utils.getScheduleSummary)(scheduleList, config === null || config === void 0 ? void 0 : config.locale, {
+				start_date: (_walletValidity$start = walletValidity === null || walletValidity === void 0 ? void 0 : walletValidity.start_date) !== null && _walletValidity$start !== void 0 ? _walletValidity$start : originData === null || originData === void 0 ? void 0 : originData.start_date,
+				expire_date: (_ref2 = (_walletValidity$expir = walletValidity === null || walletValidity === void 0 ? void 0 : walletValidity.expire_date) !== null && _walletValidity$expir !== void 0 ? _walletValidity$expir : originData === null || originData === void 0 ? void 0 : originData.expire_date) !== null && _ref2 !== void 0 ? _ref2 : validDate,
+				expire_time: (_walletValidity$expir2 = walletValidity === null || walletValidity === void 0 ? void 0 : walletValidity.expire_time) !== null && _walletValidity$expir2 !== void 0 ? _walletValidity$expir2 : originData === null || originData === void 0 ? void 0 : originData.expire_time
+			}) || validDate);
+		}
 		return /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, require_index.getText("pisell-wallet-pass-card-valid-to"), " ", !!validDate ? validDate : require_index.getText("pisell-wallet-pass-card-expireDate"));
 	}, [
 		validDateBySchedule,
 		scheduleList,
-		validDate
+		validDate,
+		walletValidity,
+		originData,
+		config === null || config === void 0 ? void 0 : config.locale
 	]);
 	const _onConfirmEdit = () => {
 		form.validateFields().then((values) => {
@@ -242,7 +252,7 @@ const PisellWalletPassCard = (props) => {
 		return /* @__PURE__ */ react.default.createElement("div", { className: (0, classnames.default)("pisell-card-name-info-wrap") }, /* @__PURE__ */ react.default.createElement("div", { className: "pisell-card-name-wrap" }, showName && name), _showHolderName && /* @__PURE__ */ react.default.createElement("div", { className: "pisell-card-holder-name" }, holderName), shouldShowStoreName && /* @__PURE__ */ react.default.createElement("div", { className: "pisell-card-store-name" }, storeName));
 	};
 	const handleEditAmount = function() {
-		var _ref2 = require_asyncToGenerator._asyncToGenerator(function* (e) {
+		var _ref3 = require_asyncToGenerator._asyncToGenerator(function* (e) {
 			if (active && enableEditAmount) e.stopPropagation();
 			if (!active) return;
 			if (enableEditAmount && !disabled) {
@@ -263,7 +273,7 @@ const PisellWalletPassCard = (props) => {
 			}
 		});
 		return function handleEditAmount(_x) {
-			return _ref2.apply(this, arguments);
+			return _ref3.apply(this, arguments);
 		};
 	}();
 	const createOriginalBalanceTitleDom = () => /* @__PURE__ */ react.default.createElement("div", { className: "pisell-card-amount-item-label" }, formatBalanceTitle ? formatBalanceTitle(balanceTitle, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 //#region src/components/qrcode/index.d.ts
 declare const QRCode: (props: any) => JSX.Element;
 //#endregion

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 //#region src/components/radio/index.d.ts
 declare const Radio: (props: any) => JSX.Element;
 //#endregion

package/lib/components/section-footers/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 //#region src/components/section-footers/index.d.ts
 interface SectionFooterProps {
   left?: React.ReactNode;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SegmentedProps } from "antd";
 //#region src/components/segmented/index.d.ts
 declare const Segmented: (props: SegmentedProps) => JSX.Element;

package/lib/components/select-time/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { VirtualKeyboardTimeProps } from "../virtual-keyboard/Time/index.js";
 import { PopoverProps, TimePickerProps } from "antd";
 //#region src/components/select-time/index.d.ts

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 //#region src/components/skeleton/index.d.ts
 declare const Skeleton: (props: any) => JSX.Element;
 //#endregion

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 //#region src/components/slider/index.d.ts
 declare const SliderOuter: (props: any) => JSX.Element;
 //#endregion

package/lib/components/time-picker/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 //#region src/components/time-picker/index.d.ts
 declare const TimePicker: (props: any) => JSX.Element;
 //#endregion

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 //#region src/components/upload/index.d.ts
 declare const Upload: (props: any) => JSX.Element;
 //#endregion

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 //#region src/components/versionSelect/index.d.ts
 interface Version {

package/lib/components/virtual-keyboard/Amount/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { AmountProps, RightItemsStyleProps } from "./types.js";
 //#region src/components/virtual-keyboard/Amount/index.d.ts
 declare const Amount: (props: AmountProps) => JSX.Element;

package/lib/components/virtual-keyboard/Amount/types.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { BaseNumberKeyboardProps } from "../BaseNumberKeyboard/index.js";
 
 //#region src/components/virtual-keyboard/Amount/types.d.ts

package/lib/components/virtual-keyboard/Number/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { NumberProps } from "./types.js";
 //#region src/components/virtual-keyboard/Number/index.d.ts
 declare const Number: (props: NumberProps) => JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "6.12.65",
+  "version": "6.12.67",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -95,9 +95,9 @@
     "swiper": "^8.4.7",
     "antd-mobile": "^5.38.1",
     "vod-js-sdk-v6": "^1.4.11",
-    "@pisell/date-picker": "3.0.10",
+    "@pisell/date-picker": "3.0.12",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.4"
+    "@pisell/utils": "3.0.6"
   },
   "peerDependencies": {
     "react": "^18.0.0",