提交Form失败时，用户填写的数据 #406

SeriaWei · Dec 30, 2020 · 0acae03 · 0acae03
1 parent bc71eb4
commit 0acae03
Show file tree

Hide file tree

Showing 27 changed files with 127 additions and 130 deletions.
diff --git a/src/ZKEACMS.FormGenerator/Controllers/FormDataController.cs b/src/ZKEACMS.FormGenerator/Controllers/FormDataController.cs
@@ -40,7 +40,7 @@ public IActionResult Submit(string FormId)
             {
                 TempData["Message"] = _localize.Get("Form have submited");
             }
-            return View();
+            return View(result.Result.Form);
         }
 
         [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageFormData)]

diff --git a/src/ZKEACMS.FormGenerator/DisplayTemplate/Address.html b/src/ZKEACMS.FormGenerator/DisplayTemplate/Address.html
@@ -1,4 +1,7 @@
 <label class="control-label" ng-if="field.DisplayName" ng-bind="field.DisplayName"></label>
+<span class="text-muted" ng-if="field.Description">
+    <span ng-bind="field.Description"></span>
+</span>
 <div class="input-group" ng-class="'size-' + field.Size" style="display:block;">
     <div class="row">
         <div class="col-md-4">
@@ -18,7 +21,4 @@
         </div>
     </div>
 </div>
-<dl ng-if="field.Description">
-    <dd ng-bind="field.Description"></dd>
-</dl>
 <button type="button" class="close" ng-click="removeField(field)" ng-if="Fields.length>1"><span aria-hidden="true">&times;</span></button>
diff --git a/src/ZKEACMS.FormGenerator/DisplayTemplate/Checkbox.html b/src/ZKEACMS.FormGenerator/DisplayTemplate/Checkbox.html
@@ -1,12 +1,12 @@
 <label class="control-label" ng-if="field.DisplayName" ng-bind="field.DisplayName"></label>
+<span class="text-muted" ng-if="field.Description">
+    <span ng-bind="field.Description"></span>
+</span>
 <div>
     <div class="checkbox" ng-repeat="option in field.FieldOptions">
         <label>
             <input type="checkbox" ng-checked="option.DefaultSelected"> <span ng-bind="option.DisplayText" />
         </label>
     </div>
 </div>
-<dl ng-if="field.Description">
-    <dd ng-bind="field.Description"></dd>
-</dl>
 <button type="button" class="close" ng-click="removeField(field)" ng-if="Fields.length>1"><span aria-hidden="true">&times;</span></button>
diff --git a/src/ZKEACMS.FormGenerator/DisplayTemplate/Date.html b/src/ZKEACMS.FormGenerator/DisplayTemplate/Date.html
@@ -1,9 +1,9 @@
 <label class="control-label" ng-if="field.DisplayName" ng-bind="field.DisplayName"></label>
+<span class="text-muted" ng-if="field.Description">
+    <span ng-bind="field.Description"></span>
+</span>
 <div class="input-group" ng-class="'size-' + field.Size">
     <input type="text" class="form-control" placeholder="{{field.Placeholder}}">
     <span class="input-group-addon"><i class="glyphicon glyphicon-calendar"></i></span>
 </div>
-<dl ng-if="field.Description">
-    <dd ng-bind="field.Description"></dd>
-</dl>
 <button type="button" class="close" ng-click="removeField(field)" ng-if="Fields.length>1"><span aria-hidden="true">&times;</span></button>
diff --git a/src/ZKEACMS.FormGenerator/DisplayTemplate/Dropdown.html b/src/ZKEACMS.FormGenerator/DisplayTemplate/Dropdown.html
@@ -1,9 +1,9 @@
 <label class="control-label" ng-if="field.DisplayName" ng-bind="field.DisplayName"></label>
+<span class="text-muted" ng-if="field.Description">
+    <span ng-bind="field.Description"></span>
+</span>
 <select class="form-control" ng-class="'size-' + field.Size">
     <option>-- 请选择 --</option>
     <option ng-repeat="op in field.FieldOptions" value="op.Value" ng-bind="op.DisplayText"></option>
 </select>
-<dl ng-if="field.Description">
-    <dd ng-bind="field.Description"></dd>
-</dl>
 <button type="button" class="close" ng-click="removeField(field)" ng-if="Fields.length>1"><span aria-hidden="true">&times;</span></button>
diff --git a/src/ZKEACMS.FormGenerator/DisplayTemplate/Email.html b/src/ZKEACMS.FormGenerator/DisplayTemplate/Email.html
@@ -1,6 +1,6 @@
 <label class="control-label" ng-if="field.DisplayName" ng-bind="field.DisplayName"></label>
+<span class="text-muted" ng-if="field.Description">
+    <span ng-bind="field.Description"></span>
+</span>
 <input class="form-control" type="text" ng-class="'size-' + field.Size"  placeholder="{{field.Placeholder}}" />
