diff --git a/src/components/Common/Flows/CommonFlow.js b/src/components/Common/Flows/CommonFlow.js index ec838a0..12b2de5 100644 --- a/src/components/Common/Flows/CommonFlow.js +++ b/src/components/Common/Flows/CommonFlow.js @@ -36,7 +36,7 @@ const OverviewFlow = (props) => { if (commonutils.isNotEmptyArr(initialEdges)) { initialEdges.forEach((item) => { if (commonutils.isNotEmptyStr(item.markerEnd)) { - const markerObj = { + const markerObj = { type: MarkerType.ArrowClosed, } item.markerEnd = markerObj @@ -123,11 +123,11 @@ const OverviewFlow = (props) => { - - - - - + {/**/} + {/**/} + {/**/} + {/**/} + {/**/} handleChangeValue(e)} value={value} /> diff --git a/src/components/IndexCenter/IndexCenter.js b/src/components/IndexCenter/IndexCenter.js index e7f1554..5ab4902 100644 --- a/src/components/IndexCenter/IndexCenter.js +++ b/src/components/IndexCenter/IndexCenter.js @@ -204,12 +204,16 @@ class IndexCenter extends Component { // this.tableTree.scrollTop = 0; // } const addState = {}; - Object.keys(model).forEach((child, index) => { + Object.keys(model).sort((a, b) => { + const firstA = model[a][0]?.iJsOrder || 0; + const firstB = model[b][0]?.iJsOrder || 0; + return firstA - firstB; + }).forEach((child, index) => { const name = child.split('_')[0]; // const num = child.split('_')[1]; let num = 0; // const key = name; - const data = model[child]; + const data = model[child].sort((a, b) => a.iJsOrder - b.iJsOrder); data.forEach((item, index) => { let { dToDayNum } = item; dToDayNum = Number(dToDayNum);