@pisell/private-materials 6.9.2 → 6.9.3

package/lib/pro/NumericStepper/index.js

@@ -35,9 +35,8 @@ module.exports = __toCommonJS(NumericStepper_exports);
 var React = __toESM(require("react"));
 var import_react = require("react");
 var import_classnames = __toESM(require("classnames"));
-var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
-var import_numberKeyboard = __toESM(require("../numberKeyboard"));
+var import_keyboards = require("../keyboards");
 var import_index = require("./index.less");
 var NumericStepper = ({
   value,
@@ -53,7 +52,10 @@ var NumericStepper = ({
   shape = "round",
   minusIcon,
   plusIcon,
-  horizontalPadding = 0
+  horizontalPadding = 0,
+  variant = "separated",
+  enableInput = true,
+  displayMaxWidth
 }) => {
   const [open, setOpen] = (0, import_react.useState)(false);
   const [internalValue, setInternalValue] = (0, import_react.useState)(
@@ -115,7 +117,7 @@ var NumericStepper = ({
     }
   };
   const handleNumberClick = () => {
-    if (disabled) return;
+    if (disabled || !enableInput) return;
     setTempValue(currentValue.toString());
     if (_isMobile) {
       setOpen(true);
@@ -136,17 +138,20 @@ var NumericStepper = ({
   };
   const isDecreaseDisabled = disabled || currentValue <= min;
   const isIncreaseDisabled = disabled || currentValue >= max;
-  const isPlusOnly = currentValue === 0 || currentValue === void 0;
+  const isPlusOnly = variant === "capsule" ? false : currentValue === 0 || currentValue === void 0;
   const outOfRange = currentValue < min || currentValue > max;
   const stepperClasses = (0, import_classnames.default)(
     "numeric-stepper",
     `numeric-stepper-${size}`,
-    `numeric-stepper-${shape}`,
+    `numeric-stepper-${variant}`,
     {
+      // shape 仅在分离式下生效
+      [`numeric-stepper-${shape}`]: variant === "separated",
       "numeric-stepper-disabled": disabled,
       "numeric-stepper-simple": currentValue === 0 || currentValue === void 0,
       "numeric-stepper-out-of-range": outOfRange,
-      "numeric-stepper-plus-only": isPlusOnly
+      "numeric-stepper-plus-only": isPlusOnly,
+      "numeric-stepper-input-disabled": !enableInput
     },
     className
   );
@@ -187,52 +192,54 @@ var NumericStepper = ({
     if (isPlusOnly) {
       return null;
     }
+    const displayWrapperStyle = variant === "capsule" && displayMaxWidth ? { maxWidth: typeof displayMaxWidth === "number" ? `${displayMaxWidth}px` : displayMaxWidth } : {};
+    const displayElement = /* @__PURE__ */ React.createElement(
+      "span",
+      {
+        className: "numeric-stepper-display-wrapper",
+        onClick: handleNumberClick,
+        style: displayWrapperStyle
+      },
+      /* @__PURE__ */ React.createElement("span", { className: (0, import_classnames.default)("numeric-stepper-display") }, currentValue)
+    );
+    if (!enableInput) {
+      return displayElement;
+    }
     if (_isMobile) {
-      return /* @__PURE__ */ React.createElement(
-        "span",
-        {
-          className: "numeric-stepper-display-wrapper",
-          onClick: handleNumberClick
-        },
-        /* @__PURE__ */ React.createElement("span", { className: (0, import_classnames.default)("numeric-stepper-display") }, currentValue)
-      );
+      return displayElement;
     }
     return /* @__PURE__ */ React.createElement(
-      import_materials.Popover,
+      import_keyboards.NumberKeyboard,
       {
-        open,
-        trigger: ["click"],
-        overlayInnerStyle: { padding: 0 },
-        destroyTooltipOnHide: true,
-        arrow: false,
-        align: {
-          offset: [0, 0]
+        max,
+        min,
+        originalValue: currentValue.toString(),
+        defaultValue: currentValue.toString(),
+        onEnter: (newValue) => {
+          handleValueChange == null ? void 0 : handleValueChange(Number(newValue));
+          setOpen(false);
         },
-        overlayClassName: "pisell-number-selector-popover",
-        onOpenChange: handleOpenChange,
-        content: /* @__PURE__ */ React.createElement(
-          import_numberKeyboard.default,
-          {
-            max,
-            value: tempValue,
-            onChange: handleChange,
-            onOk: () => {
-              const newValue = parseInt(tempValue) || 0;
-              const clampedValue = Math.max(min, Math.min(max, newValue));
-              onChange == null ? void 0 : onChange(clampedValue);
-              setOpen(false);
+        containerProps: {
+          className: "numeric-stepper-keyboard-popover",
+          renderType: "popover",
+          open,
+          onOpenChange: handleOpenChange,
+          content: /* @__PURE__ */ React.createElement(
+            import_keyboards.NumberKeyboard,
+            {
+              max,
+              min,
+              originalValue: currentValue.toString(),
+              defaultValue: currentValue.toString(),
+              onEnter: (newValue) => {
+                handleValueChange == null ? void 0 : handleValueChange(Number(newValue));
+                setOpen(false);
+              }
             }
-          }
-        )
+          )
+        }
       },
-      /* @__PURE__ */ React.createElement(
-        "span",
-        {
-          className: "numeric-stepper-display-wrapper",
-          onClick: handleNumberClick
-        },
-        /* @__PURE__ */ React.createElement("span", { className: (0, import_classnames.default)("numeric-stepper-display") }, currentValue)
-      )
+      displayElement
     );
   }, [
     _isMobile,
@@ -245,7 +252,10 @@ var NumericStepper = ({
     max,
     min,
     onChange,
-    tempValue
+    tempValue,
+    enableInput,
+    variant,
+    displayMaxWidth
   ]);
   const _plus = /* @__PURE__ */ React.createElement(
     "div",
@@ -291,33 +301,26 @@ var NumericStepper = ({
     _minus,
     _display,
     _plus,
-    _isMobile && open && /* @__PURE__ */ React.createElement(
-      import_materials.PisellModal,
+    _isMobile && /* @__PURE__ */ React.createElement(
+      import_keyboards.NumberKeyboard,
       {
-        open: true,
-        platform: "pc",
-        width: "unset",
-        header: null,
-        footer: false,
-        maskClosable: true,
-        closeIcon: null,
-        className: "numeric-stepper-keyboard-modal",
-        onCancel: () => setOpen(false)
-      },
-      /* @__PURE__ */ React.createElement(
-        import_numberKeyboard.default,
-        {
-          max,
-          value: tempValue,
-          onChange: handleChange,
-          onOk: () => {
-            const newValue = parseInt(tempValue) || 0;
-            const clampedValue = Math.max(min, Math.min(max, newValue));
-            onChange == null ? void 0 : onChange(clampedValue);
+        containerProps: {
+          className: "numeric-stepper-keyboard-modal",
+          renderType: "modal",
+          open,
+          onCancel: () => {
             setOpen(false);
           }
+        },
+        max,
+        min,
+        defaultValue: currentValue.toString(),
+        originalValue: currentValue.toString(),
+        onEnter: (newValue) => {
+          handleValueChange == null ? void 0 : handleValueChange(Number(newValue));
+          setOpen(false);
         }
-      )
+      }
     )
   );
 };

package/lib/pro/NumericStepper/index.less

@@ -1,52 +1,95 @@
+// ========== 变量定义 ==========
+@primary-color: #7f56d9;
+@primary-hover: #6b46c1;
+@primary-active: #553c9a;
+
+@text-color: #101828;
+@text-secondary: #344054;
+@text-disabled: #d0d5dd;
+
+@border-color: #d0d5dd;
+@border-color-light: #e4e7ec;
+
+@bg-disabled: #d0d5dd;
+@bg-hover-light: #f2f4f7;
+@bg-active-light: #e4e7ec;
+@bg-disabled-light: #f9fafb;
+
+// 尺寸变量 - 分离模式
+@size-small: 24px;
+@size-middle: 32px;
+@size-large: 40px;
+
+// 尺寸变量 - 胶囊模式
+@capsule-size-small: 28px;
+@capsule-size-middle: 40px;
+@capsule-size-large: 52px;
+
+// 图标尺寸 - 分离模式
+@icon-size-small: 12px;
+@icon-size-middle: 16px;
+@icon-size-large: 20px;
+
+// 图标尺寸 - 胶囊模式
+@capsule-icon-size-small: 14px;
+@capsule-icon-size-middle: 20px;
+@capsule-icon-size-large: 26px;
+
+@font-size-small: 14px;
+@font-size-middle: 16px;
+@font-size-large: 18px;
+
+// ========== 混入定义 ==========
+.button-size(@size, @icon-size) {
+  width: @size;
+  height: @size;
+
+  svg {
+    width: @icon-size;
+    height: @icon-size;
+  }
+}
+
+.display-size(@width, @height, @font-size, @max-width: 56px, @padding: 0 4px) {
+  width: @width;
+  height: @height;
+  max-width: @max-width;
+  font-size: @font-size;
+  font-weight: 600;
+  color: @text-color;
+  padding: @padding;
+  text-align: center;
+  overflow: hidden;
+}
+
+// ========== 基础样式 ==========
 .numeric-stepper {
   align-items: center;
   display: grid;
   grid-template-columns: 1fr auto 1fr;
   gap: 8px;
   height: 100%;
-  transition: all 0.2s ease-in-out;
   width: 100%;
+  overflow: hidden;
 
-  &-plus-only {
-    grid-template-columns: 1fr;
-
-    .numeric-stepper-plus-button-wrapper {
-      justify-content: center;
-    }
-  }
-
-  &-disabled {
-    cursor: not-allowed;
-  }
-
-  // 简单模式样式（只显示加号按钮）
-  &-simple {
-    gap: 0;
-  }
-
+  // ========== 按钮容器 ==========
   &-button-wrapper {
     align-items: center;
     display: flex;
     height: 100%;
 
-    &:hover {
-      .numeric-stepper-button {
-        background-color: #6b46c1;
-      }
+    &:hover .numeric-stepper-button:not(.numeric-stepper-button-disabled) {
+      background-color: @primary-hover;
     }
 
-    &:active {
-      .numeric-stepper-button {
-        background-color: #553c9a;
-        transform: scale(0.95);
-      }
+    &:active .numeric-stepper-button:not(.numeric-stepper-button-disabled) {
+      background-color: @primary-active;
+      transform: scale(0.95);
     }
 
-    &:focus {
-      .numeric-stepper-button {
-        outline: none;
-        box-shadow: 0 0 0 2px rgba(127, 86, 217, 0.3);
-      }
+    &:focus .numeric-stepper-button {
+      outline: none;
+      box-shadow: 0 0 0 2px rgba(127, 86, 217, 0.3);
     }
   }
 
@@ -54,113 +97,61 @@
     justify-content: flex-end;
   }
 
-  // 按钮样式
+  // ========== 按钮样式 ==========
   &-button {
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 32px;
-    height: 32px;
+    .button-size(@size-middle, @icon-size-middle);
     border: none;
-    background-color: #7f56d9;
+    background-color: @primary-color;
     cursor: pointer;
     color: #ffffff;
-    transition: all 0.2s ease-in-out;
 
-    // &:hover {
-    //   background-color: #6b46c1;
-    // }
-
-    // &:active {
-    //   background-color: #553c9a;
-    //   transform: scale(0.95);
-    // }
-
-    // &:focus {
-    //   outline: none;
-    //   box-shadow: 0 0 0 2px rgba(127, 86, 217, 0.3);
-    // }
+    svg {
+      stroke: currentColor;
+    }
 
     &-disabled {
       cursor: not-allowed;
-      background-color: #d0d5dd !important;
+      background-color: @bg-disabled !important;
 
       &:hover {
-        background-color: #d0d5dd !important;
+        background-color: @bg-disabled !important;
         transform: none;
       }
     }
-
-    svg {
-      width: 16px;
-      height: 16px;
-      stroke: currentColor;
-    }
-  }
-
-  // 按钮形状样式
-  &-round {
-    .numeric-stepper-button {
-      border-radius: 50%;
-    }
-  }
-
-  &-square {
-    .numeric-stepper-button {
-      border-radius: 12px;
-    }
   }
 
+  // ========== 显示区域 ==========
   &-display-wrapper {
     display: flex;
     align-items: center;
     justify-content: center;
     height: 100%;
+    cursor: pointer;
   }
 
-  // 显示区域样式（当不显示输入框时）
   &-display {
-    border: 2px solid var(--Gray-300, #d0d5dd);
+    border: 2px solid @border-color;
     border-radius: 6px;
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 30px;
-    height: 30px;
-    max-width: 56px;
-    padding: 0 4px;
-    font-size: 16px;
-    font-weight: 600;
+    .display-size(30px, 30px, @font-size-middle);
     line-height: 1.5;
-    color: #101828;
-    text-align: center;
-    overflow: hidden;
   }
 
-  // 尺寸变体
+  // ========== 尺寸变体 ==========
   &-small {
     gap: 8px;
 
     .numeric-stepper-button {
-      width: 24px;
-      height: 24px;
-
-      svg {
-        width: 12px;
-        height: 12px;
-      }
+      .button-size(@size-small, @icon-size-small);
     }
 
     .numeric-stepper-display {
-      width: 24px;
-      height: 24px;
-      max-width: 40px;
-      font-size: 14px;
-      font-weight: 600;
-      color: #101828;
-      padding: 0 2px;
-      text-align: center;
-      overflow: hidden;
+      .display-size(@size-small, @size-small, @font-size-small, 40px, 0 2px);
     }
   }
 
@@ -168,25 +159,11 @@
     gap: 8px;
 
     .numeric-stepper-button {
-      width: 32px;
-      height: 32px;
-
-      svg {
-        width: 16px;
-        height: 16px;
-      }
+      .button-size(@size-middle, @icon-size-middle);
     }
 
     .numeric-stepper-display {
-      width: 30px;
-      height: 30px;
-      max-width: 56px;
-      font-size: 16px;
-      font-weight: 600;
-      color: #101828;
-      padding: 0 4px;
-      text-align: center;
-      overflow: hidden;
+      .display-size(30px, 30px, @font-size-middle);
     }
   }
 
@@ -194,44 +171,192 @@
     gap: 10px;
 
     .numeric-stepper-button {
-      width: 40px;
-      height: 40px;
-
-      svg {
-        width: 20px;
-        height: 20px;
-      }
+      .button-size(@size-large, @icon-size-large);
     }
 
     .numeric-stepper-display {
-      width: 36px;
-      height: 36px;
-      max-width: 64px;
-      font-size: 18px;
-      font-weight: 600;
-      color: #101828;
-      padding: 0 6px;
-      text-align: center;
-      overflow: hidden;
+      .display-size(36px, 36px, @font-size-large, 64px, 0 6px);
       text-overflow: ellipsis;
       white-space: nowrap;
     }
   }
 
-  &-out-of-range {
-    .numeric-stepper-display {
-      color: #ff4d4f;
+  // ========== 形状变体（分离式下生效）==========
+  &-round .numeric-stepper-button {
+    border-radius: 50%;
+  }
+
+  &-square .numeric-stepper-button {
+    border-radius: 12px;
+  }
+
+  // ========== 状态样式 ==========
+  &-plus-only {
+    grid-template-columns: 1fr;
+
+    .numeric-stepper-plus-button-wrapper {
+      justify-content: center;
     }
   }
 
-  // 禁用状态下的特殊样式
+  &-simple {
+    gap: 0;
+  }
+
   &-disabled {
+    cursor: not-allowed;
+
     .numeric-stepper-display {
       color: #9ca3af;
     }
   }
+
+  &-out-of-range .numeric-stepper-display {
+    color: #ff4d4f;
+  }
+
+  &-input-disabled {
+    .numeric-stepper-display-wrapper {
+      cursor: default;
+    }
+
+    .numeric-stepper-display {
+      border: none;
+    }
+  }
+
+  // ========== 胶囊式变体 ==========
+  &-capsule {
+    display: inline-flex;
+    width: auto;
+    background-color: #fff;
+    border: 1px solid @border-color;
+    border-radius: 999px;
+    padding: 0;
+    gap: 2px;
+    height: @capsule-size-middle;
+
+    // 胶囊式按钮容器交互
+    .numeric-stepper-button-wrapper {
+      &:hover .numeric-stepper-button:not(.numeric-stepper-button-disabled) {
+        background-color: @bg-hover-light;
+      }
+
+      &:active .numeric-stepper-button:not(.numeric-stepper-button-disabled) {
+        background-color: @bg-active-light;
+        transform: none;
+      }
+    }
+
+    // 胶囊式按钮样式
+    .numeric-stepper-button {
+      background-color: transparent;
+      color: @text-secondary;
+      border-radius: 50%;
+      transition: all 0.15s ease-in-out;
+
+      &-disabled {
+        background-color: transparent !important;
+        color: @text-disabled !important;
+      }
+    }
+
+    // 胶囊式按钮默认尺寸（middle）
+    .numeric-stepper-button {
+      .button-size(@capsule-size-middle, @capsule-icon-size-middle);
+    }
+
+    // 胶囊式显示区域
+    .numeric-stepper-display-wrapper {
+      flex: 1;
+      min-width: 0; // 允许收缩
+      padding: 0 2px;
+    }
+
+    .numeric-stepper-display {
+      width: auto;
+      height: auto;
+      min-width: 20px;
+      max-width: 100%;
+      border: 2px solid @border-color;
+      border-radius: 6px;
+      background-color: transparent;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    // 胶囊式关闭输入
+    &.numeric-stepper-input-disabled .numeric-stepper-display {
+      border: none;
+    }
+
+    // 胶囊式整体禁用
+    &.numeric-stepper-disabled {
+      background-color: @bg-disabled-light;
+      border-color: @border-color-light;
+
+      .numeric-stepper-button {
+        color: @text-disabled !important;
+        cursor: not-allowed;
+      }
+
+      .numeric-stepper-button-wrapper {
+        &:hover,
+        &:active {
+          .numeric-stepper-button {
+            background-color: transparent !important;
+          }
+        }
+      }
+
+      .numeric-stepper-display {
+        color: @text-disabled;
+      }
+    }
+
+    // 胶囊式尺寸调整
+    &.numeric-stepper-small {
+      height: @capsule-size-small;
+
+      .numeric-stepper-button {
+        .button-size(@capsule-size-small, @capsule-icon-size-small);
+      }
+
+      .numeric-stepper-display {
+        min-width: 16px;
+        font-size: @font-size-small;
+      }
+    }
+
+    &.numeric-stepper-middle {
+      height: @capsule-size-middle;
+
+      .numeric-stepper-button {
+        .button-size(@capsule-size-middle, @capsule-icon-size-middle);
+      }
+
+      .numeric-stepper-display {
+        min-width: 20px;
+        font-size: @font-size-middle;
+      }
+    }
+
+    &.numeric-stepper-large {
+      height: @capsule-size-large;
+
+      .numeric-stepper-button {
+        .button-size(@capsule-size-large, @capsule-icon-size-large);
+      }
+
+      .numeric-stepper-display {
+        min-width: 24px;
+        font-size: @font-size-large;
+      }
+    }
+  }
 }
 
+// ========== 键盘弹窗样式 ==========
 .numeric-stepper-keyboard-modal {
   .ant-modal-content,
   .pisell-lowcode-modal-content {
@@ -244,4 +369,4 @@
   .pisell-lowcode-modal-close {
     display: none;
   }
-}
+}