@pisell/private-materials 3.4.68 → 3.4.70

package/lib/pro/Selector/components/Card/index.less

@@ -1,7 +1,7 @@
 /* Card组件样式 */
 .pisell-pro-card {
   position: relative;
-  display: flex;
+  display: grid;
   border-radius: 8px;
   transition: all 0.2s;
   box-sizing: border-box;
@@ -21,7 +21,6 @@
 
   /* 布局样式 */
   &-vertical {
-    flex-direction: column;
     border-radius: 12px;
 
     .pisell-pro-card_content {
@@ -33,18 +32,24 @@
       align-items: center;
       justify-content: center;
       margin: 0;
+      height: 64px;
     }
 
     .pisell-pro-card_actions-item {
-      margin: 20px 0;
+      margin: 0;
+      height: 100%;
     }
   }
 
   &-horizontal {
-    flex-direction: row;
+    grid-template-columns: 1fr auto;
     align-items: center;
     gap: 10px;
 
+    &.pisell-pro-card-actions-left {
+      grid-template-columns: auto 1fr;
+    }
+
     .pisell-pro-card_content {
       flex: 1;
       font-size: 16px;
@@ -55,10 +60,12 @@
       align-items: center;
       margin: 0;
       padding: 0;
+      height: 100%;
     }
 
     .pisell-pro-card_actions-item {
       margin: 0;
+      height: 100%;
     }
   }
 

package/lib/pro/Selector/components/Indicator/index.d.ts

@@ -0,0 +1,20 @@
+import React from 'react';
+import './index.less';
+export interface IndicatorProps {
+    mode?: 'single' | 'multiple';
+    variant?: 'outlined' | 'filled';
+    defaultChecked?: boolean;
+    checked?: boolean;
+    disabled?: boolean;
+    onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
+    className?: string;
+    styles?: {
+        container?: React.CSSProperties;
+        indicator?: React.CSSProperties;
+        content?: React.CSSProperties;
+    };
+    children?: React.ReactNode;
+    size?: 'small' | 'middle' | 'large' | number;
+}
+declare const Indicator: React.FC<IndicatorProps>;
+export default Indicator;

package/lib/pro/Selector/components/Indicator/index.js

@@ -124,6 +124,6 @@ var Indicator = (props) => {
       disabled,
       onChange: handleInputChange
     }
-  ), /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-inner`, style: indicatorStyle }, checked && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, mode === "single" && variant === "outlined" ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-dot` }) : renderCheckIcon())), children && /* @__PURE__ */ import_react.default.createElement("span", { className: `${prefixCls}-content` }, children));
+  ), /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-inner`, style: indicatorStyle }, checked && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, mode === "single" && variant === "outlined" ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-dot` }) : renderCheckIcon())), children && /* @__PURE__ */ import_react.default.createElement("span", { className: `${prefixCls}-content`, style: styles == null ? void 0 : styles.content }, children));
 };
 var Indicator_default = Indicator;

package/lib/pro/Selector/components/Indicator/index.less

