Commit 916534dc by zhaochengxiang

衍生表bug

parent 936081c0
...@@ -545,7 +545,7 @@ const ImportAction = (props) => { ...@@ -545,7 +545,7 @@ const ImportAction = (props) => {
const newModelerData = {...modelerData}; const newModelerData = {...modelerData};
if (newModelerData.inheritedEasyDataModelerDataModels) { if (newModelerData.inheritedEasyDataModelerDataModels) {
newModelerData.inheritedEasyDataModelerDataModels = {...newModelerData.inheritedEasyDataModelerDataModels, historical: value?modelerData.inheritedEasyDataModelerDataModels?.historical:null} newModelerData.inheritedEasyDataModelerDataModels = {...newModelerData.inheritedEasyDataModelerDataModels, historical: value?modelerData.inheritedEasyDataModelerDataModels?.historical:null, zipper: createZipperModel?modelerData.inheritedEasyDataModelerDataModels?.zipper:null}
onChange?.(newModelerData); onChange?.(newModelerData);
} }
} else if (type === inheritanceZipperType) { } else if (type === inheritanceZipperType) {
...@@ -553,7 +553,7 @@ const ImportAction = (props) => { ...@@ -553,7 +553,7 @@ const ImportAction = (props) => {
const newModelerData = {...modelerData}; const newModelerData = {...modelerData};
if (newModelerData.inheritedEasyDataModelerDataModels) { if (newModelerData.inheritedEasyDataModelerDataModels) {
newModelerData.inheritedEasyDataModelerDataModels = {...newModelerData.inheritedEasyDataModelerDataModels, zipper: value?modelerData.inheritedEasyDataModelerDataModels?.zipper:null} newModelerData.inheritedEasyDataModelerDataModels = {...newModelerData.inheritedEasyDataModelerDataModels, historical: createHistoryModel?modelerData.inheritedEasyDataModelerDataModels?.historical:null, zipper: value?modelerData.inheritedEasyDataModelerDataModels?.zipper:null}
onChange?.(newModelerData); onChange?.(newModelerData);
} }
......
...@@ -19,8 +19,6 @@ const FC = (props) => { ...@@ -19,8 +19,6 @@ const FC = (props) => {
const [zipperModelerData, setZipperModelerData] = useState(undefined); const [zipperModelerData, setZipperModelerData] = useState(undefined);
const { createHistoryModel, createZipperModel, setInheriteState, setInheriteData } = useContext(EditInheritedModelContext); const { createHistoryModel, createZipperModel, setInheriteState, setInheriteData } = useContext(EditInheritedModelContext);
const mountRef = useRef(true);
useEffect(() => { useEffect(() => {
if (!editable) { if (!editable) {
if (modelerData?.inheritedFromEasyDataModelerDataModel) { if (modelerData?.inheritedFromEasyDataModelerDataModel) {
...@@ -50,16 +48,14 @@ const FC = (props) => { ...@@ -50,16 +48,14 @@ const FC = (props) => {
if (modelerData) { if (modelerData) {
if (modelerData.inheritedEasyDataModelerDataModels?.historical) { if (modelerData.inheritedEasyDataModelerDataModels?.historical) {
setHistoricalModelerData(modelerData.inheritedEasyDataModelerDataModels?.historical); setHistoricalModelerData(modelerData.inheritedEasyDataModelerDataModels?.historical);
} else if (mountRef.current) { } else {
getInheriteDataModel(inheritanceHistoricalType); getInheriteDataModel(inheritanceHistoricalType);
} }
if (modelerData.inheritedEasyDataModelerDataModels?.zipper) { if (modelerData.inheritedEasyDataModelerDataModels?.zipper) {
setZipperModelerData(modelerData.inheritedEasyDataModelerDataModels?.zipper); setZipperModelerData(modelerData.inheritedEasyDataModelerDataModels?.zipper);
} else if (mountRef.current) { } else {
getInheriteDataModel(inheritanceZipperType); getInheriteDataModel(inheritanceZipperType);
} }
mountRef.current = false;
} }
} }
//eslint-disable-next-line react-hooks/exhaustive-deps //eslint-disable-next-line react-hooks/exhaustive-deps
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment