From 43a517b80f2803e0dcf6658113520c4a14c8c17f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 22 五月 2023 18:21:52 +0800
Subject: [PATCH] 2023-05-22

---
 src/tabviews/custom/components/table/edit-table/normalTable/index.jsx |   75 +++++++++++++------------------------
 1 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 36e29df..2b09bfb 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -220,15 +220,7 @@
       }
     }, 50)
 
-    let values = {}
-    // if (col.editField) {
-    //   values[col.field] = label
-    //   values[col.editField] = val
-    // } else {
-      values[col.field] = val
-    // }
-
-    MKEmitter.emit('changeRecord', col.tableId, {...record, ...values})
+    MKEmitter.emit('changeRecord', col.tableId, {...record, [col.field]: val})
   }
 
   onSelectChange = (val, option) => {
@@ -244,12 +236,7 @@
         })
       }
 
-      // if (col.editField) {
-      //   values[col.field] = _option.label
-      //   values[col.editField] = val
-      // } else {
-        values[col.field] = val
-      // }
+      values[col.field] = val
     }
 
     this.setState({editing: false})
@@ -333,22 +320,14 @@
               <Input className={err ? 'has-error' : ''} title={err} id={col.uuid + record.$$uuid} defaultValue={value} onChange={(e) => this.onChange(e.target.value)} onPressEnter={this.enterPress} onBlur={this.onBlur}/>
             </td>)
           } else if (col.editType === 'switch') {
-            let _value = ''
-            // if (col.editField) {
-            //   _value = record[col.editField] !== undefined ? record[col.editField] : ''
-            // } else {
-              _value = record[col.field] !== undefined ? record[col.field] : ''
-            // }
+            let _value = record[col.field] !== undefined ? record[col.field] : ''
+
             return (<td className="editing_table_cell">
               <CusSwitch config={col} defaultValue={_value} autoFocus={true} onChange={this.onSwitchChange} onBlur={this.switchBlur}/>
             </td>)
           } else {
-            let _value = ''
-            // if (col.editField) {
-            //   _value = record[col.editField] !== undefined ? record[col.editField] : ''
-            // } else {
-              _value = record[col.field] !== undefined ? record[col.field] : ''
-            // }
+            let _value = record[col.field] !== undefined ? record[col.field] : ''
+
             return (<td className="editing_table_cell">
               <Select
                 showSearch
@@ -641,15 +620,7 @@
       }
     }, 50)
 
-    let values = {}
-    // if (col.editField) {
-    //   values[col.field] = label
-    //   values[col.editField] = val
-    // } else {
-      values[col.field] = val
-    // }
-
-    MKEmitter.emit('changeRecord', col.tableId, {...record, ...values})
+    MKEmitter.emit('changeRecord', col.tableId, {...record, [col.field]: val})
   }
 
   onSelectChange = (val, option) => {
@@ -665,12 +636,7 @@
         })
       }
 
-      // if (col.editField) {
-      //   values[col.field] = _option.label
-      //   values[col.editField] = val
-      // } else {
-        values[col.field] = val
-      // }
+      values[col.field] = val
     }
 
     setTimeout(() => {
@@ -707,12 +673,7 @@
     let children = null
     if (col.type === 'text') {
       if (col.editable === 'true' && !disabled) {
-        let _value = ''
-        // if (col.editField) {
-        //   _value = record[col.editField] !== undefined ? record[col.editField] : ''
-        // } else {
-          _value = record[col.field] !== undefined ? record[col.field] : ''
-        // }
+        let _value = record[col.field] !== undefined ? record[col.field] : ''
         
         if (!col.editType || col.editType === 'text') {
           children = (<>
@@ -776,6 +737,11 @@
             content = <span style={mark.innerStyle}>{content}</span>
           }
         }
+
+        if (col.editable === 'true' && disabled) {
+          content = <span style={{display: 'inline-block', padding: '0 6px'}}>{content}</span>
+        }
+
         children = content
       }
     } else if (col.type === 'number') {
@@ -838,6 +804,11 @@
             content = <span style={mark.innerStyle}>{content}</span>
           }
         }
+
+        if (col.editable === 'true' && disabled) {
+          content = <span style={{display: 'inline-block', padding: '0 6px'}}>{content}</span>
+        }
+
         children = content
       }
     } else if (col.type === 'textarea') {
@@ -1111,7 +1082,13 @@
     if (menuid !== MenuID) return
 
     if (type !== 'line') {
-      this.setState({edData: data})
+      if (setting.editType === 'multi' && data.length > 0) {
+        this.setState({edData: []}, () => {
+          this.setState({edData: data})
+        })
+      } else {
+        this.setState({edData: data})
+      }
 
       if (setting.addable && data.length === 0) {
         setTimeout(() => {

--
Gitblit v1.8.0