转移.net core 3.1，为.NET 5做准备

OpenAuth.Mvc/Views/UserManager/Add.cshtml

@@ -1,128 +0,0 @@
-@model OpenAuth.App.ViewModel.UserView
-@{
-    ViewBag.Title = "title";
-    Layout = null;
-}
-
-<div class="bjui-pageContent">
-    <form action="/UserManager/Add" class="pageForm" data-toggle="validate">
-        <table class="table table-condensed table-hover">
-            <tbody>
-
-                <tr>
-                    <td>
-                        @Html.HiddenFor(m => m.CreateTime)
-                        @Html.HiddenFor(m => m.Id)
-                        <label for="Account" class="control-label x90">用户账号：</label>
-                        <input type="text" name="Account" id="Account" value="@Model.Account"
-                               data-rule="required" size="20">
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Name" class="control-label x90">姓名/昵称：</label>
-                        <input type="text" name="Name" id="Name" value="@Model.Name" size="20">
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Organizations" class="control-label x90">所属机构：</label>
-                        <input id="OrganizationIds" name="OrganizationIds" value="@Model.OrganizationIds" style="display: none" />
-                        <input type="text" name="Organizations" id="Organizations"
-                               data-toggle="selectztree" size="20" data-tree="#j_select_tree1" value="@Model.Organizations">
-                        <ul id="j_select_tree1" class="ztree hide" data-toggle="ztree"></ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Status" class="control-label x85">设置状态：</label>
-
-                        <select name="Status" id="Status" data-toggle="selectpicker" data-rule="required">
-                            <option value="0" @if (Model.Status == 0) { <text> selected="selected" </text>     }>正常</option>
-                            <option value="1" @if (Model.Status == 1) { <text> selected="selected" </text>     }>禁用</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Sex" class="control-label x85">性别：</label>
-
-                        <select name="Sex" id="Sex" data-toggle="selectpicker" data-rule="required">
-                            <option value="0" @if (Model.Status == 0) { <text> selected="selected" </text>      }>男</option>
-                            <option value="1" @if (Model.Status == 1) { <text> selected="selected" </text>      }>女</option>
-                        </select>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </form>
-</div>
-<div class="bjui-pageFooter">
-    <ul>
-        <li><button type="button" class="btn-close">关闭</button></li>
-        <li><button type="submit" class="btn-green">保存</button></li>
-    </ul>
-</div>
-
-<script type="text/javascript">
-
-    var ztree = function () {
-        var orgName = $("#Organizations");
-        var orgIds = $("#OrganizationIds");
-        var zTreeObj;
-        var setting = {
-            view: {
-                selectedMulti: false
-            },
-            check: {
-                enable: true,
-                chkStyle: "checkbox",
-                chkboxType: { "Y": "", "N": "" } //去掉勾选时级联
-            },
-            data: {
-                key: {
-                    name: 'Name',
-                    title: 'Name'
-                },
-                simpleData: {
-                    enable: true,
-                    idKey: 'Id',
-                    pIdKey: 'ParentId',
-                    rootPId: 'null'
-                }
-            },
-            callback: {
-                onClick: zTreeOnClick,
-                onCheck: zTreeCheck
-            }
-        };
-
-        function zTreeCheck(event, treeId, treeNode) {
-            var nodes = zTreeObj.getCheckedNodes(true);
-            var ids = nodes.map(function (e) { return e.Id; }).join(",");
-            var names = nodes.map(function (e) { return e.Name; }).join(",");
-
-            orgName.val(names);
-            orgIds.val(ids);
-        }
-        function zTreeOnClick(event, treeId, treeNode) {
-            zTreeObj.checkNode(treeNode, !treeNode.checked, true, true);
-            event.preventDefault();
-        }
-
-        $.getJSON('/OrgManager/LoadOrg', function (json) {
-            zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json);
-            var orgstr = orgIds.val();
-            if (orgstr != '') {
-                var nodeIds = orgstr.split(',');
-                $.each(nodeIds, function () {
-                    var node = zTreeObj.getNodeByParam("Id", this, null);
-                    zTreeObj.checkNode(node, true, true);
-                });
-            }
-            zTreeObj.expandAll(true);
-        });
-    }();
-
-
-</script>

OpenAuth.Mvc/Views/UserManager/ChangePassword.cshtml

