@openli1115/lowcode-edit-pro-table 1.0.88 → 1.0.90

package/es/components/ProCascaderSelect/index.js

@@ -9,7 +9,38 @@ import { FORM_EMPTY_ARRAY } from "../../context/useComponentContext";
 var _window$React = window.React,
   createElement = _window$React.createElement,
   useCallback = _window$React.useCallback,
+  useEffect = _window$React.useEffect,
   useMemo = _window$React.useMemo;
+function toStr(v) {
+  if (v == null) return '';
+  return String(v);
+}
+function getNodeValue(node) {
+  if (!node || typeof node !== 'object') return '';
+  // 兼容 value/id/key 等常见字段
+  if (node.value != null) return toStr(node.value);
+  if (node.id != null) return toStr(node.id);
+  if (node.key != null) return toStr(node.key);
+  return '';
+}
+function getNodeLabel(node, fallback) {
+  if (fallback === void 0) {
+    fallback = '';
+  }
+  if (!node || typeof node !== 'object') return fallback;
+  if (node.label != null) return toStr(node.label);
+  if (node.name != null) return toStr(node.name);
+  if (node.title != null) return toStr(node.title);
+  return fallback;
+}
+function getNodeChildren(node) {
+  if (!node || typeof node !== 'object') return [];
+  // 兼容 children / options / childs 等结构
+  if (Array.isArray(node.children)) return node.children;
+  if (Array.isArray(node.options)) return node.options;
+  if (Array.isArray(node.childs)) return node.childs;
+  return [];
+}
 
 /**
  * 按路径在树形 dataSource 上逐级匹配，取出每一层的 label（2 级、3 级…任意多级，长度由 pathValues 决定）。
@@ -21,39 +52,92 @@ function resolvePathLabels(dataSource, pathValues) {
   var _loop = function _loop() {
     var pv = _step.value;
     var node = level.find(function (n) {
-      return String(n === null || n === void 0 ? void 0 : n.value) === String(pv);
+      return getNodeValue(n) === toStr(pv);
     });
     if (!node) return 1; // break
-    labels.push(node.label != null ? String(node.label) : String(pv));
-    var next = node.children;
-    level = Array.isArray(next) ? next : [];
+    labels.push(getNodeLabel(node, toStr(pv)));
+    level = getNodeChildren(node);
   };
   for (var _iterator = _createForOfIteratorHelperLoose(pathValues), _step; !(_step = _iterator()).done;) {
     if (_loop()) break;
   }
   return labels;
 }
-function normalizeCascaderPath(v) {
+function isValidPathInTree(dataSource, pathValues) {
+  if (!Array.isArray(dataSource) || pathValues.length === 0) return false;
+  var level = dataSource;
+  var _loop2 = function _loop2() {
+      var pv = _step2.value;
+      var node = level.find(function (n) {
+        return getNodeValue(n) === toStr(pv);
+      });
+      if (!node) return {
+        v: false
+      };
+      level = getNodeChildren(node);
+    },
+    _ret;
+  for (var _iterator2 = _createForOfIteratorHelperLoose(pathValues), _step2; !(_step2 = _iterator2()).done;) {
+    _ret = _loop2();
+    if (_ret) return _ret.v;
+  }
+  return true;
+}
+
+/** 回填仅有叶子 id（如 city=2977）时，递归反查完整路径 [provinceId, cityId] */
+function findPathByNodeValue(dataSource, targetValue, parentPath) {
+  if (parentPath === void 0) {
+    parentPath = [];
+  }
+  if (!Array.isArray(dataSource) || targetValue === '') return [];
+  for (var _iterator3 = _createForOfIteratorHelperLoose(dataSource), _step3; !(_step3 = _iterator3()).done;) {
+    var node = _step3.value;
+    var curValue = getNodeValue(node);
+    if (!curValue) continue;
+    var nextPath = parentPath.concat(curValue);
+    if (curValue === toStr(targetValue)) {
+      return nextPath;
+    }
+    var hit = findPathByNodeValue(getNodeChildren(node), targetValue, nextPath);
+    if (hit.length > 0) return hit;
+  }
+  return [];
+}
+function normalizeCascaderPath(v, dataSource) {
+  var tryExpandByLeaf = function tryExpandByLeaf(leaf, fallback) {
+    if (fallback === void 0) {
+      fallback = [];
+    }
+    var fullPath = findPathByNodeValue(dataSource, leaf);
+    return fullPath.length > 0 ? fullPath : fallback;
+  };
   if (Array.isArray(v)) {
-    return v.filter(function (x) {
+    var path = v.filter(function (x) {
       return x != null && x !== '';
     }).map(function (x) {
-      return String(x);
+      return toStr(x);
     });
+    if (path.length === 0) return [];
+    if (isValidPathInTree(dataSource, path)) return path;
+    return tryExpandByLeaf(path[path.length - 1], path);
   }
   if (typeof v === 'number' && !Number.isNaN(v)) {
-    /** 表单里有时是数字 id（2977），Fusion dataSource 已 string 化，需对齐 */
-    return [String(v)];
+    /** 表单里有时是数字 id（2977），需要根据 dataSource 找完整路径 */
+    return tryExpandByLeaf(toStr(v), [toStr(v)]);
   }
   if (typeof v === 'string' && v.trim()) {
     try {
       var parsed = JSON.parse(v);
-      return Array.isArray(parsed) ? parsed.map(function (x) {
-        return String(x);
-      }) : [];
+      if (!Array.isArray(parsed)) return [];
+      var _path = parsed.map(function (x) {
+        return toStr(x);
+      });
+      if (_path.length === 0) return [];
+      if (isValidPathInTree(dataSource, _path)) return _path;
+      return tryExpandByLeaf(_path[_path.length - 1], _path);
     } catch (_unused) {
-      /** 历史或单值存成非 JSON 字符串时，当作单选叶子 value */
-      return [v];
+      /** 历史或接口单值回填时，当作叶子值反查完整路径 */
+      return tryExpandByLeaf(v, [v]);
     }
   }
   return [];
@@ -92,6 +176,7 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     screen_inner_id = props.screen_inner_id,
     range_inner_table = props.range_inner_table,
     dataSource = props.dataSource,
+    options = props.options,
     disableEdit = props.disableEdit,
     readOnlyProp = props.readOnly,
     disabledProp = props.disabled,
@@ -99,6 +184,7 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     schemaOnChange = props.onChange,
     defaultValue = props.defaultValue,
     multiple = props.multiple;
+  var isMultiple = multiple === true || multiple === 'true';
   var _resolveProScreenBind = resolveProScreenBinding({
       screen_structure: screen_structure,
       screen_structure_field: screen_structure_field,
@@ -111,34 +197,99 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
   var _useProBoundValue = useProBoundValue(fieldPath, unboundInit, FORM_EMPTY_ARRAY),
     value = _useProBoundValue.value,
     commit = _useProBoundValue.commit;
+  // 优先 dataSource，兼容部分 schema 透传为 options
+  var cascaderOptions = useMemo(function () {
+    if (Array.isArray(dataSource)) return dataSource;
+    if (Array.isArray(options)) return options;
+    return [];
+  }, [dataSource, options]);
   var handleChange = function handleChange(newValue, _data, extra) {
     var next = cascaderChangeToPath(newValue, extra);
+    console.log('[ProCascaderSelect] onChange', {
+      fieldPath: fieldPath,
+      rawValue: newValue,
+      selectedPath: extra === null || extra === void 0 ? void 0 : extra.selectedPath,
+      normalizedPath: next
+    });
     commit(next);
     schemaOnChange === null || schemaOnChange === void 0 ? void 0 : schemaOnChange(next, structureName, structureField);
   };
 
-  /** 表单/接口：完整路径 string[]，如 ['2974','2975'] */
-  var displayValue = normalizeCascaderPath(value);
+  /** 表单/接口：优先完整路径；若仅有叶子 id（如 2977）则由 dataSource 反查完整路径 */
+  var displayValue = useMemo(function () {
+    return normalizeCascaderPath(value, cascaderOptions);
+  }, [value, cascaderOptions]);
+  var incomingLeafId = useMemo(function () {
+    if (Array.isArray(value)) {
+      var cleaned = value.filter(function (x) {
+        return x != null && x !== '';
+      });
+      return cleaned.length > 0 ? toStr(cleaned[cleaned.length - 1]) : '';
+    }
+    if (typeof value === 'number' && !Number.isNaN(value)) return toStr(value);
+    if (typeof value === 'string' && value.trim()) {
+      try {
+        var parsed = JSON.parse(value);
+        if (Array.isArray(parsed) && parsed.length > 0) {
+          return toStr(parsed[parsed.length - 1]);
+        }
+      } catch (_unused2) {
+        return value;
+      }
+      return value;
+    }
+    return '';
+  }, [value]);
+  var packedPathFromLeaf = useMemo(function () {
+    if (!incomingLeafId) return [];
+    return findPathByNodeValue(cascaderOptions, incomingLeafId);
+  }, [cascaderOptions, incomingLeafId]);
 
   /**
-   * Fusion 单选：官方约定受控 value 为 string[] | number[]，且实现里只对数组取 value[0] 再查节点。
-   * 若传入完整路径 [父,子]，会把「父」当成选中项，文案只有一级。
-   * 组件展示应传「叶子」单元素数组 [leaf]，内部 getLabelPath(叶子节点) 会生成多级展示。
-   * 多选仍传 Fusion 所需的多个 value（与表单存值一致）。
+   * 回显兼容：
+   * - 多选：沿用路径数组
+   * - 单选：传叶子值（字符串）；部分 Fusion 版本单选不接受数组 value，传数组会不显示
    */
   var valueForFusion = useMemo(function () {
     var path = displayValue;
-    if (multiple) {
+    if (isMultiple) {
       return path;
     }
-    if (path.length === 0) return [];
-    return [path[path.length - 1]];
-  }, [displayValue, multiple]);
+    if (path.length === 0) return '';
+    return path[path.length - 1];
+  }, [displayValue, isMultiple]);
+  useEffect(function () {
+    var leaf = displayValue.length > 0 ? displayValue[displayValue.length - 1] : '';
+    var resolvedPathFromLeaf = leaf ? findPathByNodeValue(cascaderOptions, toStr(leaf)) : [];
+    console.log('[ProCascaderSelect] echo-id-and-path', {
+      fieldPath: fieldPath,
+      incomingLeafId: incomingLeafId,
+      packedPathFromLeaf: packedPathFromLeaf
+    });
+    console.log('[ProCascaderSelect] render-debug', {
+      fieldPath: fieldPath,
+      structureName: structureName,
+      structureField: structureField,
+      rawBoundValue: value,
+      normalizedDisplayPath: displayValue,
+      fusionValue: valueForFusion,
+      isMultiple: isMultiple,
+      optionsCount: cascaderOptions.length,
+      resolvedPathFromLeaf: resolvedPathFromLeaf,
+      optionsPreview: cascaderOptions.slice(0, 3).map(function (n) {
+        return {
+          value: getNodeValue(n),
+          label: getNodeLabel(n),
+          childrenCount: getNodeChildren(n).length
+        };
+      })
+    });
+  }, [fieldPath, structureName, structureField, value, displayValue, valueForFusion, isMultiple, cascaderOptions]);
 
   /** dataSource 未就绪或异步时，仍用自定义文案兜底 */
   var schemaDisplayRender = props.displayRender;
   var pathDisplayRender = useCallback(function (labels, data) {
-    var fullLabels = resolvePathLabels(dataSource, normalizeCascaderPath(value));
+    var fullLabels = resolvePathLabels(cascaderOptions, displayValue);
     if (fullLabels.length > 0) {
       return fullLabels.join(' / ');
     }
@@ -146,13 +297,13 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
       return schemaDisplayRender(labels, data);
     }
     return (labels && labels.length ? labels.join(' / ') : '') || ((data === null || data === void 0 ? void 0 : data.label) != null ? String(data.label) : '');
-  }, [dataSource, value, schemaDisplayRender]);
+  }, [cascaderOptions, displayValue, schemaDisplayRender]);
   return /*#__PURE__*/React.createElement("span", {
     className: "field-wrapper " + (disableEdit ? 'disable-edit' : 'enable-edit')
   }, /*#__PURE__*/React.createElement(_CascaderSelect, _extends({}, props, {
     readOnly: disableEdit ? true : readOnlyProp,
     disabled: disabledProp,
-    dataSource: dataSource,
+    dataSource: cascaderOptions,
     value: valueForFusion,
     onChange: handleChange,
     displayRender: pathDisplayRender

package/es/components/ProSearch/index.js

@@ -102,6 +102,13 @@ var ConditionTable = function ConditionTable(_ref) {
       onChange: function onChange(v) {
         return update(row.id, 'option', v);
       }
+      // 关键：Modal 被挂到 window.top.document.body，但 Select 下拉默认使用当前 iframe 的 document.body，
+      // 会导致下拉被渲染到 iframe 内部并被 Modal 蒙层遮挡（显示在弹窗下方）。
+      // 将下拉容器固定到触发节点的父元素，保证下拉与 Select 同处 Modal 的 DOM 子树中，避免跨文档渲染被盖住。
+      ,
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode && triggerNode.parentElement || document.body;
+      }
     }), /*#__PURE__*/React.createElement(_Input, {
       size: "small",
       style: {
@@ -374,15 +381,18 @@ var ProSearch = function ProSearch(_ref2) {
     });
     onSearch && onSearch(data);
   };
-  var renderInput = function renderInput(field, key) {
+  var renderInput = function renderInput(field, key, displayCond) {
     var fv = fieldValues[field.id] || {
       low: '',
       high: '',
       conditions: []
     };
-    var val = fv[key];
     var hasConditions = fv.conditions.length > 0;
     var disabled = hasConditions;
+    // 4.2 / 4.2a / 4.2b / 4.5 / 4.6：有多值条件时，字段行展示"首行代表"的 low/high 值
+    // - 4.2a BT（介于）：起始值=low，到值=high 分别填入两个输入框
+    // - 非 BT 情况：到值留空，仅展示 low
+    var val = displayCond ? key === 'low' ? displayCond.low : displayCond.option === 'BT' ? displayCond.high : '' : fv[key];
     var _onChange = function onChange(v) {
       return updateVal(field.id, key, v);
     };
@@ -422,53 +432,59 @@ var ProSearch = function ProSearch(_ref2) {
     });
   };
 
-  // Render summary of multi-value conditions on the input area
-  var renderCondSummary = function renderCondSummary(fv) {
-    var inc = fv.conditions.filter(function (c) {
-      return c.sign === 'I' && (c.low || c.option);
+  /**
+   * 4.2 / 4.2a / 4.2b / 4.5 / 4.6：在起始值输入框前渲染选项比较符徽标。
+   * 规则：
+   *  - 选择 tab(sign='I') 首行存在（含 4.6 两个 tab 都有值时）：
+   *      · 4.2  option 为空或 EQ  → 不显示符号
+   *      · 4.2b 其它 option       → 显示「绿底」符号（GE=≥、LT=<、BT=~、CO=∋ 等）
+   *  - 仅排除 tab(sign='E') 有值：
+   *      · 4.5.1 任意 option       → 显示「红底」符号
+   *      · 4.5.2 option 为空或 EQ → 仍显示「红底」的「=」
+   */
+  var renderSignBadge = function renderSignBadge(fv) {
+    var firstInclude = fv.conditions.find(function (c) {
+      return c.sign === 'I';
     });
-    var exc = fv.conditions.filter(function (c) {
-      return c.sign === 'E' && (c.low || c.option);
+    var firstExclude = fv.conditions.find(function (c) {
+      return c.sign === 'E';
     });
-    if (!inc.length && !exc.length) return null;
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        fontSize: 11,
-        color: '#666',
-        marginTop: 2,
-        overflow: 'hidden',
-        textOverflow: 'ellipsis',
-        whiteSpace: 'nowrap'
-      }
-    }, inc.map(function (c, i) {
+    var badgeStyle = {
+      color: '#fff',
+      padding: '0 4px',
+      borderRadius: 2,
+      fontSize: 12,
+      lineHeight: '18px',
+      fontWeight: 'bold',
+      flexShrink: 0,
+      minWidth: 18,
+      textAlign: 'center',
+      display: 'inline-block'
+    };
+    // 4.6：两个 tab 都有值时，按选择 tab 首行规则显示（Include 优先）
+    if (firstInclude) {
+      var opt = firstInclude.option;
+      // 4.2：首行 option 为空或 EQ 不显示符号
+      if (!opt || opt === 'EQ') return null;
+      var sym = OPTION_SYMBOL[opt];
+      if (!sym) return null;
       return /*#__PURE__*/React.createElement("span", {
-        key: i,
-        style: {
-          marginRight: 4
-        }
-      }, c.option && OPTION_SYMBOL[c.option] && /*#__PURE__*/React.createElement("span", {
-        style: {
-          background: '#1890ff',
-          color: '#fff',
-          padding: '0 2px',
-          borderRadius: 2
-        }
-      }, OPTION_SYMBOL[c.option]), c.low, c.option === 'BT' && c.high ? "~" + c.high : '');
-    }), exc.map(function (c, i) {
+        style: _extends({}, badgeStyle, {
+          background: '#52c41a'
+        })
+      }, sym);
+    }
+    if (firstExclude) {
+      var _opt = firstExclude.option;
+      // 4.5.2：空 / EQ 也要显示红底 "=" ；其它按 OPTION_SYMBOL 显示
+      var _sym = _opt && OPTION_SYMBOL[_opt] || '=';
       return /*#__PURE__*/React.createElement("span", {
-        key: i,
-        style: {
-          marginRight: 4
-        }
-      }, c.option && OPTION_SYMBOL[c.option] && /*#__PURE__*/React.createElement("span", {
-        style: {
-          background: '#ff4d4f',
-          color: '#fff',
-          padding: '0 2px',
-          borderRadius: 2
-        }
-      }, OPTION_SYMBOL[c.option]), c.low);
-    }));
+        style: _extends({}, badgeStyle, {
+          background: '#ff4d4f'
+        })
+      }, _sym);
+    }
+    return null;
   };
   var headerSize = {
     fontWeight: headerBold ? 'bold' : 'normal',
@@ -538,7 +554,16 @@ var ProSearch = function ProSearch(_ref2) {
       high: '',
       conditions: []
     };
-    var hasMulti = fv.conditions.length > 0;
+    // 4.3：多值按钮高亮条件 = 条件行数达到两行或以上
+    var hasMulti = fv.conditions.length >= 2;
+    // 4.6："首行代表" —— 选择 tab 优先；仅排除 tab 有值时取排除 tab 首行
+    var firstInclude = fv.conditions.find(function (c) {
+      return c.sign === 'I';
+    });
+    var firstExclude = fv.conditions.find(function (c) {
+      return c.sign === 'E';
+    });
+    var displayCond = firstInclude || firstExclude || null;
     return /*#__PURE__*/React.createElement("div", {
       key: field.id,
       style: {
@@ -557,9 +582,17 @@ var ProSearch = function ProSearch(_ref2) {
       }
     }, field.fieldDesc), /*#__PURE__*/React.createElement("div", {
       style: {
-        flex: 3
+        flex: 3,
+        display: 'flex',
+        alignItems: 'center',
+        gap: 4
+      }
+    }, renderSignBadge(fv), /*#__PURE__*/React.createElement("div", {
+      style: {
+        flex: 1,
+        minWidth: 0
       }
-    }, renderInput(field, 'low'), renderCondSummary(fv)), showHighValue && /*#__PURE__*/React.createElement("div", {
+    }, renderInput(field, 'low', displayCond))), showHighValue && /*#__PURE__*/React.createElement("div", {
       style: {
         width: 24,
         textAlign: 'center',
@@ -570,7 +603,7 @@ var ProSearch = function ProSearch(_ref2) {
       style: {
         flex: 3
       }
-    }, renderInput(field, 'high')), multiValue && /*#__PURE__*/React.createElement("div", {
+    }, renderInput(field, 'high', displayCond)), multiValue && /*#__PURE__*/React.createElement("div", {
       style: {
         width: 32,
         textAlign: 'center'

package/es/context/FormProvider.d.ts

@@ -4,9 +4,5 @@ export declare function getFormContext(): any;
 export declare const FormProvider: React.FC<{
     initialValues?: Record<string, any>;
     onChange?: (values: Record<string, any>) => void;
-    /** 由 preview 传入：最后一次 onChange(newStructures) 的引用；若与 initialValues 全等则本次为 store 回灌，勿再 merge（根治 #185） */
-    lastOutboundStructuresRef?: {
-        current: any;
-    };
     children: React.ReactNode;
 }>;

package/es/context/FormProvider.js

@@ -33,47 +33,26 @@ export var FormProvider = function FormProvider(_ref) {
   var _ref$initialValues = _ref.initialValues,
     initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
     onChange = _ref.onChange,
-    lastOutboundStructuresRef = _ref.lastOutboundStructuresRef,
     children = _ref.children;
   var FormContext = getFormContext();
 
   // 使用 ref 缓存初始值
   var initialValuesRef = useRef(initialValues);
-  var _useState = useState(initialValues),
+
+  // 与外部 screenStructures 断开引用，避免逻辑流原地修改 window 对象时污染表单内部 state
+  var _useState = useState(function () {
+      return cloneDeep(initialValues);
+    }),
     values = _useState[0],
     setValues = _useState[1];
 
-  /** 每次渲染同步，供 initialValues effect 判断「store 是否只是回灌了当前表单已有数据」 */
-  var valuesRef = useRef(values);
-  valuesRef.current = values;
-
   /**
-   * store 每次 dispatch 都会给新的 screenStructures 引用；previewStore 直接把 onChange 的 payload 设为 state（同引用）。
-   * 若 initialValues === 上次 handleFormChange 推出去的对象，说明只是「表单 → store → props」回灌，禁止再 merge，否则大表 + Fusion #185。
-   * 逻辑流 / 接口改数会换对象引用，不会与 lastOutbound 全等。
-   * 另：setFieldValue 会在微任务里 onChange，回灌前 lastOutbound 已同步为深拷贝对象；若 store 又克隆导致引用不一致，需用深比较兜底。
+   * 不能只用 !isEqual：store 对同引用 clone 回灌时，initialValues 是新引用，但与 initialValuesRef 旧对象深比较相等，
+   * 会误判「无变化」而不 merge；若表单 values 已是用户 cloneDeep 的副本，不会随原地修改更新 → 逻辑流不回填。
+   * 用「引用是否变化」决定是否同步；再用 merged 深比较避免无谓 setState（减轻 Fusion #185）。
    */
   useEffect(function () {
-    if (lastOutboundStructuresRef && initialValues === lastOutboundStructuresRef.current) {
-      initialValuesRef.current = initialValues;
-      if (typeof console !== 'undefined' && console.debug) {
-        console.debug('[FormProvider] skip merge (store ref === last outbound from form)');
-      }
-      return;
-    }
-    if (lastOutboundStructuresRef !== null && lastOutboundStructuresRef !== void 0 && lastOutboundStructuresRef.current && isEqual(initialValues, lastOutboundStructuresRef.current)) {
-      initialValuesRef.current = initialValues;
-      if (typeof console !== 'undefined' && console.debug) {
-        console.debug('[FormProvider] skip merge (deep-equal to last outbound / store echo)');
-      }
-      return;
-    }
-    if (isEqual(initialValues, valuesRef.current)) {
-      initialValuesRef.current = initialValues;
-      return;
-    }
-    if (isEqual(initialValues, initialValuesRef.current)) {
-      initialValuesRef.current = initialValues;
+    if (initialValues === initialValuesRef.current) {
       return;
     }
     console.log('[FormProvider] 🔄 useEffect triggered - initialValues:', initialValues);
@@ -87,7 +66,7 @@ export var FormProvider = function FormProvider(_ref) {
     });
   }, [initialValues]);
 
-  // 优化 setFieldValue（lastOutbound 必须在 onChange 微任务之前写入，供 skip-merge 与 Fusion didUpdate 对齐）
+  // 优化 setFieldValue
   var setFieldValue = useCallback(function (path, value) {
     setValues(function (prev) {
       // 使用浅比较检查值是否实际变化
@@ -97,25 +76,19 @@ export var FormProvider = function FormProvider(_ref) {
       var newValues = cloneDeep(prev);
       set(newValues, path, value);
       console.log("[FormProvider] \uD83D\uDCDD Set field '" + path + "' to:", value);
-      if (lastOutboundStructuresRef) {
-        lastOutboundStructuresRef.current = newValues;
-      }
+
+      // 触发 onChange 回调，把新值通知给外部
       if (onChange) {
+        // 对外回传使用副本，避免 preview/window 与 FormProvider 共用同一对象引用
+        var outboundValues = cloneDeep(newValues);
+        // 使用微任务避免阻塞渲染
         Promise.resolve().then(function () {
-          var rd = typeof window !== 'undefined' ? window.ReactDOM : undefined;
-          var run = function run() {
-            return onChange(newValues);
-          };
-          if (rd && typeof rd.unstable_batchedUpdates === 'function') {
-            rd.unstable_batchedUpdates(run);
-          } else {
-            run();
-          }
+          onChange(outboundValues);
         });
       }
       return newValues;
     });
-  }, [onChange, lastOutboundStructuresRef]);
+  }, [onChange]);
 
   // 使用 useMemo 缓存 context 值
   var contextValue = useMemo(function () {