Ver código fonte

Started work on digital form change variable type function

Kenric Nugteren 1 semana atrás
pai
commit
f9b156856c

+ 1 - 3
PRS.Avalonia/PRS.Avalonia/Components/FormsEditor/Fields/DFOptionFieldControl.cs

@@ -198,9 +198,7 @@ class DFOptionControl : DigitalFormFieldControl<DFLayoutOptionField, DFLayoutOpt
 
     protected override Control Create()
     {
-        var options = string.IsNullOrWhiteSpace(Field.Properties.Options) 
-            ? new string[] { } 
-            : Field.Properties.Options.Replace(",","\n").Split('\n').Select(x=>x.Trim()).ToArray();
+        var options = DFLayoutOptionFieldProperties.ParseOptions(Field.Properties.Options);
 
         switch (Field.Properties.OptionType)
         {

+ 2 - 2
prs.server/Engines/WebEngine/WebUtils.cs

@@ -1879,7 +1879,7 @@ for(let addTaskField of addTaskFields){
                         if (optionType == DFLayoutOptionType.Radio)
                         {
                             stringBuilder.Append(BuildRadioButtons(
-                                optionField.Properties.Options.Split(','),
+                                DFLayoutOptionFieldProperties.ParseOptions(optionField.Properties.Options),
                                 fieldData?.ToString(),
                                 style,
                                 "prs-web_utils-digital_form-field",
@@ -1891,7 +1891,7 @@ for(let addTaskField of addTaskFields){
                         else
                         {
                             stringBuilder.Append(BuildLookupField(
-                                optionField.Properties.Options.Split(',').Select(x => new Tuple<string, string?>(x, null)),
+                                DFLayoutOptionFieldProperties.ParseOptions(optionField.Properties.Options).Select(x => new Tuple<string, string?>(x, null)),
                                 fieldData?.ToString(),
                                 style,
                                 "prs-web_utils-digital_form-option prs-web_utils-digital_form-field",