From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 45 ++++++++++++++-------------------------------
1 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index 1361104..555ed77 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -23,7 +23,6 @@
class VerifyCard extends Component {
static propTpyes = {
columns: PropTypes.array, // 鏄剧ず鍒�
- dict: PropTypes.object, // 瀛楀吀椤�
card: PropTypes.object,
}
@@ -33,7 +32,7 @@
activeKey: 'basemsg',
excelColumns: [
{
- title: this.props.dict['model.form.field'],
+ title: '瀛楁',
dataIndex: 'Column',
width: '14%',
inputType: 'input',
@@ -41,14 +40,14 @@
editable: true
},
{
- title: this.props.dict['model.name'],
+ title: '鍚嶇О',
dataIndex: 'Text',
width: '14%',
inputType: 'input',
editable: true
},
{
- title: this.props.dict['model.form.type'],
+ title: '绫诲瀷',
dataIndex: 'type',
width: '15%',
editable: true,
@@ -72,20 +71,20 @@
]
},
{
- title: this.props.dict['model.required'],
+ title: '蹇呭～',
dataIndex: 'required',
width: '10%',
editable: true,
inputType: 'switch',
- render: (text, record) => record.required === 'true' ? this.props.dict['model.true'] : this.props.dict['model.false']
+ render: (text, record) => record.required === 'true' ? '鏄�' : '鍚�'
},
{
- title: this.props.dict['model.import'],
+ title: '瀵煎叆',
dataIndex: 'import',
width: '10%',
editable: true,
inputType: 'switch',
- render: (text, record) => record.import !== 'false' ? this.props.dict['model.true'] : this.props.dict['model.false']
+ render: (text, record) => record.import !== 'false' ? '鏄�' : '鍚�'
},
{
title: '鏈�灏忓��',
@@ -224,11 +223,11 @@
dataIndex: 'operation',
render: (text, record) =>
(<div style={{textAlign: 'center'}}>
- <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'scripts')} style={{color: '#1890ff'}}><EditOutlined /></span>
- <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'scripts')} style={{color: '#8E44AD'}}><SwapOutlined /></span>
+ <span className="operation-btn" title="缂栬緫" onClick={() => this.handleEdit(record, 'scripts')} style={{color: '#1890ff'}}><EditOutlined /></span>
+ <span className="operation-btn" title="鐘舵�佸垏鎹�" onClick={() => this.handleStatus(record, 'scripts')} style={{color: '#8E44AD'}}><SwapOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
- title={this.props.dict['model.query.delete']}
+ title="纭畾鍒犻櫎鍚�?"
onConfirm={() => this.handleDelete(record, 'scripts')
}>
<span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
@@ -442,22 +441,6 @@
changeColumns = (columns) => {
const { verify } = this.state
-
- if (columns[0] && (columns[0].type === 'image' || columns[0].type === 'text')) {
- columns = columns.map(col => {
- let _cell = {
- uuid: Utils.getuuid(),
- Column: col.Column,
- Text: col.Text,
- type: 'Nvarchar(50)',
- limit: '50',
- import: 'true',
- required: 'true'
- }
-
- return _cell
- })
- }
columns = columns.map(col => {
if (/^Nvarchar/ig.test(col.type)) {
@@ -758,13 +741,13 @@
<Form {...formItemLayout}>
<Row gutter={24}>
<Col span={8}>
- <Form.Item label={this.props.dict['model.form.tablename']}>
+ <Form.Item label="琛ㄥ悕">
{getFieldDecorator('sheet', {
initialValue: verify.sheet || '',
rules: [
{
required: true,
- message: this.props.dict['form.required.input'] + this.props.dict['model.form.tablename'] + '!'
+ message: '璇疯緭鍏ヨ〃鍚�!'
}
]
})(<Input placeholder="" autoComplete="off" />)}
@@ -799,7 +782,7 @@
{verify.columns.length ? <span className="count-tip">{verify.columns.length}</span> : null}
</span>
} key="excelcolumn">
- <ColumnForm dict={this.props.dict} columnChange={this.columnChange}/>
+ <ColumnForm columnChange={this.columnChange}/>
<Button className="excel-col-add mk-green" title="娣诲姞鏄剧ず鍒楀瓧娈�" onClick={this.columnFieldInput}>
鍚屾鏄剧ず鍒�
</Button>
@@ -815,7 +798,7 @@
{verify.uniques.length ? <span className="count-tip">{verify.uniques.length}</span> : null}
</span>
} key="unique">
- <UniqueForm fields={verify.columns} dict={this.props.dict} uniqueChange={this.uniqueChange}/>
+ <UniqueForm fields={verify.columns} uniqueChange={this.uniqueChange}/>
<EditTable actions={['edit', 'move', 'del', 'status']} data={verify.uniques} columns={uniqueColumns} onChange={this.changeUniques}/>
</TabPane> : null}
{card.intertype === 'system' ? <TabPane tab={
--
Gitblit v1.8.0