@@ -1,12 +1,15 @@
 .pisell-pro-indicator {
+  vertical-align: middle;
   display: inline-flex;
   align-items: center;
-  vertical-align: middle;
+  justify-content: center;
   cursor: pointer;
   user-select: none;
   font-size: 14px;
   line-height: 1.5;
   position: relative;
+  height: 100%;
+  width: 100%;
 
   &-input {
     position: absolute;

package/lib/pro/Selector/components/LayoutContainer/index.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+import { LayoutConfig } from '../../types';
+import './index.less';
+interface LayoutContainerProps {
+    className: string;
+    config: LayoutConfig | null;
+    children: React.ReactNode[];
+}
+/**
+ * 统一的布局容器组件
+ *
+ * 支持三种布局模式：
+ * 1. 响应式布局（推荐）：通过 responsive 配置，使用 ResizeObserver 实现容器级响应式
+ * 2. Custom 布局：通过 className 使用预设样式
+ * 3. Ant Design Grid 布局：基础的栅格布局，用于简单场景
+ */
+declare function LayoutContainer({ className: containerClassName, config, children, }: LayoutContainerProps): React.ReactElement | null;
+export default LayoutContainer;

package/lib/pro/Selector/components/LayoutContainer/index.js

@@ -35,19 +35,147 @@ module.exports = __toCommonJS(LayoutContainer_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_classnames = __toESM(require("classnames"));
+var import_index = require("./index.less");
 var ARow = import_antd.Row;
 var ACol = import_antd.Col;
+function normalizeBreakpoints(breakpoints, defaultGap) {
+  const normalized = {};
+  for (const [width, config] of Object.entries(breakpoints)) {
+    const widthNum = Number(width);
+    if (typeof config === "number") {
+      normalized[widthNum] = { columns: config, gap: defaultGap };
+    } else {
+      normalized[widthNum] = { ...config, gap: config.gap ?? defaultGap };
+    }
+  }
+  return normalized;
+}
+function generateBreakpoints(minWidth, maxColumns, gap = 16) {
+  const gapNum = typeof gap === "number" ? gap : parseInt(gap, 10) || 16;
+  const breakpoints = {
+    0: { columns: 1, gap }
+  };
+  for (let cols = 2; cols <= maxColumns; cols++) {
+    const breakpoint = cols * minWidth + (cols - 1) * gapNum;
+    breakpoints[breakpoint] = { columns: cols, gap };
+  }
+  return breakpoints;
+}
+function getActiveBreakpoint(width, breakpoints, defaultColumns = 1, defaultGap = 16) {
+  const sortedBreakpoints = Object.keys(breakpoints).map(Number).sort((a, b) => b - a);
+  for (const breakpoint of sortedBreakpoints) {
+    if (width >= breakpoint) {
+      return breakpoints[breakpoint];
+    }
+  }
+  return { columns: defaultColumns, gap: defaultGap };
+}
+function parseResponsiveConfig(responsive) {
+  const { minWidth, maxColumns, breakpoints, gap = 16 } = responsive;
+  let finalBreakpoints = {};
+  if (minWidth && maxColumns) {
+    finalBreakpoints = generateBreakpoints(minWidth, maxColumns, gap);
+  }
+  if (breakpoints) {
+    const normalizedBreakpoints = normalizeBreakpoints(breakpoints, gap);
+    finalBreakpoints = { ...finalBreakpoints, ...normalizedBreakpoints };
+  }
+  if (Object.keys(finalBreakpoints).length === 0) {
+    finalBreakpoints = { 0: { columns: responsive.defaultColumns ?? 1, gap } };
+  }
+  return finalBreakpoints;
+}
+function useContainerWidth(ref, debounceMs = 0) {
+  const [width, setWidth] = (0, import_react.useState)(0);
+  const timeoutRef = (0, import_react.useRef)(null);
+  (0, import_react.useEffect)(() => {
+    const element = ref.current;
+    if (!element) return;
+    const updateWidth = (newWidth) => {
+      if (debounceMs > 0) {
+        if (timeoutRef.current) {
+          clearTimeout(timeoutRef.current);
+        }
+        timeoutRef.current = setTimeout(() => {
+          setWidth(newWidth);
+        }, debounceMs);
+      } else {
+        setWidth(newWidth);
+      }
+    };
+    const observer = new ResizeObserver((entries) => {
+      const entry = entries[0];
+      if (entry) {
+        updateWidth(entry.contentRect.width);
+      }
+    });
+    observer.observe(element);
+    setWidth(element.getBoundingClientRect().width);
+    return () => {
+      observer.disconnect();
+      if (timeoutRef.current) {
+        clearTimeout(timeoutRef.current);
+      }
+    };
+  }, [ref, debounceMs]);
+  return width;
+}
+var baseClassName = "pisell-pro-selector_layout";
 function LayoutContainer({
   className: containerClassName,
   config,
   children
 }) {
+  const containerRef = (0, import_react.useRef)(null);
+  const responsiveConfig = config == null ? void 0 : config.responsive;
+  const hasResponsive = !!responsiveConfig;
+  const breakpoints = (0, import_react.useMemo)(() => {
+    if (!responsiveConfig) return null;
+    return parseResponsiveConfig(responsiveConfig);
+  }, [responsiveConfig]);
+  const containerWidth = useContainerWidth(
+    containerRef,
+    (responsiveConfig == null ? void 0 : responsiveConfig.debounce) ?? 0
+  );
+  const activeConfig = (0, import_react.useMemo)(() => {
+    if (!breakpoints) return null;
+    return getActiveBreakpoint(
+      containerWidth,
+      breakpoints,
+      responsiveConfig == null ? void 0 : responsiveConfig.defaultColumns,
+      responsiveConfig == null ? void 0 : responsiveConfig.gap
+    );
+  }, [containerWidth, breakpoints, responsiveConfig]);
   if (!config) {
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: containerClassName }, children);
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)(baseClassName, containerClassName) }, children);
   }
   const { type, className, containerStyle = {} } = config;
