From e6a10ced1ed8db39486dc0a1795191c701ef3224 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 20 十二月 2021 18:11:35 +0800
Subject: [PATCH] 2021-12-20

---
 src/menu/components/table/edit-table/index.jsx |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/menu/components/table/edit-table/index.jsx b/src/menu/components/table/edit-table/index.jsx
index 4a6b04d..9eb9941 100644
--- a/src/menu/components/table/edit-table/index.jsx
+++ b/src/menu/components/table/edit-table/index.jsx
@@ -69,6 +69,7 @@
         ],
         scripts: [],
         btnlog: [],
+        submit: {intertype: 'system', default: 'true', innerFunc: '', execSuccess: 'grid', execError: 'never', scripts: [], uniques: []},
         isNew: true
       }
 
@@ -79,6 +80,10 @@
         _card.wrap.name = card.name
         _card.style = config.style
         _card.headerStyle = config.headerStyle
+
+        _card.setting = config.setting
+        _card.columns = config.columns
+        _card.scripts = config.scripts
 
         let oriUids = {}
         _card.action = config.action.map(item => {
@@ -180,14 +185,9 @@
   getStyle = (comIds, style) => {
     const { card } = this.state
 
-    if (comIds[0] !== card.uuid) return
+    if (comIds[0] !== card.uuid || comIds.length !== 1) return
 
-    let _card = {}
-    if (comIds.length === 1) {
-      _card = {...card, style}
-    } else {
-      return
-    }
+    let _card = {...card, style}
 
     this.setState({
       card: _card
@@ -205,11 +205,9 @@
   }
 
   addSearch = () => {
-    let card = fromJS(this.state.card).toJS()
+    const { card } = this.state
 
-    card.search.push({uuid: Utils.getuuid(), focus: true, label: 'label', type: 'text', match: '='})
-
-    this.setState({card})
+    MKEmitter.emit('plusSearch', card.uuid, {uuid: Utils.getuuid(), focus: true, label: 'label', type: 'text', match: '='}, 'simple')
   }
 
   addButton = () => {
@@ -219,7 +217,7 @@
     newcard.uuid = Utils.getuuid()
     newcard.focus = true
     
-    newcard.label = 'label'
+    newcard.label = '瀵煎叆Excel'
     newcard.sqlType = ''
     newcard.Ot = 'requiredSgl'
     newcard.OpenType = 'excelIn'
@@ -313,7 +311,7 @@
 
     return (
       <div className="menu-normal-table-edit-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
-        <NormalHeader defaultshow="hidden" hideSearch="true" config={card} updateComponent={this.updateComponent}/>
+        <NormalHeader hideSearch="true" config={card} updateComponent={this.updateComponent}/>
         <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
           <div className="mk-popover-control">
             <Icon className="plus" title="娣诲姞鍒�" onClick={this.addColumns} type="plus" />

--
Gitblit v1.8.0