fix: select的source是表达式时，数据域发生变化后已选值不会自动清空 issue#10359

baidu · May 31, 2024 · 1fd7a07 · 1fd7a07
1 parent 1064425
commit 1fd7a07
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/amis-core/src/renderers/Options.tsx b/packages/amis-core/src/renderers/Options.tsx
@@ -434,7 +434,8 @@ export function registerOptionsControl(config: OptionsConfig) {
             formItem.loadOptionsFromDataScope(
               props.source as string,
               props.data,
-              this.changeOptionValue
+              this.changeOptionValue,
+              true
             );
 
             this.normalizeValue();

diff --git a/packages/amis-core/src/store/formItem.ts b/packages/amis-core/src/store/formItem.ts
@@ -866,7 +866,12 @@ export const FormItemStore = StoreNode.named('FormItemStore')
     function loadOptionsFromDataScope(
       source: string,
       ctx: Record<string, any>,
-      onChange?: (value: any) => void
+      onChange?: (
+        value: any,
+        submitOnChange?: boolean,
+        changeImmediately?: boolean
+      ) => void,
+      clearValue?: boolean
     ) {
       let options: any[] = resolveVariableAndFilter(source, ctx, '| raw');
 
@@ -892,6 +897,13 @@ export const FormItemStore = StoreNode.named('FormItemStore')
 
       setOptions(options, onChange, ctx);
 
+      // source从数据域获取，同时发生变化时，需要清空当前表单项
+      if (clearValue && !self.selectFirst) {
+        self.selectedOptions.some((item: any) => item.__unmatched) &&
+          onChange &&
+          onChange('', false, true);
+      }
+
       return options;
     }