@pisell/materials 6.6.2 → 6.6.3

package/es/components/dataSourceComponents/hooks/useActions.js

@@ -258,32 +258,38 @@ var useActions = function useActions() {
             designModeToast();
             return _context4.abrupt("return", Promise.reject());
           case 3:
+            if (!(currentDataSource !== null && currentDataSource !== void 0 && currentDataSource.fromSettingMeta)) {
+              _context4.next = 5;
+              break;
+            }
+            return _context4.abrupt("return", Promise.reject());
+          case 5:
             if (!isCustomApi) {
-              _context4.next = 11;
+              _context4.next = 13;
               break;
             }
             actions = getParsedActions();
             if (actions.update) {
-              _context4.next = 7;
+              _context4.next = 9;
               break;
             }
             return _context4.abrupt("return", {});
-          case 7:
+          case 9:
             updateApi = genCustomApi(actions === null || actions === void 0 ? void 0 : actions.update);
             return _context4.abrupt("return", updateApi(formatCreateUpdateParams(values)));
-          case 11:
+          case 13:
             id = (extraParams === null || extraParams === void 0 ? void 0 : extraParams.filterByTk) || (values === null || values === void 0 ? void 0 : values.id);
             if (!(!id || !name)) {
-              _context4.next = 15;
+              _context4.next = 17;
               break;
             }
             PisellToast({
               content: getText('pisell-action-get-data')
             });
             return _context4.abrupt("return", Promise.reject());
-          case 15:
-            _context4.prev = 15;
-            _context4.next = 18;
+          case 17:
+            _context4.prev = 17;
+            _context4.next = 20;
             return updateNocobaseData({
               key: name,
               data: formatCreateUpdateParams(values),
@@ -292,18 +298,18 @@ var useActions = function useActions() {
                 filterByTk: id
               }, extraParams === null || extraParams === void 0 ? void 0 : extraParams.update)
             });
-          case 18:
+          case 20:
             res = _context4.sent;
             return _context4.abrupt("return", res);
-          case 22:
-            _context4.prev = 22;
-            _context4.t0 = _context4["catch"](15);
+          case 24:
+            _context4.prev = 24;
+            _context4.t0 = _context4["catch"](17);
             return _context4.abrupt("return", Promise.reject());
