From 947d0ed1a628353f42ac4c2aa817a4579cdf126d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 05 十一月 2023 11:29:04 +0800
Subject: [PATCH] Merge branch 'positec' into dms

---
 src/menu/components/table/edit-table/columns/index.jsx |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/menu/components/table/edit-table/columns/index.jsx b/src/menu/components/table/edit-table/columns/index.jsx
index f7d1ef3..a141757 100644
--- a/src/menu/components/table/edit-table/columns/index.jsx
+++ b/src/menu/components/table/edit-table/columns/index.jsx
@@ -190,8 +190,9 @@
 
 class NormalTableColumns extends Component {
   static propTpyes = {
-    config: PropTypes.object,       // 閰嶇疆淇℃伅
-    updatecolumn: PropTypes.func    // 鏁版嵁鍙樺寲
+    config: PropTypes.object,
+    updatecolumn: PropTypes.func,
+    addColumns: PropTypes.func
   }
 
   state = {
@@ -406,6 +407,8 @@
 
   submitCol = (col) => {
     const { card } = this.state
+    
+    if (!card) return
     
     col.uuid = card.uuid
     col.isSub = card.isSub === true
@@ -689,6 +692,7 @@
           } trigger="hover">
             <Button className="submit-btn" style={config.submit.style} onDoubleClick={() => this.setState({visible: true})} type="primary">鎻愪氦</Button>
           </Popover>
+          <PlusOutlined title="娣诲姞鍒�" onClick={this.props.addColumns}/>
           <CopyOutlined title="澶嶅埗鏄剧ず鍒�" onClick={this.copycolumn} />
           <MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
           <ColsControl config={config} onSubmit={this.props.updatecolumn}/>
@@ -714,7 +718,7 @@
             }}
           />
         </DndProvider>
-        <EditColumn column={card} columns={this.state.columns} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
+        <EditColumn column={card} wrap={config.wrap} columns={this.state.columns} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
         <Modal
           wrapClassName="mk-pop-modal"
           visible={visible}

--
Gitblit v1.8.0