@@ -0,0 +1,42 @@
+@section header
+    {
+    <link rel="stylesheet" href="/css/treetable.css" />
+    <link rel="stylesheet" href="/js/dtree/dtree.css" />
+    <link rel="stylesheet" href="/js/dtree/font/dtreefont.css" />
+}
+    <form class="layui-form layui-form-pane" action="" id="formEdit">
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">账号</label>
+            <div class="layui-input-block">
+                <input type="text" name="Account" v-model="tmp.Account" required lay-verify="required"
+                      readonly="readonly" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">密码</label>
+            <div class="layui-input-block">
+                <input type="text" name="Password" v-model="tmp.Password" required lay-verify="required"
+                       placeholder="请输入密码" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+            <label class="layui-form-label">确认密码</label>
+            <div class="layui-input-block">
+                <input type="text" name="ConfirmPassword" v-model="tmp.ConfirmPassword" required lay-verify="required"
+                       placeholder="请再次输入密码" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="formSubmit">立即提交</button>
+                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            </div>
+        </div>
+    </form>
+
+
+<script type="text/javascript" src="/layui/layui.js"></script>
+<script type="text/javascript" src="/userJs/changePwd.js"></script>

OpenAuth.Mvc/Views/UserManager/Index.cshtml

@@ -1,6 +1,8 @@
 @section header
 {
-    <link rel="stylesheet" href="/css/treetable.css" />
+     <link rel="stylesheet" href="/css/treetable.css" />
+    <link rel="stylesheet" href="/js/dtree/dtree.css" />
+    <link rel="stylesheet" href="/js/dtree/font/dtreefont.css" />
 }
 <blockquote class="layui-elem-quote news_search toolList" id="menus">
 </blockquote>
@@ -20,6 +22,8 @@
                     <th lay-data="{checkbox:true, fixed: true}"></th>
                     <th lay-data="{field:'Account', width:150, sort: true, fixed: true}">账号</th>
                     <th lay-data="{field:'Name', width:150}">用户名</th>
+                    <th lay-data="{field:'Sex', width:150,  templet: '#sexTpl'}">性别</th>
+                    <th lay-data="{field:'Status', width:150,  templet: '#statusTpl'}">状态</th>
                     <th lay-data="{field:'Organizations', width:135}">所属部门</th>
                     <th lay-data="{field:'CreateTime', width:180}">创建时间</th>
                     <th lay-data="{field:'Id', width:180}">ID</th>
@@ -27,6 +31,22 @@
                 </tr>
                 </thead>
             </table>
