@pisell/private-materials 6.3.113 → 6.3.115

package/es/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/es/pro/Selector/BatchSelectorDemo.js

@@ -35,6 +35,13 @@ var dataSource = [{
     title: '披萨',
     value: 'pizza'
   }],
+  grid: {
+    columns: 2,
+    gutter: 16,
+    colConfig: {
+      span: 3
+    }
+  },
   ruleConfig: {
     required: 1,
     autoValidate: true
@@ -113,6 +120,10 @@ var dataSource = [{
     value: 'extra-onion',
     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',
@@ -288,8 +299,7 @@ export var BatchSelectorDemo = function BatchSelectorDemo() {
       padding: '0',
       margin: '0 auto',
       height: '100vh',
-      overflow: 'auto',
-      '--theme-color': '#5d3f9f'
+      overflow: 'auto'
     },
     ref: containerRef
   }, /*#__PURE__*/React.createElement(Title, {

package/es/pro/Selector/Selector.js

@@ -1,6 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["show", "render"],
-  _excluded2 = ["disabled", "size", "style"];
+var _excluded = ["show", "render"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -10,7 +9,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useEffect, useImperativeHandle, forwardRef } from 'react';
-import { Tag, Select } from 'antd';
+import { Row, Col, Tag, Select } from 'antd';
 import classNames from 'classnames';
 import { CheckCircleOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 // @ts-ignore
@@ -22,9 +21,10 @@ import NumericStepper from "../NumericStepper";
 import useSelectionController from "./hooks/useSelectionController";
 import usePresetProps from "./hooks/usePresetProps";
 import useEngineContext from "../../hooks/useEngineContext";
-import useThemeTokens from "../../hooks/useThemeTokens";
 import Item from "./Item";
 import "./selector.less";
+var ARow = Row;
+var ACol = Col;
 var ATag = Tag;
 export var SelectorContext = /*#__PURE__*/React.createContext({
   disabled: false,
@@ -54,9 +54,6 @@ var Selector = /*#__PURE__*/forwardRef(function (props, ref) {
     valueType = _props$valueType === void 0 ? 'primitive' : _props$valueType,
     _props$variant = props.variant,
     variant = _props$variant === void 0 ? 'default' : _props$variant;
-  var _useThemeTokens = useThemeTokens(props.theme),
-    colorPrimary = _useThemeTokens.colorPrimary,
-    colorPrimaryBg = _useThemeTokens.colorPrimaryBg;
   var context = useEngineContext();
   locales.init(localeTexts, (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.storage) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.get('umi_locale')) || 'en');
   var _useSelectionControll = useSelectionController(props),
@@ -150,7 +147,8 @@ var Selector = /*#__PURE__*/forwardRef(function (props, ref) {
         actions.update(option._key, {
           quantity: value
         });
-      }
+      },
+      showInput: true
     }));
   };
 
@@ -208,16 +206,9 @@ var Selector = /*#__PURE__*/forwardRef(function (props, ref) {
     if (variant === 'select') {
       var _value = state.values;
       var _maxCount = ruleConfig === null || ruleConfig === void 0 ? void 0 : ruleConfig.max;
-      var _ref2 = props.selectProps || {},
-        selectDisabled = _ref2.disabled,
-        _ref2$size = _ref2.size,
-        size = _ref2$size === void 0 ? 'large' : _ref2$size,
-        style = _ref2.style,
-        rest = _objectWithoutProperties(_ref2, _excluded2);
-      return /*#__PURE__*/React.createElement(Select, _extends({}, rest, {
-        size: size,
-        disabled: selectDisabled || disabled,
-        style: style || {
+      return /*#__PURE__*/React.createElement(Select, {
+        size: "large",
+        style: {
           width: '100%'
         },
         mode: mode === 'multiple' ? 'multiple' : undefined,
@@ -227,18 +218,28 @@ var Selector = /*#__PURE__*/forwardRef(function (props, ref) {
         onChange: function onChange(value) {
           return actions.setValue(value);
         },
-        maxCount: _maxCount
-      }));
+        disabled: disabled,
+        maxTagCount: _maxCount
+      });
     }
     return /*#__PURE__*/React.createElement(LayoutContainer, {
       className: "pisell-pro-selector_options-container",
       config: finalLayout
     }, options.map(renderOption));
   };
+  var renderErrorMsg = function renderErrorMsg() {
+    if (!(errors !== null && errors !== void 0 && errors.length)) return null;
+    var error = errors[errors.length - 1];
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: '#D92D20'
+      }
+    }, error === null || error === void 0 ? void 0 : error.message);
+  };
   var renderRequiredTag = function renderRequiredTag() {
-    var _ref3 = ruleConfig || {},
-      _ref3$required = _ref3.required,
-      required = _ref3$required === void 0 ? false : _ref3$required;
+    var _ref2 = ruleConfig || {},
+      _ref2$required = _ref2.required,
+      required = _ref2$required === void 0 ? false : _ref2$required;
     if (!required) return null;
     var style = {
       borderRadius: 16
@@ -265,19 +266,9 @@ var Selector = /*#__PURE__*/forwardRef(function (props, ref) {
     }, locales.getText('pisell2.pro.selector.required-tag'));
   };
   var renderTip = function renderTip() {
-    var _headerProps$tip2, _headerProps$tip3, _headerProps$tip4;
-    if (Array.isArray(errors) && errors.length) {
-      var _headerProps$tip;
-      var error = errors[errors.length - 1];
-      return /*#__PURE__*/React.createElement("span", {
-        className: "pisell-pro-selector_tip",
-        style: _objectSpread(_objectSpread({}, (headerProps === null || headerProps === void 0 || (_headerProps$tip = headerProps.tip) === null || _headerProps$tip === void 0 ? void 0 : _headerProps$tip.style) || {}), {}, {
-          color: '#D92D20'
-        })
-      }, error === null || error === void 0 ? void 0 : error.message);
-    }
-    if ((headerProps === null || headerProps === void 0 || (_headerProps$tip2 = headerProps.tip) === null || _headerProps$tip2 === void 0 ? void 0 : _headerProps$tip2.visible) === false) return null;
-    var text = headerProps === null || headerProps === void 0 || (_headerProps$tip3 = headerProps.tip) === null || _headerProps$tip3 === void 0 ? void 0 : _headerProps$tip3.text;
+    var _headerProps$tip, _headerProps$tip2, _headerProps$tip3;
+    if ((headerProps === null || headerProps === void 0 || (_headerProps$tip = headerProps.tip) === null || _headerProps$tip === void 0 ? void 0 : _headerProps$tip.visible) === false) return null;
+    var text = headerProps === null || headerProps === void 0 || (_headerProps$tip2 = headerProps.tip) === null || _headerProps$tip2 === void 0 ? void 0 : _headerProps$tip2.text;
     if (ruleConfig !== null && ruleConfig !== void 0 && ruleConfig.min || ruleConfig !== null && ruleConfig !== void 0 && ruleConfig.max) {
       text = locales.getText('pisell2.pro.selector.tip.min-max-selection')(ruleConfig === null || ruleConfig === void 0 ? void 0 : ruleConfig.min, ruleConfig === null || ruleConfig === void 0 ? void 0 : ruleConfig.max);
     }
@@ -291,7 +282,7 @@ var Selector = /*#__PURE__*/forwardRef(function (props, ref) {
     if (!text) return null;
     return /*#__PURE__*/React.createElement("span", {
       className: "pisell-pro-selector_tip",
-      style: _objectSpread({}, (headerProps === null || headerProps === void 0 || (_headerProps$tip4 = headerProps.tip) === null || _headerProps$tip4 === void 0 ? void 0 : _headerProps$tip4.style) || {})
+      style: _objectSpread({}, (headerProps === null || headerProps === void 0 || (_headerProps$tip3 = headerProps.tip) === null || _headerProps$tip3 === void 0 ? void 0 : _headerProps$tip3.style) || {})
     }, "(", text, ")");
   };
   var renderHeader = function renderHeader() {
@@ -324,8 +315,8 @@ var Selector = /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement("div", {
     id: "pisell-pro-selector-".concat(props.id),
     className: classNames('pisell-pro-selector', props.className),
-    style: _objectSpread(_objectSpread({}, props.style || {}), {}, _defineProperty(_defineProperty({}, '--color-primary', colorPrimary), '--color-primary-bg', colorPrimaryBg))
-  }, renderHeader(), /*#__PURE__*/React.createElement(SelectorContext.Provider, {
+    style: props.style
+  }, renderHeader(), renderErrorMsg(), /*#__PURE__*/React.createElement(SelectorContext.Provider, {
     value: {
       mode: mode,
       disabled: disabled,