@pisell/private-materials 6.4.73 → 6.4.74

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

@@ -59,7 +59,8 @@ var CashKeyboardIntact = (props) => {
     doneText,
     resetText,
     disabled,
-    hiddenChangeDue
+    hiddenChangeDue,
+    shortcutsSize
   } = props;
   const [internalValue, setInternalValue] = (0, import_ahooks.useControllableValue)(props);
   const [isShowModal, setIsShowModal] = (0, import_react.useState)(false);
@@ -129,7 +130,8 @@ var CashKeyboardIntact = (props) => {
         value: "pay",
         style: {
           color: "white",
-          backgroundColor: "#7F56DA"
+          backgroundColor: "#7F56DA",
+          gridColumn: "span 2"
         },
         onClick: () => {
           var _a2;
@@ -138,7 +140,7 @@ var CashKeyboardIntact = (props) => {
       }
     ];
     const userPresets = presets || [];
-    const maxUserPresets = 8 - defaultEndPresets.length;
+    const maxUserPresets = 7 - defaultEndPresets.length;
     const limitedUserPresets = userPresets.slice(0, maxUserPresets);
     return [...limitedUserPresets, ...defaultEndPresets];
   };
@@ -273,10 +275,11 @@ var CashKeyboardIntact = (props) => {
           padding: "6px 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"
         },
         onClick: () => {
           setIsShowModal(true);
@@ -365,6 +368,7 @@ var CashKeyboardIntact = (props) => {
     )), /* @__PURE__ */ import_react.default.createElement(
       import_shortcuts.default,
       {
+        size: shortcutsSize || "default",
         presets: getDefaultPresets(),
         onChange: setInternalValue,
         disabled

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

@@ -6,6 +6,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/lib/pro/priceKeyboard/components/cashKeyboard/index.js

@@ -48,7 +48,7 @@ var CashKeyboard = (props) => {
   );
   const { getData } = context.appHelper.utils;
   const amountSymbol = props.amountSymbol || (getData == null ? void 0 : getData("shop_symbol")) || "$";
-  const { variant = "intact", value, onChange, ...otherProps } = props;
+  const { variant = "intact", value, onChange, shortcutsSize, ...otherProps } = props;
   const [internalValue, setInternalValue] = (0, import_ahooks.useControllableValue)(props);
   if (variant === "intact") {
     return /* @__PURE__ */ import_react.default.createElement(
@@ -58,7 +58,8 @@ var CashKeyboard = (props) => {
         amountSymbol,
         value: internalValue,
         placeholder: `${amountSymbol}0`,
-        onChange: setInternalValue
+        onChange: setInternalValue,
+        shortcutsSize
       }
     );
   }

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

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

package/lib/pro/priceKeyboard/components/discountKeyboard/index.js

@@ -55,6 +55,7 @@ var DiscountKeyboardBase = (props) => {
     defaultValue,
     originalValue,
     selectType = "light",
+    tips,
     resetText,
     doneText,
     onEnter,
@@ -344,7 +345,13 @@ var DiscountKeyboardBase = (props) => {
       )
     );
   };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-pro-price-keyboard-discount" }, /* @__PURE__ */ import_react.default.createElement(
+  const renderTipsContent = () => {
+    if (tips) {
+      return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-pro-price-keyboard-tips" }, tips);
+    }
+    return null;
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-pro-price-keyboard-discount" }, renderTipsContent(), /* @__PURE__ */ import_react.default.createElement(
     import_antd.Segmented,
     {
       size: "large",

package/lib/pro/priceKeyboard/components/discountKeyboard/index.less

@@ -7,6 +7,20 @@
   gap: 10px;
   background-color: var(--pisell-pro-price-keyboard-bg-color, #ffffff);
 
+  .pisell-pro-price-keyboard-tips {
+    background-color: var(
+      --pisell-pro-price-keyboard-bg-color-gray-200,
+      #eaecf0
+    );
+    color: #ffffff;
+    font-size: 14px;
+    font-weight: 600;
+    height: 36px;
+    line-height: 36px;
+    text-align: center;
+    border-radius: 8px;
+  }
+
   .ellipsis {
     overflow: hidden;
     text-overflow: ellipsis;

package/lib/pro/priceKeyboard/components/shortcuts/index.d.ts

@@ -12,6 +12,7 @@ export interface ShortcutsProps {
     presets?: ShortcutsItem[];
     onChange?: (val: string) => void;
     disabled?: boolean;
+    size?: 'default' | 'large';
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<ShortcutsProps & React.RefAttributes<HTMLDivElement>>>;
 export default _default;

package/lib/pro/priceKeyboard/components/shortcuts/index.js

@@ -36,7 +36,7 @@ var import_react = __toESM(require("react"));
 var import_classnames = __toESM(require("classnames"));
 var import_index = require("./index.less");
 var Shortcuts = (0, import_react.forwardRef)((props, ref) => {
-  const { presets, onChange, disabled } = props;
+  const { presets, onChange, disabled, size = "default" } = props;
   const handleItemClick = (item) => {
     if (disabled || item.disabled) {
       return;
@@ -65,7 +65,8 @@ var Shortcuts = (0, import_react.forwardRef)((props, ref) => {
         const itemProps = {
           key: index,
           className: (0, import_classnames.default)("pisell-virtual-keyboard-shortcut", {
-            disabled: item.disabled
+            disabled: item.disabled,
+            large: size === "large"
           }),
           style: item.style,
           onClick: () => handleItemClick(item)

package/lib/pro/priceKeyboard/components/shortcuts/index.less

@@ -28,6 +28,10 @@
     cursor: pointer;
     position: relative;
 
+    &.large {
+      height: 54px;
+    }
+
     &.disabled {
       cursor: not-allowed;
       pointer-events: none;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.73",
+  "version": "6.4.74",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",