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/modalconfig/index.jsx |   27 ++-------------------------
 1 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index 3ffa871..65a7158 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -40,7 +40,6 @@
     originConfig: null,    // 鍘熷鑿滃崟
     sqlVerifing: false,    // sql楠岃瘉
     showField: false,      // 鏄剧ず琛ㄥ崟瀛楁鍊�
-    standardform: null,
     saving: false
   }
 
@@ -110,17 +109,11 @@
     let _tabfields = []
     let _linkableFields = []
     let _linksupFields = []
-    let standardform = null
-    let index = null
 
     config.fields.forEach((item, i) => {
-      if (card.uuid === item.uuid) {
-        index = i
-      }
-
       if (!item.field || card.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
@@ -154,13 +147,6 @@
         label: item.label + '-琛ㄥ崟'
       })
     })
-    if (index !== null) {
-      if (index === 0) {
-        standardform = config.fields[index + 1] || null
-      } else {
-        standardform = config.fields[index - 1] || null
-      }
-    }
 
     let columns = componentConfig.columns
     if (btn.$sub) {
@@ -182,16 +168,7 @@
       card.linkSubField = card.linkSubField.filter(item => fields.includes(item))
     }
 
-    if (!card.span && standardform && standardform.span) {
-      card.span = standardform.span
-      card.labelwidth = standardform.labelwidth
-    } else if (!card.span) {
-      card.span = 12
-      card.labelwidth = 33.3
-    }
-
     this.setState({
-      standardform,
       visible: true,
       card: card,
       formlist: getModalForm(card, _inputfields, _tabfields, _linkableFields, _linksupFields, columns)
@@ -533,7 +510,7 @@
             card={card}
             formlist={this.state.formlist}
             inputSubmit={this.handleSubmit}
-            standardform={this.state.standardform}
+            fields={config.fields}
             wrappedComponentRef={(inst) => this.formRef = inst}
           />
         </Modal>

--
Gitblit v1.8.0