Commit 538791a2 by zhaochengxiang

修复部分问题

parent 5faf054c
...@@ -16,9 +16,9 @@ const AssetDetail = (props)=>{ ...@@ -16,9 +16,9 @@ const AssetDetail = (props)=>{
footer={null} footer={null}
> >
<Descriptions size="small" column={2} bordered> <Descriptions size="small" column={2} bordered>
{boxDetail.basicAttrs&&boxDetail.basicAttrs[0]&&boxDetail.basicAttrs.map(data=>{ {boxDetail.basicAttrs&&boxDetail.basicAttrs[0]&&boxDetail.basicAttrs.map((data, index)=>{
return( return(
<Descriptions.Item label={data.key}>{data.value}</Descriptions.Item> <Descriptions.Item key={index} label={data.key}>{data.value}</Descriptions.Item>
) )
}) })
......
...@@ -98,6 +98,7 @@ const AssetModal = (props)=>{ ...@@ -98,6 +98,7 @@ const AssetModal = (props)=>{
return( return(
<Modal <Modal
forceRender
title={`资产信息`} title={`资产信息`}
visible={visible} visible={visible}
width={600} width={600}
......
...@@ -172,6 +172,16 @@ const TreeModal = (props)=>{ ...@@ -172,6 +172,16 @@ const TreeModal = (props)=>{
> >
<InputNumber min={1} max={999} style={{width:'100%'}} placeholder="请输入权重(1-999)" /> <InputNumber min={1} max={999} style={{width:'100%'}} placeholder="请输入权重(1-999)" />
</Form.Item> </Form.Item>
{
!addType && (
<Form.Item
label="路径"
name="path"
>
<span>{editBox.path||''}</span>
</Form.Item>
)
}
<Form.Item <Form.Item
label="描述" label="描述"
name="remarks" name="remarks"
......
...@@ -22,11 +22,15 @@ class ImportExcelCopy extends React.Component { ...@@ -22,11 +22,15 @@ class ImportExcelCopy extends React.Component {
const { inputValue } = this.state; const { inputValue } = this.state;
const _placeholder = '支持两种方式创建' + '\n' + '方式一: excel内容复制粘贴(中文字段名)' + '\n' + '方式二: 手动输入中文字段,多个字段按行分割(每行一个)';
return ( return (
<Input.TextArea <Input.TextArea
value={inputValue||''} value={inputValue||''}
onChange={this.onInputChange} onChange={this.onInputChange}
autoSize={{minRows:4,maxRows:20}} > autoSize={{minRows:4,maxRows:20}}
placeholder={_placeholder}
>
</Input.TextArea> </Input.TextArea>
) )
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment