衍生表

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

@@ -316,7 +316,7 @@ const EditModel = (props) => {
         {
           readOnly!=='true' && <Space>
               {
-                !modelerData?.final && <Button type='primary' onClick={editInherite} danger >
+                !modelerData?.inheritedFromEasyDataModelerDataModel && <Button type='primary' onClick={editInherite} danger >
                 编辑衍生表
               </Button>
               }

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

@@ -91,8 +91,8 @@ const ImportAction = (props) => {
         }
       })
     } else {
-      setCreateHistoryModel((modelerData?.inherited?.historical)?true:false);
-      setCreateZipperModel((modelerData?.inherited?.zipper)?true:false);
+      setCreateHistoryModel((modelerData?.inheritedEasyDataModelerDataModels?.historical)?true:false);
+      setCreateZipperModel((modelerData?.inheritedEasyDataModelerDataModels?.zipper)?true:false);
     }
     //eslint-disable-next-line react-hooks/exhaustive-deps
   }, [action, hints, modelerId, ddl ]);
@@ -544,16 +544,16 @@ const ImportAction = (props) => {
       setCreateHistoryModel(value);
       const newModelerData = {...modelerData};
 
-      if (newModelerData.inherited) {
-        newModelerData.inherited = {...newModelerData.inherited, historical: value?modelerData.inherited?.historical:null}
+      if (newModelerData.inheritedEasyDataModelerDataModels) {
+        newModelerData.inheritedEasyDataModelerDataModels = {...newModelerData.inheritedEasyDataModelerDataModels, historical: value?modelerData.inheritedEasyDataModelerDataModels?.historical:null}
         onChange?.(newModelerData);
       }
     } else if (type === inheritanceZipperType) {
       setCreateZipperModel(value);
       const newModelerData = {...modelerData};
 
-      if (newModelerData.inherited) {
-        newModelerData.inherited = {...newModelerData.inherited, zipper: value?modelerData.inherited?.zipper:null}
+      if (newModelerData.inheritedEasyDataModelerDataModels) {
+        newModelerData.inheritedEasyDataModelerDataModels = {...newModelerData.inheritedEasyDataModelerDataModels, zipper: value?modelerData.inheritedEasyDataModelerDataModels?.zipper:null}
 
         onChange?.(newModelerData);
       }
@@ -565,9 +565,9 @@ const ImportAction = (props) => {
       const newModelerData = {...modelerDataRef.current};
       const newRealModelerData = {...modelerDataRef.current};
 
-      if (newModelerData.inherited) {
-        newModelerData.inherited = {...newModelerData.inherited, historical: value}
-        newRealModelerData.inherited = {...newRealModelerData.inherited, historical: createHistoryModel?value:null}
+      if (newModelerData.inheritedEasyDataModelerDataModels) {
+        newModelerData.inheritedEasyDataModelerDataModels = {...newModelerData.inheritedEasyDataModelerDataModels, historical: value}
+        newRealModelerData.inheritedEasyDataModelerDataModels = {...newRealModelerData.inheritedEasyDataModelerDataModels, historical: createHistoryModel?value:null}
 
         setModelerData(newModelerData);
         modelerDataRef.current = newModelerData;
@@ -578,9 +578,9 @@ const ImportAction = (props) => {
       const newModelerData = {...modelerDataRef.current};
       const newRealModelerData = {...modelerDataRef.current};
 
-      if (newModelerData.inherited) {
-        newModelerData.inherited = {...newModelerData.inherited, zipper: value};
-        newRealModelerData.inherited = {...newRealModelerData.inherited, zipper: createZipperModel?value:null};
+      if (newModelerData.inheritedEasyDataModelerDataModels) {
+        newModelerData.inheritedEasyDataModelerDataModels = {...newModelerData.inheritedEasyDataModelerDataModels, zipper: value};
+        newRealModelerData.inheritedEasyDataModelerDataModels = {...newRealModelerData.inheritedEasyDataModelerDataModels, zipper: createZipperModel?value:null};
         setModelerData(newModelerData);
         modelerDataRef.current = newModelerData;
 

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

@@ -23,28 +23,37 @@ const FC = (props) => {
 
   useEffect(() => {
     if (!editable) {
-      if (modelerData?.final) {
-        getDataModel();
+      if (modelerData?.inheritedFromEasyDataModelerDataModel) {
+        const newRelationModelerDatas = [];
+        
+        newRelationModelerDatas.push(modelerData?.inheritedFromEasyDataModelerDataModel);
+        if (modelerData?.inheritedFromType === inheritanceHistoricalType && modelerData?.otherEasyDataModelerDataModelsInheritedFromSameOrigin?.zipper) {
+          newRelationModelerDatas.push(modelerData?.otherEasyDataModelerDataModelsInheritedFromSameOrigin?.zipper);
+        } else if (modelerData?.inheritedFromType === inheritanceZipperType && modelerData?.otherEasyDataModelerDataModelsInheritedFromSameOrigin?.historical) {
+          newRelationModelerDatas.push(modelerData?.otherEasyDataModelerDataModelsInheritedFromSameOrigin?.historical);
+        }
+        
+        setRelationModelerDatas(newRelationModelerDatas);
       } else {
         const newRelationModelerDatas = [];
-        if (modelerData?.inherited?.historical) {
-          newRelationModelerDatas.push(modelerData?.inherited?.historical);
+        if (modelerData?.inheritedEasyDataModelerDataModels?.historical) {
+          newRelationModelerDatas.push(modelerData?.inheritedEasyDataModelerDataModels?.historical);
         }
-        if (modelerData?.inherited?.zipper) {
-          newRelationModelerDatas.push(modelerData?.inherited?.zipper);
+        if (modelerData?.inheritedEasyDataModelerDataModels?.zipper) {
+          newRelationModelerDatas.push(modelerData?.inheritedEasyDataModelerDataModels?.zipper);
         }
 
         setRelationModelerDatas(newRelationModelerDatas);
       }
     } else {
       if (modelerData) {
-        if (modelerData.inherited?.historical) {
-          setHistoricalModelerData(modelerData.inherited?.historical);
+        if (modelerData.inheritedEasyDataModelerDataModels?.historical) {
+          setHistoricalModelerData(modelerData.inheritedEasyDataModelerDataModels?.historical);
         } else if (mountRef.current) {
           getInheriteDataModel(inheritanceHistoricalType);
         }
-        if (modelerData.inherited?.zipper) {
-          setZipperModelerData(modelerData.inherited?.zipper);
+        if (modelerData.inheritedEasyDataModelerDataModels?.zipper) {
+          setZipperModelerData(modelerData.inheritedEasyDataModelerDataModels?.zipper);
         } else if (mountRef.current) {
           getInheriteDataModel(inheritanceZipperType);
         }
@@ -76,24 +85,6 @@ const FC = (props) => {
     }) 
   }
 
-  const getDataModel = () => {
-    dispatch({
-      type: 'datamodel.getDataModel',
-      payload: {
-        id: modelerData?.inheritedFrom
-      },
-      callback: data => {
-        const newRelationModelerDatas = [];
-        
-        newRelationModelerDatas.push(data);
-        if (modelerData?.inheritedFromType === inheritanceHistoricalType && modelerData?.othersInheritedFromSameOrigin?.zipper) {
-          newRelationModelerDatas.push(modelerData?.othersInheritedFromSameOrigin?.zipper);
-        }
-        setRelationModelerDatas(newRelationModelerDatas);
-      }
-    })
-  }
-
   return (
     <div className='model-import-action-inherited'>
       <div className='mb-3'>
@@ -119,7 +110,7 @@ const FC = (props) => {
               <span>
                 <Checkbox 
                   className='mr-2' 
-                  value={createHistoryModel}
+                  checked={createHistoryModel}
                   onChange={(e) => { 
                     setInheriteState(inheritanceHistoricalType, e.target.checked);
                   }}
@@ -136,7 +127,7 @@ const FC = (props) => {
               <span>
                 <Checkbox 
                   className='mr-2' 
-                  value={createZipperModel}
+                  checked={createZipperModel}
                   onChange={(e) => { 
                     setInheriteState(inheritanceZipperType, e.target.checked);
                   }}