From 4fc1eb4913f3302679d88ec01099fc8dd3a80f81 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 三月 2023 23:27:21 +0800
Subject: [PATCH] 2023-03-08

---
 src/menu/components/form/simple-form/index.jsx |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index 0875e25..b7e8139 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -506,7 +506,7 @@
     let _config = fromJS(this.state.card).toJS()
 
     if (res.subButton) {
-      let _this = this
+      let that = this
 
       _config.subcards[0].setting.focus = res.focus
       _config.subcards[0].setting.cache = res.cache
@@ -527,12 +527,38 @@
       })
 
       confirm({
-        content: `鏇挎崲琛ㄥ崟鍙婃寜閽厤缃紵`,
+        content: '鏇挎崲琛ㄥ崟鍙婃寜閽厤缃紵',
         onOk() {
-          _this.updateComponent(_config)
+          that.updateComponent(_config)
         },
         onCancel() {}
       })
+      return
+    } else if (res.fields) {
+      if (_config.subcards[0].fields.length > 0) {
+        let that = this
+        _config.subcards[0].fields = res.fields.map(item => {
+          item.uuid = Utils.getuuid()
+          return item
+        })
+
+        confirm({
+          title: '纭畾鏇挎崲琛ㄥ崟鍚楋紵',
+          content: '鍘熻〃鍗曞皢鍒犻櫎銆�',
+          onOk() {
+            that.updateComponent(_config)
+          },
+          onCancel() {}
+        })
+      } else {
+        _config.subcards[0].fields = res.fields.map(item => {
+          item.uuid = Utils.getuuid()
+          return item
+        })
+
+        this.updateComponent(_config)
+      }
+
       return
     }
 
@@ -636,7 +662,7 @@
               <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
             </NormalForm>
             <CopyComponent type="simpleform" card={card}/>
-            <PasteComponent config={card} options={['form', 'formgroup']} updateConfig={this.pasteForm} />
+            <PasteComponent config={card} options={['form', 'forms', 'formgroup']} updateConfig={this.pasteForm} />
             <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
             <UserComponent config={card}/>
             <DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />

--
Gitblit v1.8.0