update

Former-commit-id: af55d2734bf023507fd17e339512b6937fefd63d
Former-commit-id: cf8afeed79e56b6ed544f2e97da1968e4f58d92e

projects/Infrastructure/Application/Models/EditSettingModel.cs

@@ -11,7 +11,7 @@ namespace Infrastructure.Application.Models
         public string Name { get; set; }
 
         [UIHint("SelectList")]
-        [Display(Name = "输入类项")]
+        [Display(Name = "输入类型")]
         public SettingType? Type { get; set; }
 
         [Display(Name = "属性值")]

projects/Infrastructure/Areas/Admin/Controllers/SettingController.cs

@@ -2,10 +2,13 @@ using Infrastructure.Application;
 using Infrastructure.Application.Entites.Settings;
 using Infrastructure.Application.Models;
 using Infrastructure.Application.Services.Settings;
+using Infrastructure.Data;
 using Infrastructure.Extensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,15 +18,17 @@ namespace Infrastructure.Web.Mvc
     [Area("Admin")]
     public class SettingController : BaseController
     {
+        private readonly IRepository<Setting> _settingRepo;
         private readonly ISettingService _settingService;
 
-        public SettingController(ISettingService settingService)
+        public SettingController(IRepository<Setting> settingRepo,ISettingService settingService)
         {
+            this._settingRepo = settingRepo;
             this._settingService = settingService;
         }
 
         [Authorize(Roles = "Read-Setting")]
-        public IActionResult Index(PagedList<Setting> model)
+        public IActionResult Index(PagedListModel<EditSettingModel> model)
         {
             if (model is null)
             {
@@ -33,8 +38,18 @@ namespace Infrastructure.Web.Mvc
             model.TotalCount = query.Count();
             model.List.AddRange(query.Skip(model.PageSize * (model.PageIndex - 1))
                 .Take(model.PageSize)
-                .ToList());
-            return View(model);
+                .ToList()
+                .Select(o=>o.To<EditSettingModel>()));
+            ViewData.SelectList(o=>model.Query.Type,()=>this.GetSelectList<SettingType>(model.Query.Type));
+            return Result(model);
+        }
+
+        [HttpGet]
+        public virtual IActionResult Details(Guid id)
+        {
+            var entity = this._settingRepo.ReadOnlyTable().FirstOrDefault(o => o.Id == id);
+            var model = entity.To<EditSettingModel>();
+            return Result(model);
         }
 
         [Authorize(Roles = "Edit-Setting")]
@@ -124,5 +139,20 @@ namespace Infrastructure.Web.Mvc
         {
             return PartialView("_Ajax", new EditSettingModel { Type = type });
         }
+
+        [ApiExplorerSettings(IgnoreApi = true)]
+        private IActionResult Result(object model)
+        {
+            if (this.Request.Headers["accept"].ToString().Contains("json", StringComparison.OrdinalIgnoreCase))
+            {
+                return Json(new
+                {
+                    schema = this.GetJsonSchema<EditSettingModel>(),
+                    model,
+                    data = ViewData
+                }, new JsonSerializerSettings { ContractResolver = new CamelCasePropertyNamesContractResolver() });
+            }
+            return View(model);
+        }
     }
 }

projects/Infrastructure/Extensions/ControllerExtensions.cs

@@ -1,6 +1,8 @@
-using Microsoft.AspNetCore.Mvc;
+using Jint.Parser.Ast;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using System;
@@ -46,6 +48,13 @@ namespace Infrastructure.Extensions
             return CreateJson(controller, metadata as DefaultModelMetadata);
         }
 