-<dl ng-if="field.Description">
-    <dd ng-bind="field.Description"></dd>
-</dl>
 <button type="button" class="close" ng-click="removeField(field)" ng-if="Fields.length>1"><span aria-hidden="true">&times;</span></button>
diff --git a/src/ZKEACMS.FormGenerator/DisplayTemplate/Label.html b/src/ZKEACMS.FormGenerator/DisplayTemplate/Label.html
@@ -1,5 +1,5 @@
 <h4 class="control-label" ng-if="field.DisplayName" ng-bind="field.DisplayName"></h4>
-<dl ng-if="field.Description">
-    <dd ng-bind="field.Description"></dd>
-</dl>
+<p class="text-muted" ng-if="field.Description">
+    <span ng-bind="field.Description"></span>
+</p>
 <button type="button" class="close" ng-click="removeField(field)" ng-if="Fields.length>1"><span aria-hidden="true">&times;</span></button>
diff --git a/src/ZKEACMS.FormGenerator/DisplayTemplate/Number.html b/src/ZKEACMS.FormGenerator/DisplayTemplate/Number.html
@@ -1,6 +1,6 @@
 <label class="control-label" ng-if="field.DisplayName" ng-bind="field.DisplayName"></label>
+<span class="text-muted" ng-if="field.Description">
+    <span ng-bind="field.Description"></span>
+</span>
 <input class="form-control" type="text" ng-class="'size-' + field.Size"  placeholder="{{field.Placeholder}}" />
-<dl ng-if="field.Description">
-    <dd ng-bind="field.Description"></dd>
-</dl>
 <button type="button" class="close" ng-click="removeField(field)" ng-if="Fields.length>1"><span aria-hidden="true">&times;</span></button>
diff --git a/src/ZKEACMS.FormGenerator/DisplayTemplate/Paragraph.html b/src/ZKEACMS.FormGenerator/DisplayTemplate/Paragraph.html
@@ -1,6 +1,6 @@
 <label class="control-label" ng-if="field.DisplayName" ng-bind="field.DisplayName"></label>
+<span class="text-muted" ng-if="field.Description">
+    <span ng-bind="field.Description"></span>
+</span>
 <textarea class="form-control" rows="3" cols="10" ng-class="'size-' + field.Size" placeholder="{{field.Placeholder}}"></textarea>
-<dl ng-if="field.Description">
-    <dd ng-bind="field.Description"></dd>
-</dl>
 <button type="button" class="close" ng-click="removeField(field)" ng-if="Fields.length>1"><span aria-hidden="true">&times;</span></button>
diff --git a/src/ZKEACMS.FormGenerator/DisplayTemplate/Phone.html b/src/ZKEACMS.FormGenerator/DisplayTemplate/Phone.html
@@ -1,6 +1,6 @@
 <label class="control-label" ng-if="field.DisplayName" ng-bind="field.DisplayName"></label>
+<span class="text-muted" ng-if="field.Description">
+    <span ng-bind="field.Description"></span>
+</span>
 <input class="form-control" type="text" ng-class="'size-' + field.Size"  placeholder="{{field.Placeholder}}" />
-<dl ng-if="field.Description">
-    <dd ng-bind="field.Description"></dd>
-</dl>
 <button type="button" class="close" ng-click="removeField(field)" ng-if="Fields.length>1"><span aria-hidden="true">&times;</span></button>
diff --git a/src/ZKEACMS.FormGenerator/DisplayTemplate/Radio.html b/src/ZKEACMS.FormGenerator/DisplayTemplate/Radio.html
@@ -1,12 +1,12 @@
 <label class="control-label" ng-if="field.DisplayName" ng-bind="field.DisplayName"></label>
+<span class="text-muted" ng-if="field.Description">
+    <span ng-bind="field.Description"></span>
+</span>
 <div>
     <div class="radio" ng-repeat="option in field.FieldOptions">
         <label>
             <input type="radio" name="radio" ng-checked="option.DefaultSelected"> <span ng-bind="option.DisplayText" />
         </label>
     </div>
 </div>
-<dl ng-if="field.Description">
-    <dd ng-bind="field.Description"></dd>
-</dl>
 <button type="button" class="close" ng-click="removeField(field)" ng-if="Fields.length>1"><span aria-hidden="true">&times;</span></button>
diff --git a/src/ZKEACMS.FormGenerator/DisplayTemplate/SingleLine.html b/src/ZKEACMS.FormGenerator/DisplayTemplate/SingleLine.html
@@ -1,6 +1,6 @@
 <label class="control-label" ng-if="field.DisplayName" ng-bind="field.DisplayName"></label>
