Commit 81507949 by zhaochengxiang

bug fix

parent 0f78ff1c
...@@ -286,10 +286,14 @@ const DDLDetail = ({ config, setConfig }) => { ...@@ -286,10 +286,14 @@ const DDLDetail = ({ config, setConfig }) => {
const [ddlFilterParams, setDDLFilterParams] = React.useState({ const [ddlFilterParams, setDDLFilterParams] = React.useState({
visible: false, visible: false,
}) })
const prevModelIdRef = React.useRef()
React.useEffect(() => { React.useEffect(() => {
if (config?.easyDataModelerDataModelId) { if (config?.easyDataModelerDataModelId && config?.easyDataModelerDataModelId!==prevModelIdRef.current) {
prevModelIdRef.current = config?.easyDataModelerDataModelId
getVersions() getVersions()
} else {
initConfigVersionId()
} }
}, [config?.alertDLL, config?.easyDataModelerDataModelId]) }, [config?.alertDLL, config?.easyDataModelerDataModelId])
...@@ -324,31 +328,43 @@ const DDLDetail = ({ config, setConfig }) => { ...@@ -324,31 +328,43 @@ const DDLDetail = ({ config, setConfig }) => {
newData.push({ ...item, name }) newData.push({ ...item, name })
} }
setVersions(newData) setVersions(newData)
initConfigVersionId()
},
error: () => {
setLoadingVersions(false)
}
})
}
const initConfigVersionId = () => {
setVersions(prevVersions => {
if (config?.alertDLL) { if (config?.alertDLL) {
//增量 //增量
if ((newData??[]).length > 1) { if ((prevVersions??[]).length > 1) {
setIncVersions((newData??[]).slice(0, 1)) setIncVersions((prevVersions??[]).slice(0, 1))
if (!config?.leftVersionId && !config?.rightVersionId) {
setConfig?.({ setConfig?.({
...config, ...config,
leftVersionId: newData[1].id, leftVersionId: prevVersions[1].id,
rightVersionId: newData[0].id, rightVersionId: prevVersions[0].id,
}) })
} }
}
} else { } else {
//全量 //全量
if ((newData??[]).length > 0) { if ((prevVersions??[]).length > 0) {
if (!config?.leftVersionId) {
setConfig?.({ setConfig?.({
...config, ...config,
leftVersionId: newData[0].id, leftVersionId: prevVersions[0].id,
rightVersionId: null, rightVersionId: null,
}) })
} }
} }
},
error: () => {
setLoadingVersions(false)
} }
return prevVersions
}) })
} }
...@@ -373,7 +389,7 @@ const DDLDetail = ({ config, setConfig }) => { ...@@ -373,7 +389,7 @@ const DDLDetail = ({ config, setConfig }) => {
setConfig({ setConfig({
...config, ...config,
leftVersionId: val, leftVersionId: val,
rightVersionId: '', rightVersionId: null,
}) })
const index = (versions??[]).findIndex(item => item.id === val) const index = (versions??[]).findIndex(item => item.id === val)
......
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