From 3d4bc79a80eb9cff0f8ef7c53f9685c9ff9fbd2d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 02 九月 2021 23:17:36 +0800 Subject: [PATCH] 2021-09-02 --- src/menu/components/table/normal-table/columns/index.jsx | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx index c88a996..2e4d8b8 100644 --- a/src/menu/components/table/normal-table/columns/index.jsx +++ b/src/menu/components/table/normal-table/columns/index.jsx @@ -53,7 +53,7 @@ if (index !== undefined) { return connectDragSource( - connectDropTarget(<th {...restProps} index={index} style={{ cursor: 'move', textAlign: align }}> + 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"> {column && ['custom', 'colspan', 'action'].includes(column.type) ? @@ -71,7 +71,7 @@ ) } else if (column) { return ( - <th {...restProps} key={column.uuid}> + <th {...restProps} key={column.uuid} onDoubleClick={() => this.props.editColumn(column)}> <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={ <div className="mk-popover-control"> {column && ['custom', 'colspan'].includes(column.type) ? @@ -158,6 +158,7 @@ return ( <td style={{...style, minWidth: column.Width || 100}} className={className}> {column.field || (column.type === 'index' ? '$Index' : '')} + {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> ) @@ -550,9 +551,9 @@ return ( <div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType} ${config.wrap.mode || ''}`} id={tableId}> <div className="col-control"> - <Icon title="澶嶅埗" type="copy" onClick={this.copycolumn} /> + <Icon title="澶嶅埗鏄剧ず鍒�" type="copy" onClick={this.copycolumn} /> <MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} /> - <Icon title="鍚屾" type="file-sync" onClick={this.syncfield} /> + <Icon title="鍚屾瀛楁闆�" type="file-sync" onClick={this.syncfield} /> </div> <DndProvider> <Table -- Gitblit v1.8.0