From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/edit-table/columns/tableIn/index.jsx | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/tableIn/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
index 33b21b2..61698fb 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Tabs, Row, Col, Input, Button, Table, Popconfirm, Icon, notification, Modal, message, InputNumber, Radio, Typography } from 'antd'
+import { Form, Tabs, Row, Col, Input, Button, Table, Popconfirm, notification, Modal, message, InputNumber, Radio, Typography } from 'antd'
+import { StopTwoTone, CheckCircleTwoTone, EditOutlined, ArrowUpOutlined, ArrowDownOutlined, SwapOutlined, DeleteOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -79,14 +80,14 @@
render: (text, record) => record.status === 'false' ?
(
<div>
- {this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ 绂佺敤
+ <StopTwoTone style={{marginLeft: '5px'}} twoToneColor="#ff4d4f" />
</div>
) :
(
<div>
{this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <CheckCircleTwoTone style={{marginLeft: '5px'}} twoToneColor="#52c41a" />
</div>
)
},
@@ -99,12 +100,12 @@
render: (text) => {
let title = text.match(/^\s*\/\*.+\*\//)
title = title && title[0] ? title[0] : ''
- text = title ? text.replace(title, '') : text
+ let _text = title ? text.replace(title, '') : text
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
- <Paragraph copyable ellipsis={{ rows: 4, expandable: true }}>{text}</Paragraph>
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
+ <Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
}
@@ -132,14 +133,14 @@
render: (text, record) => record.status === 'false' ?
(
<div>
- {this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ 绂佺敤
+ <StopTwoTone style={{marginLeft: '5px'}} twoToneColor="#ff4d4f" />
</div>
) :
(
<div>
{this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <CheckCircleTwoTone style={{marginLeft: '5px'}} twoToneColor="#52c41a" />
</div>
)
},
@@ -150,16 +151,16 @@
dataIndex: 'operation',
render: (text, record) =>
(<div>
- <span className="operation-btn" onClick={() => this.handleEdit(record, 'scripts')} style={{color: '#1890ff'}}><Icon type="edit" /></span>
- <span className="operation-btn" onClick={() => this.handleUpDown(record, 'scripts', 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
- <span className="operation-btn" onClick={() => this.handleUpDown(record, 'scripts', 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'scripts')} style={{color: '#8E44AD'}}><Icon type="swap" /></span>
+ <span className="operation-btn" onClick={() => this.handleEdit(record, 'scripts')} style={{color: '#1890ff'}}><EditOutlined /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'scripts', 'up')} style={{color: '#1890ff'}}><ArrowUpOutlined /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'scripts', 'down')} style={{color: '#ff4d4f'}}><ArrowDownOutlined /></span>
+ <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'scripts')} style={{color: '#8E44AD'}}><SwapOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
title={this.props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record, 'scripts')
}>
- <span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
</div>)
}
@@ -167,26 +168,26 @@
}
UNSAFE_componentWillMount() {
- const { columns, cols, card, setting } = this.props
+ const { columns, card, setting } = this.props
let _verify = fromJS(card).toJS()
_verify.sheet = _verify.sheet || setting.tableName
let fieldLabel = {}
- let _columns = []
- let _fields = {}
+ // let _columns = []
+ // let _fields = {}
columns.forEach(col => {
fieldLabel[col.field] = col.label
- _fields[col.field] = col
+ // _fields[col.field] = col
})
- cols.forEach(col => {
- if (!col.field || col.type === 'index' || !_fields[col.field]) return
+ // cols.forEach(col => {
+ // if (!col.field || col.type === 'index' || !_fields[col.field]) return
- _columns.push(_fields[col.field])
- })
+ // _columns.push(_fields[col.field])
+ // })
this.setState({
- fields: _columns,
+ fields: fromJS(columns).toJS().filter(item => item.field !== setting.primaryKey),
fieldLabel,
verify: _verify
}, () => {
@@ -526,7 +527,7 @@
return (
<div id="verify-excel-box-tab">
- <Tabs activeKey={activeKey} className="verify-card-box" onChange={this.tabchange}>
+ <Tabs activeKey={activeKey} className="tablein-verify-card-box" onChange={this.tabchange}>
<TabPane tab="鍩虹楠岃瘉" key="basemsg">
<Form {...formItemLayout}>
<Row gutter={24}>
--
Gitblit v1.8.0