update all

.gitignore

@@ -6,3 +6,4 @@ obj/
 .vs
 Logs/
 /Api/Ewide.Web.Entry/wwwroot/Upload
+/Api/Ewide.EntityFramework.Core/dbsettings.Development.json

Api/Ewide.Core/Entity/SysMenu.cs

@@ -118,6 +118,7 @@ namespace Ewide.Core
         /// 不关联上级菜单显示 0标识关联 1表示不需要关联菜单 仅按钮有效
         /// </summary>
         [Comment("不关联菜单显示")]
+        [Column("UnbindParent", TypeName = "bit")]
         public bool UnbindParent { get; set; }
 
         /// <summary>

Api/Ewide.Database.Migrations/Ewide.Database.Migrations.csproj

@@ -8,8 +8,4 @@
     <ProjectReference Include="..\Ewide.EntityFramework.Core\Ewide.EntityFramework.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Migrations\" />
-  </ItemGroup>
-
 </Project>

Api/Ewide.EntityFramework.Core/dbsettings.Development.json

@@ -1,5 +1,5 @@
 {
 	"ConnectionStrings": {
-		"DefaultConnection": "Data Source=localhost;Port=3307;Database=Ewide;User ID=root;Password=root;pooling=true;sslmode=none;CharSet=utf8;"
+		"DefaultConnection": "Data Source=localhost;Port=3306;Database=ewide;User ID=root;Password=a45683926;pooling=true;sslmode=none;CharSet=utf8;"
 	}
 }

Web/src/pages/system/app/index.vue

