fix(editor): 下拉选择框和复选框组件配置接口类数据源后，被设置了value

lhtuling · Jan 16, 2024 · 8aecaff · 8aecaff
1 parent b2520da
commit 8aecaff
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/packages/amis-editor/src/plugin/Form/Checkboxes.tsx b/packages/amis-editor/src/plugin/Form/Checkboxes.tsx
@@ -4,7 +4,8 @@ import {
   getSchemaTpl,
   valuePipeOut,
   EditorNodeType,
-  EditorManager
+  EditorManager,
+  undefinedPipeOut
 } from 'amis-editor-core';
 import {registerEditorPlugin} from 'amis-editor-core';
 import {
@@ -173,11 +174,6 @@ export class CheckboxesControlPlugin extends BasePlugin {
                   ]
                 }
               ],
-              getSchemaTpl('valueFormula', {
-                rendererSchema: (schema: Schema) => schema,
-                useSelectMode: true, // 改用 Select 设置模式
-                visibleOn: 'this.options && this.options.length > 0'
-              }),
               getSchemaTpl('joinValues', {
                 visibleOn: true
               }),
@@ -199,6 +195,17 @@ export class CheckboxesControlPlugin extends BasePlugin {
               getSchemaTpl('optionControlV2', {
                 multiple: true
               }),
+              getSchemaTpl('valueFormula', {
+                rendererSchema: (schema: Schema) => ({
+                  ...schema,
+                  type: 'input-text'
+                }),
+                pipeOut: undefinedPipeOut,
+                // 默认值组件设计有些问题，自动发起了请求，接口数据作为了默认值选项，接口形式应该是设置静态值或者FX
+                needDeleteProps: ['source'],
+                // 当数据源是自定义静态选项时，不额外配置默认值，在选项上直接勾选即可，放开会有个bug：当去掉勾选时，默认值配置组件不清空，只是schema清空了value
+                visibleOn: 'this.selectFirst !== true && this.source != null'
+              }),
               // 自定义选项模板
               getSchemaTpl('optionsMenuTpl', {
                 manager: this.manager

diff --git a/packages/amis-editor/src/plugin/Form/Select.tsx b/packages/amis-editor/src/plugin/Form/Select.tsx
@@ -252,7 +252,8 @@ export class SelectControlPlugin extends BasePlugin {
                 pipeOut: undefinedPipeOut,
                 // 默认值组件设计有些问题，自动发起了请求，接口数据作为了默认值选项，接口形式应该是设置静态值或者FX
                 needDeleteProps: ['source'],
-                hiddenOn: 'this.selectFirst === true'
+                // 当数据源是自定义静态选项时，不额外配置默认值，在选项上直接勾选即可，放开会有个bug：当去掉勾选时，默认值配置组件不清空，只是schema清空了value
+                visibleOn: 'this.selectFirst !== true && this.source != null'
               }),
               getSchemaTpl(
                 'loadingConfig',