From 9d446515104a205a7140a25b82202e226e10e8fc Mon Sep 17 00:00:00 2001
From: pianruijie <pianruijie@baidu.com>
Date: Fri, 12 Aug 2022 13:20:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E5=AE=B9=E5=99=A8?=
 =?UTF-8?q?=E7=B1=BB=E7=BB=84=E4=BB=B6=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ida738aeb33362b36eef3768d36057fd69b3c0f14
---
 .../src/renderer/event-control/actions.tsx           | 12 ++----------
 .../src/renderer/event-control/helper.tsx            | 10 +---------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/packages/amis-editor/src/renderer/event-control/actions.tsx b/packages/amis-editor/src/renderer/event-control/actions.tsx
index 04749f682..ec8a3f413 100644
--- a/packages/amis-editor/src/renderer/event-control/actions.tsx
+++ b/packages/amis-editor/src/renderer/event-control/actions.tsx
@@ -734,20 +734,12 @@ const ACTION_TYPE_TREE = (manager: any): RendererPluginAction[] => {
                   items: [
                     {
                       name: 'key',
-                      type: 'select',
+                      type: 'input-text',
                       placeholder: '变量名',
                       source: '${__setValueDs}',
                       labelField: 'label',
                       valueField: 'value',
                       required: true,
-                      visibleOn: `data.__rendererName && ${SHOW_SELECT_PROP}`,
-                    },
-                    {
-                      name: 'key',
-                      type: 'input-text',
-                      placeholder: '变量名',
-                      required: true,
-                      visibleOn: `data.__rendererName && !${SHOW_SELECT_PROP} && __comboType === 'appoint'`
                     },
                     {
                       name: 'val',
@@ -826,7 +818,7 @@ const ACTION_TYPE_TREE = (manager: any): RendererPluginAction[] => {
                   label: '赋值',
                   size: 'lg',
                   mode: 'horizontal',
-                  visibleOn: `data.__rendererName && !${IS_DATA_CONTAINER} && __rendererName !== 'combo'`,
+                  visibleOn: `data.__rendererName && !${IS_DATA_CONTAINER} && !${SHOW_SELECT_PROP} && __rendererName !== 'combo'`,
                   required: true
                 }
               ]
diff --git a/packages/amis-editor/src/renderer/event-control/helper.tsx b/packages/amis-editor/src/renderer/event-control/helper.tsx
index 2c70ea634..8f4b49d8a 100644
--- a/packages/amis-editor/src/renderer/event-control/helper.tsx
+++ b/packages/amis-editor/src/renderer/event-control/helper.tsx
@@ -189,20 +189,12 @@ export const COMMON_ACTION_SCHEMA_MAP: {
           items: [
             {
               name: 'key',
-              type: 'select',
+              type: 'input-text',
               placeholder: '变量名',
               source: '${__setValueDs}',
               labelField: 'label',
               valueField: 'value',
               required: true,
-              visibleOn: `data.__rendererName && ${SHOW_SELECT_PROP}`
-            },
-            {
-              name: 'key',
-              type: 'input-text',
-              placeholder: '变量名',
-              required: true,
-              visibleOn: `data.__rendererName && !${SHOW_SELECT_PROP}`
             },
             {
               name: 'val',