@@ -76,10 +76,12 @@ export default {
         {
           title: '应用名称',
           dataIndex: 'name',
+          sorter: true,
         },
         {
           title: '唯一编码',
           dataIndex: 'code',
+          sorter: true,
         },
         {
           title: '是否默认',
@@ -87,6 +89,7 @@ export default {
           scopedSlots: {
             customRender: 'active',
           },
+          sorter: true,
         },
         {
           title: '状态',
@@ -94,10 +97,12 @@ export default {
           scopedSlots: {
             customRender: 'status',
           },
+          sorter: true,
         },
         {
           title: '排序',
           dataIndex: 'sort',
+          sorter: true,
         },
       ],
       codes: [

Web/src/pages/system/config/index.vue

@@ -39,7 +39,7 @@
       </yo-table>
     </a-card>
     <br />
-     <edit-form @ok="onReloadData" ref="edit-form" />
+    <edit-form @ok="onReloadData" ref="edit-form" />
     <add-form @ok="onReloadData" ref="add-form" />
   </container>
 </template>
@@ -47,10 +47,10 @@
 import AddForm from './addForm';
 import editForm from './editForm';
 export default {
-components: {
+  components: {
-     AddForm,
+    AddForm,
-     editForm,
+    editForm,
-   },
+  },
   data() {
     return {
       query: {},
@@ -58,35 +58,44 @@ components: {
         {
           title: '参数名称',
           dataIndex: 'name',
+          sorter: true,
         },
         {
           title: '唯一编码',
           dataIndex: 'code',
+          sorter: true,
         },
         {
           title: '参数值',
           dataIndex: 'value',
+          sorter: true,
         },
         {
           title: '所属分类',
           dataIndex: 'groupCode',
-        },
+          sorter: true,
-         {
-          title: '备注',
-          dataIndex: 'remark',
         },
         {
-          title: '操作',
+          title: '备注',
-          width: '200px',
+          dataIndex: 'remark',
-          dataIndex: 'action',
+          sorter: true,
-          scopedSlots: {
-            customRender: 'action',
-          },
         },
       ],
     };
   },
-  created() {},
+  created() {
+    const flag = this.$auth({ sysConfig: [['edit'], ['delete']] });
+    if (flag) {
+      this.columns.push({
+        title: '操作',
+        width: '200px',
+        dataIndex: 'action',
+        scopedSlots: {
+          customRender: 'action',
+        },
+      });
+    }
+  },
   methods: {
     /**
      * 必要的方法

Web/src/pages/system/dict/dictdata/index.vue

@@ -73,24 +73,29 @@ export default {
         {
           title: '字典值',
           dataIndex: 'value',
+          sorter: true,
         },
         {
           title: '唯一编码',
           dataIndex: 'code',
+          sorter: true,
         },
         {
           title: '排序',
           dataIndex: 'sort',
+          sorter: true,
         },
         {
           title: '备注',
           dataIndex: 'remark',
           width: 200,
+          sorter: true,
         },
         {
           title: '状态',
           dataIndex: 'status',
           scopedSlots: { customRender: 'status' },
+          sorter: true,
         },
       ],
     };
@@ -99,7 +104,7 @@ export default {
     this.onLoadCodes();
 
     /** 根据权限添加操作列 */
-    const flag = this.$auth(/** ... */);
+    const flag = this.$auth({ sysDictData: [['edit'], ['delete']] });
     if (flag) {
       this.columns.push({
         title: '操作',

Web/src/pages/system/dict/index.vue

@@ -71,24 +71,29 @@ export default {
         {
           title: '类型名称',
           dataIndex: 'name',
+          sorter: true,
         },
         {
           title: '唯一编码',
           dataIndex: 'code',
+          sorter: true,
         },
         {
           title: '排序',
           dataIndex: 'sort',
+          sorter: true,
         },
         {
           title: '备注',
           dataIndex: 'remark',
           width: 200,
+          sorter: true,
         },
         {
           title: '状态',
           dataIndex: 'status',
           scopedSlots: { customRender: 'status' },
+          sorter: true,
         },
       ],
       codes: {
@@ -100,7 +105,7 @@ export default {
     this.onLoadCodes();
 
     /** 根据权限添加操作列 */
-    const flag = this.$auth(/** ... */);
+    const flag = this.$auth({ sysDictType: [['edit'], ['delete']] });
     if (flag) {
       this.columns.push({
         title: '操作',

Web/src/pages/system/log/oplog/index.vue

@@ -92,34 +92,41 @@ export default {
         {
           title: '日志名称',
           dataIndex: 'name',
+          sorter: true,
         },
         {
           title: '操作类型',
           dataIndex: 'opType',
           scopedSlots: { customRender: 'opType' },
+          sorter: true,
         },
         {
           title: '是否成功',
           dataIndex: 'success',
           scopedSlots: { customRender: 'success' },
+          sorter: true,
         },
         {
           title: 'ip',
           dataIndex: 'ip',
+          sorter: true,
         },
         {
           title: '请求地址',
           dataIndex: 'url',
           scopedSlots: { customRender: 'url' },
+          sorter: true,
         },
         {
           title: '操作时间',
           dataIndex: 'opTime',
           scopedSlots: { customRender: 'opTime' },
+          sorter: true,
         },
         {
           title: '操作人',
           dataIndex: 'account',
+          sorter: true,
         },
       ],
       codes: {

Web/src/pages/system/log/vislog/index.vue

@@ -84,33 +84,40 @@ export default {
         {
           title: '日志名称',
           dataIndex: 'name',
+          sorter: true,
         },
         {
           title: '访问类型',
           dataIndex: 'visType',
           scopedSlots: { customRender: 'visType' },
+          sorter: true,
         },
         {
           title: '是否成功',
           dataIndex: 'success',
           scopedSlots: { customRender: 'success' },
+          sorter: true,
         },
         {
           title: 'ip',
           dataIndex: 'ip',
+          sorter: true,
         },
         {
           title: '浏览器',
           dataIndex: 'browser',
+          sorter: true,
         },
         {
           title: '访问时间',
           dataIndex: 'visTime',
           scopedSlots: { customRender: 'visTime' },
+          sorter: true,
         },
         {
           title: '访问人',
           dataIndex: 'account',
+          sorter: true,
         },
       ],
 

Web/src/pages/system/org/index.vue

@@ -67,20 +67,24 @@ export default {
           title: '机构名称',
           width: '400px',
           dataIndex: 'name',
+          sorter: true,
         },
         {
           title: '唯一编码',
           width: '200px',
           dataIndex: 'code',
+          sorter: true,
         },
         {
           title: '排序',
           width: '80px',
           dataIndex: 'sort',
+          sorter: true,
         },
         {
           title: '备注',
           dataIndex: 'remark',
+          sorter: true,
         },
       ],
     };

Web/src/pages/system/pos/index.vue

@@ -59,31 +59,38 @@ export default {
         {
           title: '职位名称',
           dataIndex: 'name',
+          sorter: true,
         },
         {
           title: '唯一编码',
           dataIndex: 'code',
+          sorter: true,
         },
         {
           title: '排序',
           dataIndex: 'sort',
+          sorter: true,
         },
         {
           title: '备注',
           dataIndex: 'remark',
-        },
+          sorter: true,
-        {
-          title: '操作',
-          width: '200px',
-          dataIndex: 'action',
-          scopedSlots: {
-            customRender: 'action',
-          },
         },
       ],
     };
   },
-  created() {},
+  created() {
+    if (this.$auth({ sysPos: [['edit'], ['delete']] })) {
+      this.columns.push({
+        title: '操作',
+        width: '200px',
+        dataIndex: 'action',
+        scopedSlots: {
+          customRender: 'action',
+        },
+      });
+    }
+  },
   methods: {
     /**
      * 必要的方法

Web/src/pages/system/role/index.vue

@@ -86,14 +86,17 @@ export default {
         {
           title: '角色名',
           dataIndex: 'name',
+          sorter: true,
         },
         {
           title: '唯一编码',
           dataIndex: 'code',
+          sorter: true,
         },
         {
           title: '排序',
           dataIndex: 'sort',
+          sorter: true,
         },
       ],
     };

Web/src/views/main/_layout/logo.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="logo">
-    <img :src="require('@/assets/image/logo32.png')" alt />
+    <img
-    <span>LazyOn</span>
+      :src="require('@/assets/image/logo.png')"
+      alt
+      v-if="$root.global.settings.navTheme == 'light'"
+    />
+    <img :src="require('@/assets/image/logo-w.png')" alt v-else />
   </div>
 </template>