数据表类型

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

@@ -81,26 +81,30 @@ const ConstraintSelect = ({ value = {}, constraints = [], onChange, ...restProps
   )
 }
 
-// const TemplateSelect = ({ value = {}, templates = [], onChange, ...restProps }) => {
-
-//   return (
-//     <Select 
-//       onChange={onChange} 
-//       value={value?.name || ''} 
-//       placeholder='请选择生成表类型'
-//       allowClear
-//       {...restProps}
-//     >
-//     {
-//       (templates||[]) && templates.map((template, index) => {
-//         return (
-//           <Option key={index} value={template.name||''} >{template.cnName||''}</Option>
-//         );
-//       })
-//     }
-//     </Select>
-//   )
-// }
+const TemplateSelect = ({ value = {}, templates = [], onChange, ...restProps }) => {
+
+  return (
+    <Select 
+      onChange={onChange} 
+      value={value?.name || ''} 
+      placeholder='请选择数据表类型'
+      allowClear
+      {...restProps}
+    >
+    {
+      (templates||[]) && templates.map((template, index) => {
+        return (
+          <Option key={index} value={template.name||''} >
+            <Tooltip title={template.remark}>
+            {template.cnName}
+            </Tooltip>
+          </Option>
+        );
+      })
+    }
+    </Select>
+  )
+}
 
 const AttributesSelect = ({ value = [], modelerData, onChange, mode = 'multiple', ...restProps }) => {
 
@@ -611,33 +615,16 @@ const ImportActionHeader = (props) => {
             <Col xs={24} sm={24} lg={12} xl={8}>
               <Form.Item
                 label="数据表类型"
-                name="tableType"
-                rules={[{ required: true, message: '请选择数据表类型!' }]}
-              >
-                <Select allowClear placeholder='请选择数据表类型'>
-                {
-                  tableTypeOptions.map((item, index) => <Option key={index} value={item.title}>
-                    <Tooltip title={item.remark}>
-                    {item.title}
-                    </Tooltip>
-                  </Option>)
-                }
-                </Select>
-              </Form.Item>
-            </Col> 
-            <Row gutter={10}>
-            {/* <Col xs={24} sm={24} lg={12} xl={8}>
-              <Form.Item
-                label="生成表类型"
                 name="easyDataModelerModelingTemplate"
-                rules={[{ required: false, message: '请选择生成表类型!' }]}
+                rules={[{ required: false, message: '请选择数据表类型!' }]}
               >
                 <TemplateSelect 
                   templates={templates} 
                   onChange={onTemplateChange} 
                 />
               </Form.Item>
-            </Col> */}
+            </Col>
+            <Row gutter={10}>
             <Col xs={24} sm={24} lg={12} xl={8}>
               <Form.Item
                 label="技术主键"
@@ -651,7 +638,7 @@ const ImportActionHeader = (props) => {
                 label="数据平台"
                 name="dataResidence"
               >
-                <Input disabled={true} placeholder='描述数据表落地的数据平台及数据库' />
+                <Input placeholder='描述数据表落地的数据平台及数据库' />
               </Form.Item>
             </Col>
             <Col xs={24} sm={24} lg={12} xl={8}>
@@ -765,14 +752,13 @@ const ImportActionHeader = (props) => {
             </Descriptions.Item>
             <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>规范</div>} >{modelerData.easyDataModelerModelingConstraint?(modelerData.easyDataModelerModelingConstraint.cnName||''):''}</Descriptions.Item>
             <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>数据内容</div>}>{highlightSearchContentByTerms(modelerData.remark||'', terms)}</Descriptions.Item>
-            <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>数据表类型</div>} >{highlightSearchContentByTerms(modelerData.tableType||'', terms)}</Descriptions.Item>
+            <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>数据表类型</div>} >{modelerData.easyDataModelerModelingTemplate?(modelerData.easyDataModelerModelingTemplate.cnName||''):''}</Descriptions.Item>
           </Descriptions>  
           {
             !onlyShowRequireChange && <Divider style={{ margin: '0 0 15px' }} />
           }
           {
             !onlyShowRequireChange && <Descriptions column={3}>
-              {/* <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>生成表类型</div>} >{modelerData.easyDataModelerModelingTemplate?(modelerData.easyDataModelerModelingTemplate.cnName||''):''}</Descriptions.Item> */}
               <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>

src/view/Manage/ModelConfig/index.jsx

@@ -23,7 +23,7 @@ const ModelConfig = () => {
         <TabPane tab='Word模版配置' key='1'>
           <WordTemplate />
         </TabPane>
-        <TabPane tab='生成表类型配置' key='2'>
+        <TabPane tab='数据表类型配置' key='2'>
           <TemplateCURD />
         </TabPane>
         <TabPane tab='规范配置' key='3'>