Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
szse
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaochengxiang
szse
Commits
916534dc
Commit
916534dc
authored
Apr 25, 2023
by
zhaochengxiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
衍生表bug
parent
936081c0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
ImportAction.jsx
src/view/Manage/Model/Component/ImportAction.jsx
+2
-2
ImportActionInherited.jsx
src/view/Manage/Model/Component/ImportActionInherited.jsx
+2
-6
No files found.
src/view/Manage/Model/Component/ImportAction.jsx
View file @
916534dc
...
@@ -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);
}
}
...
...
src/view/Manage/Model/Component/ImportActionInherited.jsx
View file @
916534dc
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment