From 9ee3d1f9a09a865188baffdffb85f6ad329c7b09 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 19 十二月 2021 01:09:20 +0800
Subject: [PATCH] 2021-12-19

---
 src/menu/components/table/edit-table/columns/index.jsx |   22 ++++++++++++++++------
 1 files changed, 16 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 fdf0b84..023ccbf 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>
@@ -285,8 +295,7 @@
         intertype: 'system',
         execSuccess: 'grid',
         execError: 'never',
-        show: 'link',
-        $type: 'tableButton'
+        show: 'link'
       }
 
       // 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
@@ -420,7 +429,7 @@
 
       let cell = { uuid: Utils.getuuid(), label: item.label, field: item.field, Align: 'left', Hide: 'false', IsSort: 'false', Width: 120, blacklist: [], postfix: '', prefix: '', linkmenu: [], marks: [], perspective: 'linkmenu' }
       
-      if (/Nvarchar/ig.test(item.datatype)) {
+      if (/Nvarchar|date/ig.test(item.datatype)) {
         cell.type = 'text'
         cell.rowspan = 'false'
         cell.textFormat = 'none'
@@ -429,6 +438,7 @@
         cell.format = 'none'
         cell.sum = 'false'
         cell.decimal = item.decimal || 0
+        cell.Width = 80
       }
 
       columns.push(cell)

--
Gitblit v1.8.0