@pisell/materials 1.0.424 → 1.0.426

package/es/components/pisellAdjustPrice/PisellAdjustPriceInputNumber.js

@@ -25,7 +25,7 @@ var PisellAdjustPriceInputNumber = function PisellAdjustPriceInputNumber(props)
     setOpen = _useState2[1];
   var handleChange = function handleChange(val) {
     setOpen(false);
-    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+    onChange === null || onChange === void 0 ? void 0 : onChange(Number(val.toFixed(2)));
   };
   var content = useMemo(function () {
     return /*#__PURE__*/React.createElement(PisellAdjustPricePanel, {
@@ -46,7 +46,11 @@ var PisellAdjustPriceInputNumber = function PisellAdjustPriceInputNumber(props)
     onOpenChange: function onOpenChange(val) {
       return setOpen(val);
     },
-    destroyTooltipOnHide: true
+    destroyTooltipOnHide: true,
+    arrow: false,
+    align: {
+      offset: [0, 20]
+    }
   }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(InputNumber, _extends({}, others, {
     disabled: disabled,
     prefix: prefix,

package/es/components/pisellAdjustPrice/index.js

@@ -83,6 +83,13 @@ var PisellAdjustPrice = function PisellAdjustPrice(props) {
     setUpdateMode(val);
     setNewValue(val === 'priceOverride' ? value || 0 : '');
   };
+  var inputFormat = function inputFormat(v) {
+    if (discountMode === 'amount') {
+      return null;
+    } else {
+      return "".concat(v, "%");
+    }
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode-adjust-price-wrap"
   }, /*#__PURE__*/React.createElement(Segmented, {
@@ -100,7 +107,7 @@ var PisellAdjustPrice = function PisellAdjustPrice(props) {
   }), updateMode === 'discount' && /*#__PURE__*/React.createElement(Segmented, {
     size: "large",
     options: [{
-      label: "".concat(getText('pisell-adjust-price-discount-amount'), "(").concat((config === null || config === void 0 ? void 0 : config.symbol) || "$", ")"),
+      label: "".concat(getText('pisell-adjust-price-discount-amount'), "(").concat((config === null || config === void 0 ? void 0 : config.symbol) || '$', ")"),
       value: 'amount'
     }, {
       label: "".concat(getText('pisell-adjust-price-discount-percentage'), "(%)"),
@@ -108,12 +115,14 @@ var PisellAdjustPrice = function PisellAdjustPrice(props) {
     }],
     value: discountMode,
     onChange: function onChange(val) {
-      return setDiscountMode(val);
+      setNewValue('');
+      setDiscountMode(val);
     },
     block: true
   }), /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode-adjust-price-amount-wrap"
   }, /*#__PURE__*/React.createElement(Amount, _extends({}, others, {
+    inputFormat: inputFormat,
     defaultValue: updateMode === 'priceOverride' ? defaultValue : '',
     key: updateMode,
     value: newValue,

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

@@ -16,6 +16,7 @@ export interface AmountProps {
     onChange?: (val: string | number) => void;
     onEnter?: (val: string | number) => void;
     defaultSelect?: boolean;
+    inputFormat?: (_v: string) => React.ReactNode | null;
 }
 declare const Amount: (props: AmountProps) => React.JSX.Element;
 export default Amount;

package/es/components/virtual-keyboard/Amount/index.js

@@ -18,7 +18,8 @@ var Amount = function Amount(props) {
     placeholder = props.placeholder,
     onEnter = props.onEnter,
     presets = props.presets,
-    defaultSelect = props.defaultSelect;
+    defaultSelect = props.defaultSelect,
+    inputFormat = props.inputFormat;
   var _useControllableValue = useControllableValue(props, {
       defaultValue: defaultValue || ""
     }),
@@ -30,6 +31,9 @@ var Amount = function Amount(props) {
   }, []);
   var format = function format(_v) {
     var v = "".concat(_v);
+    if (inputFormat !== null && inputFormat !== void 0 && inputFormat(v)) {
+      return inputFormat === null || inputFormat === void 0 ? void 0 : inputFormat(v);
+    }
     // 取value小数位数
     var precision = v.includes('.') ? v.split('.')[1].length : 0;
     var endWith = v.endsWith('.');

package/lib/components/pisellAdjustPrice/PisellAdjustPriceInputNumber.js

@@ -40,7 +40,7 @@ var PisellAdjustPriceInputNumber = (props) => {
   const [open, setOpen] = (0, import_react.useState)(false);
   const handleChange = (val) => {
     setOpen(false);
-    onChange == null ? void 0 : onChange(val);
+    onChange == null ? void 0 : onChange(Number(val.toFixed(2)));
   };
   const content = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(
@@ -62,7 +62,11 @@ var PisellAdjustPriceInputNumber = (props) => {
       trigger: ["click"],
       overlayInnerStyle: { padding: 0 },
       onOpenChange: (val) => setOpen(val),
-      destroyTooltipOnHide: true
+      destroyTooltipOnHide: true,
+      arrow: false,
+      align: {
+        offset: [0, 20]
+      }
     },
     /* @__PURE__ */ import_react.default.createElement("span", null, /* @__PURE__ */ import_react.default.createElement(
       import_antd.InputNumber,

package/lib/components/pisellAdjustPrice/index.js

@@ -82,6 +82,13 @@ var PisellAdjustPrice = (props) => {
     setUpdateMode(val);
     setNewValue(val === "priceOverride" ? value || 0 : "");
   };
+  const inputFormat = (v) => {
+    if (discountMode === "amount") {
+      return null;
+    } else {
+      return `${v}%`;
+    }
+  };
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-adjust-price-wrap" }, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Segmented,
     {
@@ -112,13 +119,17 @@ var PisellAdjustPrice = (props) => {
         }
       ],
       value: discountMode,
-      onChange: (val) => setDiscountMode(val),
+      onChange: (val) => {
+        setNewValue("");
+        setDiscountMode(val);
+      },
       block: true
     }
   ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-adjust-price-amount-wrap" }, /* @__PURE__ */ import_react.default.createElement(
     import_Amount.default,
     {
       ...others,
+      inputFormat,
       defaultValue: updateMode === "priceOverride" ? defaultValue : "",
       key: updateMode,
       value: newValue,

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

@@ -16,6 +16,7 @@ export interface AmountProps {
     onChange?: (val: string | number) => void;
     onEnter?: (val: string | number) => void;
     defaultSelect?: boolean;
+    inputFormat?: (_v: string) => React.ReactNode | null;
 }
 declare const Amount: (props: AmountProps) => React.JSX.Element;
 export default Amount;

package/lib/components/virtual-keyboard/Amount/index.js

@@ -47,7 +47,8 @@ var Amount = (props) => {
     placeholder,
     onEnter,
     presets,
-    defaultSelect
+    defaultSelect,
+    inputFormat
   } = props;
   const [value, setValue] = (0, import_ahooks.useControllableValue)(props, {
     defaultValue: defaultValue || ""
@@ -57,6 +58,9 @@ var Amount = (props) => {
   }, []);
   const format = (_v) => {
     const v = `${_v}`;
+    if (inputFormat == null ? void 0 : inputFormat(v)) {
+      return inputFormat == null ? void 0 : inputFormat(v);
+    }
     const precision = v.includes(".") ? v.split(".")[1].length : 0;
     const endWith = v.endsWith(".");
     const value2 = endWith ? v.slice(0, -1) : v;

package/package.json

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