From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms

---
 src/menu/components/table/edit-table/columns/index.jsx |   43 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/menu/components/table/edit-table/columns/index.jsx b/src/menu/components/table/edit-table/columns/index.jsx
index 569b68d..c52f0e3 100644
--- a/src/menu/components/table/edit-table/columns/index.jsx
+++ b/src/menu/components/table/edit-table/columns/index.jsx
@@ -55,14 +55,14 @@
     return connectDragSource(
       connectDropTarget(<th {...restProps} index={index} style={{ cursor: 'move', textAlign: align }} onDoubleClick={() => column && this.props.editColumn(column)}>
         <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
-          <div className="mk-popover-control">
+          <div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
             {column && ['custom', 'action'].includes(column.type) ?
               <Icon className="plus" title="娣诲姞" type="plus" onClick={() => this.props.addElement(column)} /> : null
             }
             <Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.props.editColumn(column)} />
             {column && column.type === 'custom' ? <Icon className="style" title="璋冩暣鏍峰紡" onClick={() => this.props.changeStyle(column)} type="font-colors" /> : null}
             <Icon className="close" title="鍒犻櫎" type="delete" onClick={this.deleteCol} />
-            {column && ['text', 'number'].includes(column.type) ? <MarkColumn columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+            {column && ['text', 'number', 'formula'].includes(column.type) ? <MarkColumn columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
           </div>
         } trigger="hover">
           {children}
@@ -135,9 +135,19 @@
         </td>
       )
     } else if (column) {
+      let val = column.field || ''
+      if (column.type === 'index') {
+        val = '$Index'
+      } else if (column.type === 'formula') {
+        val = column.formula
+        if (column.eval === 'false') {
+          val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, '&nbsp;')
+          val = <span dangerouslySetInnerHTML={{__html: val}}></span>
+        }
+      }
       return (
         <td style={{...style, minWidth: column.Width || 100}} className={className}>
-          {column.field || (column.type === 'index' ? '$Index' : '')}
+          {val}
           {column.Hide === 'true' ? <Icon style={{marginLeft: '5px', color: 'orange', fontSize: '12px'}} type="close-circle" /> : null}
           {column.marks && column.marks.length ? <Icon className="profile" type="ant-design"/> : null}
         </td>
@@ -315,10 +325,24 @@
     MKEmitter.emit('changeStyle', [col.uuid], ['font', 'padding'], col.style || {})
   }
 
+  changeSubmitStyle = () => {
+    const { config } = this.props
+
+    MKEmitter.emit('changeStyle', [config.uuid, 'submit'], ['font', 'background', 'border', 'margin', 'padding'], config.submit.style || {})
+  }
+
   getStyle = (comIds, style) => {
+    const { config } = this.props
     const { editStyleCard } = this.state
 
-    if (!editStyleCard || comIds[0] !== editStyleCard.uuid || comIds.length !== 1) return
+    if (comIds.length === 2 && comIds[0] === config.uuid && comIds[1] === 'submit') {
+      let submit = {...config.submit, style}
+
+      this.props.updatecolumn({...config, submit: submit})
+
+      return
+    }
+    if (comIds.length !== 1 || !editStyleCard || comIds[0] !== editStyleCard.uuid) return
 
     let _card = {...editStyleCard, style}
     
@@ -451,6 +475,7 @@
     const { config } = this.props
     
     this.verifyRef.handleConfirm().then(res => {
+      res.style = config.submit.style || {}
       this.setState({
         visible: false
       }, () => {
@@ -486,8 +511,12 @@
     }
 
     const columns = this.state.columns.map((col, index) => {
+      let title = col.label
+      if (col.editable === 'true') {
+        title = <span>{col.label}<Icon style={{position: 'absolute', bottom: 0, right: 0, color: '#1890ff'}} type="edit" /></span>
+      }
       return {
-        title: col.label,
+        title: title,
         dataIndex: col.uuid,
         align: col.Align,
         sorter: col.IsSort === 'true',
@@ -526,9 +555,10 @@
           <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
             <div className="mk-popover-control">
               <Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.setState({visible: true})} />
+              <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeSubmitStyle} type="font-colors" />
             </div>
           } trigger="hover">
-            <Button style={{height: '24px', marginRight: '10px', backgroundColor: '#1890ff'}} onDoubleClick={() => this.setState({visible: true})} type="primary">鎻愪氦</Button>
+            <Button className="submit-btn" style={config.submit.style} onDoubleClick={() => this.setState({visible: true})} type="primary">鎻愪氦</Button>
           </Popover>
           <Icon title="澶嶅埗鏄剧ず鍒�" type="copy" onClick={this.copycolumn} />
           <MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
@@ -568,6 +598,7 @@
         >
           <TableVerify
             card={config.submit}
+            setting={config.setting}
             dict={dict}
             cols={config.cols}
             columns={config.columns}

--
Gitblit v1.8.0