From 5b48cb28d135b501a478bcb9dd34c03246d9db9f Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 27 Jun 2023 14:58:10 +0800
Subject: [PATCH] update

---
 .../Identity/Controllers/UserController.cs            |  6 ++++++
 .../Identity/Entities/SystemManagement/User.cs        |  1 +
 docs/demo/src/WTA.Shared/Domain/BaseEntity.cs         |  1 +
 .../src/WTA.Shared/Extensions/JsonSchemaExtensions.cs | 11 ++++++++---
 .../src/WTA/wwwroot/components/form/form-input.js     |  3 +++
 .../demo/src/WTA/wwwroot/components/form/form-item.js |  5 +++--
 docs/demo/src/WTA/wwwroot/components/list/index.js    |  2 +-
 7 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/UserController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/UserController.cs
index ea2075b1..3e771c42 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/UserController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/UserController.cs
@@ -19,6 +19,12 @@ public class UserController : GenericController<User, User, User, User, User, Us
         this.Repository.DisableTenantFilter();
     }
 
+    [HttpPost, Display(Name = "密码重置")]
+    public virtual IActionResult ResetPassword()
+    {
+        return null;
+    }
+
     [HttpPost, Hidden]
     public AuthenticateResult Authenticate(string name, string operation)
     {
diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/User.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/User.cs
index ccfea3e4..46121d6b 100644
--- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/User.cs
+++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/User.cs
@@ -32,5 +32,6 @@ public class User : BaseEntity
     public Department? Department { get; set; }
     public Post? Post { get; set; }
 
+    [UIHint("select")]
     public List<UserRole> UserRoles { get; set; } = new List<UserRole>();
 }
diff --git a/docs/demo/src/WTA.Shared/Domain/BaseEntity.cs b/docs/demo/src/WTA.Shared/Domain/BaseEntity.cs
index 1ae6adec..e969165b 100644
--- a/docs/demo/src/WTA.Shared/Domain/BaseEntity.cs
+++ b/docs/demo/src/WTA.Shared/Domain/BaseEntity.cs
@@ -59,5 +59,6 @@ public abstract class BaseEntity : IResource, IBaseEntity, ISoftDeleteEntity, IA
     [ScaffoldColumn(false)]
     public string? TenantId { get; set; }
 
+    [ScaffoldColumn(false)]
     public Dictionary<string, string> Properties { get; set; } = new Dictionary<string, string>();
 }
diff --git a/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs b/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs
index c665006a..7e712780 100644
--- a/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs
+++ b/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs
@@ -66,7 +66,8 @@ public static class JsonSchemaExtensions
             if (modelType != meta.ElementMetadata!.ModelType.UnderlyingSystemType)
             {
                 schema.Add("type", "array");
-                //schema.Add("items", meta.ElementMetadata!.ModelType.GetMetadataForType(serviceProvider));
+                schema.TryAdd("multiple", true);
+                schema.TryAdd("url", "url");
                 schema.Add("items", meta.ElementMetadata.GetSchema(serviceProvider, meta));
             }
         }
@@ -184,7 +185,12 @@ public static class JsonSchemaExtensions
         var actionContext = new ActionContext { HttpContext = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext! };
         var provider = new EmptyModelMetadataProvider();
         var modelValidationContextBase = new ModelValidationContextBase(actionContext, meta, new EmptyModelMetadataProvider());
-        if (pm.IsRequired && !pm.IsNullableValueType && !pm.UnderlyingOrModelType.IsValueType && !pm.Attributes.Attributes.Any(o => o.GetType() == typeof(RequiredAttribute)))
+        if (pm.IsRequired &&
+            !pm.IsNullableValueType &&
+            !pm.UnderlyingOrModelType.IsValueType &&
+            !pm.IsEnumerableType &&
+            !pm.Attributes.Attributes.Any(o => o.GetType() == typeof(RequiredAttribute))
+            )
         {
             var message = string.Format(CultureInfo.InvariantCulture, localizer.GetString(nameof(RequiredAttribute)).Value, title);
             rules.Add(new Dictionary<string, object> { { "required", true }, { "message", message } });
@@ -234,7 +240,6 @@ public static class JsonSchemaExtensions
                 else if (attribute is RequiredAttribute)
                 {
                     rule.Add("required", true);
-                    //message = string.Format(CultureInfo.InvariantCulture, localizer.GetString(nameof(RequiredAttribute)).Value, title);
                 }
                 else if (attribute is CompareAttribute compare)//??
                 {
diff --git a/docs/demo/src/WTA/wwwroot/components/form/form-input.js b/docs/demo/src/WTA/wwwroot/components/form/form-input.js
index 02911edf..5a83e378 100644
--- a/docs/demo/src/WTA/wwwroot/components/form/form-input.js
+++ b/docs/demo/src/WTA/wwwroot/components/form/form-input.js
@@ -83,6 +83,9 @@ export default {
       return schema.input ?? schema.type;
     };
     /*end*/
+    // if (props.schema.url && !props.schema.options) {
+    //   props.schema.options = (await post(props.schema.url)).map((o) => ({ label: o.name, value: o }));
+    // }
     return {
       model,
       getDisabled,
diff --git a/docs/demo/src/WTA/wwwroot/components/form/form-item.js b/docs/demo/src/WTA/wwwroot/components/form/form-item.js
index 3a2984a1..f4a12281 100644
--- a/docs/demo/src/WTA/wwwroot/components/form/form-item.js
+++ b/docs/demo/src/WTA/wwwroot/components/form/form-item.js
@@ -3,13 +3,14 @@ import { ref, reactive, watch } from "vue";
 import AppFormInput from "./form-input.js";
 
 export default {
+  name: "formItem",
   components: { AppFormInput },
   template: html`
     <template v-if="showItem()">
       <template v-if="schema.type==='object'"></template>
-      <template v-else-if="schema.type==='array'"></template>
-      <template v-else>
+      <template v-if="schema.type!=='array'||(schema.items.type!=='object'&&schema.items.type!=='array')"> </template>
         <el-form-item
+          :title="getProp(prop)"
           :label="schema.title"
           :prop="getProp(prop)"
           :rules="getRules(parentSchema,schema,model)"
diff --git a/docs/demo/src/WTA/wwwroot/components/list/index.js b/docs/demo/src/WTA/wwwroot/components/list/index.js
index 98bd97ef..b0ff184b 100644
--- a/docs/demo/src/WTA/wwwroot/components/list/index.js
+++ b/docs/demo/src/WTA/wwwroot/components/list/index.js
@@ -295,7 +295,7 @@ export default {
         const vm = (await get(url)).data;
         Object.assign(editFormSchema, vm.schema);
         Object.assign(editFormModel, vm.model);
-        editFormTitle.value = `${t("update")}${schema.title}`;
+        editFormTitle.value = `${t("create")}${schema.title}`;
         dialogVisible.value = true;
       } else if (item.path === "update") {
         //update