From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/table/normal-table/columns/editColumn/index.jsx | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/editColumn/index.jsx b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
index 81aed8a..921f31e 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
@@ -17,10 +17,11 @@
colspan: ['label', 'type', 'Align', 'Hide', 'blacklist'],
custom: ['label', 'type', 'Align', 'Hide', 'Width', 'blacklist'],
action: ['label', 'type', 'Align', 'Width'],
+ formula: ['label', 'type', 'Align', 'Hide', 'Width', 'prefix', 'postfix', 'eval', 'formula', 'blacklist'],
index: ['label', 'type', 'Align', 'Width']
}
-class MainSearch extends Component {
+class NormalTableColumn extends Component {
static propTpyes = {
dict: PropTypes.object, // 瀛楀吀椤�
visible: PropTypes.bool,
@@ -327,7 +328,7 @@
message: this.props.dict['form.required.input'] + item.label + '!'
}
]
- })(<TextArea rows={2} disabled={item.readonly} onPressEnter={this.handleSubmit} />)}
+ })(<TextArea rows={2} disabled={item.readonly} placeholder={item.placeholder || ''}/>)}
</Form.Item>
</Col>
)
@@ -385,4 +386,4 @@
}
}
-export default Form.create()(MainSearch)
\ No newline at end of file
+export default Form.create()(NormalTableColumn)
\ No newline at end of file
--
Gitblit v1.8.0