From 3ecc98d6ba3fe31b9694bad348cbbb08c1b0dd81 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 五月 2024 22:52:02 +0800
Subject: [PATCH] 2024-05-22

---
 src/menu/components/form/simple-form/index.jsx |   31 +++++--------------------------
 1 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index 2d1855a..974b624 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -41,8 +41,7 @@
     visible: false,
     editform: null,
     formlist: null,
-    sqlVerifing: false,
-    standardform: null
+    sqlVerifing: false
   }
 
   UNSAFE_componentWillMount () {
@@ -346,23 +345,17 @@
    * @description 琛ㄥ崟缂栬緫
    */
   handleForm = (_item) => {
-    const { card, appType } = this.state
+    const { card } = this.state
     let _form = fromJS(_item).toJS()
     let _inputfields = []
     let _tabfields = []
     let _linkableFields = []
     let _linksupFields = []
-    let standardform = null
-    let index = null
 
     card.subcards[0].fields.forEach((item, i) => {
-      if (_form.uuid === item.uuid) {
-        index = i
-      }
-
       if (!item.field || _form.field === item.field) return
 
-      if (['text', 'number', 'textarea', 'color'].includes(item.type)) {
+      if (['text', 'number', 'textarea', 'select'].includes(item.type)) {
         _inputfields.push({
           field: item.field,
           label: item.label
@@ -397,14 +390,6 @@
       })
     })
 
-    if (index !== null) {
-      if (index === 0) {
-        standardform = card.subcards[0].fields[index + 1] || null
-      } else {
-        standardform = card.subcards[0].fields[index - 1] || null
-      }
-    }
-
     let _fields = _linkableFields.map(cell => cell.field)
     card.columns.forEach(col => {
       if (col.field && !_fields.includes(col.field)) {
@@ -420,13 +405,7 @@
       _form.linkSubField = _form.linkSubField.filter(item => fields.includes(item))
     }
 
-    if (appType !== 'mob' && !_form.span && standardform && standardform.span) {
-      _form.span = standardform.span
-      _form.labelwidth = standardform.labelwidth
-    }
-
     this.setState({
-      standardform,
       visible: true,
       editform: _form,
       formlist: getModalForm(_form, _inputfields, _tabfields, _linkableFields, _linksupFields, card.columns)
@@ -442,7 +421,7 @@
   handleSubmit = () => {
     let _config = fromJS(this.state.card).toJS()
 
-    this.formRef.handleConfirm(_config.subcards[0].fields).then(res => {
+    this.formRef.handleConfirm().then(res => {
       _config.subcards[0].fields = _config.subcards[0].fields.map(item => {
         delete item.focus
 
@@ -687,7 +666,7 @@
             card={this.state.editform}
             formlist={this.state.formlist}
             inputSubmit={this.handleSubmit}
-            standardform={this.state.standardform}
+            fields={card.subcards[0].fields}
             wrappedComponentRef={(inst) => this.formRef = inst}
           />
         </Modal>

--
Gitblit v1.8.0