@pisell/private-materials 6.3.113 → 6.3.115

package/lib/pro/NumericStepper/index.less

@@ -1,149 +1,149 @@
-// ========== 变量定义 ==========
-@primary-color: var(--color-primary, #5d3f9f);
-
-@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 {
+  display: inline-flex;
   align-items: center;
-  display: grid;
-  grid-template-columns: 1fr auto 1fr;
   gap: 8px;
-  height: 100%;
-  width: 100%;
-  overflow: hidden;
-
-  // ========== 按钮容器 ==========
-  &-button-wrapper {
-    align-items: center;
-    display: flex;
-    height: 100%;
-    &:active .numeric-stepper-button:not(.numeric-stepper-button-disabled) {
-      transform: scale(0.95);
-    }
+  transition: all 0.2s ease-in-out;
 
-    &:focus .numeric-stepper-button {
-      outline: none;
-      box-shadow: 0 0 0 2px rgba(127, 86, 217, 0.3);
-    }
+  &-disabled {
+    cursor: not-allowed;
   }
 
-  &-minus-button-wrapper {
-    justify-content: flex-end;
+  // 简单模式样式（只显示加号按钮）
+  &-simple {
+    gap: 0;
   }
 
-  // ========== 按钮样式 ==========
+  // 按钮样式
   &-button {
     display: flex;
     align-items: center;
     justify-content: center;
-    .button-size(@size-middle, @icon-size-middle);
+    width: 32px;
+    height: 32px;
     border: none;
-    background-color: @primary-color;
+    background-color: #7f56d9;
     cursor: pointer;
     color: #ffffff;
+    transition: all 0.2s ease-in-out;
 
-    svg {
-      stroke: currentColor;
+    &: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);
     }
 
     &-disabled {
       cursor: not-allowed;
-      background-color: @bg-disabled !important;
+      background-color: #d0d5dd !important;
 
       &:hover {
-        background-color: @bg-disabled !important;
+        background-color: #d0d5dd !important;
         transform: none;
       }
     }
+
+    svg {
+      width: 16px;
+      height: 16px;
+      stroke: currentColor;
+    }
   }
 
-  // ========== 显示区域 ==========
-  &-display-wrapper {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    cursor: pointer;
+  // 按钮形状样式
+  &-round {
+    .numeric-stepper-button {
+      border-radius: 50%;
+    }
+  }
+
+  &-square {
+    .numeric-stepper-button {
+      border-radius: 12px;
+    }
+  }
+
+  // 输入框样式
+  &-input {
+    border: none;
+    outline: none;
+    text-align: center;
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 1.5;
+    color: #101828;
+    background: transparent;
+    width: 30px;
+    height: 30px;
+    max-width: 56px;
+    padding: 0 4px;
+    overflow: hidden;
+
+    &::-webkit-outer-spin-button,
+    &::-webkit-inner-spin-button {
+      -webkit-appearance: none;
+      margin: 0;
+    }
+
+    &[type='number'] {
+      -moz-appearance: textfield;
+    }
+
+    &:disabled {
+      color: #9ca3af;
+      cursor: not-allowed;
+    }
   }
 
+  // 显示区域样式（当不显示输入框时）
   &-display {
-    border: 2px solid @border-color;
-    border-radius: 6px;
     display: flex;
     align-items: center;
     justify-content: center;
-    .display-size(30px, 30px, @font-size-middle);
+    width: 30px;
+    height: 30px;
+    max-width: 56px;
+    padding: 0 4px;
+    font-size: 16px;
+    font-weight: 600;
     line-height: 1.5;
+    color: #101828;
+    text-align: center;
+    overflow: hidden;
   }
 
-  // ========== 尺寸变体 ==========
+  // 尺寸变体
   &-small {
     gap: 8px;
 
     .numeric-stepper-button {
-      .button-size(@size-small, @icon-size-small);
+      width: 24px;
+      height: 24px;
+
+      svg {
+        width: 12px;
+        height: 12px;
+      }
     }
 
+    .numeric-stepper-input,
     .numeric-stepper-display {
-      .display-size(@size-small, @size-small, @font-size-small, 40px, 0 2px);
+      width: 24px;
+      height: 24px;
+      max-width: 40px;
+      font-size: 14px;
+      font-weight: 600;
+      color: #101828;
+      padding: 0 2px;
+      text-align: center;
+      overflow: hidden;
     }
   }
 
@@ -151,11 +151,26 @@
     gap: 8px;
 
     .numeric-stepper-button {
-      .button-size(@size-middle, @icon-size-middle);
+      width: 32px;
+      height: 32px;
+
+      svg {
+        width: 16px;
+        height: 16px;
+      }
     }
 
+    .numeric-stepper-input,
     .numeric-stepper-display {
-      .display-size(30px, 30px, @font-size-middle);
+      width: 30px;
+      height: 30px;
+      max-width: 56px;
+      font-size: 16px;
+      font-weight: 600;
+      color: #101828;
+      padding: 0 4px;
+      text-align: center;
+      overflow: hidden;
     }
   }
 
@@ -163,202 +178,43 @@
     gap: 10px;
 
     .numeric-stepper-button {
-      .button-size(@size-large, @icon-size-large);
+      width: 40px;
+      height: 40px;
+
+      svg {
+        width: 20px;
+        height: 20px;
+      }
     }
 
+    .numeric-stepper-input,
     .numeric-stepper-display {
-      .display-size(36px, 36px, @font-size-large, 64px, 0 6px);
+      width: 36px;
+      height: 36px;
+      max-width: 64px;
+      font-size: 18px;
+      font-weight: 600;
+      color: #101828;
+      padding: 0 6px;
+      text-align: center;
+      overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
     }
   }
 
-  // ========== 形状变体（分离式下生效）==========
-  &-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;
+  &-out-of-range {
+    .numeric-stepper-input,
+    .numeric-stepper-display {
+      color: #ff4d4f;
     }
   }
 
-  &-simple {
-    gap: 0;
-  }
-
+  // 禁用状态下的特殊样式
   &-disabled {
-    cursor: not-allowed;
-
+    .numeric-stepper-input,
     .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 {
-    padding: 0;
-    background-color: transparent;
-    overflow: hidden;
-  }
-
-  .ant-modal-close,
-  .pisell-lowcode-modal-close {
-    display: none;
-  }
 }

package/lib/pro/Selector/BatchSelectorDemo.js

@@ -49,21 +49,22 @@ var dataSource = [
       { id: 1, title: "汉堡", value: "burger" },
       { id: 2, title: "披萨", value: "pizza" }
     ],
+    grid: {
+      columns: 2,
+      gutter: 16,
+      colConfig: {
+        span: 3
+      }
+    },
     ruleConfig: {
       required: 1,
       autoValidate: true
     },
     titleProps: {
-      renderExtra: () => /* @__PURE__ */ import_react.default.createElement(
-        "div",
-        {
-          style: {
-            flex: 1,
-            textAlign: "right"
-          }
-        },
-        "额外内容"
-      )
+      renderExtra: () => /* @__PURE__ */ import_react.default.createElement("div", { style: {
+        flex: 1,
+        textAlign: "right"
+      } }, "额外内容")
     }
   },
   {
@@ -123,6 +124,10 @@ var dataSource = [
         cover: "https://file.mypisell-dev.com/pisel/image/9/52fe9ca4233877f2c06865d27b9fb7912022_12_01_13_32_47_147_00076174656__1080_1073__.jpeg"
       }
     ],
+    grid: {
+      columns: 3,
+      gutter: 16
+    },
     variant: "card",
     itemProps: {
       layout: "vertical",
@@ -247,8 +252,7 @@ var BatchSelectorDemo = () => {
         padding: "0",
         margin: "0 auto",
         height: "100vh",
-        overflow: "auto",
-        "--theme-color": "#5d3f9f"
+        overflow: "auto"
       },
       ref: containerRef
     },
@@ -628,7 +632,9 @@ var BatchSelectorDemo = () => {
         {
           type: "expr",
           when: {
-            and: [{ groupId: "31", op: "in", value: ["single", "double"] }]
+            and: [
+              { groupId: "31", op: "in", value: ["single", "double"] }
+            ]
           },
           then: [
             {

package/lib/pro/Selector/Selector.js

@@ -45,7 +45,6 @@ var import_NumericStepper = __toESM(require("../NumericStepper"));
 var import_useSelectionController = __toESM(require("./hooks/useSelectionController"));
 var import_usePresetProps = __toESM(require("./hooks/usePresetProps"));
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
-var import_useThemeTokens = __toESM(require("../../hooks/useThemeTokens"));
 var import_Item = __toESM(require("./Item"));
 var import_selector = require("./selector.less");
 var ATag = import_antd.Tag;
@@ -74,7 +73,6 @@ var Selector = (0, import_react.forwardRef)((props, ref) => {
     valueType = "primitive",
     variant = "default"
   } = props;
-  const { colorPrimary, colorPrimaryBg } = (0, import_useThemeTokens.default)(props.theme);
   const context = (0, import_useEngineContext.default)();
   import_utils.locales.init(
     import_locales.default,
@@ -154,7 +152,8 @@ var Selector = (0, import_react.forwardRef)((props, ref) => {
         disabled: disabled || option.disabled,
         onChange: (value) => {
           actions.update(option._key, { quantity: value });
-        }
+        },
+        showInput: true
       }
     );
   };
@@ -202,25 +201,18 @@ var Selector = (0, import_react.forwardRef)((props, ref) => {
     if (variant === "select") {
       const _value = state.values;
       const _maxCount = ruleConfig == null ? void 0 : ruleConfig.max;
-      const {
-        disabled: selectDisabled,
-        size = "large",
-        style,
-        ...rest
-      } = props.selectProps || {};
       return /* @__PURE__ */ import_react.default.createElement(
         import_antd.Select,
         {
-          ...rest,
-          size,
-          disabled: selectDisabled || disabled,
-          style: style || { width: "100%" },
+          size: "large",
+          style: { width: "100%" },
           mode: mode === "multiple" ? "multiple" : void 0,
           options,
           fieldNames,
           value: _value,
           onChange: (value) => actions.setValue(value),
-          maxCount: _maxCount
+          disabled,
+          maxTagCount: _maxCount
         }
       );
     }
@@ -233,6 +225,11 @@ var Selector = (0, import_react.forwardRef)((props, ref) => {
       options.map(renderOption)
     );
   };
+  const renderErrorMsg = () => {
+    if (!(errors == null ? void 0 : errors.length)) return null;
+    const error = errors[errors.length - 1];
+    return /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#D92D20" } }, error == null ? void 0 : error.message);
+  };
   const renderRequiredTag = () => {
     const { required = false } = ruleConfig || {};
     if (!required) return null;
@@ -249,20 +246,9 @@ var Selector = (0, import_react.forwardRef)((props, ref) => {
     return /* @__PURE__ */ import_react.default.createElement(ATag, { style }, import_utils.locales.getText("pisell2.pro.selector.required-tag"));
   };
   const renderTip = () => {
-    var _a2, _b2, _c2, _d;
-    if (Array.isArray(errors) && errors.length) {
-      const error = errors[errors.length - 1];
-      return /* @__PURE__ */ import_react.default.createElement(
-        "span",
-        {
-          className: "pisell-pro-selector_tip",
-          style: { ...((_a2 = headerProps == null ? void 0 : headerProps.tip) == null ? void 0 : _a2.style) || {}, color: "#D92D20" }
-        },
-        error == null ? void 0 : error.message
-      );
-    }
-    if (((_b2 = headerProps == null ? void 0 : headerProps.tip) == null ? void 0 : _b2.visible) === false) return null;
-    let text = (_c2 = headerProps == null ? void 0 : headerProps.tip) == null ? void 0 : _c2.text;
+    var _a2, _b2, _c2;
+    if (((_a2 = headerProps == null ? void 0 : headerProps.tip) == null ? void 0 : _a2.visible) === false) return null;
+    let text = (_b2 = headerProps == null ? void 0 : headerProps.tip) == null ? void 0 : _b2.text;
     if ((ruleConfig == null ? void 0 : ruleConfig.min) || (ruleConfig == null ? void 0 : ruleConfig.max)) {
       text = import_utils.locales.getText("pisell2.pro.selector.tip.min-max-selection")(
         ruleConfig == null ? void 0 : ruleConfig.min,
@@ -281,7 +267,7 @@ var Selector = (0, import_react.forwardRef)((props, ref) => {
       "span",
       {
         className: "pisell-pro-selector_tip",
-        style: { ...((_d = headerProps == null ? void 0 : headerProps.tip) == null ? void 0 : _d.style) || {} }
+        style: { ...((_c2 = headerProps == null ? void 0 : headerProps.tip) == null ? void 0 : _c2.style) || {} }
       },
       "(",
       text,
@@ -330,13 +316,10 @@ var Selector = (0, import_react.forwardRef)((props, ref) => {
     {
       id: `pisell-pro-selector-${props.id}`,
       className: (0, import_classnames.default)("pisell-pro-selector", props.className),
-      style: {
-        ...props.style || {},
-        ["--color-primary"]: colorPrimary,
-        ["--color-primary-bg"]: colorPrimaryBg
-      }
+      style: props.style
     },
     renderHeader(),
+    renderErrorMsg(),
     /* @__PURE__ */ import_react.default.createElement(
       SelectorContext.Provider,
       {

package/lib/pro/Selector/SelectorGroup.js

@@ -38,7 +38,6 @@ var import_lodash = require("lodash");
 var import_utils = require("@pisell/utils");
 var import_locales = __toESM(require("./locales"));
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
-var import_useThemeTokens = __toESM(require("../../hooks/useThemeTokens"));
 var import_Selector = __toESM(require("./Selector"));
 var import_utils2 = require("./utils");
 var import_IntersectionObserver = require("./components/IntersectionObserver");
@@ -60,7 +59,6 @@ var SelectorGroup = (0, import_react.forwardRef)(
       preserve: preserveDefault = false,
       style
     } = props;
-    const { colorPrimary, colorPrimaryBg } = (0, import_useThemeTokens.default)(props.theme);
     const [activeIndex, setActiveIndex] = (0, import_react.useState)(-1);
     const isManualChangeIndexRef = (0, import_react.useRef)(false);
     const containerRef = (0, import_react.useRef)(null);
@@ -513,11 +511,7 @@ var SelectorGroup = (0, import_react.forwardRef)(
           `pisell-batch-selector-${_uniqueId}`
         ),
         ref: containerRef,
-        style: {
-          ...style || {},
-          ["--color-primary"]: colorPrimary,
-          ["--color-primary-bg"]: colorPrimaryBg
-        }
+        style
       },
       renderTabs(),
       /* @__PURE__ */ import_react.default.createElement(