From bd1dfc9e6c9b9f8076ca2783ce598e0936b4c664 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 十二月 2021 14:36:03 +0800
Subject: [PATCH] 2021-12-22
---
src/templates/zshare/modalform/modaleditable/index.jsx | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/templates/zshare/modalform/modaleditable/index.jsx b/src/templates/zshare/modalform/modaleditable/index.jsx
index 314fe78..2713db5 100644
--- a/src/templates/zshare/modalform/modaleditable/index.jsx
+++ b/src/templates/zshare/modalform/modaleditable/index.jsx
@@ -1,7 +1,9 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Table, Input, Popconfirm, Form, Icon, Radio } from 'antd'
+import { Table, Input, Popconfirm, Form, Radio } from 'antd'
+import { ArrowUpOutlined, ArrowDownOutlined, DeleteOutlined, PlusOutlined, SwapOutlined } from '@ant-design/icons'
+
import { formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
import './index.scss'
@@ -109,7 +111,6 @@
class EditTable extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
type: PropTypes.string, // 琛ㄥ崟绫诲瀷
linkSubFields: PropTypes.array, // 鍏宠仈瀛楁
onChange: PropTypes.func // 鏁版嵁鍙樺寲
@@ -124,7 +125,7 @@
}
UNSAFE_componentWillMount () {
- const { linkSubFields, type, dict } = this.props
+ const { linkSubFields, type } = this.props
let data = this.props['data-__meta'].initialValue
if (!data) {
@@ -134,7 +135,7 @@
let fields = []
let dataItem = data[0] || ''
- if (type === 'select' || type === 'radio') {
+ if (type === 'select' || type === 'radio' || type === 'link') {
fields = linkSubFields.map(cell => {
return {
title: cell.label,
@@ -167,14 +168,13 @@
render: (text, record) =>
this.state.dataSource.length >= 1 ? (
<div>
- <span className="operation-btn" title={dict['header.form.up']} onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
- <span className="operation-btn" title={dict['header.form.down']} onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><ArrowUpOutlined /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><ArrowDownOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
- title={dict['model.query.delete']}
onConfirm={() => this.handleDelete(record.key)
}>
- <span style={{color: '#ff4d4f', cursor: 'pointer'}}><Icon type="delete" /></span>
+ <span style={{color: '#ff4d4f', cursor: 'pointer'}}><DeleteOutlined /></span>
</Popconfirm>
</div>
) : null,
@@ -218,7 +218,7 @@
</div>
),
filterIcon: () => (
- <Icon type="swap" style={{ color: column.datatype === 'number' ? '#1890ff' : undefined}} />
+ <SwapOutlined style={{ color: column.datatype === 'number' ? '#1890ff' : ''}} />
)
})
@@ -233,7 +233,7 @@
if (isNaN(val)) {
val = ''
}
- } catch {
+ } catch (e) {
val = ''
}
} else {
@@ -300,7 +300,8 @@
})
}
- handleAdd = () => {
+ handleAdd = (e) => {
+ e.stopPropagation()
const { type, count, dataSource } = this.state
const newData = {
key: Utils.getuuid(),
@@ -348,7 +349,7 @@
let dataItem = dataSource ? dataSource[0] : ''
- if (type === 'select' || type === 'radio') {
+ if (type === 'select' || type === 'radio' || type === 'link') {
fields = linkSubFields.map(field => {
return {
title: field.label,
@@ -381,14 +382,13 @@
render: (text, record) =>
this.state.dataSource.length >= 1 ? (
<div>
- <span className="operation-btn" title={this.props.dict['header.form.up']} onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.down']} onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'up')} style={{color: '#1890ff'}}><ArrowUpOutlined /></span>
+ <span className="operation-btn" onClick={() => this.handleUpDown(record, 'down')} style={{color: '#ff4d4f'}}><ArrowDownOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
- title={this.props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record.key)
}>
- <span style={{color: '#1890ff', cursor: 'pointer'}}><Icon type="delete" /></span>
+ <span style={{color: '#ff4d4f', cursor: 'pointer'}}><DeleteOutlined /></span>
</Popconfirm>
</div>
) : null,
@@ -450,7 +450,7 @@
})
return (
<div className="common-modal-edit-table">
- <Icon className="add-row" type="plus" onClick={this.handleAdd} />
+ <PlusOutlined className="add-row" onClick={this.handleAdd} />
<Table
components={components}
rowClassName={() => 'editable-row'}
--
Gitblit v1.8.0