@baishuyun/ai-design 2.0.48 → 2.0.50

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @baishuyun/ai-design
 
+## 2.0.50
+
+### Patch Changes
+
+- agent helper error
+- Updated dependencies
+  - @baishuyun/ai-feat-utils@2.0.45
+  - @baishuyun/types@3.0.42
+
+## 2.0.49
+
+### Patch Changes
+
+- mobile style
+- Updated dependencies
+  - @baishuyun/ai-feat-utils@2.0.44
+  - @baishuyun/types@3.0.41
+
 ## 2.0.48
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baishuyun/ai-design",
-  "version": "2.0.48",
+  "version": "2.0.50",
   "description": "AI 功能 UI 组件库 - 所有 AI 功能的 UI 表现唯一真相来源",
   "type": "module",
   "main": "src/index.ts",
@@ -60,8 +60,8 @@
     "tw-animate-css": "^1.4.0",
     "vaul": "^1.1.2",
     "zod": "^4.1.13",
-    "@baishuyun/ai-feat-utils": "2.0.43",
-    "@baishuyun/types": "3.0.40"
+    "@baishuyun/ai-feat-utils": "2.0.45",
+    "@baishuyun/types": "3.0.42"
   },
   "peerDependencies": {
     "react": "^19.0.0",
@@ -84,7 +84,7 @@
     "vite": "^5.1.4",
     "vite-plugin-dts": "^4.5.4",
     "@baishuyun/tailwind-config": "3.0.9",
-    "@baishuyun/types": "3.0.40",
+    "@baishuyun/types": "3.0.42",
     "@baishuyun/typescript-config": "2.0.9"
   },
   "keywords": [],

package/src/components/agent-drawer.tsx

@@ -17,8 +17,20 @@ export interface AgentDrawerProps {
   trigger?: React.ReactNode;
 }
 