+  if (hasResponsive) {
+    const cssVariables = {
+      "--layout-columns": (activeConfig == null ? void 0 : activeConfig.columns) ?? 1,
+      "--layout-gap": typeof (activeConfig == null ? void 0 : activeConfig.gap) === "number" ? `${activeConfig.gap}px` : (activeConfig == null ? void 0 : activeConfig.gap) ?? "16px"
+    };
+    return /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        ref: containerRef,
+        className: (0, import_classnames.default)(
+          baseClassName,
+          `${baseClassName}-responsive`,
+          containerClassName,
+          className
+        ),
+        style: { ...cssVariables, ...containerStyle, ...activeConfig == null ? void 0 : activeConfig.style }
+      },
+      children
+    );
+  }
   if (type !== "antdGrid") {
-    const layoutClassName = (0, import_classnames.default)(containerClassName, className);
+    const layoutClassName = (0, import_classnames.default)(
+      baseClassName,
+      containerClassName,
+      className
+    );
     return /* @__PURE__ */ import_react.default.createElement("div", { className: layoutClassName, style: containerStyle }, children);
   }
   const { columns = 1, align, justify, gutter, wrap, colConfig = {} } = config;

package/lib/pro/Selector/components/LayoutContainer/index.less

@@ -0,0 +1,19 @@
+.pisell-pro-selector_layout {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  // 响应式布局容器
+  &-responsive {
+    display: grid;
+    gap: var(--layout-gap, 16px);
+    grid-template-columns: repeat(var(--layout-columns, 1), 1fr);
+  }
+
+  // 自动宽度布局 - 内容自适应
+  &-auto-flex {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 16px;
+  }
+}

package/lib/pro/Selector/demo.d.ts

@@ -0,0 +1,2 @@
+declare const SelectorDemo: () => JSX.Element;
+export default SelectorDemo;

package/lib/pro/Selector/demo.js

@@ -57,7 +57,7 @@ var SelectorDemo = () => {
   });
   const [paymentMethod, setPaymentMethod] = (0, import_react.useState)("alipay");
   const [serviceOptions, setServiceOptions] = (0, import_react.useState)([1, 2]);
