@pisell/materials 6.11.7 → 6.11.9

package/lib/components/pisellLookup/PisellLookup.js

@@ -253,9 +253,13 @@ var PisellLookupComponent = (0, import_react.forwardRef)((props, ref) => {
       }, 200);
     }
   }, [displayType, close]);
-  const handleConfirm = (0, import_react.useCallback)(() => {
-    handleConfirmSearch(keyword);
-  }, [keyword, handleConfirmSearch]);
+  const handleConfirm = (0, import_react.useCallback)(
+    (valueFromTrigger) => {
+      const keywordToSearch = valueFromTrigger ?? keyword;
+      handleConfirmSearch(keywordToSearch);
+    },
+    [keyword, handleConfirmSearch]
+  );
   const handleClear = (0, import_react.useCallback)(() => {
     isManualSelectRef.current = true;
     setKeyword("");
@@ -353,12 +357,14 @@ var PisellLookupComponent = (0, import_react.forwardRef)((props, ref) => {
     }
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lookup-result" }, resultRender(keyword, close));
   };
+  const hasAuxiliaryContent = showHistory && history.length > 0 || showSuggestions && suggestions.length > 0 && !!keyword || showHotWords && hotWords.length > 0 && !keyword;
+  const hasResultsContent = Boolean(loading || keyword && resultRender);
   const renderContent = () => {
-    const auxiliary = renderAuxiliary();
-    const results = renderResults();
-    if (!auxiliary && !results) {
+    if (!hasAuxiliaryContent && !hasResultsContent) {
       return null;
     }
+    const auxiliary = renderAuxiliary();
+    const results = renderResults();
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lookup-content" }, auxiliary, results);
   };
   if (displayType === "inline" || displayType === "popup") {

package/lib/components/pisellLookup/PisellLookup.less

@@ -132,8 +132,11 @@
 
   // ============ Input 样式覆盖 ============
 
-  // 覆盖 Ant Design Input 默认样式（适用于所有尺寸）
-  &-trigger-input.pisell-lowcode-input-affix-wrapper {
+  // 覆盖 Ant Design Input 默认样式（适用于所有尺寸）；默认高度 50px
+  // 同时匹配 ant- / pisell-lowcode- 前缀，确保有无 prefixCls 都能生效
+  &-trigger-input.pisell-lowcode-input-affix-wrapper,
+  &-trigger-input.ant-input-affix-wrapper {
+    min-height: 50px;
     border: 1px solid #d0d5dd;
     border-radius: 8px;
     box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
@@ -145,13 +148,15 @@
     }
 
     &:focus,
-    &.pisell-lowcode-input-affix-wrapper-focused {
+    &.pisell-lowcode-input-affix-wrapper-focused,
+    &.ant-input-affix-wrapper-focused {
       border-color: #7f56d9;
       box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05), 0 0 0 2px rgba(127, 86, 217, 0.1);
     }
 
-    // Input 文本样式
-    .pisell-lowcode-input {
+    // Input 文本样式（antd 内部 input 类名可能为 .ant-input 或 .pisell-lowcode-input）
+    .pisell-lowcode-input,
+    .ant-input {
       color: #000000;
       font-size: 16px;
       line-height: 24px;
@@ -164,8 +169,9 @@
     }
   }
 
-  // 小号输入框
-  &-trigger-input.pisell-lowcode-input-affix-wrapper-sm {
+  // 小号输入框（同时匹配 ant- / pisell-lowcode-）
+  &-trigger-input.pisell-lowcode-input-affix-wrapper-sm,
+  &-trigger-input.ant-input-affix-wrapper-sm {
     padding: 2px 2px 2px 12px;
 
     .pisell-lookup-input-clear {
@@ -192,8 +198,10 @@
     }
   }
 
-  // 大号输入框
-  &-trigger-input.pisell-lowcode-input-affix-wrapper-lg {
+  // 大号输入框，高度 58px（同时匹配 ant- / pisell-lowcode-）
+  &-trigger-input.pisell-lowcode-input-affix-wrapper-lg,
+  &-trigger-input.ant-input-affix-wrapper-lg {
+    min-height: 58px;
     padding: 6px 6px 6px 16px;
 
     .pisell-lookup-input-clear {
@@ -210,6 +218,23 @@
 
     .pisell-lookup-input-confirm {
       padding: 10px;
+      line-height: 24px;
+    }
+  }
+
+  // 无 Lookup 按钮时：class 在包裹层 .pisell-lookup-trigger-input-no-confirm 上，对子元素 affix-wrapper 设左右对称 padding
+  &-trigger-input-no-confirm {
+    > .ant-input-affix-wrapper,
+    > .pisell-lowcode-input-affix-wrapper {
+      padding: 4px 16px;
+    }
+    > .ant-input-affix-wrapper-sm,
+    > .pisell-lowcode-input-affix-wrapper-sm {
+      padding: 2px 12px;
+    }
+    > .ant-input-affix-wrapper-lg,
+    > .pisell-lowcode-input-affix-wrapper-lg {
+      padding: 6px 16px;
     }
   }
 
@@ -270,8 +295,8 @@
     }
 
     &-confirm {
+      border: none;
       background-color: #7f56d9;
-      border-color: #7f56d9;
       border-radius: 8px;
       box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
       padding: 10px;
@@ -279,39 +304,37 @@
       min-width: auto;
       font-size: 16px;
       font-weight: 600;
-      line-height: 22px;
+      line-height: 20px;
       color: #ffffff;
 
       &:hover {
         background-color: #6941c6 !important;
-        border-color: #6941c6 !important;
         color: #ffffff !important;
       }
 
       &:active {
         background-color: #53389e !important;
-        border-color: #53389e !important;
         color: #ffffff !important;
       }
 
       span {
         font-size: 16px;
         font-weight: 600;
-        line-height: 22px;
+        line-height: 20px;
       }
 
       &.pisell-lowcode-btn-sm {
         padding: 10px;
         height: auto;
         font-size: 16px;
-        line-height: 22px;
+        line-height: 20px;
       }
 
       &.pisell-lowcode-btn-middle {
         padding: 10px;
         height: auto;
         font-size: 16px;
-        line-height: 22px;
+        line-height: 20px;
       }
     }
   }

package/lib/components/pisellLookup/components/LookupTrigger.js

@@ -142,8 +142,10 @@ var LookupTriggerComponent = (0, import_react.forwardRef)(
       onConfirm == null ? void 0 : onConfirm();
     };
     const handleKeyPress = (e) => {
+      var _a2;
       if (e.key === "Enter") {
-        onConfirm == null ? void 0 : onConfirm();
+        const currentValue = ((_a2 = e.currentTarget) == null ? void 0 : _a2.value) ?? value ?? "";
+        onConfirm == null ? void 0 : onConfirm(currentValue);
       }
     };
     const renderInputTrigger = () => {
@@ -165,7 +167,7 @@ var LookupTriggerComponent = (0, import_react.forwardRef)(
         },
         confirmButtonText
       ));
-      return /* @__PURE__ */ import_react.default.createElement(
+      const inputEl = /* @__PURE__ */ import_react.default.createElement(
         import_antd.Input,
         {
           ref: inputRef,
@@ -180,10 +182,14 @@ var LookupTriggerComponent = (0, import_react.forwardRef)(
           prefix,
           suffix,
           autoFocus,
-          className: `pisell-lookup-trigger-input ${className || ""}`,
+          className: `pisell-lookup-trigger-input ${className || ""}`.trim(),
           style
         }
       );
+      if (!showConfirmButton) {
+        return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lookup-trigger-input pisell-lookup-trigger-input-no-confirm" }, inputEl);
+      }
+      return inputEl;
     };
     const renderButtonTrigger = () => {
       return /* @__PURE__ */ import_react.default.createElement(

package/lib/components/pisellLookup/types.d.ts

@@ -421,7 +421,8 @@ export interface LookupTriggerProps {
     /**
      * 确认触发回调
      */
-    onConfirm?: () => void;
+    /** 确认搜索（回车或点击按钮）；可传入当前输入值，受控下回车时传 input 当前值以保证历史能正确保存 */
+    onConfirm?: (value?: string) => void;
     /**
      * 扫码回调
      */

package/lib/components/pisellModal/components/Information/index.d.ts

@@ -17,5 +17,5 @@ export interface InformationProps extends PisellModalProps {
     /** 右上角关闭按钮是否展示 */
     closable?: boolean;
 }
-declare const Information: (props: InformationProps) => React.JSX.Element;
+declare const Information: (props: InformationProps) => JSX.Element;
 export default Information;

package/lib/components/pisellModal/components/IpadModal/index.d.ts

@@ -1,6 +1,6 @@
-import React from 'react';
+/// <reference types="react" />
 import { PcModalProps } from '../PcModal';
 export interface IpadModalProps extends PcModalProps {
 }
-declare const IpadModal: (props: IpadModalProps) => React.JSX.Element;
+declare const IpadModal: (props: IpadModalProps) => JSX.Element;
 export default IpadModal;

package/lib/components/pisellModal/components/MobileModal/index.d.ts

@@ -1,9 +1,9 @@
-import React from 'react';
+/// <reference types="react" />
 import { PcModalProps } from '../PcModal';
 import './index.less';
 export interface MobileModalProps extends PcModalProps {
     /** 移动端展示时弹窗高度 默认null 在移动端全屏 */
     mobileModalHeight?: string | number;
 }
-declare const MobileModal: (props: MobileModalProps) => React.JSX.Element;
+declare const MobileModal: (props: MobileModalProps) => JSX.Element;
 export default MobileModal;

package/lib/components/pisellModal/components/PcModal/index.d.ts

@@ -26,5 +26,5 @@ export interface PcModalProps extends ModalProps {
     /** header是否展示 */
     header?: boolean | null;
 }
-declare const PcModal: (props: PcModalProps) => React.JSX.Element;
+declare const PcModal: (props: PcModalProps) => JSX.Element;
 export default PcModal;

package/lib/components/pisellModal/components/index.d.ts

@@ -1,9 +1,10 @@
+/// <reference types="react" />
 import IpadModal from './IpadModal';
 import MobileModal from './MobileModal';
 import PcModal from './PcModal';
 declare const platformCpt: {
-    h5: (props: import("./MobileModal").MobileModalProps) => import("react").JSX.Element;
-    pc: (props: import("./PcModal").PcModalProps) => import("react").JSX.Element;
-    ipad: (props: import("./IpadModal").IpadModalProps) => import("react").JSX.Element;
+    h5: (props: import("./MobileModal").MobileModalProps) => JSX.Element;
+    pc: (props: import("./PcModal").PcModalProps) => JSX.Element;
+    ipad: (props: import("./IpadModal").IpadModalProps) => JSX.Element;
 };
 export { IpadModal, MobileModal, PcModal, platformCpt };

package/lib/components/pisellModal/index.d.ts

@@ -31,7 +31,7 @@ export interface PisellModalProps extends ModalProps {
     header?: boolean | null;
 }
 declare const PisellModal: {
-    (props: PisellModalProps): React.JSX.Element;
+    (props: PisellModalProps): JSX.Element;
     confirm: (props: import("./components/functions").PisellModalFuncProps) => {
         destroy: () => void;
         update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
@@ -53,6 +53,6 @@ declare const PisellModal: {
         destroy: () => void;
         update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
     };
-    Information: (props: import("./components/Information").InformationProps) => React.JSX.Element;
+    Information: (props: import("./components/Information").InformationProps) => JSX.Element;
 };
 export default PisellModal;

package/lib/components/pisellMultipleSelect/PisellMultipleSelect.less

@@ -1,53 +1,131 @@
 /**
  * PisellMultipleSelect 组件样式
- * 
- * 注意：大部分样式通过 tokens.ts 中的 Select Token 配置实现
- * 此文件仅包含 Token 无法实现的样式
+ * 基于 Figma 设计规范，覆盖时使用 pisell-lowcode-xxx
  */
 
 .pisell-multiple-select {
+  height: 48px !important;
   width: 100%;
 
-  // 包装器布局（Token 无法配置）
+  // Select 触发器（Figma 设计规范，与 SingleSelect / Input 体系一致）
+  .pisell-lowcode-select:not(.pisell-lowcode-select-disabled):not(.pisell-lowcode-select-customize-input) {
+    .pisell-lowcode-select-selector {
+      font-size: 16px !important;
+      line-height: 24px !important;
+      border-radius: 8px !important;
+      border: 1px solid #d0d5dd !important; // Gray/300
+      padding: 12px 16px !important;
+      min-height: 48px !important;
+      color: #101828 !important; // Gray/900
+      background-color: #ffffff !important;
+    }
+
+    // 多选模式：内边距适配标签，高度保持 48px
+    &.pisell-lowcode-select-multiple .pisell-lowcode-select-selector {
+      padding: 6px 16px !important;
+      min-height: 48px !important;
+    }
+
+    &.pisell-lowcode-select-open .pisell-lowcode-select-selector {
+      border-color: #d6bbfb !important; // Primary/300
+      box-shadow: 0 0 0 4px #f4ebff !important; // Primary/100
+    }
+
+    &:not(.pisell-lowcode-select-open):not(.pisell-lowcode-select-disabled)
+    .pisell-lowcode-select-selector:hover {
+      border-color: #b692f6 !important; // Primary/400
+    }
+
+    &.pisell-lowcode-select-disabled .pisell-lowcode-select-selector {
+      background-color: #f9fafb !important; // Gray/50
+      color: #98a2b3 !important; // Gray/400
+      border-color: #d0d5dd !important;
+      cursor: not-allowed !important;
+    }
+
+    .pisell-lowcode-select-selection-placeholder {
+      color: #667085 !important; // Gray/500
+    }
+
+    .pisell-lowcode-select-arrow {
+      color: #667085;
+    }
+
+    .pisell-lowcode-select-clear {
+      color: #667085;
+
+      &:hover {
+        color: #344054;
+      }
+    }
+
+    // 多选标签（选择后展示的 item）高度 36px
+    .pisell-lowcode-select-selection-item {
+      border-radius: 6px !important;
+      padding: 0 10px !important;
+      margin-inline-end: 4px !important;
+      height: 36px !important;
+      min-height: 36px !important;
+      line-height: 36px !important;
+
+      &-content {
+        line-height: 36px !important;
+      }
+
+      &-remove {
+        margin-left: 4px !important;
+
+        &:hover {
+          background-color: transparent !important;
+        }
+      }
+    }
+  }
+
   &-wrapper {
     display: flex;
     flex-direction: column;
     gap: 8px;
+    position: relative;
+
+    // 下拉选项高度 48px（通过 getPopupContainer 挂到 wrapper 内，无需 :global）
+    .pisell-multiple-select-dropdown .pisell-lowcode-select-item {
+      min-height: 48px !important;
+      height: 48px !important;
+      line-height: 48px !important;
+      padding: 0 16px !important;
+      font-size: 16px !important;
+    }
   }
 
-  // 标签（Token 无法配置的自定义元素）
   &-label {
-    font-family: 'Inter', sans-serif;
     font-size: 14px;
     font-weight: 600;
-    color: #344054;
+    color: #344054; // Gray/700
     line-height: 20px;
 
     &-required::after {
       content: ' *';
-      color: #D92D20;
+      color: #d92d20; // Error/600
       margin-left: 0;
     }
   }
 
-  // 辅助文本（Token 无法配置的自定义元素）
   &-helper-text {
     font-size: 14px;
     font-weight: 400;
-    color: #667085;
+    color: #667085; // Gray/500
     line-height: 20px;
   }
 
-  // 错误文本（Token 无法配置的自定义元素）
   &-error-text {
-    font-size: 14px;
+    font-size: 12px;
     font-weight: 400;
-    color: #D92D20;
-    line-height: 20px;
-    animation: fadeIn 0.3s ease-in-out;
+    color: #d92d20; // Error/600
+    line-height: 1.5;
+    animation: pisell-multiple-select-fadeIn 0.3s ease-in-out;
   }
 
-  // 下拉选项中的勾选图标（Figma 设计）
   &-option-content {
     display: flex;
     align-items: center;
@@ -56,99 +134,34 @@
   }
 
   &-option-check {
-    color: #7F56D9; // Primary/600
+    color: #7f56d9; // Primary/600
     font-size: 16px;
     margin-left: 8px;
   }
 
-  // 多选模式下的特殊样式（Token 部分支持，Less 补充细节）
-  :global {
-    // 选择框垂直内边距（多选时需要更小的内边距以容纳标签）
-    .pisell-lowcode-select-multiple .pisell-lowcode-select-selector {
-      padding: 6px 16px !important;
-    }
-
-    // 标签圆角（Token 不支持 multipleItemBorderRadius）
-    .pisell-lowcode-select-selection-item {
-      border-radius: 6px !important;
-      padding: 6px 10px !important;
-      margin-inline-end: 4px !important;
-
-      // 确保标签内容垂直居中
-      &-content {
-        line-height: 24px !important;
-      }
-
-      // 删除图标样式微调
-      &-remove {
-        margin-left: 4px !important;
-
-        &:hover {
-          background-color: transparent !important;
-        }
-      }
-    }
-
-    // hover 边框颜色（Token 不支持 colorBorderHover）
-    .pisell-lowcode-select-multiple:not(.pisell-lowcode-select-disabled):not(.pisell-lowcode-select-customize-input):not(.ant-select-open) {
-      .ant-select-selector:hover {
-        border-color: #D6BBFB !important;
-      }
-    }
-  }
-}
-
-// 下拉框内的搜索框样式（Figma 设计）
-:global {
-  .pisell-select-search-wrapper {
-    padding: 6px;
-    border-bottom: 1px solid #EAECF0;
-  }
-
-  .pisell-select-search-input {
-    padding: 9px 10px !important;
-    font-size: 14px;
-
-    .ant-input {
-      font-size: 14px !important;
-      color: #344054 !important;
-
-      &::placeholder {
-        color: #98A2B3 !important;
-        font-size: 12px !important;
-      }
-    }
-
-    &:hover,
-    &:focus-within {
-      background-color: transparent !important;
-    }
-  }
-}
-
-.pisell-multiple-select {
-  // 错误状态（Token 无法单独配置错误边框颜色）
+  // 错误状态（Figma 设计体系 Error 色）
   &-error {
-    :global(.ant-select-selector) {
-      border-color: #D92D20 !important;
+    .pisell-lowcode-select .pisell-lowcode-select-selector {
+      border-color: #fda29b !important; // Error/300
 
       &:hover {
-        border-color: #D92D20 !important;
+        border-color: #f97066 !important; // Error/400
       }
     }
 
-    :global(.ant-select-focused .ant-select-selector) {
-      border-color: #D92D20 !important;
-      box-shadow: 0px 0px 0px 4px rgba(217, 45, 32, 0.1), 0px 1px 2px 0px rgba(16, 24, 40, 0.05) !important;
+    .pisell-lowcode-select.pisell-lowcode-select-focused .pisell-lowcode-select-selector,
+    .pisell-lowcode-select.pisell-lowcode-select-open .pisell-lowcode-select-selector {
+      border-color: #f97066 !important; // Error/400
+      box-shadow: 0 0 0 4px #fee4e2 !important; // Error/100
     }
   }
 
-  // 自定义聚合标签样式（用于 maxTagPlaceholder 返回的元素，不受 Token 控制）
+  // 聚合标签（maxTagPlaceholder）
   &-more-tag {
     display: inline-flex;
     align-items: center;
-    background-color: #EAECF0;
-    color: #344054;
+    background-color: #eaecf0;
+    color: #344054; // Gray/700
     border: none;
     border-radius: 6px;
     padding: 6px 10px;
@@ -159,35 +172,28 @@
     transition: background-color 0.2s ease;
 
     &:hover {
-      background-color: #D0D5DD;
+      background-color: #d0d5dd; // Gray/300
     }
   }
 
-  // 只读状态（完全自定义的显示，不使用 Select 组件）
+  // 只读状态
   &-readonly {
     &-display {
       display: flex;
       flex-wrap: wrap;
       gap: 4px;
-      padding: 12px 16px;
-      background-color: #F9FAFB;
-      border: 1px solid #EAECF0;
-      border-radius: 8px;
-      min-height: 48px;
+      align-items: center;
+      min-height: 24px;
     }
 
     &-tag {
-      display: inline-flex;
-      align-items: center;
-      gap: 4px;
-      padding: 6px 10px;
-      background-color: #EAECF0;
-      border: none;
-      border-radius: 6px;
-      font-size: 16px;
-      font-weight: 500;
-      line-height: 24px;
-      color: #344054;
+      margin: 0;
+      cursor: default;
+      border-radius: 12px;
+      border: 1px solid transparent;
+      font-size: 14px;
+      line-height: 22px;
+      padding: 2px 10px;
 
       &-icon {
         display: flex;
@@ -196,17 +202,13 @@
     }
 
     &-more-tag {
-      display: inline-flex;
-      align-items: center;
-      padding: 6px 10px;
-      background-color: #EAECF0;
-      color: #344054;
-      border: none;
-      border-radius: 6px;
-      font-size: 16px;
-      font-weight: 500;
-      line-height: 24px;
-      cursor: pointer;
+      margin: 0;
+      cursor: default;
+      border-radius: 12px;
+      border: 1px solid transparent;
+      font-size: 14px;
+      line-height: 22px;
+      padding: 2px 10px;
     }
 
     &-empty {
@@ -218,8 +220,33 @@
   }
 }
 
-// 动画
-@keyframes fadeIn {
+// 下拉内搜索框（在 dropdown 内）
+.pisell-select-search-wrapper {
+  padding: 6px;
+  border-bottom: 1px solid #eaecf0;
+}
+
+.pisell-select-search-input {
+  padding: 9px 10px !important;
+  font-size: 14px;
+
+  .pisell-lowcode-input {
+    font-size: 14px !important;
+    color: #344054 !important;
+
+    &::placeholder {
+      color: #98a2b3 !important;
+      font-size: 12px !important;
+    }
+  }
+
+  &:hover,
+  &:focus-within {
+    background-color: transparent !important;
+  }
+}
+
+@keyframes pisell-multiple-select-fadeIn {
   from {
     opacity: 0;
     transform: translateY(-4px);

package/lib/components/pisellMultipleSelect/PisellMultipleSelect.stories.js

@@ -51,7 +51,7 @@ var import_PisellMultipleSelect = __toESM(require("./PisellMultipleSelect"));
 var import_react = require("react");
 var import_antd = require("antd");
 var meta = {
-  title: "Components/PisellMultipleSelect",
+  title: "表单/表单组件/PisellMultipleSelect",
   component: import_PisellMultipleSelect.default,
   tags: ["autodocs"],
   argTypes: {