+/** 关闭图标（设计稿 40434:34111，20×20，#121111） */
+const CloseIcon = () => (
+  <svg width="20" height="20" viewBox="0 0 20 20" fill="none" aria-hidden="true">
+    <path
+      d="M11.2584 9.99867L17.874 3.37975C18.0348 3.21757 18.125 2.99839 18.125 2.76996C18.125 2.54153 18.0348 2.32235 17.874 2.16017L17.8388 2.12495C17.6764 1.96522 17.4578 1.87572 17.23 1.87572C17.0023 1.87572 16.7837 1.96522 16.6213 2.12495L10.0027 8.75414L3.38708 2.12495C3.22461 1.96478 3.00568 1.875 2.77759 1.875C2.54951 1.875 2.33057 1.96478 2.1681 2.12495L2.13143 2.16017C2.05026 2.23946 1.98576 2.33419 1.94172 2.43878C1.89769 2.54338 1.875 2.65573 1.875 2.76923C1.875 2.88272 1.89769 2.99507 1.94172 3.09967C1.98576 3.20427 2.05026 3.299 2.13143 3.37828L8.74706 9.99867L2.13143 16.6205C1.97109 16.7826 1.88115 17.0015 1.88115 17.2296C1.88115 17.4577 1.97109 17.6765 2.13143 17.8386L2.1681 17.8739C2.33014 18.0343 2.5489 18.1243 2.77686 18.1243C3.00482 18.1243 3.22358 18.0343 3.38561 17.8739L10.0027 11.2549L16.6183 17.8739C16.7804 18.0347 16.9995 18.125 17.2278 18.125C17.4561 18.125 17.6752 18.0347 17.8373 17.8739L17.874 17.8386C18.0343 17.6765 18.1243 17.4577 18.1243 17.2296C18.1243 17.0015 18.0343 16.7826 17.874 16.6205L11.2598 9.99867H11.2584Z"
+      fill="#121111"
+    />
+  </svg>
+);
+
 /**
- * 智能体选择抽屉（默认从右侧滑入），复用 AgentSelect 列表，选中后自动关闭。
+ * 智能体选择抽屉（移动端从底部滑出），复用 AgentSelect 列表，选中后自动关闭。
+ * 视觉对齐设计稿 40434:34107：顶部圆角面板 +「全部智能体」18px 标题 +
+ * 关闭按钮 + 搜索框 + 全宽列表行。
  * shadow DOM 兼容逻辑统一由 EnhancedDrawer 处理。
  */
 export const AgentDrawer = ({
@@ -60,14 +72,35 @@ export const AgentDrawer = ({
       <EnhancedDrawer
         open={open}
         onOpenChange={setOpen}
-        direction="right"
-        width={300}
+        direction="bottom"
         title="选择智能体"
+        // DrawerContent 内联 style 强制 borderRadius: 0（会压掉方向圆角），
+        // 用 !important 任意值恢复设计稿的顶部 10px 圆角
+        className="rounded-t-[10px]!"
       >
-        <div className="h-full overflow-hidden p-[12px]">
+        <div className="flex flex-col">
+          {/* 头部：标题 18px Bold + 关闭（设计稿 40434:34109，上 20、下 20、左右 12） */}
+          <div className="flex items-center justify-between px-[12px] pt-[20px] pb-[20px]">
+            <span className="text-[18px] font-bold text-[#030303] leading-[normal]">
+              全部智能体
+            </span>
+            <button
+              type="button"
+              aria-label="关闭"
+              className="shrink-0 size-[20px] border-none bg-transparent p-0 text-[#121111] cursor-pointer"
+              onClick={() => setOpen(false)}
+            >
+              <CloseIcon />
+            </button>
+          </div>
+          {/* 搜索 + 列表（样式见 AgentSelect large；85px ≈ 头部块高度；
+              底部 16px 内边距，设计稿 40654:39900） */}
           <div
-            className="overflow-y-auto"
-            style={{ maxHeight: 'calc(100vh - 60px)', scrollbarWidth: 'none' }}
+            className="overflow-y-auto pb-[16px]"
+            style={{
+              maxHeight: 'calc(100vh - 52px - 85px)',
+              scrollbarWidth: 'none',
+            }}
             data-vaul-no-drag
           >
             <AgentSelect
@@ -76,6 +109,7 @@ export const AgentDrawer = ({
               onSelect={handleSelect}
               showSearch={showSearch}
               showAllItems
+              large
             />
           </div>
         </div>

package/src/components/agent-helper/condition-input/index.tsx

@@ -1,5 +1,12 @@
 import { useState, useCallback, useRef } from 'react';
-import type { IField, ICondition, IConditionItem, quantifier, IFieldValueService, FieldType } from '@baishuyun/types';
+import type {
+  IField,
+  ICondition,
+  IConditionItem,
+  quantifier,
+  IFieldValueService,
+  FieldType,
+} from '@baishuyun/types';
 import { cn } from '../../../lib/utils';
 import { transCls } from '../../../const/ui';
 import { ConditonTriggerDescription } from '../condition-trigger-description';
@@ -23,12 +30,7 @@ function createEmptyItem(): IConditionItem {
   };
 }
 
-const FilterFieldTypeBlacklist: Array<FieldType> = [
-  'button',
-  'separator',
-  'subform',
-  'upload',
-];
+const FilterFieldTypeBlacklist: Array<FieldType> = ['button', 'separator', 'subform'];
 
 export interface ConditionInputProps {
   targetName: string;
@@ -56,11 +58,11 @@ export const ConditionInput = ({
       targetName,
       quantifier: 'all',
       items: [],
-    },
+    }
   ).current;
 
   const fields = allFields.filter(
-    (f) => !FilterFieldTypeBlacklist.includes(f.widget?.type as FieldType),
+    (f) => !FilterFieldTypeBlacklist.includes(f.widget?.type as FieldType)
   );
 
   const [internalValue, setInternalValue] = useState<ICondition>(defaultCondition);
@@ -72,14 +74,14 @@ export const ConditionInput = ({
       if (!isControlled) setInternalValue(next);
       onChange?.(next);
     },
-    [isControlled, onChange],
+    [isControlled, onChange]
   );
 
   const handleQuantifierChange = useCallback(
     (nextQuantifier: quantifier) => {
       updateValue({ ...currentValue, quantifier: nextQuantifier });
     },
-    [currentValue, updateValue],
+    [currentValue, updateValue]
   );
 
   const handleAddCondition = useCallback(() => {
@@ -111,7 +113,7 @@ export const ConditionInput = ({
             'text-[14px] leading-[normal] text-[#0265FF]',
             'hover:opacity-80',
             disabled && 'opacity-50 cursor-not-allowed',
-            transCls,
+            transCls
           )}
         >
           <AddIcon />
@@ -127,7 +129,7 @@ export const ConditionInput = ({
               'text-[14px] leading-[normal] text-[#FF5631]',
               'hover:opacity-80',
               disabled && 'opacity-50 cursor-not-allowed',
-              transCls,
+              transCls
             )}
           >
             删除全部
@@ -150,10 +152,7 @@ ConditionInput.displayName = 'ConditionInput';
 
 // ── BsConditionInput (IBsCondition string ↔ ICondition adapter) ──────────────
 
-function parseBsCondition(
-  str: string | undefined,
-  targetName: string,
-): ICondition {
+function parseBsCondition(str: string | undefined, targetName: string): ICondition {
   if (str) {
     try {
       const parsed = bsConditionParse2Condition(str);
@@ -198,9 +197,7 @@ export const BsConditionInput = ({
   disabled = false,
   className,
 }: BsConditionInputProps) => {
-  const defaultBS = useRef<string>(
-    defaultValue ?? defaultBsConditionString(targetName),
-  ).current;
+  const defaultBS = useRef<string>(defaultValue ?? defaultBsConditionString(targetName)).current;
 
   const [internalValue, setInternalValue] = useState<string>(defaultBS);
   const isControlled = controlledValue !== undefined;
@@ -214,7 +211,7 @@ export const BsConditionInput = ({
       if (!isControlled) setInternalValue(bsStr);
       onChange?.(bsStr);
     },
-    [isControlled, onChange, targetName],
+    [isControlled, onChange, targetName]
   );
 
   return (

package/src/components/agent-helper/condition-item/index.tsx

@@ -183,6 +183,7 @@ export const ConditionItem = ({
         value={currentOperator}
         onChange={handleOperatorChange}
         operators={availableOperators}
+        fieldType={fieldType}
         borderless
         disabled={disabled}
         className="w-[120px] shrink-0"

package/src/components/agent-helper/field-edit-preference-select/index.tsx

@@ -3,7 +3,7 @@ import { cn } from '../../../lib/utils';
 import { transCls } from '../../../const/ui';
 import { Popover, PopoverTrigger, PopoverContent } from '../../ui/popover';
 import { FieldSelectPopover } from '../field-select';
-import type { IField } from '@baishuyun/types';
+import type { IField, ISubformField } from '@baishuyun/types';
 import type { FormActionFieldEditPreference } from '@baishuyun/types';
 
 // ── Inline SVG Icons ──────────────────────────────────────────────
@@ -62,6 +62,29 @@ function FieldChip({ label, onRemove }: { label: string; onRemove: () => void })
 
 // ── Types ─────────────────────────────────────────────────────────
 
+/**
+ * 解析选中的字段：
+ * 顶层字段 nodeKey 无 '.'，原样返回；
+ * 子表单子字段 nodeKey 形如 parent.childWidgetName，从父字段 items 中取出
+ * 子字段，构造 label 为子字段名、widgetName 为完整路径的独立 IField，
+ * 使 FieldChip 显示子字段名而非「子表单」字段名。
+ */
+function resolveSelectedField(field: IField, nodeKey: string): IField {
+  const dotIndex = nodeKey.indexOf('.');
+  if (dotIndex < 0) return field;
+  const childWidgetName = nodeKey.slice(dotIndex + 1);
+  const item = field.widget?.items?.find(
+    (it): it is ISubformField =>
+      'widget' in it && it.widget?.widgetName === childWidgetName
+  );
+  if (!item) return field;
+  return {
+    ...field,
+    label: item.label,
+    widget: { ...item.widget, widgetName: nodeKey },
+  } as IField;
+}
+
 export interface FieldEditPreferenceSelectProps {
   fields: IField[];
   value?: FormActionFieldEditPreference;
@@ -118,12 +141,16 @@ export const FieldEditPreferenceSelect = ({
   );
 
   const handleAddField = useCallback(
-    (field: IField, _nodeKey: string) => {
-      if (selectedFields.some((f) => f.label === field.label)) {
+    (field: IField, nodeKey: string) => {
+      // 子表单子字段解析为独立字段（label=子字段名，widgetName=完整路径）
+      const resolved = resolveSelectedField(field, nodeKey);
+      // 以 widgetName（子字段为完整路径）去重，避免同名子字段误判
+      const resolvedKey = resolved.widget?.widgetName ?? resolved.label;
+      if (selectedFields.some((f) => (f.widget?.widgetName ?? f.label) === resolvedKey)) {
         setOpen(false);
         return;
       }
-      const newFields = [...selectedFields, field];
+      const newFields = [...selectedFields, resolved];
       setValue({ type: 'edit_any_specified_field', fields: newFields });
       setOpen(false);
     },