From 21404653d49e13298ebd961ef7f6191cf9b2e9f3 Mon Sep 17 00:00:00 2001
From: DiamondYuan <fandi.yfd@antgroup.com>
Date: Tue, 20 Feb 2024 14:26:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20FormDynamiac=20?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compiled/alipay/demo/pages/FormDynamic/index.axml |  2 +-
 compiled/wechat/demo/pages/FormDynamic/index.wxml |  2 +-
 compiled/wechat/src/Form/FormInput/index.wxml     |  7 ++++++-
 demo/pages/FormDynamic/index.axml.tsx             |  2 +-
 src/Form/FormInput/index.axml.tsx                 | 11 +++++------
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/compiled/alipay/demo/pages/FormDynamic/index.axml b/compiled/alipay/demo/pages/FormDynamic/index.axml
index c394a9384..77a7ebab7 100644
--- a/compiled/alipay/demo/pages/FormDynamic/index.axml
+++ b/compiled/alipay/demo/pages/FormDynamic/index.axml
@@ -2,7 +2,7 @@
   a:for="{{ list }}"
   a:for-index="index"
   a:for-item="item"
-  a:key="{{ item.id }}">
+  a:key="id">
   <ant-form-input
     label="{{ list[index].id }}"
     name="account{{ list[index].id }}"
diff --git a/compiled/wechat/demo/pages/FormDynamic/index.wxml b/compiled/wechat/demo/pages/FormDynamic/index.wxml
index 617f1fc1e..f11f4ec6c 100644
--- a/compiled/wechat/demo/pages/FormDynamic/index.wxml
+++ b/compiled/wechat/demo/pages/FormDynamic/index.wxml
@@ -2,7 +2,7 @@
   wx:for="{{ list }}"
   wx:for-index="index"
   wx:for-item="item"
-  wx:key="{{ item.id }}">
+  wx:key="id">
   <ant-form-input
     label="{{ list[index].id }}"
     name="account{{ list[index].id }}"
diff --git a/compiled/wechat/src/Form/FormInput/index.wxml b/compiled/wechat/src/Form/FormInput/index.wxml
index 79df06f30..f898c1da6 100644
--- a/compiled/wechat/src/Form/FormInput/index.wxml
+++ b/compiled/wechat/src/Form/FormInput/index.wxml
@@ -46,7 +46,12 @@
     slot="tooltip">
     <slot name="tooltip" />
   </view>
-  <view slot="extra">{{ extra }}</view>
+  <view slot="extra">
+    <block wx:if="{{ extra }}">{{ extra }}</block>
+    <slot
+      wx:else
+      name="extra" />
+  </view>
   <view
     slot="header"
     slot-scope="item">
diff --git a/demo/pages/FormDynamic/index.axml.tsx b/demo/pages/FormDynamic/index.axml.tsx
index cb3dd73c4..af7f08d39 100644
--- a/demo/pages/FormDynamic/index.axml.tsx
+++ b/demo/pages/FormDynamic/index.axml.tsx
@@ -7,7 +7,7 @@ export default ({ list }) => (
   <Page>
     {list.map((item, index) => (
       <AntFormInput
-        key={item.id}
+        key={"id"}
         label={list[index].id}
         name={`account${list[index].id}`}
         required
diff --git a/src/Form/FormInput/index.axml.tsx b/src/Form/FormInput/index.axml.tsx
index 4dd0919eb..444d84e20 100644
--- a/src/Form/FormInput/index.axml.tsx
+++ b/src/Form/FormInput/index.axml.tsx
@@ -1,4 +1,4 @@
-import { Component, InternalData, Slot, TSXMLProps, View } from 'tsxml';
+import { Component, InternalData, Slot, TSXMLProps, View, Block } from 'tsxml';
 import AntInput from '../../Input/index.axml';
 import FormItem from '../FormItem/index.axml';
 import { FormInputProps } from './props'; // assuming the props file is in the same directory
@@ -82,12 +82,11 @@ export default (
         </View>
       )}
       <View slot="extra">
+        {/* #if WECHAT */}
+        {extra ? <Block>{extra}</Block> : <Slot name="extra"></Slot>}
+        {/* #endif */}
         {/* #if ALIPAY */}
-        <Slot name="extra">
-          {/* #endif */}
-          {extra}
-          {/* #if ALIPAY */}
-        </Slot>
+        <Slot name="extra">{extra}</Slot>
         {/* #endif */}
       </View>
       <View slot="header" slot-scope="item">