Commit 8c6c8e79 by zhaochengxiang

模型表头增加数据情况

parent 9cfe4f67
......@@ -157,14 +157,16 @@ const EditModel = (props) => {
if (action==='add') {
actionsBtn = (
<Button
type='primary'
onClick={save}
loading={confirmLoading}
danger
>
保存
</Button>
<Space>
<Button
type='primary'
onClick={save}
loading={confirmLoading}
danger
>
保存
</Button>
</Space>
)
} else if (action === 'detail') {
actionsBtn = (
......
......@@ -222,50 +222,52 @@ const ImportActionHeader = (props) => {
/>
</Form.Item>
</Col>
</Row>
<Row>
<Col span={8}>
<Form.Item
label="数据平台"
name="dataResidence"
label="数据内容"
name="dataContent"
labelAlign="left"
>
<Input style={{ width: 300 }} />
</Form.Item>
</Col>
</Row>
<Row gutter={10}>
<Col span={8}>
<Form.Item
label="数据内容"
name="dataContent"
label="数据平台"
name="dataResidence"
labelAlign="left"
>
<Input style={{ width: 300 }} />
</Form.Item>
</Col>
</Row>
<Row>
<Col span={8}>
<Form.Item
label="更新时间"
name="dataUpdatingTiming"
label="数据情况"
name="dataCircumstances"
labelAlign="left"
>
<Input style={{ width: 300 }} />
</Form.Item>
</Col>
<Col span={8}>
<Col span={8}>
<Form.Item
label="维护历史"
name="maintenanceRecords"
label="分布键"
name="distributionKeysDescription"
labelAlign="left"
>
<Input style={{ width: 300 }} />
<Input style={{ width: 300 }} disabled={true} />
</Form.Item>
</Col>
</Row>
<Row gutter={10}>
<Col span={8}>
<Row>
<Col span={8}>
<Form.Item
label="加载方式"
name="dataLoadingStrategy"
label="分区键"
name="partitionsDescription"
labelAlign="left"
>
<Input style={{ width: 300 }} />
......@@ -280,36 +282,47 @@ const ImportActionHeader = (props) => {
<Input style={{ width: 300 }} disabled={true} />
</Form.Item>
</Col>
<Col span={8}>
</Row>
<Row>
<Col span={8}>
<Form.Item
label="分布键"
name="distributionKeysDescription"
label="类主键"
name="semiPrimaryKeysDescription"
labelAlign="left"
>
<Input style={{ width: 300 }} disabled={true} />
<Input style={{ width: 300 }} />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label="加载方式"
name="dataLoadingStrategy"
labelAlign="left"
>
<Input style={{ width: 300 }} />
</Form.Item>
</Col>
</Row>
<Row gutter={10}>
<Col span={8}>
<Row>
<Col span={8}>
<Form.Item
label="分区"
name="partitionsDescription"
label="更新时间"
name="dataUpdatingTiming"
labelAlign="left"
>
<Input style={{ width: 300 }} />
</Form.Item>
</Col>
<Col span={8}>
<Col span={8}>
<Form.Item
label="类主键"
name="semiPrimaryKeysDescription"
label="维护历史"
name="maintenanceRecords"
labelAlign="left"
>
<Input style={{ width: 300 }} />
</Form.Item>
</Col>
</Row>
</Row>
<Row>
<Col span={8}>
<Form.Item
......@@ -342,19 +355,19 @@ const ImportActionHeader = (props) => {
</div>
}
</Descriptions.Item>
<Descriptions.Item label="描述">{highlightSearchContentByTerms(modelerData.remark||'', terms)}</Descriptions.Item>
<Descriptions.Item label="规范">{modelerData.easyDataModelerModelingConstraint?(modelerData.easyDataModelerModelingConstraint.cnName||''):''}</Descriptions.Item>
<Descriptions.Item label="数据表类型">{modelerData.easyDataModelerModelingTemplate?(modelerData.easyDataModelerModelingTemplate.cnName||''):''}</Descriptions.Item>
<Descriptions.Item label="数据平台">{highlightSearchContentByTerms(modelerData.dataResidence||'', terms)}</Descriptions.Item>
<Descriptions.Item label="数据内容">{highlightSearchContentByTerms(modelerData.dataContent||'', terms)}</Descriptions.Item>
<Descriptions.Item label="更新时间">{highlightSearchContentByTerms(modelerData.dataUpdatingTiming||'', terms)}</Descriptions.Item>
<Descriptions.Item label="维护历史">{highlightSearchContentByTerms(modelerData.maintenanceRecords||'', terms)}</Descriptions.Item>
<Descriptions.Item label="加载方式">{highlightSearchContentByTerms(modelerData.dataLoadingStrategy||'', terms)}</Descriptions.Item>
<Descriptions.Item label="主键">{highlightSearchContentByTerms(modelerData.primaryKeysDescription||'', terms)}</Descriptions.Item>
<Descriptions.Item label="数据平台">{highlightSearchContentByTerms(modelerData.dataResidence||'', terms)}</Descriptions.Item>
<Descriptions.Item label="数据情况">{highlightSearchContentByTerms(modelerData.dataCircumstances||'', terms)}</Descriptions.Item>
<Descriptions.Item label="分布键">{highlightSearchContentByTerms(modelerData.distributionKeysDescription||'', terms)}</Descriptions.Item>
<Descriptions.Item label="分区">{highlightSearchContentByTerms(modelerData.partitionsDescription||'', terms)}</Descriptions.Item>
<Descriptions.Item label="分区键">{highlightSearchContentByTerms(modelerData.partitionsDescription||'', terms)}</Descriptions.Item>
<Descriptions.Item label="主键">{highlightSearchContentByTerms(modelerData.primaryKeysDescription||'', terms)}</Descriptions.Item>
<Descriptions.Item label="类主键">{highlightSearchContentByTerms(modelerData.semiPrimaryKeysDescription||'', terms)}</Descriptions.Item>
<Descriptions.Item label="加载方式">{highlightSearchContentByTerms(modelerData.dataLoadingStrategy||'', terms)}</Descriptions.Item>
<Descriptions.Item label="更新时间">{highlightSearchContentByTerms(modelerData.dataUpdatingTiming||'', terms)}</Descriptions.Item>
<Descriptions.Item label="维护历史">{highlightSearchContentByTerms(modelerData.maintenanceRecords||'', terms)}</Descriptions.Item>
<Descriptions.Item label="描述">{highlightSearchContentByTerms(modelerData.remark||'', terms)}</Descriptions.Item>
</Descriptions>
)
}
......
......@@ -90,14 +90,16 @@ const EditTemplate = (props) => {
if (action==='add') {
actionsBtn = (
<Button
type='primary'
onClick={save}
loading={confirmLoading}
danger
>
保存
</Button>
<Space>
<Button
type='primary'
onClick={save}
loading={confirmLoading}
danger
>
保存
</Button>
</Space>
)
} else if (action === 'detail') {
actionsBtn = (
......
import React, { useState, useEffect } from 'react';
import { Spin, Tabs, Popover } from 'antd';
import { Spin, Tabs, Popover, Divider, Button, Space } from 'antd';
import { QuestionCircleOutlined } from '@ant-design/icons';
import TemplateActionHeader from './TemplateActionHeader';
......@@ -92,6 +92,14 @@ const TemplateAction = (props) => {
setTabKey(key);
}
const prevStep = () => {
setTabKey(`${Number(tabKey)-1}`);
}
const nextStep = () => {
setTabKey(`${Number(tabKey)+1}`);
}
return (
<Spin spinning={loading}>
<Tabs activeKey={tabKey} onChange={onTabChange}>
......@@ -126,6 +134,19 @@ const TemplateAction = (props) => {
/>
</TabPane>
</Tabs>
{
action!=='detail'&&(
<React.Fragment>
<Divider style={{ margin: 0 }} />
<div className='flex' style={{ justifyContent: 'flex-end', height: 64, alignItems: 'center' }}>
<Space size='small'>
<Button type='primary' onClick={prevStep} disabled={tabKey==='1'} danger>上一步</Button>
<Button type='primary' onClick={nextStep} disabled={tabKey==='2'} danger>下一步</Button>
</Space>
</div>
</React.Fragment>
)
}
</Spin>
);
};
......
import React from 'react';
import { Form, Input, Row, Col, Descriptions } from 'antd';
const { TextArea } = Input;
const TemplateActionHeader = (props) => {
const { editable, form, templateData } = props;
......@@ -21,7 +23,7 @@ const TemplateActionHeader = (props) => {
form={form}
{...formItemLayout}
>
<Row gutter={10}>
<Row>
<Col span={12}>
<Form.Item
label="中文名称"
......@@ -43,7 +45,7 @@ const TemplateActionHeader = (props) => {
</Form.Item>
</Col>
</Row>
<Row gutter={10}>
<Row>
<Col span={12}>
<Form.Item
label="描述"
......@@ -51,13 +53,13 @@ const TemplateActionHeader = (props) => {
labelAlign="left"
rules={[{ required: true, message: '请输入描述!' }]}
>
<Input />
<TextArea row={4} />
</Form.Item>
</Col>
</Row>
</Form>
) : (
<Descriptions>
<Descriptions column={2}>
<Descriptions.Item label="中文名称">{templateData.cnName||''}</Descriptions.Item>
<Descriptions.Item label="英文名称">{templateData.name||''}</Descriptions.Item>
<Descriptions.Item label="描述">{templateData.remark||''}</Descriptions.Item>
......
.model-config {
height: calc(100vh - 30px);
height: calc(100vh - 64px - 30px);
padding: 20px;
background: #fff;
overflow: auto;
......
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