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

OpenAuth.Mvc/Views/ModuleManager/Assign.cshtml

@@ -1,6 +1,6 @@
 @section header
 {
-    <link rel="stylesheet" href="/css/treetable.css" />
+     <link rel="stylesheet" href="/css/treetable.css" />
 }
 
 <div class="layui-row">
@@ -9,9 +9,9 @@
             style="padding: 2px; border: 1px solid #ddd; overflow: auto;"></ul>
     </div>
     <div class="layui-col-xs9">
-        <table class="layui-table"
-               lay-data="{height: 'full-5', page:true, id:'mainList'}"
-               lay-filter="list" lay-size="sm">
+        <table class="layui-table mainList"
+               lay-data="{ page:true, id:'mainList' ,  text: { none: '先分配左边的模块项，再单击模块加载菜单进行分配' }}"
+               lay-filter="mainList" lay-size="sm">
             <thead>
             <tr>
                 <th lay-data="{checkbox:true, fixed: true}"></th>
@@ -22,10 +22,23 @@
             </thead>
         </table>
         <script type="text/html" id="icontmpl">
-            <i class="layui-icon" style="font-size: 20px; color: #1E9FFF;">{{ d.Icon }}</i>
+            <i class="layui-icon {{ d.Icon }}" style="font-size: 20px; color: #1E9FFF;"></i>
         </script>
+
+         <table class="layui-table propList"
+               lay-data="{id:'propList' ,  text: { none: '用户自定义模块可以分配可见字段' }}"
+               lay-filter="propList" lay-size="sm">
+            <thead>
+            <tr>
+                <th lay-data="{checkbox:true, fixed: true}"></th>
+                <th lay-data="{field:'Description', width:150}">字段描述</th>
+                <th lay-data="{field:'Key', width:150}">字段代码</th>
+            </tr>
+            </thead>
+        </table>
+
     </div>
 </div>
 
 <script type="text/javascript" src="/layui/layui.js"></script>
-<script type="text/javascript" src="/userJs/assignModule.js"></script>
+<script type="text/javascript" src="/userJs/assignModule.js?v=2.1"></script>

OpenAuth.Mvc/Views/ModuleManager/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>
@@ -16,36 +18,49 @@
                lay-data="{height: 'full-80', id:'mainList'}"
                lay-filter="list" lay-size="sm">
             <thead>
-            <tr>
-                <th lay-data="{checkbox:true, fixed: true}"></th>
-                <th lay-data="{field:'Name', width:120, sort: true, fixed: true}">模块名称</th>
-                <th lay-data="{field:'CascadeId', width:80}">层级ID</th>
-                <th lay-data="{field:'Code', width:80}">模块标识</th>
-                <th lay-data="{field:'Url', width:200}">Url</th>
-                <th lay-data="{field:'IconName', width:60,templet: '#iconTpl'}">图标</th>
-                <th lay-data="{field:'ParentName', width:135}">父节点名称</th>
-                <th lay-data="{field:'SortNo', width:80}">排序号</th>
-                <th lay-data="{fixed: 'right', width:100, toolbar: '#barList'}"></th>
-            </tr>
+                <tr>
+                    <th lay-data="{checkbox:true, fixed: true}"></th>
+                    <th lay-data="{field:'Name', width:120, sort: true, fixed: true}">模块名称</th>
+                    <th lay-data="{field:'Status', width:100,templet: '#statusTpl'}">导航栏展示</th>
+                     <th lay-data="{field:'IsSys', width:100,templet: '#sysTpl'}">模块类型</th>
+                    <th lay-data="{field:'IconName', width:60,templet: '#iconTpl'}">图标</th>
+                    <th lay-data="{field:'CascadeId', width:80}">层级ID</th>
+                    <th lay-data="{field:'Code', width:80}">模块标识</th>
+                    <th lay-data="{field:'Url', width:200}">Url</th>
+                    <th lay-data="{field:'ParentName', width:135}">父节点名称</th>
+                    <th lay-data="{field:'SortNo', width:80}">排序号</th>
+                </tr>
             </thead>
         </table>