+<span class="text-muted" ng-if="field.Description">
+    <span ng-bind="field.Description"></span>
+</span>
 <input class="form-control" type="text" ng-class="'size-' + field.Size"  placeholder="{{field.Placeholder}}" />
-<dl ng-if="field.Description">
-    <dd ng-bind="field.Description"></dd>
-</dl>
 <button type="button" class="close" ng-click="removeField(field)" ng-if="Fields.length>1"><span aria-hidden="true">&times;</span></button>
diff --git a/src/ZKEACMS.FormGenerator/DisplayTemplate/ValidCode.html b/src/ZKEACMS.FormGenerator/DisplayTemplate/ValidCode.html
@@ -1,7 +1,7 @@
 <label class="control-label" ng-if="field.DisplayName" ng-bind="field.DisplayName"></label>
+<span class="text-muted" ng-if="field.Description">
+    <span ng-bind="field.Description"></span>
+</span>
 <input class="form-control" type="text" ng-class="'size-' + field.Size" placeholder="{{field.Placeholder}}" />
 <img src="/Validation/Code" style="margin-top:2px"/>
-<dl ng-if="field.Description">
-    <dd ng-bind="field.Description"></dd>
-</dl>
 <button type="button" class="close" ng-click="removeField(field)" ng-if="Fields.length>1"><span aria-hidden="true">&times;</span></button>
diff --git a/src/ZKEACMS.FormGenerator/Service/FormDataService.cs b/src/ZKEACMS.FormGenerator/Service/FormDataService.cs
@@ -63,6 +63,12 @@ public override FormData Get(params object[] primaryKey)
             var formData = base.Get(primaryKey);
             formData.Form = _formService.Get(formData.FormId);
             formData.Datas = _formDataItemService.Get(m => m.FormDataId == formData.ID).ToList();
+            MergeDataToForm(formData);
+            return formData;
+        }
+
+        private void MergeDataToForm(FormData formData)
+        {
             if (formData.Form != null)
             {
                 foreach (var item in formData.Form.FormFields)
@@ -94,8 +100,8 @@ public override FormData Get(params object[] primaryKey)
 
                 }
             }
-            return formData;
         }
+
         public ServiceResult<FormData> SaveForm(IFormCollection formCollection, string formId)
         {
             var result = new ServiceResult<FormData>();
@@ -137,6 +143,8 @@ public ServiceResult<FormData> SaveForm(IFormCollection formCollection, string f
                     formData.Datas.Add(dataitem);
                 }
             }
+            MergeDataToForm(formData);
+            result.Result = formData;
             if (result.HasViolation)
             {
                 return result;

diff --git a/src/ZKEACMS.FormGenerator/Service/FormWidgetService.cs b/src/ZKEACMS.FormGenerator/Service/FormWidgetService.cs
@@ -27,7 +27,11 @@ public class FormWidgetService : SimpleWidgetService<FormWidget>
 
         public override WidgetViewModelPart Display(WidgetDisplayContext widgetDisplayContext)
         {
-            Form form = _formService.Get((widgetDisplayContext.Widget as FormWidget).FormID);
+            if(widgetDisplayContext.Model is Form form)
+            {
+                return widgetDisplayContext.ToWidgetViewModelPart(form);
+            }
+            form = _formService.Get((widgetDisplayContext.Widget as FormWidget).FormID);
             return widgetDisplayContext.ToWidgetViewModelPart(form);
         }
     }

diff --git a/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Address.cshtml b/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Address.cshtml
@@ -20,7 +20,13 @@
         {
             district = dist[2];
         }
-
+    }
+    Dictionary<string, object> cityAttrs = new Dictionary<string, object> { { "class", "form-control" }, { "data-city", city ?? L("-- City --").Text } };
+    Dictionary<string, object> districtAttrs = new Dictionary<string, object> { { "class", "form-control" }, { "data-district", district ?? L("-- District --").Text } };
+    foreach (var item in Model.Attributes)
+    {
+        cityAttrs[item.Key] = item.Value;
+        districtAttrs[item.Key] = item.Value;
     }
     Model.Attributes.TryAdd("data-province", province ?? L("-- Province --").Text);
 }
@@ -35,24 +41,24 @@
             }
         </label>
     }
+    @if (Model.Description.IsNotNullAndWhiteSpace())
+    {
+        <span class="text-muted">
+            <span>@Model.Description</span>
+        </span>
+    }
     <div class="row" data-toggle="distpicker">
         <div class="col-md-4">
             @Html.DropDownList(Model.ID + "[0]", items, Model.Attributes)
+            @Html.ValidationMessage(Model.ID + "[0]")
         </div>
         <div class="col-md-4">
-            @Html.DropDownList(Model.ID + "[1]", items, new Dictionary<string, object> { { "class", "form-control" }, { "data-city", city ?? L("-- City --").Text } })
+            @Html.DropDownList(Model.ID + "[1]", items, cityAttrs)
+            @Html.ValidationMessage(Model.ID + "[1]")
         </div>
         <div class="col-md-4">
