@baishuyun/ai-design 2.0.49 → 2.0.50

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baishuyun/ai-design",
-  "version": "2.0.49",
+  "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.44",
-    "@baishuyun/types": "3.0.41"
+    "@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.41",
+    "@baishuyun/types": "3.0.42",
     "@baishuyun/typescript-config": "2.0.9"
   },
   "keywords": [],

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/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);
     },

package/src/components/agent-helper/field-value-input/picker-inputs.tsx

@@ -131,7 +131,8 @@ export function ComboInput({ field, value, onChange, disabled, service, showLabe
                   type="button"
                   onClick={() => handleSelect(item.value)}
                   className={cn(
-                    'h-[34px] px-[10px] rounded-[4px] text-left text-[14px] leading-[normal]',
+                    // shrink-0 防止 flex 容器 max-height 下子项收缩坍缩，改走 overflow 滚动
+                    'shrink-0 h-[34px] px-[10px] rounded-[4px] text-left text-[14px] leading-[normal]',
                     value === item.value
                       ? 'bg-[#F0F6FF] text-[#0265FF]'
                       : 'text-[#030303] hover:bg-[#EFF0F6]',
@@ -504,7 +505,8 @@ export function AsyncPicker({ field, value, onChange, disabled, service, kind, m
                   type="button"
                   onClick={() => handleSelect(opt)}
                   className={cn(
-                    'flex items-center gap-[10px] h-[34px] px-[10px] rounded-[4px] text-left',
+                    // shrink-0 防止 flex 容器 max-height 下子项收缩坍缩，改走 overflow 滚动
+                    'shrink-0 flex items-center gap-[10px] h-[34px] px-[10px] rounded-[4px] text-left',
                     isSelected
                       ? 'bg-[#F0F6FF] text-[#0265FF]'
                       : 'text-[#030303] hover:bg-[#EFF0F6]',
@@ -684,7 +686,8 @@ export function TextMultiSelect({ field, value, onChange, disabled, service, sho
                     type="button"
                     onClick={() => handleToggle(opt)}
                     className={cn(
-                      'flex items-center gap-[10px] h-[34px] px-[10px] rounded-[4px] text-left',
+                      // shrink-0 防止 flex 容器 max-height 下子项收缩坍缩，改走 overflow 滚动
+                      'shrink-0 flex items-center gap-[10px] h-[34px] px-[10px] rounded-[4px] text-left',
                       checked
                         ? 'bg-[#F0F6FF] text-[#0265FF]'
                         : 'text-[#030303] hover:bg-[#EFF0F6]',
@@ -1027,7 +1030,8 @@ export function AddressInput({ field, value, onChange, disabled, service, showLa
                     setKeyword('');
                   }}
                   className={cn(
-                    'h-[34px] px-[10px] rounded-[4px] text-left text-[14px] leading-[normal]',
+                    // shrink-0 防止 flex 容器 max-height 下子项收缩坍缩，改走 overflow 滚动
+                    'shrink-0 h-[34px] px-[10px] rounded-[4px] text-left text-[14px] leading-[normal]',
                     'text-[#030303] hover:bg-[#EFF0F6]',
                     transCls,
                   )}
@@ -1124,7 +1128,8 @@ export function LocationInput({ field, value, onChange, disabled, service, showL
                     setKeyword('');
                   }}
                   className={cn(
-                    'h-[34px] px-[10px] rounded-[4px] text-left text-[14px] leading-[normal]',
+                    // shrink-0 防止 flex 容器 max-height 下子项收缩坍缩，改走 overflow 滚动
+                    'shrink-0 h-[34px] px-[10px] rounded-[4px] text-left text-[14px] leading-[normal]',
                     'text-[#030303] hover:bg-[#EFF0F6]',
                     transCls,
                   )}