Skip to content

S
szse
Commit 8c6c8e79 by zhaochengxiang
Options

模型表头增加数据情况

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