-            @Html.DropDownList(Model.ID + "[2]", items, new Dictionary<string, object> { { "class", "form-control" }, { "data-district", district ?? L("-- District --").Text } })
+            @Html.DropDownList(Model.ID + "[2]", items, districtAttrs)
+            @Html.ValidationMessage(Model.ID + "[2]")
         </div>
     </div>
-    @Html.ValidationMessage(Model.ID + "[0]")
-    @if (Model.Description.IsNotNullAndWhiteSpace())
-    {
-        <dl>
-            <dd>
-                @Model.Description
-            </dd>
-        </dl>
-    }
 </div>
diff --git a/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Checkbox.cshtml b/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Checkbox.cshtml
@@ -10,6 +10,12 @@
             }
         </label>
     }
+    @if (Model.Description.IsNotNullAndWhiteSpace())
+    {
+        <span class="text-muted">
+            <span>@Model.Description</span>
+        </span>
+    }
     <div>
         @for (int i = 0; i < Model.FieldOptions.Count; i++)
         {
@@ -28,12 +34,4 @@
 
     </div>
     @Html.ValidationMessage(Model.ID, L("Please select at least one option").Text)
-    @if (Model.Description.IsNotNullAndWhiteSpace())
-    {
-        <dl>
-            <dd>
-                @Model.Description
-            </dd>
-        </dl>
-    }
 </div>
diff --git a/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Date.cshtml b/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Date.cshtml
@@ -17,17 +17,15 @@
             }
         </label>
     }
+    @if (Model.Description.IsNotNullAndWhiteSpace())
+    {
+        <span class="text-muted">
+            <span>@Model.Description</span>
+        </span>
+    }
     <div class="input-group">
         @Html.TextBox(Model.ID, Model.Value, Model.Attributes)
         <span class="input-group-addon"><i class="glyphicon glyphicon-calendar"></i></span>
     </div>
     @Html.ValidationMessage(Model.ID)
-    @if (Model.Description.IsNotNullAndWhiteSpace())
-    {
-        <dl>
-            <dd>
-                @Model.Description
-            </dd>
-        </dl>
-    }
 </div>
diff --git a/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Dropdown.cshtml b/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Dropdown.cshtml
@@ -17,14 +17,12 @@
             }
         </label>
     }
-    @Html.DropDownList(Model.ID, items, L("-- Select --").Text, Model.Attributes)
-    @Html.ValidationMessage(Model.ID)
     @if (Model.Description.IsNotNullAndWhiteSpace())
     {
-        <dl>
-            <dd>
-                @Model.Description
-            </dd>
-        </dl>
+        <span class="text-muted">
+            <span>@Model.Description</span>
+        </span>
     }
+    @Html.DropDownList(Model.ID, items, L("-- Select --").Text, Model.Attributes)
+    @Html.ValidationMessage(Model.ID)
 </div>
diff --git a/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Email.cshtml b/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Email.cshtml
@@ -16,14 +16,12 @@
             }
         </label>
     }
-    @Html.TextBox(Model.ID, Model.Value, Model.Attributes)
-    @Html.ValidationMessage(Model.ID)
     @if (Model.Description.IsNotNullAndWhiteSpace())
     {
-        <dl>
-            <dd>
-                @Model.Description
-            </dd>
-        </dl>
+        <span class="text-muted">
+            <span>@Model.Description</span>
+        </span>
     }
+    @Html.TextBox(Model.ID, Model.Value, Model.Attributes)
+    @Html.ValidationMessage(Model.ID)
 </div>
diff --git a/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Label.cshtml b/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Label.cshtml
@@ -6,12 +6,11 @@
             @Model.DisplayName
         </h3>
     }
+
     @if (Model.Description.IsNotNullAndWhiteSpace())
     {
-        <dl>
-            <dd>
-                @Model.Description
-            </dd>
-        </dl>
+        <p class="text-muted">
+            <span>@Model.Description</span>
+        </p>
     }
 </div>
diff --git a/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Number.cshtml b/src/ZKEACMS.FormGenerator/Views/EditorTemplates/Form.Number.cshtml
@@ -17,14 +17,12 @@
             }
         </label>
     }
-    @Html.TextBox(Model.ID, Model.Value, Model.Attributes)
-    @Html.ValidationMessage(Model.ID)
     @if (Model.Description.IsNotNullAndWhiteSpace())
     {
-        <dl>
-            <dd>
-                @Model.Description
-            </dd>
-        </dl>
+        <span class="text-muted">
+            <span>@Model.Description</span>
+        </span>
     }
+    @Html.TextBox(Model.ID, Model.Value, Model.Attributes)
+    @Html.ValidationMessage(Model.ID)
 </div>