基本信息调整

src/view/Manage/Model/Component/ImportActionHeader.jsx

@@ -445,52 +445,62 @@ const ImportActionHeader = (props) => {
                     <UpdateSelect placeholder='描述数据表的更新时间点'/>
                   </Form.Item>
                 </Col>
-                <Col xs={24} sm={24} lg={12} xl={8}>  
-                  <Form.Item
-                    label="分区键"
-                    name="partition"
-                  >
-                    <PartitionSelect modelerData={modelerData} partitionTypes={supportedPartitionTypes} />
-                  </Form.Item>
-                </Col>
-                <Col xs={24} sm={24} lg={12} xl={8}>
-                  <Form.Item
-                    label="绑定加载范围"
-                    name="bindingLoadRange"
-                    tooltip={bindingLoadRemark}
-                  >
-                    <Select allowClear placeholder='请选择绑定加载范围'>
-                    {
-                      bindingLoadRangeList?.map((item, index) => <Option key={index} value={item}>
-                        {item}
-                      </Option>)
-                    }
-                    </Select>
-                  </Form.Item>
-                </Col>
-                <Col xs={24} sm={24} lg={12} xl={8}>
-                  <Form.Item
-                    label="维护历史"
-                    name="maintenanceRecords"
-                  >
-                    <TextArea rows={3} disabled={true} />
-                  </Form.Item>
+              </Row>
+              <Row>
+                <Col xs={24} sm={24} lg={24} xl={16}>
+                  <Row gutter={10}>
+                    <Col xs={24} sm={24} lg={12} xl={12}>  
+                      <Form.Item
+                        label="分区键"
+                        name="partition"
+                      >
+                        <PartitionSelect modelerData={modelerData} partitionTypes={supportedPartitionTypes} />
+                      </Form.Item>
+                    </Col>  
+                    <Col xs={24} sm={24} lg={12} xl={12}>
+                      <Form.Item
+                        label="绑定加载范围"
+                        name="bindingLoadRange"
+                        tooltip={bindingLoadRemark}
+                      >
+                        <Select allowClear placeholder='请选择绑定加载范围'>
+                        {
+                          bindingLoadRangeList?.map((item, index) => <Option key={index} value={item}>
+                            {item}
+                          </Option>)
+                        }
+                        </Select>
+                      </Form.Item>
+                    </Col>
+                  </Row>
+                  <Row gutter={10}>
+                    <Col xs={24} sm={24} lg={12} xl={12}>  
+                      <Form.Item
+                        label="类主键"
+                        name="easyDataModelerSemiPrimaryKey"
+                      >
+                        <AttributesSelect modelerData={modelerData} mode='tags' />
+                      </Form.Item>
+                    </Col>
+                    <Col xs={24} sm={24} lg={12} xl={12}>
+                      <Form.Item
+                        label="加载方式"
+                        name="dataLoadingStrategy"
+                      >
+                        <LoadSelect />
+                      </Form.Item>
+                    </Col>
+                  </Row>
                 </Col>
-                <Col xs={24} sm={24} lg={12} xl={8}>  
-                  <Form.Item
-                    label="类主键"
-                    name="easyDataModelerSemiPrimaryKey"
-                  >
-                    <AttributesSelect modelerData={modelerData} mode='tags' />
-                  </Form.Item>
-                </Col>
-                <Col xs={24} sm={24} lg={12} xl={8}>
-                  <Form.Item
-                    label="加载方式"
-                    name="dataLoadingStrategy"
-                  >
-                    <LoadSelect />
-                  </Form.Item>
+                <Col xs={24} sm={24} lg={24} xl={8}>
+                  <Col xs={24} sm={24} lg={24} xl={24}>
+                    <Form.Item
+                      label="维护历史"
+                      name="maintenanceRecords"
+                    >
+                      <TextArea rows={3} disabled={true} />
+                    </Form.Item>
+                  </Col>
                 </Col>
               </Row> 
             </React.Fragment>
@@ -524,27 +534,39 @@ const ImportActionHeader = (props) => {
             !onlyShowRequireChange && <Divider style={{ margin: '0 0 15px' }} />
           }
           {
-            !onlyShowRequireChange && <Descriptions column={3}>
-              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>技术主键</div>} >{highlightSearchContentByTerms(primaryDescription||'', terms)}</Descriptions.Item>
-              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>数据平台</div>} >{highlightSearchContentByTerms(modelerData.dataResidence||'', terms)}</Descriptions.Item>   
-              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>数据情况</div>} >{highlightSearchContentByTerms(modelerData.dataCircumstances||'', terms)}</Descriptions.Item>
-              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>分布键</div>} >{highlightSearchContentByTerms(distributionDescription||'', terms)}</Descriptions.Item>
-              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>数据类型</div>} >{highlightSearchContentByTerms(modelerData.dataType||'', terms)}</Descriptions.Item>
-              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>更新时间</div>} >{highlightSearchContentByTerms(modelerData.dataUpdatingTiming||'', terms)}</Descriptions.Item>
-              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>分区键</div>} >{highlightSearchContentByTerms(partitionsDescription||'', terms)}</Descriptions.Item>
-              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>绑定加载范围</div>} >{highlightSearchContentByTerms(modelerData.bindingLoadRange||'', terms)}</Descriptions.Item>
-              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>维护历史</div>} >
-                <div>
-                {
-                  (maintenanceRecords||[]).map((record, index) => {
-                    return <div key={index}>{record||''}</div>;
-                  })
-                }
-                </div>
-              </Descriptions.Item> 
-              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>类主键</div>} >{highlightSearchContentByTerms(semiPrimaryDescription||'', terms)}</Descriptions.Item>
-              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>加载方式</div>} >{highlightSearchContentByTerms(modelerData.dataLoadingStrategy||'', terms)}</Descriptions.Item>
-            </Descriptions>
+            !onlyShowRequireChange && <React.Fragment> 
+              <Descriptions column={3}>
+                <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>技术主键</div>} >{highlightSearchContentByTerms(primaryDescription||'', terms)}</Descriptions.Item>
+                <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>数据平台</div>} >{highlightSearchContentByTerms(modelerData.dataResidence||'', terms)}</Descriptions.Item>   
+                <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>数据情况</div>} >{highlightSearchContentByTerms(modelerData.dataCircumstances||'', terms)}</Descriptions.Item>
+                <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>分布键</div>} >{highlightSearchContentByTerms(distributionDescription||'', terms)}</Descriptions.Item>
+                <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>数据类型</div>} >{highlightSearchContentByTerms(modelerData.dataType||'', terms)}</Descriptions.Item>
+                <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>更新时间</div>} >{highlightSearchContentByTerms(modelerData.dataUpdatingTiming||'', terms)}</Descriptions.Item>
+              </Descriptions>
+              <Row>
+                <Col span={16}>
+                  <Descriptions column={2}>
+                    <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>分区键</div>} >{highlightSearchContentByTerms(partitionsDescription||'', terms)}</Descriptions.Item>
+                    <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>绑定加载范围</div>} >{highlightSearchContentByTerms(modelerData.bindingLoadRange||'', terms)}</Descriptions.Item>
+                    <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>类主键</div>} >{highlightSearchContentByTerms(semiPrimaryDescription||'', terms)}</Descriptions.Item>
+                    <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>加载方式</div>} >{highlightSearchContentByTerms(modelerData.dataLoadingStrategy||'', terms)}</Descriptions.Item>
+                  </Descriptions>
+                </Col>
+                <Col span={8}>
+                  <Descriptions column={1}>
+                    <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }} >维护历史</div>} >
+                      <div>
+                      {
+                        (maintenanceRecords||[]).map((record, index) => {
+                          return <div key={index}>{record||''}</div>;
+                        })
+                      }
+                      </div>
+                    </Descriptions.Item> 
+                  </Descriptions>
+                </Col>
+              </Row>
+            </React.Fragment>
           }         
         </React.Fragment>
       )