Merge branch 'dev'
This commit is contained in:
commit
58a881c813
11 changed files with 111 additions and 76 deletions
|
@ -210,10 +210,12 @@ export const DEFAULT_MAINCONTAINER_PROPS: IContainerProperties = {
|
|||
isFlex: false,
|
||||
positionReference: PositionReference.TopLeft,
|
||||
hideChildrenInTreeview: false,
|
||||
showChildrenDimensions: [Position.Up, Position.Left],
|
||||
showSelfDimensions: [Position.Up, Position.Left],
|
||||
showDimensionWithMarks: [Position.Down, Position.Right],
|
||||
markPosition: [],
|
||||
dimensionOptions: {
|
||||
showChildrenDimensions: [Position.Up, Position.Left],
|
||||
showSelfDimensions: [Position.Up, Position.Left],
|
||||
showDimensionWithMarks: [Position.Down, Position.Right],
|
||||
markPosition: []
|
||||
},
|
||||
warning: '',
|
||||
style: DEFAULT_CONTAINER_STYLE
|
||||
};
|
||||
|
@ -257,10 +259,12 @@ export function GetDefaultContainerProps(type: string,
|
|||
minHeight: containerConfig.MinWidth ?? 1,
|
||||
maxHeight: containerConfig.MaxWidth ?? Number.MAX_SAFE_INTEGER,
|
||||
hideChildrenInTreeview: containerConfig.HideChildrenInTreeview ?? false,
|
||||
showChildrenDimensions: containerConfig.ShowChildrenDimensions ?? [],
|
||||
showSelfDimensions: containerConfig.ShowSelfDimensions ?? [],
|
||||
markPosition: containerConfig.MarkPosition ?? [],
|
||||
showDimensionWithMarks: containerConfig.ShowDimensionWithMarks ?? [],
|
||||
dimensionOptions: {
|
||||
showChildrenDimensions: containerConfig.ShowChildrenDimensions ?? [],
|
||||
showSelfDimensions: containerConfig.ShowSelfDimensions ?? [],
|
||||
markPosition: containerConfig.MarkPosition ?? [],
|
||||
showDimensionWithMarks: containerConfig.ShowDimensionWithMarks ?? []
|
||||
},
|
||||
warning: '',
|
||||
customSVG: containerConfig.CustomSVG,
|
||||
style: Object.assign(structuredClone(DEFAULT_CONTAINER_STYLE), structuredClone(containerConfig.Style)),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue