fix: 修复编辑器中switch组件默认值回显不对问题 (baidu#9522)

* fix: 修复编辑器中switch组件默认值回显不对问题 * 修改为isExpression方法 --------- Co-authored-by: qinhaoyan <30946345+qinhaoyan@users.noreply.github.com>
qkiroc · Jan 25, 2024 · 70c8d30 · 70c8d30
1 parent d9d9231
commit 70c8d30
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/packages/amis-editor/src/plugin/Form/Switch.tsx b/packages/amis-editor/src/plugin/Form/Switch.tsx
@@ -9,6 +9,7 @@ import type {
   RendererPluginAction,
   RendererPluginEvent
 } from 'amis-editor-core';
+import {isExpression} from 'amis-core';
 
 export class SwitchControlPlugin extends BasePlugin {
   static id = 'SwitchControlPlugin';
@@ -202,12 +203,10 @@ export class SwitchControlPlugin extends BasePlugin {
                     : value;
                 },
                 pipeOut: (value: any, origin: any, data: any) => {
+                  // 如果是表达式，直接返回
+                  if (isExpression(value)) return value;
                   const {trueValue = true, falseValue = false} = data || {};
-                  return value && value === trueValue
-                    ? trueValue
-                    : value && value !== falseValue
-                    ? value
-                    : falseValue;
+                  return value ? trueValue : falseValue;
                 }
               }),
               getSchemaTpl('labelRemark'),