模型基本信息修改

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

@@ -5,7 +5,6 @@ import LocalStorage from 'local-storage';
 import ImportActionHeader from './ImportActionHeader'; 
 import ImportActionTable from './ImportActionTable';
 import ImportActionIndex from './ImportActionIndex';
-import ImportActionPartition from './ImportActionPartition';
 import { getQueryParam } from '../../../../util';
 import { Action } from '../../../../util/constant';
 
@@ -127,9 +126,7 @@ const ImportAction = (props) => {
       },
       callback: data => {
         let newModelerData = {...(data||{})};
-        newModelerData = { ...newModelerData, ...{ easyDataModelerIndices: getIndicesAfterTableChange(newModelerData), partition: getPartitionAfterTableChange(newModelerData) } };
-
-        newModelerData = {...onPartitionChangeByNewModelerData(newModelerData)};
+        newModelerData = { ...newModelerData, ...getAllNewKeysAfterTableChange(newModelerData) };
 
         setModelerData(newModelerData)
         onChange && onChange(newModelerData);
@@ -288,12 +285,27 @@ const ImportAction = (props) => {
   }
 
   const onHeaderChange = (changedValues, allValues) => {
+
     let newModelerData = {...modelerData, ...allValues};
 
     if (newModelerData.easyDataModelerModelingTemplate==='' || newModelerData.easyDataModelerModelingTemplate==={}) {
       newModelerData.easyDataModelerModelingTemplate = null;
     } 
 
+    //主键不允许为空
+    if (changedValues.hasOwnProperty('easyDataModelerPrimaryKey')) {
+      (newModelerData.easyDataModelerDataModelAttributes||[]).forEach(attribute => {
+        let ownPrimaryKey = false;
+        if (newModelerData?.easyDataModelerPrimaryKey) {
+          ownPrimaryKey = (newModelerData.easyDataModelerPrimaryKey.filter(item => item.name===attribute.name).length>0);
+        }
+
+        if (ownPrimaryKey) {
+          attribute.nullable = false;
+        }
+      })
+    }
+
     setModelerData(newModelerData);
     onChange && onChange(newModelerData);
 
@@ -307,9 +319,7 @@ const ImportAction = (props) => {
 
     let newModelerData = {...modelerData, ...{easyDataModelerDataModelAttributes: data}};
 
-    newModelerData = { ...newModelerData, ...{ easyDataModelerIndices: getIndicesAfterTableChange(newModelerData), partition: getPartitionAfterTableChange(newModelerData) } };
-
-    newModelerData = {...onPartitionChangeByNewModelerData(newModelerData)};
+    newModelerData = { ...newModelerData, ...getAllNewKeysAfterTableChange(newModelerData) };
     
     setModelerData(newModelerData);
     onChange && onChange(newModelerData);
@@ -345,54 +355,59 @@ const ImportAction = (props) => {
     }
   }
 
-  const onPartitionChangeByNewModelerData = (newModelerData) => {
+  const getAllNewKeysAfterTableChange = (newModelerData) => {
 
-    //数据表分区内容回填到基本信息分区键中
-    let newPartitionDesc = '';
+    //分布键
+    let newDistribution = {...newModelerData.easyDataModelerDistributionKey};
 
-    if ((newModelerData?.partition?.keys||[]).length>0) {
-      (newModelerData?.partition?.keys||[]).forEach((item, index) => {
-        if (index > 0) {
-          newPartitionDesc += ','
-        }
+    (newDistribution||[]).forEach((item, index) => {
+      const _index = (newModelerData.easyDataModelerDataModelAttributes||[]).findIndex(_item => item.name === _item.name);
 
-        newPartitionDesc += item.name||'';
-      })
+      if (_index !== -1) {
+        newDistribution.push({...newModelerData.easyDataModelerDataModelAttributes[_index]});
+      } 
+    })
 
-      newPartitionDesc += '/' + newModelerData?.partition?.partitionType?.name||'';
+    if ((newDistribution||[]).length === 0) {
+      newDistribution = null;
     }
 
-    newModelerData.partitionsDescription = newPartitionDesc;
-    
-    return newModelerData;
-  }
+     //主键
+     let newPrimary = {...newModelerData.easyDataModelerPrimaryKey};
 
-  const onPartitionChange = (data, validate=false) => {
-    const newModelerData = {...modelerData, partition: data};
+     (newPrimary||[]).forEach((item, index) => {
+       const _index = (newModelerData.easyDataModelerDataModelAttributes||[]).findIndex(_item => item.name === _item.name);
+ 
+       if (_index !== -1) {
+        newPrimary.push({...newModelerData.easyDataModelerDataModelAttributes[_index]});
+       } 
+     })
+ 
+     if ((newPrimary||[]).length === 0) {
+      newPrimary = null;
+     }
 
-    //数据表分区内容回填到基本信息分区键中
-    let newPartitionDesc = '';
-    (data?.keys||[]).forEach((item, index) => {
-      if (index > 0) {
-        newPartitionDesc += ','
-      }
+    //分区
+    let newPartition = {...newModelerData.partition};
 
-      newPartitionDesc += item.name||'';
-    })
+    const newKeys = [];
 
-    newPartitionDesc += '/' + data?.partitionType?.name||'';
+    (newPartition.keys||[]).forEach((item, index) => {
+      const _index = (newModelerData.easyDataModelerDataModelAttributes||[]).findIndex(_item => item.name === _item.name);
 
-    newModelerData.partitionsDescription = newPartitionDesc;
-    setModelerData(newModelerData);
-    onChange && onChange(newModelerData);
+      if (_index !== -1) {
+        newKeys.push({...newModelerData.easyDataModelerDataModelAttributes[_index]});
+      } 
+    })
 
-    if (validate) {
-      validateDataModel(newModelerData);
+    newPartition.keys = newKeys;
+
+    if ((newKeys||[]).length === 0) {
+      newPartition = null;
     }
-  }
 
-  const getIndicesAfterTableChange = (newModelerData) => {
-    const newEasyDataModelerIndices = [...(newModelerData.easyDataModelerIndices||[])];
+    //索引
+    let newEasyDataModelerIndices = [...(newModelerData.easyDataModelerIndices||[])];
     (newModelerData.easyDataModelerIndices||[]).forEach((easyDataModelerIndex, index) => {
       
       const newIndexedEasyDataModelAttributes = [], newIndexedAttributeOrders = [];
@@ -410,45 +425,26 @@ const ImportAction = (props) => {
       newEasyDataModelerIndices.splice(index, 1, {...item, ...{ indexedEasyDataModelAttributes: newIndexedEasyDataModelAttributes, indexedAttributeOrders: newIndexedAttributeOrders }} )
     })
 
-    return newEasyDataModelerIndices.filter(item => (item.indexedEasyDataModelAttributes||[]).length > 0);
-  }
-
-  const getPartitionAfterTableChange = (newModelerData) => {
-
-    const newPartition = {...newModelerData.partition};
-
-    const newKeys = [];
-
-    (newPartition.keys||[]).forEach((item, index) => {
-      const _index = (newModelerData.easyDataModelerDataModelAttributes||[]).findIndex(_item => item.iid === _item.iid);
-
-      if (_index !== -1) {
-        newKeys.push({...newModelerData.easyDataModelerDataModelAttributes[_index]});
-      } 
-    })
-
-    newPartition.keys = newKeys;
+    newEasyDataModelerIndices = newEasyDataModelerIndices.filter(item => (item.indexedEasyDataModelAttributes||[]).length > 0);
 
-    if ((newKeys||[]).length === 0) return null;
-
-    return newPartition;
- 
+    return { partition: newPartition, easyDataModelerDistributionKey: newDistribution, easyDataModelerPrimaryKey: newPrimary, easyDataModelerIndices: newEasyDataModelerIndices };
   }
 
   return (
     <Spin spinning={loading}>
       <ImportActionHeader 
-          form={form}
-          editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'} 
-          modelerData={modelerData||{}} 
-          constraints={constraints}
-          templates={templates}
-          validateReports={validateReports}
-          onTemplateChange={onTemplateChange}
-          onConstraintChange={onConstraintChange}
-          onChange={onHeaderChange}
-          terms={terms}
-        />   
+        form={form}
+        editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'} 
+        modelerData={modelerData||{}} 
+        constraints={constraints}
+        templates={templates}
+        validateReports={validateReports}
+        onTemplateChange={onTemplateChange}
+        onConstraintChange={onConstraintChange}
+        onChange={onHeaderChange}
+        terms={terms}
+        supportedPartitionTypes={supportedPartitionTypes} 
+      />   
       <ImportActionTable 
         modelerData={modelerData||{}}
         constraint={constraint} 
@@ -469,16 +465,6 @@ const ImportAction = (props) => {
         editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'} 
         terms={terms}
       />
-      <ImportActionPartition
-        modelerData={modelerData||{}} 
-        constraint={constraint} 
-        template={template}
-        validateReports={validateReports}
-        supportedPartitionTypes={supportedPartitionTypes} 
-        onChange={onPartitionChange} 
-        editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'} 
-        terms={terms}
-      />
     </Spin>
   );
 };

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

@@ -349,7 +349,7 @@ const ImportActionTable = (props) => {
       cnName: '',
       datatype: null,
       nullable: null,
-      partOfPrimaryKey: null,
+      partOfPrimaryKeyLogically: null,
       partOfDistributionKey: null,
       needAttention: null,
       remark: '',
@@ -452,6 +452,11 @@ const ImportActionTable = (props) => {
     // console.log('changed values', changedValues);
     // console.log('all values', allValues);
 
+    let ownPrimaryKey = false;
+    if (modelerData?.easyDataModelerPrimaryKey) {
+      ownPrimaryKey = (modelerData.easyDataModelerPrimaryKey.filter(item => item.name===allValues.name).length>0);
+    }
+
     if (changedValues.hasOwnProperty('cnName') || changedValues.hasOwnProperty('name')) {
 
       if (offset === 1) {
@@ -535,12 +540,12 @@ const ImportActionTable = (props) => {
       }
 
     } else if(changedValues.hasOwnProperty('nullable') ) {
-      if (changedValues.nullable && allValues.partOfPrimaryKey) {
+      if (changedValues.nullable && ownPrimaryKey) {
         showMessage('info', '主键不允许为空');
       }
     } 
      
-    if (allValues.partOfPrimaryKey) {
+    if (ownPrimaryKey) {
       form.setFieldsValue({
         nullable: false
       });
@@ -667,14 +672,14 @@ const ImportActionTable = (props) => {
     {
       title: '主键',
       width: 50,
-      dataIndex: 'partOfPrimaryKey',
+      dataIndex: 'partOfPrimaryKeyLogically',
       editable: (type==='model'?true:false),
-      render: (partOfPrimaryKey, record, index) => {
-        if (!partOfPrimaryKey) {
+      render: (partOfPrimaryKeyLogically, record, index) => {
+        if (!partOfPrimaryKeyLogically) {
           return ( 
             <CloseOutlined />
           ); 
-        } else if (partOfPrimaryKey === true) {
+        } else if (partOfPrimaryKeyLogically === true) {
           return (
             <CheckOutlined />
           )
@@ -683,25 +688,25 @@ const ImportActionTable = (props) => {
         return '';
       }
     },
-    {
-      title: '分布键',
-      width: 60,
-      dataIndex: 'partOfDistributionKey',
-      editable: (type==='model'?true:false),
-      render: (partOfDistributionKey, record, index) => {
-        if (!partOfDistributionKey) {
-          return ( 
-            <CloseOutlined />
-          ); 
-        } else if (partOfDistributionKey === true) {
-          return (
-            <CheckOutlined />
-          )
-        }
+    // {
+    //   title: '分布键',
+    //   width: 60,
+    //   dataIndex: 'partOfDistributionKey',
+    //   editable: (type==='model'?true:false),
+    //   render: (partOfDistributionKey, record, index) => {
+    //     if (!partOfDistributionKey) {
+    //       return ( 
+    //         <CloseOutlined />
+    //       ); 
+    //     } else if (partOfDistributionKey === true) {
+    //       return (
+    //         <CheckOutlined />
+    //       )
+    //     }
 
-        return '';
-      }
-    },
+    //     return '';
+    //   }
+    // },
     {
       title: '外键',
       width: 50,
@@ -983,7 +988,7 @@ const ImportActionTable = (props) => {
           onCell: (record) => ({
             record,
             dataIndex: col.dataIndex,
-            inputType:  (col.dataIndex==='nullable' || col.dataIndex==='partOfDistributionKey' || col.dataIndex==='partOfPrimaryKey' || col.dataIndex==='needAttention' || col.dataIndex==='foreignKey') ? 'check' : 'text',
+            inputType:  (col.dataIndex==='nullable' || col.dataIndex==='partOfDistributionKey' || col.dataIndex==='partOfPrimaryKeyLogically' || col.dataIndex==='needAttention' || col.dataIndex==='foreignKey') ? 'check' : 'text',
             colTitle: col.title,
             editing: isEditing(record),
             datatypes: supportedDatatypes,