@pisell/private-materials 6.7.4 → 6.7.6

package/es/plus/walletPassGallery/components/passDetail/index.js

@@ -1,3 +1,7 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -20,16 +24,20 @@ import Recharge from "../recharge";
 import FooterButtons from "../footerButton";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import "./index.less";
+import { formatScheduleText } from "../../../../components/wallet/utils";
+import localeTexts from "../../locales";
+import { request } from "../../../../utils";
 var Text = Typography.Text;
 var PassDetail = function PassDetail(props) {
-  var _context$appHelper, _store$getState, _dataSource$machineco, _getDetail$data, _getDetail$data2, _dataSource$machineco2;
-  if (!props.dataSource) return null;
+  var _context$appHelper, _context$appHelper2, _store$getState, _context$engine, _context$appHelper3, _dataSource$machineco, _getDetail$data, _getDetail$data2, _dataSource$machineco2;
   var _usePisellConfig = usePisellConfig(),
     _usePisellConfig$symb = _usePisellConfig.symbol,
     symbol = _usePisellConfig$symb === void 0 ? '$' : _usePisellConfig$symb;
   var dataSource = props.dataSource,
     _props$platform = props.platform,
-    platform = _props$platform === void 0 ? 'pc' : _props$platform;
+    platform = _props$platform === void 0 ? 'pc' : _props$platform,
+    _props$showTimeLine = props.showTimeLine,
+    showTimeLine = _props$showTimeLine === void 0 ? true : _props$showTimeLine;
   var _useState = useState('detail'),
     _useState2 = _slicedToArray(_useState, 2),
     activeKey = _useState2[0],
@@ -47,38 +55,54 @@ var PassDetail = function PassDetail(props) {
       store: {}
     },
     store = _ref.store;
-  var timezone = (store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 || (_store$getState = _store$getState.symbol) === null || _store$getState === void 0 ? void 0 : _store$getState.shop.timezone) || 'Asia/Shanghai';
-  var _ref2 = dataSource || {},
-    _ref2$id = _ref2.id,
-    id = _ref2$id === void 0 ? '' : _ref2$id,
-    _ref2$code = _ref2.code,
-    code = _ref2$code === void 0 ? '' : _ref2$code,
-    _ref2$tag = _ref2.tag,
-    tag = _ref2$tag === void 0 ? '' : _ref2$tag,
-    _ref2$product_title = _ref2.product_title,
-    product_title = _ref2$product_title === void 0 ? '' : _ref2$product_title,
-    _ref2$encoded = _ref2.encoded,
-    encoded = _ref2$encoded === void 0 ? '' : _ref2$encoded,
-    balance = _ref2.balance,
-    _ref2$expire_date = _ref2.expire_date,
-    expire_date = _ref2$expire_date === void 0 ? '' : _ref2$expire_date,
-    _ref2$product = _ref2.product,
-    product = _ref2$product === void 0 ? {} : _ref2$product;
-  var _ref3 = product || {},
-    _ref3$description = _ref3.description,
-    description = _ref3$description === void 0 ? '' : _ref3$description,
-    _ref3$extension_data = _ref3.extension_data,
-    extension_data = _ref3$extension_data === void 0 ? [] : _ref3$extension_data,
-    _ref3$customer_order_ = _ref3.customer_order_behavior_count,
-    customer_order_behavior_count = _ref3$customer_order_ === void 0 ? 0 : _ref3$customer_order_;
+  var _ref2 = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.constants) || {
+      apiPrefix: "/h5"
+    },
+    apiPrefix = _ref2.apiPrefix;
+  var timezone = (store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 || (_store$getState = _store$getState.symbol) === null || _store$getState === void 0 || (_store$getState = _store$getState.shop) === null || _store$getState === void 0 ? void 0 : _store$getState.timezone) || 'Asia/Shanghai';
+  locales.init(localeTexts, (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en');
+  if ((_context$appHelper3 = context.appHelper) !== null && _context$appHelper3 !== void 0 && (_context$appHelper3 = _context$appHelper3.utils) !== null && _context$appHelper3 !== void 0 && _context$appHelper3.request) {
+    var _context$appHelper4;
+    request.setRequest((_context$appHelper4 = context.appHelper) === null || _context$appHelper4 === void 0 || (_context$appHelper4 = _context$appHelper4.utils) === null || _context$appHelper4 === void 0 ? void 0 : _context$appHelper4.request);
+  }
+  var _ref3 = dataSource || {},
+    _ref3$id = _ref3.id,
+    id = _ref3$id === void 0 ? '' : _ref3$id,
+    _ref3$code = _ref3.code,
+    code = _ref3$code === void 0 ? '' : _ref3$code,
+    _ref3$tag = _ref3.tag,
+    tag = _ref3$tag === void 0 ? '' : _ref3$tag,
+    _ref3$product_title = _ref3.product_title,
+    product_title = _ref3$product_title === void 0 ? '' : _ref3$product_title,
+    _ref3$encoded = _ref3.encoded,
+    encoded = _ref3$encoded === void 0 ? '' : _ref3$encoded,
+    balance = _ref3.balance,
+    _ref3$expire_date = _ref3.expire_date,
+    expire_date = _ref3$expire_date === void 0 ? '' : _ref3$expire_date,
+    _ref3$product = _ref3.product,
+    product = _ref3$product === void 0 ? {} : _ref3$product,
+    custom_schedule_snapshot = _ref3.custom_schedule_snapshot,
+    customer_id = _ref3.customer_id;
+  var _ref4 = product || {},
+    _ref4$description = _ref4.description,
+    description = _ref4$description === void 0 ? '' : _ref4$description,
+    _ref4$extension_data = _ref4.extension_data,
+    extension_data = _ref4$extension_data === void 0 ? [] : _ref4$extension_data,
+    _ref4$customer_order_ = _ref4.customer_order_behavior_count,
+    customer_order_behavior_count = _ref4$customer_order_ === void 0 ? 0 : _ref4$customer_order_;
   var _getDetail = useRequest(function () {
     return getDetailApi({
-      id: id
+      id: id,
+      apiPrefix: apiPrefix,
+      order_behavior_count_customer_id: customer_id
     });
   }, {
     ready: !!id,
-    refreshDeps: [id]
+    refreshDeps: [id, customer_id]
   });
+  var scheduleList = useMemo(function () {
+    return (custom_schedule_snapshot === null || custom_schedule_snapshot === void 0 ? void 0 : custom_schedule_snapshot.data) || [];
+  }, [custom_schedule_snapshot]);
   useEffect(function () {
     if (tag === 'product_discount_card') {
       setActiveKey('detail');
@@ -113,6 +137,33 @@ var PassDetail = function PassDetail(props) {
     };
   }, []);
   var descs = useMemo(function () {
+    var _context$engine2;
+    var detail = formatScheduleText(scheduleList, context === null || context === void 0 || (_context$engine2 = context.engine) === null || _context$engine2 === void 0 || (_context$engine2 = _context$engine2.props) === null || _context$engine2 === void 0 ? void 0 : _context$engine2.locale);
+    var expireText = expire_date ? expire_date : locales.getText('wallet-pass-gallery.expireDate');
+    if (scheduleList.length > 0) {
+      // 换行展示
+      var validityTexts = "";
+      var excludedText = "";
+      var includedText = "";
+      detail.forEach(function (item) {
+        if (item.validityTexts.length > 0) {
+          validityTexts = "".concat(validityTexts).concat(item.validityTexts.join('\n'), "\n");
+        }
+        if (item.excluded_date.length > 0) {
+          excludedText = "".concat(excludedText).concat(item.excluded_date.join('\n'), "\n");
+        }
+        if (item.included_date.length > 0) {
+          includedText = "".concat(includedText).concat(item.included_date.join('\n'), "\n");
+        }
+      });
+      expireText = /*#__PURE__*/React.createElement("span", {
+        className: "wallet-detail-expire-text"
+      }, validityTexts, excludedText && /*#__PURE__*/React.createElement("div", {
+        className: "wallet-detail-expire-text-title"
+      }, locales.getText('page.wallet.notValidDate')), excludedText, includedText && /*#__PURE__*/React.createElement("div", {
+        className: "wallet-detail-expire-text-title"
+      }, locales.getText('page.wallet.includedDate')), includedText);
+    }
     var data = [{
       label: locales.getText('wallet-pass-gallery.cardName'),
       value: product_title
@@ -122,7 +173,7 @@ var PassDetail = function PassDetail(props) {
       isLink: false
     }, {
       label: locales.getText('wallet-pass-gallery.validDate'),
-      value: expire_date ? expire_date : locales.getText('wallet-pass-gallery.expireDate')
+      value: expireText
     }];
     //折扣卡显示折扣字段 其他显示余额字段
     if (tag === 'product_discount_card') {
@@ -191,14 +242,16 @@ var PassDetail = function PassDetail(props) {
   };
   var renderTimeLine = function renderTimeLine() {
     if (tag === 'product_discount_card') return null;
+    if (!showTimeLine) return null;
     return /*#__PURE__*/React.createElement(TimelineSection, {
       code: code,
       tag: tag,
       timezone: timezone
     });
   };
+  if (!props.dataSource) return null;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: classNames("pisell-wallet-pass-gallery_detail", "pisell-wallet-pass-gallery_detail-".concat(platform))
+    className: classNames("pisell-wallet-pass-gallery_detail", "pisell-wallet-pass-gallery_detail-".concat(platform), _defineProperty({}, "pisell-wallet-pass-gallery_detail-with-footer", platform === 'h5' && tag === 'gift_card'))
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-pass-gallery_detail-content",
     ref: containerRef

package/es/plus/walletPassGallery/components/passDetail/index.less

@@ -18,6 +18,10 @@
     padding: 20px 0px;
   }
 
+  &-with-footer {
+    height: calc(100% - 90px);
+  }
+
   .pisell-wallet-pass-gallery_detail-content {
     overflow-y: auto;
     height: 100%;

package/es/plus/walletPassGallery/components/passList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface IPassListProps {
     dataSource: any[];
     value?: string | number;

package/es/plus/walletPassGallery/components/recharge/index.js

@@ -32,6 +32,10 @@ var Recharge = function Recharge(_ref) {
     storage = _ref2.storage;
   var dvaStore = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getStore) === null || _context$appHelper2$g === void 0 || (_context$appHelper2$g = _context$appHelper2$g.call(_context$appHelper2)) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.getState();
   var shop = (dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 || (_dvaStore$core = _dvaStore$core.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.shop) || {};
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   useEffect(function () {
     if (detailData) {
       setChargeItem(((detailData === null || detailData === void 0 ? void 0 : detailData.gift_option) || [])[0]);
@@ -44,6 +48,7 @@ var Recharge = function Recharge(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
+            setLoading(true);
             params = {
               voucher_id: (detailData === null || detailData === void 0 ? void 0 : detailData.id) || '',
               product_id: (detailData === null || detailData === void 0 ? void 0 : detailData.product_id) || '',
@@ -57,9 +62,9 @@ var Recharge = function Recharge(_ref) {
                 currency_format: (shop === null || shop === void 0 ? void 0 : shop.currency_format) || ''
               }
             };
-            _context.next = 4;
+            _context.next = 5;
             return orderRechargeProduct(params);
-          case 4:
+          case 5:
             data = _context.sent;
             if (data !== null && data !== void 0 && data.order_id) {
               storage === null || storage === void 0 || (_storage$set = storage.set) === null || _storage$set === void 0 || _storage$set.call(storage, 'orderId', data.order_id);
@@ -69,23 +74,28 @@ var Recharge = function Recharge(_ref) {
                 callback: function callback() {}
               });
             }
-            _context.next = 11;
+            _context.next = 12;
             break;
-          case 8:
-            _context.prev = 8;
+          case 9:
+            _context.prev = 9;
             _context.t0 = _context["catch"](0);
             console.error(locales.getText('wallet-pass-gallery.log.rechargeOrderFailed'), _context.t0);
-          case 11:
+          case 12:
+            _context.prev = 12;
+            setLoading(false);
+            return _context.finish(12);
+          case 15:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 8]]);
+      }, _callee, null, [[0, 9, 12, 15]]);
     }));
     return function handleRecharge() {
       return _ref3.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/React.createElement(Drawer, {
+    destroyOnClose: true,
     title: locales.getText('wallet-pass-gallery.rechargeOptions'),
     open: open,
     zIndex: 999,
@@ -97,7 +107,8 @@ var Recharge = function Recharge(_ref) {
       block: true,
       size: "large",
       onClick: handleRecharge,
-      disabled: !(chargeItem !== null && chargeItem !== void 0 && chargeItem.id)
+      disabled: !(chargeItem !== null && chargeItem !== void 0 && chargeItem.id),
+      loading: loading
     }, locales.getText('wallet-pass-gallery.recharge'))
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-pass-gallery_recharge"

package/es/plus/walletPassGallery/components/timelineSection/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface TimelineSectionProps {
     code: string;

package/es/plus/walletPassGallery/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export interface WalletPassGalleryProps {
     [key: string]: any;

package/es/plus/walletPassGallery/index.js

@@ -82,7 +82,8 @@ var WalletPassGallery = function WalletPassGallery(props) {
               num: 20,
               skip: (d === null || d === void 0 ? void 0 : d.nextId) || 1,
               tags: TAGS,
-              filter_wallet_id: walletId || undefined
+              filter_wallet_id: walletId || undefined,
+              "with": ['customScheduleSnapshot']
             });
           case 3:
             res = _context.sent;
@@ -121,7 +122,8 @@ var WalletPassGallery = function WalletPassGallery(props) {
               num: 20,
               skip: (d === null || d === void 0 ? void 0 : d.nextId) || 1,
               tags: TAGS,
-              filter_wallet_id: walletId || undefined
+              filter_wallet_id: walletId || undefined,
+              "with": ['customScheduleSnapshot']
             });
           case 3:
             res = _context2.sent;
@@ -552,7 +554,9 @@ var WalletPassGallery = function WalletPassGallery(props) {
       },
       block: true
     }, locales.getText('wallet-pass-gallery.button.add'))), /*#__PURE__*/React.createElement(PisellModal, {
-      platform: 'h5',
+      zIndex: 997,
+      destroyOnClose: true,
+      platform: platform,
       visible: !!_currentItem,
       onCancel: function onCancel() {
         return setCurrentItemId('');

package/es/plus/walletPassGallery/serve.d.ts

@@ -17,6 +17,7 @@ export interface IWalletListParmsProps {
     skip?: number;
     filter_wallet_id?: string;
     available: 0 | 1;
+    with?: string[];
 }
 /**
  * 钱包列表项属性接口
@@ -171,6 +172,8 @@ export declare const getAssetList: (params: IAssetListProps) => Promise<{
  */
 export declare const getDetailApi: (params: {
     id: string;
+    order_behavior_count_customer_id: string;
+    apiPrefix: string;
 }) => Promise<IDetailResponse>;
 /**
  * 详情响应数据结构，供组件消费

package/es/plus/walletPassGallery/serve.js

@@ -214,10 +214,12 @@ export var getDetailApi = /*#__PURE__*/function () {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
           _context6.next = 2;
-          return request.getRequest().get("/h5/machinecode/lowcode/detail/".concat(params.id), {
+          return request.getRequest().get("".concat(params.apiPrefix || '/h5', "/machinecode/lowcode/detail/").concat(params.id), {
             order_behavior_count: 1,
             // 订单行为次数
-            order_behavior_count_customer: 1 // 客户订单行为次数
+            order_behavior_count_customer: 1,
+            // 客户订单行为次数
+            order_behavior_count_customer_id: params.apiPrefix === '/shop' ? params.order_behavior_count_customer_id : undefined
           });
         case 2:
           _yield$request$getReq6 = _context6.sent;

package/es/pro/Login2.0/index.less

@@ -15,6 +15,14 @@
   
   /* 默认底部内边距 */
   padding-bottom: 24px;
+
+  // 加载状态优化
+  .pisell-lowcode-btn-loading-icon {
+    .anticon {
+      color: #ffffff !important;
+    }
+  }
+
   
   /* 在弹窗模式下不需要额外的底部内边距，因为使用 sticky 定位 */
   .pisell-lowcode-modal-body & {
@@ -450,6 +458,13 @@
   .login-lm-drawer-popover & {
     padding-bottom: 100px;
   }
+    // 加载状态优化
+  .pisell-lowcode-btn-loading-icon {
+    .anticon {
+      color: #ffffff !important;
+    }
+  }
+
 }
 
 // 错误提示样式优化
@@ -509,14 +524,6 @@
 //     }
 //   }
 // }
-
-// 加载状态优化
-.pisell-lowcode-btn-loading-icon {
-  .anticon {
-    color: #ffffff !important;
-  }
-}
-
 // 切换认证方式按钮
 .login2-switch-button {
   margin-top: 0;

package/es/pro/comprehensiveSearch/components/searchSection/locales.js

@@ -1,14 +1,14 @@
 export default {
   en: {
-    'pisell2.comprehensive-search.placeholder': 'WalletPass Code / Name / Mobile / Email',
+    'pisell2.comprehensive-search.placeholder': 'WalletPass Code / Name / Mobile / Email / Contact info',
     'pisell2.text.search': 'Search'
   },
   'zh-CN': {
-    'pisell2.comprehensive-search.placeholder': '钱包码 / 姓名 / 电话 / 电子邮箱',
+    'pisell2.comprehensive-search.placeholder': '钱包码 / 姓名 / 电话 / 电子邮箱 / 联系信息',
     'pisell2.text.search': '搜索'
   },
   'zh-HK': {
-    'pisell2.comprehensive-search.placeholder': '錢包碼 / 姓名 / 電話 / 電子郵箱',
+    'pisell2.comprehensive-search.placeholder': '錢包碼 / 姓名 / 電話 / 電子郵箱 / 聯繫信息',
     'pisell2.text.search': '搜索'
   }
 };

package/es/pro/comprehensiveSearch/locales.js

@@ -1,6 +1,6 @@
 export default {
   en: {
-    'pisell2.text.new-client': 'New Client',
+    'pisell2.text.new-client': 'New Customer',
     'pisell2.comprehensive-search.empty': 'No Data'
   },
   'zh-CN': {

package/es/pro/pisellPhoneKeyboard/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PopoverProps } from 'antd';
 import './index.less';
 interface PisellPhoneKeyboardProps {

package/es/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.d.ts

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

package/es/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.js

@@ -22,7 +22,6 @@ import { useControllableValue } from 'ahooks';
 import { merge, omit } from 'lodash';
 //@ts-ignore
 import { locales } from '@pisell/utils';
-import { VirtualInput } from '@pisell/materials';
 import Shortcuts from "../shortcuts";
 import CashKeyboardSimple from "./CashKeyboardSimple";
 import { setKeyboardTheme } from "../../utils";
@@ -30,6 +29,7 @@ import "./index.less";
 import Decimal from 'decimal.js';
 import { AutoResizeText } from '@pisell/materials';
 import { formatAmountWithOptions } from '@pisell/utils';
+import { Iconfont } from '@pisell/materials';
 var CashKeyboardIntact = function CashKeyboardIntact(props) {
   var _mergedDisplayField$b, _mergedDisplayField$c, _mergedDisplayField$c2;
   var amountSymbol = props.amountSymbol,
@@ -46,7 +46,8 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     doneText = props.doneText,
     resetText = props.resetText,
     disabled = props.disabled,
-    hiddenChangeDue = props.hiddenChangeDue;
+    hiddenChangeDue = props.hiddenChangeDue,
+    shortcutsSize = props.shortcutsSize;
   var _useControllableValue = useControllableValue(props),
     _useControllableValue2 = _slicedToArray(_useControllableValue, 2),
     internalValue = _useControllableValue2[0],
@@ -69,7 +70,7 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     setKeyboardTheme(selectType);
   }, [selectType]);
 
-  // 变体2：末尾有三个默认预设项，总数不大于8个
+  // 变体2：末尾有三个默认预设项，总数不大于7个(因为支付占了 2)
   var getDefaultPresets = function getDefaultPresets() {
     var defaultEndPresets = [{
       label: locales.getText('cash-keyboard-other'),
@@ -113,7 +114,8 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
       value: 'pay',
       style: {
         color: 'white',
-        backgroundColor: '#7F56DA'
+        backgroundColor: '#7F56DA',
+        gridColumn: 'span 2'
       },
       onClick: function onClick() {
         var _props$onEnter;
@@ -122,8 +124,8 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     }];
     var userPresets = presets || [];
 
-    // 计算可用的用户预设数量（总数8 - 默认3个 = 5个）
-    var maxUserPresets = 8 - defaultEndPresets.length;
+    // 计算可用的用户预设数量（总数7 - 默认3个 = 4个）
+    var maxUserPresets = 7 - defaultEndPresets.length;
     var limitedUserPresets = userPresets.slice(0, maxUserPresets);
     return [].concat(_toConsumableArray(limitedUserPresets), defaultEndPresets);
   };
@@ -249,46 +251,52 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     showCurrencySymbol: true
   }))))), ((_mergedDisplayField$c = mergedDisplayField.cashReceived) === null || _mergedDisplayField$c === void 0 ? void 0 : _mergedDisplayField$c.visible) && /*#__PURE__*/React.createElement("div", {
     style: _objectSpread(_objectSpread({}, getGridStyle(1)), {}, {
-      padding: '6px 16px',
+      padding: '0px 16px',
       borderRadius: '8px',
       backgroundColor: 'white',
-      boxShadow: '0px 1px 2px rgba(16, 24, 40, 0.06)',
+      boxShadow: 'inset 0 2px 4px rgba(16, 24, 40, 0.08), inset 0 -2px 4px rgba(16, 24, 40, 0.08), inset 2px 0 4px rgba(16, 24, 40, 0.08), inset -2px 0 4px rgba(16, 24, 40, 0.08)',
       overflow: 'hidden',
       maxWidth: 188,
-      cursor: 'pointer'
+      cursor: 'pointer',
+      border: '1px solid #7f56da',
+      borderBottom: '1px solid #7f56da'
     }),
     onClick: function onClick() {
       setIsShowModal(true);
     }
-  }, /*#__PURE__*/React.createElement(VirtualInput, {
-    showCursor: false,
-    focused: true,
-    wrapperStyle: {
-      width: '100%'
-    },
-    topContent: /*#__PURE__*/React.createElement("div", {
-      style: {
-        fontSize: '14px',
-        color: '#667085'
-      }
-    }, mergedDisplayField.cashReceived.label),
-    value: internalValue ? formatAmountWithOptions(internalValue || '', amountSymbol, {
-      value: internalValue,
-      hideDecimalForWholeNumbers: false,
-      precision: 2,
-      showCurrencySymbol: true
-    }) : '',
-    height: 30,
-    fontSize: 20,
-    placeholder: placeholder,
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-cash-keyboard-intact-container-top",
+    style: _objectSpread(_objectSpread({}, getGridStyle(0)), {}, {
+      overflow: 'hidden',
+      padding: '5px 0'
+    })
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-cash-keyboard-intact-container-top-label"
+  }, mergedDisplayField.cashReceived.label), /*#__PURE__*/React.createElement("div", {
+    className: "pisell-cash-keyboard-intact-container-top-value"
+  }, /*#__PURE__*/React.createElement(AutoResizeText, {
+    minFontSizePx: 10,
+    maxFontSizePx: 18,
+    fontSizePrecisionPx: 0.5,
+    style: {
+      color: '#7f56da',
+      textDecoration: 'underline',
+      textUnderlineOffset: '3px'
+    }
+  }, internalValue ? formatAmountWithOptions(internalValue || '', amountSymbol, {
+    value: internalValue,
+    hideDecimalForWholeNumbers: false,
+    precision: 2,
+    showCurrencySymbol: true
+  }) : ''), /*#__PURE__*/React.createElement(Iconfont, {
+    type: "pisell2-edit-05",
     style: {
-      fontSize: '24px',
-      fontWeight: 'bold',
-      border: 'none',
-      background: 'transparent',
-      width: '100%'
+      color: '#7f56da',
+      fontSize: '18px',
+      marginLeft: '4px',
+      marginTop: '4px'
     }
-  })), ((_mergedDisplayField$c2 = mergedDisplayField.changeDue) === null || _mergedDisplayField$c2 === void 0 ? void 0 : _mergedDisplayField$c2.visible) && /*#__PURE__*/React.createElement("div", {
+  })))), ((_mergedDisplayField$c2 = mergedDisplayField.changeDue) === null || _mergedDisplayField$c2 === void 0 ? void 0 : _mergedDisplayField$c2.visible) && /*#__PURE__*/React.createElement("div", {
     className: "pisell-cash-keyboard-intact-container-top",
     style: _objectSpread(_objectSpread({}, getGridStyle(2)), {}, {
       overflow: 'hidden'
@@ -314,6 +322,7 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     hideDecimalForWholeNumbers: false,
     precision: 2
   })))))), /*#__PURE__*/React.createElement(Shortcuts, {
+    size: shortcutsSize || 'default',
     presets: getDefaultPresets(),
     onChange: setInternalValue,
     disabled: disabled

package/es/pro/priceKeyboard/components/cashKeyboard/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CashKeyboardBaseProps } from './types';
 export interface CashKeyboardProps extends CashKeyboardBaseProps {
     containerProps?: {
@@ -6,6 +7,7 @@ export interface CashKeyboardProps extends CashKeyboardBaseProps {
         [key: string]: any;
     };
     variant?: 'intact' | 'simple';
+    shortcutsSize?: 'default' | 'large';
 }
 declare const CashKeyboard: (props: CashKeyboardProps) => JSX.Element;
 export default CashKeyboard;

package/es/pro/priceKeyboard/components/cashKeyboard/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["variant", "value", "onChange"];
+var _excluded = ["variant", "value", "onChange", "shortcutsSize"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -26,6 +26,7 @@ var CashKeyboard = function CashKeyboard(props) {
     variant = _props$variant === void 0 ? 'intact' : _props$variant,
     value = props.value,
     onChange = props.onChange,
+    shortcutsSize = props.shortcutsSize,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useControllableValue = useControllableValue(props),
     _useControllableValue2 = _slicedToArray(_useControllableValue, 2),
@@ -36,7 +37,8 @@ var CashKeyboard = function CashKeyboard(props) {
       amountSymbol: amountSymbol,
       value: internalValue,
       placeholder: "".concat(amountSymbol, "0"),
-      onChange: setInternalValue
+      onChange: setInternalValue,
+      shortcutsSize: shortcutsSize
     }));
   }
   return /*#__PURE__*/React.createElement(CashKeyboardSimple, _extends({}, otherProps, {

package/es/pro/priceKeyboard/components/cashKeyboard/types.d.ts

@@ -94,4 +94,5 @@ export interface CashKeyboardBaseProps {
     keyboardButtonBackgroundColor?: string;
     keyboardButtonTextColor?: string;
     keyboardButtonHoverColor?: string;
+    shortcutsSize?: 'default' | 'large';
 }