Siklos/svg-layout-designer-react
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix serialization + bug undefined Dimension

Browse source
This commit is contained in:
Guillaume Tauzin 2023-02-27 15:18:29 +01:00
parent a9744a8860
commit 6792d5e105
4 changed files with 3157 additions and 1753 deletions
Download patch file Download diff file Expand all files Collapse all files

7
csharp/SVGLDLibs/SVGLDLibs/Models/AvailableSymbolModel.cs
View file

@ -12,10 +12,13 @@ namespace SVGLDLibs.Models
public ImageModel Image { get; set; } public ImageModel Image { get; set; }
[DataMember(EmitDefaultValue = false)] [DataMember(EmitDefaultValue = false)]
public double X { get; set; } public double offset { get; set; }
[DataMember(EmitDefaultValue = false)] [DataMember(EmitDefaultValue = false)]
public double Y { get; set; } public bool isVertical { get; set; }
[DataMember(EmitDefaultValue = false)]
public string DisplayedText { get; set; }
[DataMember(EmitDefaultValue = false)] [DataMember(EmitDefaultValue = false)]
public double Width { get; set; } public double Width { get; set; }

10
csharp/SVGLDLibs/SVGLDLibs/Models/SymbolModel.cs
View file

@ -12,11 +12,17 @@ namespace SVGLDLibs.Models
[DataMember(EmitDefaultValue = false)] [DataMember(EmitDefaultValue = false)]
public string type { get; set; } public string type { get; set; }
[DataMember(EmitDefaultValue = false)]
public string displayedText { get; set; }
[DataMember(EmitDefaultValue = false)] [DataMember(EmitDefaultValue = false)]
public AvailableSymbolModel config { get; set; } public AvailableSymbolModel config { get; set; }
[DataMember(EmitDefaultValue = false)] [DataMember(EmitDefaultValue = false)]
public double x { get; set; } public double offset { get; set; }
[DataMember(EmitDefaultValue = false)]
public bool isVertical { get; set; }
[DataMember(EmitDefaultValue = false)] [DataMember(EmitDefaultValue = false)]
public double width { get; set; } public double width { get; set; }
@ -28,6 +34,6 @@ namespace SVGLDLibs.Models
public List<string> linkedContainers { get; set; } public List<string> linkedContainers { get; set; }
[DataMember(EmitDefaultValue = false)] [DataMember(EmitDefaultValue = false)]
public List<bool> showDimension { get; set; } public bool showDimension { get; set; }
} }
} }

4885
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

8
src/utils/default.ts
View file

@ -279,20 +279,20 @@ export function GetDefaultContainerProps(
dimensionOptions: { dimensionOptions: {
childrenDimensions: { childrenDimensions: {
...containerConfig.DimensionOptions?.childrenDimensions, ...containerConfig.DimensionOptions?.childrenDimensions,
positions: containerConfig.DimensionOptions?.childrenDimensions.positions ?? [] positions: containerConfig.DimensionOptions?.childrenDimensions?.positions ?? []
}, },
selfDimensions: { selfDimensions: {
...containerConfig.DimensionOptions?.selfDimensions, ...containerConfig.DimensionOptions?.selfDimensions,
positions: containerConfig.DimensionOptions?.selfDimensions.positions ?? [] positions: containerConfig.DimensionOptions?.selfDimensions?.positions ?? []
}, },
selfMarginsDimensions: { selfMarginsDimensions: {
...containerConfig.DimensionOptions?.selfMarginsDimensions, ...containerConfig.DimensionOptions?.selfMarginsDimensions,
positions: containerConfig.DimensionOptions?.selfMarginsDimensions.positions ?? [] positions: containerConfig.DimensionOptions?.selfMarginsDimensions?.positions ?? []
}, },
markPosition: containerConfig.DimensionOptions?.markPosition ?? [], markPosition: containerConfig.DimensionOptions?.markPosition ?? [],
dimensionWithMarks: { dimensionWithMarks: {
...containerConfig.DimensionOptions?.dimensionWithMarks, ...containerConfig.DimensionOptions?.dimensionWithMarks,
positions: containerConfig.DimensionOptions?.dimensionWithMarks.positions ?? [] positions: containerConfig.DimensionOptions?.dimensionWithMarks?.positions ?? []
} }
}, },
warning: '', warning: '',