+            
+            <script type="text/html" id="statusTpl">
+                {{#  if(d.Status == 0){ }}
+                <span class="layui-badge layui-bg-green">正常</span>
+                {{#  } else { }}
+                <span class="layui-badge layui-bg-gray">无效</span>
+                {{#  } }}
+            </script>
+            
+            <script type="text/html" id="sexTpl">
+                {{#  if(d.Sex == 1){ }}
+                <span class="layui-badge layui-bg-green">男</span>
+                {{#  } else { }}
+            <span class="layui-badge">女</span>
+                {{#  } }}
+            </script>
         </div>
     </div>
 
@@ -38,19 +58,19 @@
 <div id="divEdit" style="display: none">
     <form class="layui-form layui-form-pane" action=""  id="formEdit">
 
-        <input type="hidden" name="Id" v-model="Id" />
+        <input type="hidden" name="Id" v-model="tmp.Id" />
 
         <div class="layui-form-item">
             <label class="layui-form-label">账号</label>
             <div class="layui-input-block">
-                <input type="text" name="Account" v-model="Account" required lay-verify="required"
+                <input type="text" name="Account" v-model="tmp.Account" required lay-verify="required"
                        placeholder="请输入登录账号" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">姓名</label>
             <div class="layui-input-block">
-                <input type="text" name="Name" v-model="Name" required lay-verify="required"
+                <input type="text" name="Name" v-model="tmp.Name" required lay-verify="required"
                        placeholder="请输入昵称或姓名" autocomplete="off" class="layui-input">
             </div>
         </div>
@@ -58,35 +78,33 @@
         <div class="layui-form-item">
             <label class="layui-form-label">所属部门</label>
             <div class="layui-input-block">
-                <input id="Organizations" name="Organizations" v-model="Organizations" required lay-verify="required" class="layui-input" />
-                <input id="OrganizationIds" name="OrganizationIds" v-model="OrganizationIds" required lay-verify="required" type="hidden" />
-                <div id="menuContent" class="menuContent" style="display: none;">
-                    <ul id="org" class="ztree"></ul>
-                </div>
+                <input id="Organizations" name="Organizations" v-model="tmp.Organizations" required lay-verify="required" class="layui-input" />
+                <input id="OrganizationIds" name="OrganizationIds" v-model="tmp.OrganizationIds" required lay-verify="required" type="hidden" />
+                
             </div>
         </div>
 
         <div class="layui-form-item" pane>
             <label class="layui-form-label">性别</label>
             <div class="layui-input-block">
-                <input type="radio" name="Sex" value="1" title="男" checked>
-                <input type="radio" name="Sex" value="0" title="女">
+                <input type="radio" name="Sex" value="1" title="男" v-model="tmp.Sex" >
+                <input type="radio" name="Sex" value="0" title="女" v-model="tmp.Sex" >
             </div>
         </div>
         <div class="layui-form-item" pane>
-            <label class="layui-form-label">是否可用</label>
+            <label class="layui-form-label">禁用</label>
             <div class="layui-input-block">
-                <input type="checkbox" name="Status" v-model="Status" lay-skin="switch" value="1">
+                <input type="checkbox" name="Status" v-model="tmp.Status" lay-skin="switch" value="1">
             </div>
         </div>
         <div class="layui-form-item">
             <div class="layui-input-block">
                 <button class="layui-btn" lay-submit lay-filter="formSubmit">立即提交</button>
-                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+                <button type="reset" id="reset" class="layui-btn layui-btn-primary" >重置</button>
             </div>
         </div>
     </form>
 </div>
 
 <script type="text/javascript" src="/layui/layui.js"></script>
-<script type="text/javascript" src="/userJs/users.js"></script>
+<script type="text/javascript" src="/userJs/users.js?v1.6"></script>

OpenAuth.Mvc/Views/UserManager/Profile.cshtml

@@ -0,0 +1,67 @@
+@section header
+    {
+    <link rel="stylesheet" href="/css/treetable.css" />
+    <link rel="stylesheet" href="/js/dtree/dtree.css" />
+    <link rel="stylesheet" href="/js/dtree/font/dtreefont.css" />
+}
+<form class="layui-form layui-form-pane" action="" id="formEdit">
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">账号</label>
+        <div class="layui-input-block">
+            <input type="text" name="Account" v-model="tmp.Account" required lay-verify="required"
+                   readonly="readonly" class="layui-input">
+        </div>
+    </div>
+       
+    <div class="layui-form-item">
+        <label class="layui-form-label">姓名</label>
+        <div class="layui-input-block">
+            <input type="text" name="Name" v-model="tmp.Name" required lay-verify="required"
+                   class="layui-input">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">性别</label>
+        <div class="layui-input-block">
+            <input type="radio" name="Sex" value="1" title="男" v-model="tmp.Sex" >
+            <input type="radio" name="Sex" value="0" title="女" v-model="tmp.Sex" >
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formSubmit">立即提交</button>
+            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+        </div>
+    </div>
+</form>
+
+<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+  <legend>权限信息</legend>
+</fieldset>   
+ 
+<div style="padding: 20px; background-color: #F2F2F2;">
+  <div class="layui-row layui-col-space15">
+    <div class="layui-col-md6">
+      <div class="layui-card">
+        <div class="layui-card-header">可访问的部门（点击可切换）</div>
+        <div class="layui-card-body">
+         <ul id="tree" class="ztree" style="padding: 2px; border: 1px solid #ddd; overflow: auto;">    </ul>
+        </div>
+      </div>
+    </div>
+    <div class="layui-col-md6">
+      <div class="layui-card">
+        <div class="layui-card-header">可访问的模块权限</div>
+        <div class="layui-card-body">
+          <ul id="treeModule" class="ztree" style="padding: 2px; border: 1px solid #ddd; overflow: auto;">    </ul>
+        </div>
+      </div>
+    </div>
+    
+  </div>
+</div>
+
+<script type="text/javascript" src="/layui/layui.js"></script>
+<script type="text/javascript" src="/userJs/profile.js"></script>