-          case 25:
+          case 27:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[15, 22]]);
+      }, _callee4, null, [[17, 24]]);
     }));
     return function (_x3) {
       return _ref12.apply(this, arguments);

package/es/components/pisellQrcode/index.d.ts

@@ -2,9 +2,9 @@ import React from 'react';
 import './index.less';
 interface PisellQrcodeProps {
     size?: number;
-    platform: 'pc' | 'h5' | 'ipad';
+    platform?: 'pc' | 'h5' | 'ipad';
     value: string;
-    className: string;
+    className?: string;
 }
 declare const PisellQrcode: React.FC<PisellQrcodeProps>;
 export default PisellQrcode;

package/es/components/pisellToast/squareToast/renderImperatively.d.ts

@@ -24,6 +24,5 @@ export declare function unmount(container: ContainerType): Promise<void>;
  * @deprecated 设置 React 渲染函数以兼容使用。
  */
 export declare function unstableSetRender(render?: RenderType): RenderType;
-export declare function renderToBody(element: ReactElement): UnmountType;
 export declare function renderImperatively(element: TargetElement): ImperativeHandler;
 export {};

package/es/components/pisellToast/squareToast/renderImperatively.js

@@ -14,16 +14,37 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import * as ReactDOM from 'react-dom';
-import { createRoot } from 'react-dom/client';
 import React, { useEffect, useImperativeHandle, useRef, useState } from 'react';
 var MARK = '__pisell_react_root__';
 
 // ========================== Render ==========================
 
 export function render(node, container) {
-  var root = container[MARK] || createRoot(container);
-  root.render(node);
-  container[MARK] = root;
+  var root = container[MARK];
+  if (root) {
+    root.render(node);
+    return;
+  }
+  var ReactMajorVersion = parseInt(React.version.split('.')[0], 10);
+  var isReact18OrNewer = ReactMajorVersion >= 18;
+
+  // 尝试探测 ReactDOM.createRoot (某些环境或 Polyfill)
+  var fallbackCreateRoot = ReactDOM.createRoot;
+  if (isReact18OrNewer && fallbackCreateRoot) {
+    var _root = fallbackCreateRoot(container);
+    _root.render(node);
+    container[MARK] = _root;
+    return;
+  }
+
+  // React 19 强制检查：如果此时还没找到 createRoot，必须报错
+  // 因为 React 19 已移除 ReactDOM.render
+  if (ReactMajorVersion >= 19) {
+    console.error('[pisellToast] React 19+ requires `createRoot`. Please call `setCreateRoot(createRoot)` at your app entry.');
+  }
+
+  // 降级到 Legacy Render (React 16/17 或 React 18 Legacy Mode)
+  ReactDOM.render(node, container);
 }
 
 // ========================= Unmount ==========================
@@ -36,9 +57,15 @@ function _unmount() {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           return _context2.abrupt("return", Promise.resolve().then(function () {
-            var _container$MARK;
-            (_container$MARK = container[MARK]) === null || _container$MARK === void 0 || _container$MARK.unmount();
-            delete container[MARK];
+            if (container[MARK]) {
+              var _container$MARK;
+              // React 18+ with createRoot
+              (_container$MARK = container[MARK]) === null || _container$MARK === void 0 || _container$MARK.unmount();
+              delete container[MARK];
+            } else {
+              // Legacy React 16/17
+              ReactDOM.unmountComponentAtNode(container);
+            }
           }));
         case 1:
         case "end":
@@ -49,12 +76,6 @@ function _unmount() {
   return _unmount.apply(this, arguments);
 }
 var defaultReactRender = function defaultReactRender(node, container) {
-  // React 19 及以上版本 ，只在开发环境下警告
-  if (process.env.NODE_ENV !== 'production') {
-    var majorVersion = parseInt(React.version.split('.')[0], 10);
-    var fullKeys = Object.keys(ReactDOM);
-    console.warn(majorVersion < 19 || fullKeys.includes('createRoot'), "[Compatible] Toast support React is 16 ~ 18.");
-  }
   render(node, container);
   return function () {
     return unmount(container);
@@ -71,9 +92,13 @@ export function unstableSetRender(render) {
   }
   return unstableRender;
 }
-export function renderToBody(element) {
-  var container = document.createElement('div');
-  document.body.appendChild(container);
+var sharedContainer = null;
+function renderToBody(element) {
+  if (!sharedContainer) {
+    sharedContainer = document.createElement('div');
+    document.body.appendChild(sharedContainer);
+  }
+  var container = sharedContainer;
   return unstableSetRender()(element, container);
 }
 export function renderImperatively(element) {

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

@@ -134,6 +134,12 @@ export interface PisellWalletPassCardProps {
     maxRedeem?: number;
     /** 编辑金额前事件 */
     onBeforeEditAmount?: (value: any) => Promise<any> | boolean | void;
+    /** 是否显示持有人 */
+    showHolderName?: boolean;
+    /** 持有人, 表单记录，展示时一般取main_field */
+    holder?: any;
+    /** 持有人点击回调 */
+    onSetHolder?: (currentValue?: any) => void;
     [key: string]: any;
 }
 declare const PisellWalletPassCard: (props: PisellWalletPassCardProps) => JSX.Element;

package/es/components/pisellWalletPassCard/index.js

@@ -17,7 +17,7 @@ import React, { useEffect, useMemo, useRef } from 'react';
 import { useSize } from 'ahooks';
 import classNames from 'classnames';
 import { CheckCircleFilled, EditOutlined, ExclamationCircleOutlined, MoreOutlined } from '@ant-design/icons';
-import { Dropdown, Form, Input, InputNumber, DatePicker, Radio } from 'antd';
+import { Button, Dropdown, Form, Input, InputNumber, DatePicker, Radio } from 'antd';
 import dayjs from 'dayjs';
 import Iconfont from "../iconfont";
 import { PisellModal, usePisellConfig } from "../../index";
@@ -146,6 +146,10 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
     formatRedeem = props.formatRedeem,
     formatRedeemTitle = props.formatRedeemTitle,
     maxRedeem = props.maxRedeem,
+    _props$showHolderName = props.showHolderName,
+    showHolderName = _props$showHolderName === void 0 ? true : _props$showHolderName,
+    holder = props.holder,
+    onSetHolder = props.onSetHolder,
     validDateBySchedule = props.validDateBySchedule,
     scheduleList = props.scheduleList;
   useEffect(function () {
@@ -289,35 +293,6 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
       return _ref.apply(this, arguments);
     };
   }();
-
-  // 添加长按相关处理函数
-  var handleTouchStart = function handleTouchStart() {
-    var _actions$edit3;
-    if (disabled || disabledReason || !(actions !== null && actions !== void 0 && (_actions$edit3 = actions.edit) !== null && _actions$edit3 !== void 0 && _actions$edit3.enableDialog)) return;
-    var timer = setTimeout(function () {
-      onEdit();
-    }, 500); // 500ms 长按阈值
-
-    setPressTimer(timer);
-  };
-  var handleTouchEnd = function handleTouchEnd() {
-    if (pressTimer) {
-      clearTimeout(pressTimer);
-      setPressTimer(null);
-    }
-  };
-
-  // 处理移动端双击
-  var handleTap = function handleTap() {
-    if (disabled || disabledReason) return;
-    var now = Date.now();
-    var DOUBLE_TAP_DELAY = 300; // 双击间隔阈值
-
-    if (now - lastTap < DOUBLE_TAP_DELAY) {
-      handleDetail();
-    }
-    setLastTap(now);
-  };
   var formatValidDate = useMemo(function () {
     if (validDateBySchedule && scheduleList && (scheduleList === null || scheduleList === void 0 ? void 0 : scheduleList.length) > 0) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, getText('pisell-wallet-pass-card-valid'), ' ', getScheduleSummary(scheduleList, config === null || config === void 0 ? void 0 : config.locale) || validDate);
@@ -347,7 +322,7 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
     if ((disabled || disabledReason) && !showStatus) return null;
     if ((!showActions || !actions) && !showStatus) return null;
     if ('collapsed' === (actions === null || actions === void 0 ? void 0 : actions.layout)) {
-      var _actions$detail2, _actions$edit4;
+      var _actions$detail2, _actions$edit3;
       var items = [];
       if (actions !== null && actions !== void 0 && actions.detail && actions !== null && actions !== void 0 && (_actions$detail2 = actions.detail) !== null && _actions$detail2 !== void 0 && _actions$detail2.visible) {
         items.push({
@@ -361,7 +336,7 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
           }, /*#__PURE__*/React.createElement("span", null, getText('pisell-wallet-pass-card-detail')))
         });
       }
-      if (actions !== null && actions !== void 0 && actions.edit && actions !== null && actions !== void 0 && (_actions$edit4 = actions.edit) !== null && _actions$edit4 !== void 0 && _actions$edit4.visible) {
+      if (actions !== null && actions !== void 0 && actions.edit && actions !== null && actions !== void 0 && (_actions$edit3 = actions.edit) !== null && _actions$edit3 !== void 0 && _actions$edit3.visible) {
         items.push({
           key: 'edit',
           label: /*#__PURE__*/React.createElement("div", {
@@ -392,7 +367,7 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
       })));
     }
     if ('expanded' === (actions === null || actions === void 0 ? void 0 : actions.layout) || showStatus) {
-      var _actions$detail3, _actions$edit5;
+      var _actions$detail3, _actions$edit4;
       return /*#__PURE__*/React.createElement("div", {
         className: "actions-btn-wrapper",
         ref: actionsWrapperRef
@@ -418,7 +393,7 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
           fontSize: 24,
           color: actions.detail.iconColor || '#1570EF'
         }
-      })), (actions === null || actions === void 0 ? void 0 : actions.edit) && (actions === null || actions === void 0 || (_actions$edit5 = actions.edit) === null || _actions$edit5 === void 0 ? void 0 : _actions$edit5.visible) && /*#__PURE__*/React.createElement("div", {
+      })), (actions === null || actions === void 0 ? void 0 : actions.edit) && (actions === null || actions === void 0 || (_actions$edit4 = actions.edit) === null || _actions$edit4 === void 0 ? void 0 : _actions$edit4.visible) && /*#__PURE__*/React.createElement("div", {
         className: "pisell-card-actions-edit-btn",
         onClick: function onClick(e) {
           stop(e);
@@ -432,12 +407,25 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
       })));
     }
   };
+  var _showHolderName = useMemo(function () {
+    return (holder === null || holder === void 0 ? void 0 : holder.holder_type) === 'form' && showHolderName;
+  }, [holder, showHolderName]);
+  var holderName = useMemo(function () {
+    var _holder$detail;
+    if ((holder === null || holder === void 0 ? void 0 : holder.holder_type) === 'form' && !(holder !== null && holder !== void 0 && holder.holder_id)) {
+      return '--';
+    }
+    return (holder === null || holder === void 0 || (_holder$detail = holder.detail) === null || _holder$detail === void 0 ? void 0 : _holder$detail.main_field) || '';
+  }, [holder]);
   var renderNameInfo = function renderNameInfo() {
     var shouldShowStoreName = typeof showStoreName === 'function' ? showStoreName(props) : showStoreName;
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-      className: "pisell-card-name-wrap",
-      style: dynamicNameWrapStyle
-    }, showName && name), shouldShowStoreName && /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement("div", {
+      className: classNames('pisell-card-name-info-wrap')
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "pisell-card-name-wrap"
+    }, showName && name), _showHolderName && /*#__PURE__*/React.createElement("div", {
+      className: "pisell-card-holder-name"
+    }, holderName), shouldShowStoreName && /*#__PURE__*/React.createElement("div", {
       className: "pisell-card-store-name"
     }, storeName));
   };
