Commit 1cc621c1 by zhaochengxiang

屏蔽没有的功能

parent 21c03651
...@@ -196,6 +196,7 @@ const ImportAction = (props) => { ...@@ -196,6 +196,7 @@ const ImportAction = (props) => {
<ImportActionTable <ImportActionTable
modelerData={modelerData||{}} modelerData={modelerData||{}}
constraint={constraint} constraint={constraint}
template={template}
supportedDatatypes={supportedDatatypes} supportedDatatypes={supportedDatatypes}
onChange={onTableChange} onChange={onTableChange}
editable={action!=='detail'} /> editable={action!=='detail'} />
......
...@@ -5,6 +5,7 @@ import { HTML5Backend } from 'react-dnd-html5-backend'; ...@@ -5,6 +5,7 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
import update from 'immutability-helper'; import update from 'immutability-helper';
import { generateUUID } from '../../../../util'; import { generateUUID } from '../../../../util';
import { dispatchLatest } from '../../../../model'; import { dispatchLatest } from '../../../../model';
import { template } from '@babel/core';
const { Option } = Select; const { Option } = Select;
...@@ -214,7 +215,7 @@ const DragableBodyRow = ({ index, moveRow, className, style, ...restProps }) => ...@@ -214,7 +215,7 @@ const DragableBodyRow = ({ index, moveRow, className, style, ...restProps }) =>
}; };
const ImportActionTable = (props) => { const ImportActionTable = (props) => {
const { modelerData, onChange, editable, supportedDatatypes, constraint } = props; const { modelerData, onChange, editable, supportedDatatypes, constraint, template } = props;
const data = modelerData.easyDataModelerDataModelAttributes||[]; const data = modelerData.easyDataModelerDataModelAttributes||[];
const [form] = Form.useForm(); const [form] = Form.useForm();
const [editingKey, setEditingKey] = useState(''); const [editingKey, setEditingKey] = useState('');
...@@ -223,7 +224,7 @@ const ImportActionTable = (props) => { ...@@ -223,7 +224,7 @@ const ImportActionTable = (props) => {
//规则改变的时候 数据表为可编辑状态 //规则改变的时候 数据表为可编辑状态
useEffect(() => { useEffect(() => {
setEditingKey(''); setEditingKey('');
}, [constraint]) }, [constraint, template])
const isEditing = (record) => record.iid === editingKey; const isEditing = (record) => record.iid === editingKey;
......
...@@ -13,18 +13,18 @@ const modes = [ ...@@ -13,18 +13,18 @@ const modes = [
{ {
title: 'Excel导入', title: 'Excel导入',
}, },
{ // {
title: 'Excel复制粘贴', // title: 'Excel复制粘贴',
}, // },
{ // {
title: 'Erwin', // title: 'Erwin',
}, // },
{ // {
title: '元数据输入', // title: '元数据输入',
}, // },
{ // {
title: '数据模型输入', // title: '数据模型输入',
} // }
] ]
const ImportModal = (props) => { const ImportModal = (props) => {
......
...@@ -23,6 +23,14 @@ const ModelTable = (props) => { ...@@ -23,6 +23,14 @@ const ModelTable = (props) => {
const columns = [ const columns = [
{ {
title: '序号',
dataIndex: 'key',
editable: false,
render: (text, record, index) => {
return (index+1).toString();
}
},
{
title: '模型名称', title: '模型名称',
dataIndex: 'name', dataIndex: 'name',
}, },
...@@ -46,9 +54,9 @@ const ModelTable = (props) => { ...@@ -46,9 +54,9 @@ const ModelTable = (props) => {
<Tooltip placement='bottom' title={'详情'}> <Tooltip placement='bottom' title={'详情'}>
<Button icon={<ReconciliationOutlined />} size='small' onClick={() => { detailItem(record); }} /> <Button icon={<ReconciliationOutlined />} size='small' onClick={() => { detailItem(record); }} />
</Tooltip> </Tooltip>
<Tooltip placement='bottom' title={'提交审核'}> {/* <Tooltip placement='bottom' title={'提交审核'}>
<Button icon={<CheckOutlined />} size='small' /> <Button icon={<CheckOutlined />} size='small' />
</Tooltip> </Tooltip> */}
<Tooltip placement='bottom' title={'删除'}> <Tooltip placement='bottom' title={'删除'}>
<Button icon={<DeleteOutlined />} size='small' onClick={() => { deleteItem(record); }} /> <Button icon={<DeleteOutlined />} size='small' onClick={() => { deleteItem(record); }} />
</Tooltip> </Tooltip>
......
...@@ -109,8 +109,8 @@ class Model extends React.Component { ...@@ -109,8 +109,8 @@ class Model extends React.Component {
borderBottom: "1px solid #EFEFEF", borderBottom: "1px solid #EFEFEF",
}} }}
> >
<Button type="primary" style={{ marginLeft: 'auto' }}>提交审核</Button> {/* <Button type="primary" style={{ marginLeft: 'auto' }}>提交审核</Button> */}
<Button type="primary" className='ml-3' onClick={this.onImportBtnClick}>模型创建</Button> <Button type="primary" className='ml-3' style={{ marginLeft: 'auto' }} onClick={this.onImportBtnClick}>模型创建</Button>
<Button type="primary" className='ml-3' onClick={this.onExportBtnClick}>模型导出</Button> <Button type="primary" className='ml-3' onClick={this.onExportBtnClick}>模型导出</Button>
</div> </div>
<div className='p-3'> <div className='p-3'>
......
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