fix: 修复 combo nullable 清空失败的问题 (baidu#9414)

lhtuling · Jan 12, 2024 · bddf9d1 · bddf9d1
1 parent 0628726
commit bddf9d1
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/packages/amis/src/renderers/Form/Combo.tsx b/packages/amis/src/renderers/Form/Combo.tsx
@@ -55,6 +55,7 @@ import {
 import {ListenerAction} from 'amis-core';
 import type {SchemaTokenizeableString} from '../../Schema';
 import isPlainObject from 'lodash/isPlainObject';
+import isEqual from 'lodash/isEqual';
 
 export type ComboCondition = {
   test: string;
@@ -798,6 +799,11 @@ export default class ComboControl extends React.Component<ComboProps> {
   }
 
   handleSingleFormChange(values: object) {
+    if (this.props.value === null && isEqual(this.defaultValue, values)) {
+      // 由清空触发，忽略
+      return;
+    }
+
     this.props.onChange(
       {
         ...values
@@ -1713,7 +1719,9 @@ export default class ComboControl extends React.Component<ComboProps> {
     } = this.props;
 
     let items = this.props.items;
-    const data = isObject(value) ? this.formatValue(value) : this.defaultValue;
+    const data = isObject(value)
+      ? this.formatValue(value)
+      : this.formatValue(this.defaultValue);
     let condition: ComboCondition | null = null;
 
     if (Array.isArray(conditions) && conditions.length) {