调整数据表类型位置

src/service/datamodeler.js

-import { filePost, GetJSON, PostJSON, Post } from "../util/axios"
+import { filePost, GetJSON, PostJSON } from "../util/axios"
 
 export function loadDataModelCatalog() {
   return GetJSON("/datamodeler/easyDataModelerCURD/loadDataModelCatalog");

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

 import React, { useState, useEffect } from 'react';
-import { Alert, Select } from 'antd';
+import { Select } from 'antd';
 
 import ImportActionHeader from './ImportActionHeader'; 
 import ImportActionTable from './ImportActionTable';
@@ -30,6 +30,7 @@ const ImportAction = (props) => {
         cnName: '',
         name: '',
         remark: '',
+        easyDataModelerModelingTemplate: {}
       });
     }
 
@@ -63,6 +64,12 @@ const ImportAction = (props) => {
       callback: data => {
         if (!modelerData) {
           setModelerData(data||{});
+          form.setFieldsValue({ 
+            cnName: data.cnName||'',
+            name: data.name||'',
+            remark: data.remark||'',
+            easyDataModelerModelingTemplate: data.easyDataModelerModelingTemplate||''
+          });
         } else {
           //切换规则,更新数据表结构
           setModelerData({...modelerData, easyDataModelerDataModelAttributes: [...data.easyDataModelerDataModelAttributes] })
@@ -92,6 +99,7 @@ const ImportAction = (props) => {
             cnName: data.cnName||'',
             name: data.name||'',
             remark: data.remark||'',
+            easyDataModelerModelingTemplate: data.easyDataModelerModelingTemplate||''
           });
         }
       }
@@ -107,6 +115,8 @@ const ImportAction = (props) => {
       }
     });
 
+    if (!currentConstraint) return;
+
     const newModelerData = {...modelerData, easyDataModelerModelingConstraint: currentConstraint };
     setModelerData(newModelerData)
     onChange && onChange(newModelerData);
@@ -130,6 +140,12 @@ const ImportAction = (props) => {
       }
     });
 
+    if (!currentTemplate) return;
+
+    form.setFieldsValue({ 
+      easyDataModelerModelingTemplate: currentTemplate
+    });
+
     const newModelerData = {...modelerData, easyDataModelerModelingTemplate: currentTemplate };
     setModelerData(newModelerData)
     onChange && onChange(newModelerData);
@@ -181,7 +197,7 @@ const ImportAction = (props) => {
   return (
     <>
       {
-        <div className='d-flex mb-3'>
+        <div className='d-flex mb-5'>
           <Select value={constraint.name?constraint.name:null} placeholder='请选择规则' style={{ marginLeft: 'auto', minWidth: 100 }} onChange={onConstraintChange} disabled={ action==='detail' } >
           {
             (constraints||[]).map((constraint, index) => {
@@ -191,30 +207,15 @@ const ImportAction = (props) => {
             })
           }
           </Select>
-          <Select className='ml-3' value={template.name?template.name:null} placeholder='请选择模版' style={{ minWidth: 100 }} onChange={onTemplateChange} disabled={action==='detail'}>
-          {
-            (templates||[]).map((template, index) => {
-              return (
-                <Option key={index} value={template.name}>{ template.cnName||'' }</Option>
-              )
-            })
-          }
-          </Select>
         </div> 
       } 
       <ImportActionHeader 
         form={form}
         editable={action!=='detail'} 
         modelerData={modelerData||{}} 
+        templates={templates}
+        onTemplateChange={onTemplateChange}
       /> 
-      {/* {
-        action!=='detail' && <Alert
-          message="表格可以通过拖拽来排序"
-          type="info"
-          closable
-          className='mb-3'
-        />
-      } */}
       <ImportActionTable 
         modelerData={modelerData||{}}
         constraint={constraint} 

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

 import React from 'react';
-import { Form, Input, Row, Col, Descriptions } from 'antd';
+import { Form, Input, Row, Col, Descriptions, Select } from 'antd';
+
+const { Option } = Select;
+
+const TemplateSelect = ({ value = {}, templates = [], onChange, ...restProps }) => {
+
+  return (
+    <Select 
+      onChange={onChange} 
+      value={value.name || ''} 
+      placeholder='请选择数据表类型'
+      {...restProps}
+    >
+    {
+      (templates||[]) && templates.map((template, index) => {
+        return (
+          <Option key={index} value={template.name||''} >{template.cnName||''}</Option>
+        );
+      })
+    }
+    </Select>
+  )
+}
 
 const ImportActionHeader = (props) => {
-  const { editable, form, modelerData } = props;
+  const { editable, form, modelerData, templates, onTemplateChange } = props;
 
   const formItemLayout = {
     labelCol: {
       xs: { span: 24 },
-      sm: { span: 4 },
+      sm: { span: 5 },
     },
     wrapperCol: {
       xs: { span: 24 },
-      sm: { span: 20 },
+      sm: { span: 19 },
     },
   };
 
@@ -29,7 +51,7 @@ const ImportActionHeader = (props) => {
               labelAlign="left"
               rules={[{ required: true, message: '请输入中文名称!' }]}
             >
-              <Input disabled={!editable} />
+              <Input />
             </Form.Item>
           </Col>
           <Col span={12}>
@@ -39,20 +61,33 @@ const ImportActionHeader = (props) => {
               labelAlign="left"
               rules={[{ required: true, message: '请输入英文名称!' }]}
             >
-              <Input disabled={!editable} />
+              <Input />
             </Form.Item>
           </Col>
         </Row>
         <Row gutter={10}>
           <Col span={12}>
             <Form.Item
+              label="数据表类型"
+              name="easyDataModelerModelingTemplate"
+              labelAlign="left"
+              rules={[{ required: true, message: '请选择数据表类型!' }]}
+            >
+              <TemplateSelect 
+                templates={templates} 
+                onChange={onTemplateChange} 
+                style={{ width: 150 }}
+              />
+            </Form.Item>
+          </Col>
+          <Col span={12}>
+            <Form.Item
               label="描述"
               name="remark"
               labelAlign="left"
-              disabled={!editable}
               rules={[{ required: true, message: '请输入描述!' }]}
             >
-              <Input disabled={!editable} />
+              <Input />
             </Form.Item>
           </Col>
         </Row>
@@ -61,6 +96,7 @@ const ImportActionHeader = (props) => {
       <Descriptions>
         <Descriptions.Item label="中文名称">{modelerData.cnName||''}</Descriptions.Item>
         <Descriptions.Item label="英文名称">{modelerData.name||''}</Descriptions.Item>
+        <Descriptions.Item label="数据表类型">{modelerData.easyDataModelerModelingTemplate?(modelerData.easyDataModelerModelingTemplate.cnName||''):''}</Descriptions.Item>
         <Descriptions.Item label="描述">{modelerData.remark||''}</Descriptions.Item>
       </Descriptions>
     )