-        <!--列表右边的按钮-->
-        <script type="text/html" id="barList">
-            <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看菜单</a>
-        </script>
         <script type="text/html" id="iconTpl">
             {{#  if( d.IconName != null && d.IconName != ''){ }}
-            <i class="layui-icon">{{ d.IconName }}</i>
+            <i class="layui-icon {{ d.IconName }}"></i>
             {{#  } else { }}
             {{ d.IconName }}
             {{#  } }}
         </script>
+
+        <script type="text/html" id="statusTpl">
+            {{#  if( d.Status == -1){ }}
+            <span style="color:red">隐藏</span>
+            {{#  } else { }}
+            <span style="color:green">显示</span>
+            {{#  } }}
+        </script>
+
+         <script type="text/html" id="sysTpl">
+            {{#  if( d.IsSys == 1){ }}
+            <span class="layui-badge">内置</span>
+            {{#  } else { }}
+            <span class="layui-badge layui-bg-green">自定义</span>
+            {{#  } }}
+        </script>
     </div>
     
     <div class="layui-col-xs">
         <!--菜单列表-->
         <table class="layui-table"
-               lay-data="{height: 'full-80', id:'menuList'}"
+               lay-data="{height: 'full-80', id:'menuList',  text: { none: '单击模块列表数据行查看菜单' }}"
                lay-filter="menulist" lay-size="sm">
             <thead>
             <tr>
@@ -56,7 +71,7 @@
         </table>
        
         <script type="text/html" id="menuTpl">
-            <button class="layui-btn layui-btn-xs {{ d.Class }} layui-btn-fluid" alt="{{ d.DomId }}">{{ d.Name }}</button>
+            <button class="layui-btn layui-btn-xs {{ d.Class }} layui-btn-fluid" alt="{{ d.DomId }}"> <i class="layui-icon {{ d.Icon }}"></i> {{ d.Name }}</button>
         </script>
     </div>
 </div>
@@ -66,40 +81,49 @@
 <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="Name" v-model="Name" required lay-verify="required"
-                       placeholder="请输入部门名称" autocomplete="off" class="layui-input">
+                <input type="text" name="Name" v-model="tmp.Name" 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">
+                <select name="Status" v-model="tmp.Status" required lay-verify="required">
+                    <option value="0" selected="selected" >正常</option>
+                    <option value="-1">隐藏</option>
+                </select>
+
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">模块标识</label>
             <div class="layui-input-block">
-                <input type="text" name="Code" v-model="Code" 
+                <input type="text" name="Code" v-model="tmp.Code" 
                        placeholder="比如：Module" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">URL地址</label>
             <div class="layui-input-block">
-                <input type="text" name="Url" v-model="Url" required lay-verify="required"
+                <input type="text" name="Url" v-model="tmp.Url" required lay-verify="required"
                        placeholder="请输入URL" 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="IconName" v-model="IconName"
-                       placeholder="请选择图标" autocomplete="off" class="layui-input">
+                <input type="text" id="IconName" name="IconName" v-model="tmp.IconName" lay-filter="iconPicker" 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="SortNo" v-model="SortNo" required lay-verify="required"
+                <input type="text" name="SortNo" v-model="tmp.SortNo" required lay-verify="required"
                        placeholder="请输入排序号" autocomplete="off" class="layui-input">
             </div>
         </div>
@@ -107,11 +131,9 @@
         <div class="layui-form-item">
             <label class="layui-form-label">所属模块</label>
             <div class="layui-input-block">
-                <input id="ParentName" name="ParentName" v-model="ParentName" class="layui-input" />
-                <input id="ParentId" name="ParentId" v-model="ParentId"  type="hidden" />
-                <div id="menuContent" class="menuContent" style="display: none;">
-                    <ul id="org" class="ztree"></ul>
-                </div>
+                <input id="ParentName" name="ParentName" v-model="tmp.ParentName" class="layui-input" />
+                <input id="ParentId" name="ParentId" v-model="tmp.ParentId"  type="hidden" />
+                
             </div>
         </div>
 
@@ -128,13 +150,13 @@
 <div id="divMenuEdit" style="display: none">
     <form class="layui-form layui-form-pane" action="" id="mfromEdit">
 
-        <input type="hidden" name="Id" v-model="Id" />
-        <input type="hidden" name="ModuleId" v-model="ModuleId" />  
+        <input type="hidden" name="Id" v-model="tmp.Id" />
+        <input type="hidden" name="ModuleId" v-model="tmp.ModuleId" />  
 
         <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>
@@ -142,21 +164,28 @@
         <div class="layui-form-item">
             <label class="layui-form-label">DomId</label>
             <div class="layui-input-block">
-                <input type="text" name="DomId" v-model="DomId" required lay-verify="required"
+                <input type="text" name="DomId" v-model="tmp.DomId" required lay-verify="required"
                        placeholder="请输入DomId" 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" id="Icon" name="Icon" v-model="tmp.Icon" lay-filter="btnIconPicker" 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="Class" v-model="Class"
+                <input type="text" name="Class" v-model="tmp.Class"
                        placeholder="菜单的样式，如：layui-btn-danger" 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="Sort" v-model="Sort" required lay-verify="required"
+                <input type="text" name="Sort" v-model="tmp.Sort" required lay-verify="required"
                        placeholder="请输入排序号" autocomplete="off" class="layui-input">
             </div>
         </div>