-  const [width, setWidth] = (0, import_react.useState)("660");
+  const [width, setWidth] = (0, import_react.useState)("100%");
   const simpleDataSource = [
     { id: 1, title: "选项A" },
     { id: 2, title: "选项B" },

package/lib/pro/Selector/hooks/usePresetItemProps.js

@@ -111,6 +111,7 @@ var usePresetItemProps = (params) => {
           content: {}
         };
         if (presetVariant === "1") {
+          defaultStyles.container.padding = "12px 16px";
           defaultStyles.content.textAlign = "center";
           baseProps = {
             selectedType: "outlined-bold"
@@ -120,6 +121,7 @@ var usePresetItemProps = (params) => {
           }
           indicator = null;
         } else if (presetVariant === "2") {
+          defaultStyles.container.padding = "12px 16px";
           baseProps = {
             selectedType: "filled"
           };

package/lib/pro/Selector/hooks/usePresetProps.d.ts

@@ -0,0 +1,24 @@
+import { LayoutConfig, ItemLayout, PresetConfig, SelectorVariant, SelectorProps } from '../types';
+interface UsePresetPropsParams {
+    layout?: LayoutConfig;
+    mode?: 'single' | 'multiple';
+    preset?: PresetConfig;
+    itemLayout?: ItemLayout;
+    variant?: SelectorVariant;
+    indicatorProps?: SelectorProps['indicatorProps'];
+}
+interface UsePresetPropsResult {
+    layout: LayoutConfig | null;
+    indicatorProps: SelectorProps['indicatorProps'];
+}
+/**
+ * 根据预设配置生成 layout 和 indicatorProps
+ * Layout 规则：
+ * - 根据 variant 和 preset.variant 计算布局样式
+ * IndicatorProps 规则：
+ * 1. 当 variant='card' 且 preset.variant='2' 时，indicator 默认 variant='filled'
+ * 2. 当 variant='media' 时，indicator 默认 variant='filled'
+ * 3. 外部传入的 indicatorProps 优先级更高（会合并到预设配置中）
+ */
+declare const usePresetProps: ({ layout, mode, preset, itemLayout, variant, indicatorProps, }: UsePresetPropsParams) => UsePresetPropsResult;
+export default usePresetProps;

package/lib/pro/Selector/hooks/usePresetProps.js

@@ -30,18 +30,39 @@ var VARIANT_MAP = {
   ["media"]: ["1", "2"]
 };
 var EMPTY_CONFIG = {};
+var RESPONSIVE_PRESETS = {
+  /** 响应式布局 - 最小宽度 210px，最多 5 列 */
+  responsive210: {
+    breakpoints: {
+      0: { columns: 1, gap: 16 },
+      420: { columns: 2, gap: 16 },
+      630: { columns: 3, gap: 16 },
+      841: { columns: 4, gap: 16 },
+      1367: { columns: 5, gap: 16 }
+    }
+  },
+  /** 响应式布局 - 最小宽度 330px，最多 4 列 */
+  responsive330: {
+    breakpoints: {
+      0: { columns: 1, gap: 16 },
+      660: { columns: 2, gap: 16 },
+      995: { columns: 3, gap: 16 },
+      1367: { columns: 4, gap: 16 }
+    }
+  }
+};
 var PRESET_LAYOUTS = {
   /** 自动宽度布局 - 内容自适应 */
   autoFlex: {
     className: "pisell-pro-selector_layout-auto-flex"
   },
-  /** 响应式布局 - 最小宽度 210px */
+  /** 响应式布局 - 最小宽度 210px，最多 5 列 */
   responsive210: {
-    className: "pisell-pro-selector_layout-responsive-210"
+    responsive: RESPONSIVE_PRESETS.responsive210
   },
-  /** 响应式布局 - 最小宽度 330px */
+  /** 响应式布局 - 最小宽度 330px，最多 4 列 */
   responsive330: {
-    className: "pisell-pro-selector_layout-responsive-330"
+    responsive: RESPONSIVE_PRESETS.responsive330
   }
 };
 var VARIANT_PRESET_MAP = {
@@ -74,7 +95,7 @@ var usePresetProps = ({
   return (0, import_react.useMemo)(() => {
     let layoutConfig = null;
     if (variant === "select" || !(preset == null ? void 0 : preset.variant)) {
-      layoutConfig = null;
+      layoutConfig = layout || null;
     } else {
       let baseLayoutConfig = null;
       let validVariants = VARIANT_MAP[variant] || [];
@@ -108,7 +129,8 @@ var usePresetProps = ({
     const shouldUseFilled = variant === "media" || variant === "card" && (preset == null ? void 0 : preset.variant) === "2";
     if (shouldUseFilled) {
       computedIndicatorProps = {
-        variant: "filled"
+        variant: "filled",
+        size: "small"
       };
     }
     if (indicatorProps) {

package/lib/pro/Selector/selector.less

@@ -2,7 +2,6 @@
   display: flex;
   flex-direction: column;
   gap: 12px;
-  container-type: inline-size; // 启用容器查询
 
   &_header {
     display: flex;
@@ -43,67 +42,4 @@
       line-height: 34px;
     }
   }
-
-  &_options-container {
-    display: flex;
-    flex-direction: column;
-    gap: 16px;
-  }
-
-  // 自动宽度布局 - 内容自适应
-  &_layout-auto-flex {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    gap: 16px;
-  }
-
-  // 响应式布局 - 最小宽度 210px
-  &_layout-responsive-210 {
-    display: grid;
-    gap: 16px;
-    grid-template-columns: 1fr; // 默认一列
-
-    // 容器宽度 >= 420px 且 < 630px: 两列
-    @container (min-width: 420px) {
-      grid-template-columns: repeat(2, 1fr);
-    }
-
-    // 容器宽度 >= 630px 且 <= 840px: 三列
-    @container (min-width: 630px) {
-      grid-template-columns: repeat(3, 1fr);
-    }
-
-    // 容器宽度 >= 841px 且 <= 1366px: 四列
-    @container (min-width: 841px) {
-      grid-template-columns: repeat(4, 1fr);
-    }
-
-    // 容器宽度 > 1366px: 五列
-    @container (min-width: 1367px) {
-      grid-template-columns: repeat(5, 1fr);
-    }
-  }
-
-  // 响应式布局 - 最小宽度 330px
-  &_layout-responsive-330 {
-    display: grid;
-    gap: 16px;
-    grid-template-columns: 1fr; // 默认一列
-
-    // 容器宽度 >= 660px 且 < 995px: 两列
-    @container (min-width: 660px) {
-      grid-template-columns: repeat(2, 1fr);
-    }
-
-    // 容器宽度 >= 995px 且 <= 1366px: 三列
-    @container (min-width: 995px) {
-      grid-template-columns: repeat(3, 1fr);
-    }
-
-    // 容器宽度 > 1366px: 四列
-    @container (min-width: 1367px) {
-      grid-template-columns: repeat(4, 1fr);
-    }
-  }
 }