+        public static SelectList GetSelectList<T>(this Controller controller,object selectedValue)
+        {
+            var values = from Enum e in Enum.GetValues(typeof(T))
+                         select new { Id = e, Name = e.GetDisplayName() };
+            return new SelectList(values, "Id", "Name", selectedValue);
+        }
+
         public static object CreateJson(this ControllerBase controller, DefaultModelMetadata metadata)
         {
             if (metadata is null)

projects/WebMVC/libman.json

@@ -29,7 +29,7 @@
     {
       "library": "vue@2.6.11",
       "destination": "wwwroot/lib/vue",
-      "files": [ "vue.min.js" ]
+      "files": [ "vue.min.js","vue.js" ]
     },
     {
       "library": "vue-router@3.2.0",

projects/WebMVC/wwwroot/index.html

@@ -32,7 +32,7 @@
     <script src="lib/linq.js/linq.min.js"></script>
     <script src="lib/axios/axios.min.js"></script>
     <script src="lib/pubsub-js/pubsub.min.js"></script>
-    <script src="lib/vue/vue.min.js"></script>
+    <script src="lib/vue/vue.js"></script>
     <script src="lib/vuex/vuex.min.js"></script>
     <script src="lib/vue-router/vue-router.min.js"></script>
     <script src="lib/jwt-decode/build/jwt-decode.min.js"></script>

projects/WebMVC/wwwroot/js/form.js

@@ -10,6 +10,7 @@
     'edit-string',
     'edit-boolean',
     'edit-integer',
+    'edit-selectlist',
 ];
 for (var i = 0; i < formComponents.length; i++) {
     var name = formComponents[i];

projects/WebMVC/wwwroot/router/shared/display/multiselectlist.html

@@ -3,6 +3,6 @@
 </template>
 <script>
     export default {
-        props: ['key', 'value', 'data']
+        props: ['name', 'value', 'data']
     };
 </script>

projects/WebMVC/wwwroot/router/shared/display/selectlist.html

@@ -3,6 +3,6 @@
 </template>
 <script>
     export default {
-        props: ['key', 'value', 'data']
+        props: ['name', 'value', 'data']
     };
 </script>

projects/WebMVC/wwwroot/router/shared/edit/selectlist.html

@@ -0,0 +1,26 @@
+<template>
+    <div>
+        <select class="form-control" :name="name">
+            <option value="">请选择</option>
+            <template v-for="item in list">
+                <option v-if="item.value===value" :value="item.value" selected>{{item.text}}</option>
+                <option v-else :value="item.value">{{item.text}}</option>
+            </template>
+        </select>
+    </div>
+</template>
+<script>
+    export default {
+        props: ['name', 'value', 'data','prefix'],
+        computed:{
+            list:function(){
+                var key=this.name;
+                if(this.prefix)
+                {
+                   key=this.name.substring(this.prefix.length+1);
+                }
+                return this.data[key+'SelectList'];
+            }
+        }
+    };
+</script>

projects/WebMVC/wwwroot/router/shared/layout.html

@@ -9,7 +9,7 @@
                     <router-link :to="{path:'/'}" class="nav-link">首页</router-link>
                 </li>
             </ul>
-            <ul class="navbar-nav ml-auto">
+            <ul class="navbar-nav ml-auto" v-if="model.username">
                 <li class="nav-item">
                     <router-link class="nav-link" to="/router/user.html">{{model.username}}</router-link>
                 </li>

projects/WebMVC/wwwroot/router/shared/list.html

@@ -12,7 +12,7 @@
                                     <div class="form-group row">
                                         <label class="col-sm-3 col-form-label" :for="key">{{value.title}}:</label>
                                         <div class="col-sm-9">
-                                            <component :is="getQueryComponent(value)" :title="value.title" :name="'query.'+key" :value="data.model.query[key]" v-if="data.model.query" />
+                                            <component :is="getQueryComponent(value)" :title="value.title" :name="'query.'+key" :value="data.model.query[key]" v-bind:data="data.data" v-bind:prefix="'query'" v-if="data.model.query" />
                                         </div>
                                     </div>
                                 </div>
@@ -50,7 +50,7 @@
                                                     <input type="checkbox" name="list[]" :value="item.id" />
                                                 </td>
                                                 <td v-for="(value,key,index) in data.schema.properties" v-if="showForList(key,value)">
-                                                    <component :is="getDisplayComponent(key)" v-bind:key="key" v-bind:value="item[key]" v-bind:data="data.data" :mode="'list'" />
+                                                    <component :is="getDisplayComponent(key)" v-bind:name="key" v-bind:value="item[key]" v-bind:data="data.data" :mode="'list'" />
                                                 </td>
                                                 <td v-if="hasPermission('Edit')">
                                                     <a href="javascript:;" class="btn btn-sm btn-info">编辑</a>
@@ -130,7 +130,7 @@
                 return template;
             },
             getQueryComponent: function (value) {
-                var template = 'edit-' + (value.format || value.type);
+                var template = 'edit-' + (value.ui || value.format || value.type);
                 console.log(template);
                 return template;
             },

projects/WebMVC/wwwroot/router/shared/pagination.html

@@ -1,7 +1,7 @@
 <template>
     <div class="row">
         <div class="col-sm-12 col-md-5">
-            <div class="dataTables_info">共{{total}}条 当前数据{{(index-1)*size+1}}-{{index*size}} 当前页{{index}}/{{getPageCount()}}</div>
+            <div class="dataTables_info">共{{total}}条 当前数据{{(index-1)*size+1}}-{{index*size>total?total:index*size}} 当前页{{index}}/{{getPageCount()}}</div>
         </div>
         <div class="col-sm-12 col-md-7">
             <div class="dataTables_paginate paging_simple_numbers">
@@ -44,7 +44,7 @@
             },
             sizeList: {
                 type: Array,
-                default: [20, 50, 100]
+                default: ()=>[20, 50, 100]
             },
             nav: {
                 type: Function,