Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 52s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 52s
This commit is contained in:
commit
c1e41131a5
1 changed files with 70 additions and 61 deletions
|
|
@ -68,27 +68,27 @@ export class StrategyController extends Controller {
|
||||||
order: child2.order,
|
order: child2.order,
|
||||||
children: child2.strategyChild3s
|
children: child2.strategyChild3s
|
||||||
? child2.strategyChild3s.map((child3) => ({
|
? child2.strategyChild3s.map((child3) => ({
|
||||||
id: child3.id,
|
id: child3.id,
|
||||||
level: 3,
|
level: 3,
|
||||||
name: child3.strategyChild3Name,
|
name: child3.strategyChild3Name,
|
||||||
order: child3.order,
|
order: child3.order,
|
||||||
children: child3.strategyChild4s
|
children: child3.strategyChild4s
|
||||||
? child3.strategyChild4s.map((child4) => ({
|
? child3.strategyChild4s.map((child4) => ({
|
||||||
id: child4.id,
|
id: child4.id,
|
||||||
level: 4,
|
level: 4,
|
||||||
name: child4.strategyChild4Name,
|
name: child4.strategyChild4Name,
|
||||||
order: child4.order,
|
order: child4.order,
|
||||||
children: child4.strategyChild5s
|
children: child4.strategyChild5s
|
||||||
? child4.strategyChild5s.map((child5) => ({
|
? child4.strategyChild5s.map((child5) => ({
|
||||||
id: child5.id,
|
id: child5.id,
|
||||||
level: 5,
|
level: 5,
|
||||||
name: child5.strategyChild5Name,
|
name: child5.strategyChild5Name,
|
||||||
order: child5.order,
|
order: child5.order,
|
||||||
}))
|
|
||||||
: [],
|
|
||||||
}))
|
}))
|
||||||
: [],
|
: [],
|
||||||
}))
|
}))
|
||||||
|
: [],
|
||||||
|
}))
|
||||||
: [],
|
: [],
|
||||||
})),
|
})),
|
||||||
}));
|
}));
|
||||||
|
|
@ -119,9 +119,18 @@ export class StrategyController extends Controller {
|
||||||
order: "ASC",
|
order: "ASC",
|
||||||
strategyChild2s: {
|
strategyChild2s: {
|
||||||
order: "ASC",
|
order: "ASC",
|
||||||
|
createdAt: "ASC",
|
||||||
strategyChild3s: {
|
strategyChild3s: {
|
||||||
order: "ASC",
|
order: "ASC",
|
||||||
strategyChild4s: { order: "ASC", strategyChild5s: { order: "ASC" } },
|
createdAt: "ASC",
|
||||||
|
strategyChild4s: {
|
||||||
|
order: "ASC",
|
||||||
|
createdAt: "ASC",
|
||||||
|
strategyChild5s: {
|
||||||
|
order: "ASC",
|
||||||
|
createdAt: "ASC"
|
||||||
|
}
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -143,27 +152,27 @@ export class StrategyController extends Controller {
|
||||||
order: child2.order,
|
order: child2.order,
|
||||||
children: child2.strategyChild3s
|
children: child2.strategyChild3s
|
||||||
? child2.strategyChild3s.map((child3) => ({
|
? child2.strategyChild3s.map((child3) => ({
|
||||||
id: child3.id,
|
id: child3.id,
|
||||||
level: 3,
|
level: 3,
|
||||||
name: child3.strategyChild3Name,
|
name: child3.strategyChild3Name,
|
||||||
order: child3.order,
|
order: child3.order,
|
||||||
children: child3.strategyChild4s
|
children: child3.strategyChild4s
|
||||||
? child3.strategyChild4s.map((child4) => ({
|
? child3.strategyChild4s.map((child4) => ({
|
||||||
id: child4.id,
|
id: child4.id,
|
||||||
level: 4,
|
level: 4,
|
||||||
name: child4.strategyChild4Name,
|
name: child4.strategyChild4Name,
|
||||||
order: child4.order,
|
order: child4.order,
|
||||||
children: child4.strategyChild5s
|
children: child4.strategyChild5s
|
||||||
? child4.strategyChild5s.map((child5) => ({
|
? child4.strategyChild5s.map((child5) => ({
|
||||||
id: child5.id,
|
id: child5.id,
|
||||||
level: 5,
|
level: 5,
|
||||||
name: child5.strategyChild5Name,
|
name: child5.strategyChild5Name,
|
||||||
order: child5.order,
|
order: child5.order,
|
||||||
}))
|
|
||||||
: [],
|
|
||||||
}))
|
}))
|
||||||
: [],
|
: [],
|
||||||
}))
|
}))
|
||||||
|
: [],
|
||||||
|
}))
|
||||||
: [],
|
: [],
|
||||||
})),
|
})),
|
||||||
}));
|
}));
|
||||||
|
|
@ -208,27 +217,27 @@ export class StrategyController extends Controller {
|
||||||
order: child2.order,
|
order: child2.order,
|
||||||
children: child2.strategyChild3s
|
children: child2.strategyChild3s
|
||||||
? child2.strategyChild3s.map((child3) => ({
|
? child2.strategyChild3s.map((child3) => ({
|
||||||
id: child3.id,
|
id: child3.id,
|
||||||
level: 3,
|
level: 3,
|
||||||
name: child3.strategyChild3Name,
|
name: child3.strategyChild3Name,
|
||||||
order: child3.order,
|
order: child3.order,
|
||||||
children: child3.strategyChild4s
|
children: child3.strategyChild4s
|
||||||
? child3.strategyChild4s.map((child4) => ({
|
? child3.strategyChild4s.map((child4) => ({
|
||||||
id: child4.id,
|
id: child4.id,
|
||||||
level: 4,
|
level: 4,
|
||||||
name: child4.strategyChild4Name,
|
name: child4.strategyChild4Name,
|
||||||
order: child4.order,
|
order: child4.order,
|
||||||
children: child4.strategyChild5s
|
children: child4.strategyChild5s
|
||||||
? child4.strategyChild5s.map((child5) => ({
|
? child4.strategyChild5s.map((child5) => ({
|
||||||
id: child5.id,
|
id: child5.id,
|
||||||
level: 5,
|
level: 5,
|
||||||
name: child5.strategyChild5Name,
|
name: child5.strategyChild5Name,
|
||||||
order: child5.order,
|
order: child5.order,
|
||||||
}))
|
|
||||||
: [],
|
|
||||||
}))
|
}))
|
||||||
: [],
|
: [],
|
||||||
}))
|
}))
|
||||||
|
: [],
|
||||||
|
}))
|
||||||
: [],
|
: [],
|
||||||
})),
|
})),
|
||||||
}));
|
}));
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue