@pisell/private-materials 6.4.46 → 6.4.47

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

@@ -42,6 +42,8 @@ var import_CashKeyboardSimple = __toESM(require("./CashKeyboardSimple"));
 var import_utils2 = require("../../utils");
 var import_index = require("./index.less");
 var import_decimal = __toESM(require("decimal.js"));
+var import_materials2 = require("@pisell/materials");
+var import_utils3 = require("@pisell/utils");
 var CashKeyboardIntact = (props) => {
   var _a, _b, _c;
   const {
@@ -232,56 +234,77 @@ var CashKeyboardIntact = (props) => {
       },
       /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-cash-keyboard-intact-container-top-label" }, mergedDisplayField.balanceDue.label),
       /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-cash-keyboard-intact-container-top-value" }, /* @__PURE__ */ import_react.default.createElement(
-        import_materials.PisellText.Amount,
+        import_materials2.AutoResizeText,
         {
-          value: originalValue || "",
-          hideDecimalForWholeNumbers: false,
-          precision: 2
-        }
+          minFontSizePx: 10,
+          maxFontSizePx: 14,
+          fontSizePrecisionPx: 0.5
+        },
+        (0, import_utils3.formatAmountWithOptions)(originalValue || "", "", {
+          precision: 2,
+          hideDecimalForWholeNumbers: false
+        })
       ))
     ), ((_b = mergedDisplayField.cashReceived) == null ? void 0 : _b.visible) && /* @__PURE__ */ import_react.default.createElement(
-      import_materials.VirtualInput,
+      "div",
       {
-        showCursor: false,
-        focused: true,
-        wrapperStyle: {
+        style: {
           ...getGridStyle(1),
           padding: "6px 16px",
           borderRadius: "8px",
           backgroundColor: "white",
           boxShadow: "0px 1px 2px rgba(16, 24, 40, 0.06)",
           overflow: "hidden",
-          maxWidth: 188
+          maxWidth: 188,
+          cursor: "pointer"
         },
-        topContent: /* @__PURE__ */ import_react.default.createElement(
-          "div",
-          {
-            style: {
-              fontSize: "14px",
-              color: "#667085"
-            }
+        onClick: () => {
+          setIsShowModal(true);
+        }
+      },
+      /* @__PURE__ */ import_react.default.createElement(
+        import_materials.VirtualInput,
+        {
+          showCursor: false,
+          focused: true,
+          wrapperStyle: {
+            width: "100%"
           },
-          mergedDisplayField.cashReceived.label
-        ),
-        value: internalValue ? /* @__PURE__ */ import_react.default.createElement(
-          import_materials.PisellText.Amount,
-          {
-            value: internalValue,
-            hideDecimalForWholeNumbers: false,
-            precision: 2
+          topContent: /* @__PURE__ */ import_react.default.createElement(
+            "div",
+            {
+              style: {
+                fontSize: "14px",
+                color: "#667085"
+              }
+            },
+            mergedDisplayField.cashReceived.label
+          ),
+          value: internalValue ? /* @__PURE__ */ import_react.default.createElement(
+            import_materials2.AutoResizeText,
+            {
+              minFontSizePx: 10,
+              maxFontSizePx: 14,
+              fontSizePrecisionPx: 0.5
+            },
+            (0, import_utils3.formatAmountWithOptions)(internalValue || "", "", {
+              value: internalValue,
+              hideDecimalForWholeNumbers: false,
+              precision: 2
+            })
+          ) : "",
+          height: 30,
+          fontSize: 20,
+          placeholder,
+          style: {
+            fontSize: "24px",
+            fontWeight: "bold",
+            border: "none",
+            background: "transparent",
+            width: "100%"
           }
-        ) : "",
-        height: 30,
-        fontSize: 20,
-        placeholder,
-        style: {
-          fontSize: "24px",
-          fontWeight: "bold",
-          border: "none",
-          background: "transparent",
-          width: "100%"
         }
-      }
+      )
     ), ((_c = mergedDisplayField.changeDue) == null ? void 0 : _c.visible) && /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
@@ -290,12 +313,17 @@ var CashKeyboardIntact = (props) => {
       },
       /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-cash-keyboard-intact-container-top-label" }, mergedDisplayField.changeDue.label),
       /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-cash-keyboard-intact-container-top-value" }, /* @__PURE__ */ import_react.default.createElement(
-        import_materials.PisellText.Amount,
+        import_materials2.AutoResizeText,
         {
+          minFontSizePx: 10,
+          maxFontSizePx: 14,
+          fontSizePrecisionPx: 0.5
+        },
+        (0, import_utils3.formatAmountWithOptions)(hiddenChangeDue ? 0 : changeDue, "", {
           value: hiddenChangeDue ? 0 : changeDue,
           hideDecimalForWholeNumbers: false,
           precision: 2
-        }
+        })
       ))
     )), /* @__PURE__ */ import_react.default.createElement(
       import_shortcuts.default,

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

@@ -44,6 +44,11 @@ var import_utils2 = require("../../utils");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_locales = __toESM(require("./locales"));
 var import_index = require("./index.less");
+var TIP_COLORS = {
+  positive: "#CA8504",
+  negative: "#1570EF",
+  overflow: "#D92D20"
+};
 var DiscountKeyboardBase = (props) => {
   var _a, _b, _c, _d, _e, _f, _g;
   const {
@@ -117,10 +122,16 @@ var DiscountKeyboardBase = (props) => {
     }
     return discountAmount2.toNumber();
   }, [updateMode, discountMode, internalValue, discountValue, originalValue]);
-  const isDiscountError = (0, import_react.useMemo)(() => {
-    const _discountAmount = new import_decimal.default(discountAmount || 0);
-    return _discountAmount.lessThan(0) || _discountAmount.greaterThan(new import_decimal.default(originalValue || 0));
-  }, [discountAmount, originalValue]);
+  const isDiscountOverflow = (0, import_react.useMemo)(() => {
+    const _original = new import_decimal.default(originalValue || 0);
+    if (updateMode === "priceOverride") {
+      return new import_decimal.default(internalValue || 0).greaterThan(_original);
+    }
+    if (discountMode === "amount") {
+      return new import_decimal.default(discountValue || 0).greaterThan(_original);
+    }
+    return false;
+  }, [updateMode, discountMode, internalValue, discountValue, originalValue]);
   const payableAmount = (0, import_react.useMemo)(() => {
     return new import_decimal.default(originalValue || 0).minus(discountAmount).toNumber();
   }, [originalValue, discountAmount]);
@@ -129,7 +140,7 @@ var DiscountKeyboardBase = (props) => {
       onEnter == null ? void 0 : onEnter(String(discountAmount));
       return;
     }
-    if (isDiscountError) {
+    if (isDiscountOverflow) {
       return;
     }
     onEnter == null ? void 0 : onEnter(String(discountAmount));
@@ -149,7 +160,9 @@ var DiscountKeyboardBase = (props) => {
   const rightItems = (0, import_rightItems.default)({
     rightItemsStyle: {
       doneButtonStyle: {
-        boxShadow: "0px 0px 1px #898A8D"
+        boxShadow: "0px 0px 1px #898A8D",
+        cursor: updateMode !== "priceOverride" && isDiscountOverflow ? "not-allowed" : void 0,
+        backgroundColor: updateMode !== "priceOverride" && isDiscountOverflow ? "#D0D5DD" : void 0
       }
     },
     doneText: doneText || import_utils.locales.getText("discount-keyboard-done"),
@@ -176,14 +189,35 @@ var DiscountKeyboardBase = (props) => {
     }
   }, [amountSymbol, updateMode, discountMode]);
   const renderBottomContent = () => {
-    const style = {
-      color: isDiscountError ? "#D92D20" : "#079455"
-    };
-    const sign = new import_decimal.default(discountAmount).greaterThan(0) ? "+" : new import_decimal.default(discountAmount).lessThan(0) ? "-" : "";
-    const _maxDiscount = /* @__PURE__ */ import_react.default.createElement(
+    if (new import_decimal.default(discountAmount).equals(0)) {
+      return /* @__PURE__ */ import_react.default.createElement("div", null, " ");
+    }
+    if (updateMode === "priceOverride" || discountMode === "percentage") {
+      let color;
+      let sign = "";
+      if (new import_decimal.default(discountAmount).greaterThan(0)) {
+        color = TIP_COLORS.negative;
+        sign = "-";
+      } else {
+        sign = "+";
+        color = TIP_COLORS.positive;
+      }
+      const style = {
+        color
+      };
+      return /* @__PURE__ */ import_react.default.createElement("div", { style, className: "ellipsis" }, /* @__PURE__ */ import_react.default.createElement("span", null, sign, /* @__PURE__ */ import_react.default.createElement(
+        import_materials.PisellText.Amount,
+        {
+          hideDecimalForWholeNumbers: false,
+          precision: 2,
+          value: Math.abs(discountAmount)
+        }
+      )));
+    }
+    return /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
-        style: isDiscountError && !isFirstInput ? style : {},
+        style: { color: isDiscountOverflow ? TIP_COLORS.overflow : "" },
         className: "ellipsis"
       },
       import_utils.locales.getText("discount-keyboard-max-discount"),
@@ -198,27 +232,9 @@ var DiscountKeyboardBase = (props) => {
         }
       )
     );
-    const _discountText = /* @__PURE__ */ import_react.default.createElement("div", { style, className: "ellipsis" }, import_utils.locales.getText("discount-keyboard-discount-amount"), ":", " ", /* @__PURE__ */ import_react.default.createElement("span", null, sign, /* @__PURE__ */ import_react.default.createElement(
-      import_materials.PisellText.Amount,
-      {
-        hideDecimalForWholeNumbers: false,
-        precision: 2,
-        value: Math.abs(discountAmount)
-      }
-    )));
-    if (updateMode === "priceOverride") {
-      if (isFirstInput) {
-        return _maxDiscount;
-      } else {
-        return _discountText;
-      }
-    }
-    if (updateMode === "discount" && discountMode === "amount") {
-      return _maxDiscount;
-    }
-    return _discountText;
   };
   const customDisplay = () => {
+    const _color = updateMode === "discount" && discountMode === "amount" && isDiscountOverflow ? TIP_COLORS.overflow : void 0;
     return /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
@@ -240,6 +256,9 @@ var DiscountKeyboardBase = (props) => {
             flex: "2",
             overflow: "hidden"
           },
+          style: {
+            color: _color
+          },
           placeholder,
           bottomContent: renderBottomContent()
         }
@@ -313,7 +332,7 @@ var DiscountKeyboardBase = (props) => {
             "div",
             {
               style: {
-                color: isDiscountError ? "#f56565" : "#475467",
+                color: "#475467",
                 fontSize: 14,
                 fontWeight: 700,
                 wordWrap: "break-word"

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

@@ -29,7 +29,7 @@ var locales_default = {
     "discount-keyboard-discount": "Discount",
     "discount-keyboard-amount": "Amount",
     "discount-keyboard-percentage": "Percentage",
-    "discount-keyboard-max-discount": "Max Discount",
+    "discount-keyboard-max-discount": "Max",
     "discount-keyboard-discount-amount": "Discount Amount",
     "discount-keyboard-total": "Total",
     "discount-keyboard-payable": "Payable",
@@ -43,7 +43,7 @@ var locales_default = {
     "discount-keyboard-discount": "折扣",
     "discount-keyboard-amount": "金额",
     "discount-keyboard-percentage": "百分比",
-    "discount-keyboard-max-discount": "最高折扣",
+    "discount-keyboard-max-discount": "最高",
     "discount-keyboard-discount-amount": "折扣金额",
     "discount-keyboard-total": "待支付金额",
     "discount-keyboard-payable": "需支付金额",
@@ -57,7 +57,7 @@ var locales_default = {
     "discount-keyboard-discount": "折扣",
     "discount-keyboard-amount": "金額",
     "discount-keyboard-percentage": "百分比",
-    "discount-keyboard-max-discount": "最高折扣",
+    "discount-keyboard-max-discount": "最高",
     "discount-keyboard-discount-amount": "折扣金額",
     "discount-keyboard-total": "待支付金額",
     "discount-keyboard-payable": "需支付金額",

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

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

package/lib/pro/priceKeyboard/hooks/rightItems.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const useRightItems: (props: {
     rightItemsStyle?: any;
     doneText?: string;

package/package.json

@@ -1,6 +1,12 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.46",
+  "version": "6.4.47",
+  "scripts": {
+    "dev": "father dev",
+    "build": "father build",
+    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
+    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
+  },
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -50,6 +56,10 @@
     "@dnd-kit/modifiers": "^6.0.1",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
+    "@pisell/date-picker": "workspace:*",
+    "@pisell/icon": "workspace:*",
+    "@pisell/materials": "workspace:*",
+    "@pisell/utils": "workspace:*",
     "ahooks": "^3.7.6",
     "antd": "^5.6.3",
     "classnames": "^2.3.2",
@@ -58,11 +68,7 @@
     "rc-virtual-list": "^3.11.3",
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
-    "styled-components": "^6.0.0-rc.3",
-    "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.4.9",
-    "@pisell/utils": "3.0.2",
-    "@pisell/date-picker": "3.0.7"
+    "styled-components": "^6.0.0-rc.3"
   },
   "peerDependencies": {
     "react": "^18.0.0",
@@ -70,11 +76,5 @@
   },
   "componentConfig": {
     "materialSchema": "https://unpkg.com/@pisell/materials@1.0.1/build/lowcode/assets-prod.json"
-  },
-  "scripts": {
-    "dev": "father dev",
-    "build": "father build",
-    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
-    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
   }
 }