@@ -524,11 +512,8 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
       // onClick={handleEditAmount}
     });
   };
-  var renderBalanceInfo = function renderBalanceInfo() {
-    var _props$metadata;
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-      className: "pisell-card-amount-wrap"
-    }, showRedeem && !disabled && /*#__PURE__*/React.createElement("div", {
+  var renderRedeemInfo = function renderRedeemInfo() {
+    return showRedeem && !disabled && /*#__PURE__*/React.createElement("div", {
       className: "pisell-card-amount-item pisell-wallet-pass-card-redeem"
     }, /*#__PURE__*/React.createElement("div", {
       className: "pisell-card-amount-item-label"
@@ -540,17 +525,23 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
       originDom: createOriginalRedeemDom(),
       active: active,
       data: props
-    }) : createOriginalRedeemDom()), showBalance && /*#__PURE__*/React.createElement("div", {
-      className: "pisell-card-amount-item pisell-wallet-pass-card-balance"
+    }) : createOriginalRedeemDom());
+  };
+  var renderBalanceInfo = function renderBalanceInfo() {
+    var _props$metadata;
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+      className: "pisell-card-amount-info-wrap"
+    }, showBalance && /*#__PURE__*/React.createElement("div", {
+      className: "pisell-card-amount-item pisell-card-amount-item-balance"
     }, createOriginalBalanceTitleDom(), formatBalance ? formatBalance(balance, {
       originDom: createOriginalBalanceDom(),
       active: active,
       data: props
     }) : createOriginalBalanceDom()), showDiscount && /*#__PURE__*/React.createElement("div", {
-      className: "pisell-card-amount-item"
+      className: "pisell-card-amount-item pisell-card-amount-item-discount"
     }, /*#__PURE__*/React.createElement("div", {
       className: "pisell-card-amount-item-label"
-    }, getText('pisell-discount-card-title')), /*#__PURE__*/React.createElement("div", {
+    }, getText('pisell-discount-card-title'), ': '), /*#__PURE__*/React.createElement("div", {
       className: "pisell-card-amount-item-value"
     }, ((_props$metadata = props.metadata) === null || _props$metadata === void 0 ? void 0 : _props$metadata.discount_card_type) === 'fixed_amount' ? /*#__PURE__*/React.createElement(React.Fragment, null, getText('pisell-discount-card-fixed-amount-prefix'), ' ', /*#__PURE__*/React.createElement(Amount, {
       className: "pisell-card-amount-item-value",
@@ -563,7 +554,7 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
       }
     }, /*#__PURE__*/React.createElement("div", {
       className: "pisell-card-code"
-    }, showCode && !isMini && /*#__PURE__*/React.createElement("div", null, code), showValidDate && /*#__PURE__*/React.createElement("div", null, formatValidDate))));
+    }, showCode && !isMini && /*#__PURE__*/React.createElement("div", null, code), showValidDate && (!isMini || !_showHolderName) && /*#__PURE__*/React.createElement("div", null, formatValidDate))));
   };
   var getInputItem = function getInputItem(name) {
     if ('validDate' === name) {
@@ -594,9 +585,9 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
     });
   };
   var renderEditModal = function renderEditModal() {
-    var _actions$edit6, _actions$edit7;
+    var _actions$edit5, _actions$edit6;
     return /*#__PURE__*/React.createElement(PisellModal, {
-      title: (actions === null || actions === void 0 || (_actions$edit6 = actions.edit) === null || _actions$edit6 === void 0 ? void 0 : _actions$edit6.dialogTitle) || getText('pisell-wallet-pass-card-edit'),
+      title: (actions === null || actions === void 0 || (_actions$edit5 = actions.edit) === null || _actions$edit5 === void 0 ? void 0 : _actions$edit5.dialogTitle) || getText('pisell-wallet-pass-card-edit'),
       open: isShowEdit,
       className: "pisell-wallet-pass-card-edit-modal",
       onCancel: function onCancel() {
@@ -613,7 +604,7 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
       style: {
         padding: '16px 0'
       }
-    }, Array.isArray(actions === null || actions === void 0 || (_actions$edit7 = actions.edit) === null || _actions$edit7 === void 0 ? void 0 : _actions$edit7.fields) && actions.edit.fields.map(function (item) {
+    }, Array.isArray(actions === null || actions === void 0 || (_actions$edit6 = actions.edit) === null || _actions$edit6 === void 0 ? void 0 : _actions$edit6.fields) && actions.edit.fields.map(function (item) {
       return /*#__PURE__*/React.createElement(Form.Item, {
         key: item.name,
         name: item.name,
@@ -722,26 +713,46 @@ var PisellWalletPassCard = function PisellWalletPassCard(props) {
       paddingBottom: dynamicPaddingBottom
     });
   }, [style, showCover, isMini, cover, dynamicPaddingBottom]);
+  var _renderMask = function _renderMask() {
+    if (typeof onSetHolder !== 'function') return null;
+    if ((holder === null || holder === void 0 ? void 0 : holder.holder_type) === 'form' && !(holder !== null && holder !== void 0 && holder.holder_id)) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "pisell-wallet-add-holder-mask",
+        onClick: function onClick(e) {
+          return e.stopPropagation();
+        }
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "pisell-wallet-add-holder-mask-text"
+      }, getText('pisell2.wallet-card.add-holder-tip')), /*#__PURE__*/React.createElement(Button, {
+        type: "primary",
+        className: "pisell-wallet-add-holder-mask-button"
+        // @ts-ignore
+        ,
+        onClick: function onClick(e) {
+          e.stopPropagation();
+          onSetHolder === null || onSetHolder === void 0 || onSetHolder();
+        }
+      }, getText('pisell2.wallet-card.add-holder-button-text'), /*#__PURE__*/React.createElement(Iconfont, {
+        type: "pisell2-user-edit",
+        style: {
+          fontSize: 16
+        }
+      })));
+    }
+    return null;
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, renderDetailModal(), renderEditModal()), /*#__PURE__*/React.createElement("div", {
     className: classNames('pisell-wallet-pass-card', {
       'pisell-card-disabled': disabled,
       'pisell-card-disabled-hide-disabled-reason': disabled && !showDisabledReason,
       'pisell-wallet-pass-card-mini': isMini,
       active: active
-    })
-    // onTouchStart={handleTouchStart}
-    // onTouchEnd={handleTouchEnd}
-    // onTouchCancel={handleTouchEnd}
-    // onMouseDown={handleTouchStart}
-    // onMouseUp={handleTouchEnd}
-    // onMouseLeave={handleTouchEnd}
-    // onClick={handleTap}
-    ,
+    }),
     style: wrapperStyle
-  }, renderActions(), /*#__PURE__*/React.createElement("div", {
+  }, _renderMask(), renderActions(), /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-pass-card-body",
     onClick: handleEditAmount
-  }, renderNameInfo(), renderBalanceInfo(), showQrCode && !isMini && /*#__PURE__*/React.createElement("div", {
+  }, renderNameInfo(), renderRedeemInfo(), renderBalanceInfo(), showQrCode && !isMini && /*#__PURE__*/React.createElement("div", {
     className: "pisell-card-qr-code"
   }, /*#__PURE__*/React.createElement(PisellQrcode, {
     value: qrCode,

package/es/components/pisellWalletPassCard/index.less

@@ -8,6 +8,35 @@
   position: relative;
   overflow: hidden;
 
+  .pisell-wallet-add-holder-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.6);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 16px;
+    z-index: 9;
+
+    &-text {
+      color: #fff;
+      text-align: center;
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 600;
+      line-height: 24px;
+      white-space: pre-line;
+    }
+
+    &-button {
+      font-weight: bold;
+    }
+  }
+
   .actions-dropdown-trigger {
     position: absolute;
     top: 16px;
@@ -61,9 +90,15 @@
     z-index: 2;
   }
 
+  .pisell-card-name-info-wrap {
+    // 避免子组件 display: inline-block 产生的幽灵间距
+    font-size: 0px;
+  }
+
   .pisell-card-name-wrap {
     font-weight: 500;
     line-height: 20px;
+    font-size: 14px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -75,6 +110,27 @@
     }
   }
 
+  .pisell-card-holder-name {
+    cursor: pointer;
+    display: inline-block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    padding: 2px 8px;
+    border-radius: 16px;
+    max-width: 60%;
+    height: 22px;
+    min-width: 50px;
+    text-align: center;
+    line-height: 16px;
+    font-size: 12px;
+    font-style: normal;
+    font-weight: 500;
+    background-color: #475467;
+    color: white;
+    margin: 4px 0;
+  }
+
   .pisell-card-store-name {
     height: 20px;
     font-size: 12px;
@@ -85,30 +141,34 @@
     text-overflow: ellipsis;
   }
 
-  .pisell-card-amount-wrap {
+  .pisell-card-amount-item {
     display: flex;
-    margin-bottom: 4px;
+    flex-direction: row;
+    align-items: center;
+    margin-right: 16px;
+    overflow: hidden;
 
-    .pisell-card-amount-item {
-      display: flex;
-      flex-direction: column;
-      margin-right: 16px;
+    .pisell-card-amount-item-label {
+      color: var(--Gray-500, #667085);
+      font-weight: 400;
+      line-height: 20px;
+      height: 20px;
+      white-space: nowrap;
+    }
+
+    .pisell-card-amount-item-value {
+      font-size: 20px;
+      font-weight: 600;
+      line-height: 30px;
       overflow: hidden;
+      text-overflow: ellipsis;
+    }
 
+    &-balance,
+    &-discount {
       .pisell-card-amount-item-label {
-        color: var(--Gray-500, #667085);
-        font-weight: 400;
-        line-height: 20px;
-        height: 20px;
-        white-space: nowrap;
-      }
-
-      .pisell-card-amount-item-value {
-        font-size: 20px;
-        font-weight: 600;
-        line-height: 20px;
-        overflow: hidden;
-        text-overflow: ellipsis;
+        transform: translateY(2px);
+        margin-right: 2px;
       }
     }
   }
@@ -167,16 +227,18 @@
   color: var(--Gray-500, #667085);
   padding-bottom: 30px;
 
-  .pisell-card-amount-wrap {
-    .pisell-card-amount-item {
-      flex-direction: row;
-      align-items: center;
+  .pisell-card-amount-item {
+    flex-direction: row;
+    align-items: center;
 
-      .pisell-card-amount-item-value {
-        font-size: 14px;
-        font-weight: 400;
-        line-height: 20px;
-      }
+    .pisell-card-amount-item-label {
+      transform: unset !important;
+    }
+
+    .pisell-card-amount-item-value {
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
     }
   }
 
@@ -211,10 +273,6 @@
     line-height: 20px;
   }
 
-  .pisell-card-amount-wrap {
-    display: block;
-  }
-
   .pisell-wallet-pass-card-redeem {
     visibility: hidden;
     flex-direction: row;
@@ -252,7 +310,7 @@
     }
   }
 
-  .pisell-wallet-pass-card-balance {
+  .pisell-card-amount-item-balance {
     flex-direction: row;
     align-items: center;
 
@@ -279,6 +337,10 @@
       height: 20px;
     }
   }
+
+  .pisell-card-warn-message {
+    padding: 6px 16px;
+  }
 }
 
 .pisell-wallet-pass-card-detail-modal,

package/es/components/productCard/cartSkuCard/components/packages/utils.d.ts

@@ -17,4 +17,4 @@ export declare const minusSign: (item: any, type?: string) => "" | "-";
  * @Author: WangHan
  * @Date: 2024-11-22 10:58
  */
-export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => string | number;
+export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => any;

package/es/components/productCard/components/Packages/utils.d.ts

@@ -17,4 +17,4 @@ export declare const minusSign: (item: any, type?: string) => "" | "-";
  * @Author: WangHan
  * @Date: 2024-11-22 10:58
  */
-export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => string | number;
+export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => any;

package/es/components/walletCard/index.d.ts

@@ -66,6 +66,12 @@ export interface WalletCardProps {
     showViewPin?: boolean;
     /** 查看PIN的回调 */
     onViewPinClick?: () => void;
+    /** 是否显示持有人 */
+    showHolderName?: boolean;
+    /** 持有人, 表单记录，展示时一般取main_field */
+    holder?: any;
+    /** 持有人点击回调 */
+    onSetHolder?: (currentValue?: any) => void;
 }
 declare const WalletCard: React.FC<WalletCardProps>;
 export default WalletCard;