fix: 界面小问题修复

Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuInput.cs

@@ -10,7 +10,7 @@ public class MenuInput
     /// <summary>
     /// 菜单类型（1目录 2菜单 3按钮）
     /// </summary>
-    public MenuTypeEnum Type { get; set; }
+    public MenuTypeEnum? Type { get; set; }
 }
 
 public class AddMenuInput : SysMenu

Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs

@@ -76,11 +76,11 @@ public class SysMenuService : IDynamicApiController, ITransient
         var menuIdList = _userManager.SuperAdmin ? new List<long>() : await GetMenuIdList();
 
         // 有筛选条件时返回list列表（防止构造不出树）
-        if (!string.IsNullOrWhiteSpace(input.Title) || input.Type > 0)
+        if (!string.IsNullOrWhiteSpace(input.Title) || input.Type is > 0)
         {
             return await _sysMenuRep.AsQueryable()
                 .WhereIF(!string.IsNullOrWhiteSpace(input.Title), u => u.Title.Contains(input.Title))
-                .WhereIF(input.Type > 0, u => u.Type == input.Type)
+                .WhereIF(input.Type is > 0, u => u.Type == input.Type)
                 .WhereIF(menuIdList.Count > 1, u => menuIdList.Contains(u.Id))
                 .OrderBy(u => u.OrderNo).ToListAsync();
         }

Admin.NET/Admin.NET.Core/Service/Notice/Dto/NoticeInput.cs

@@ -10,7 +10,7 @@ public class PageNoticeInput : BasePageInput
     /// <summary>
     /// 类型（1通知 2公告）
     /// </summary>
-    public virtual NoticeTypeEnum Type { get; set; }
+    public virtual NoticeTypeEnum? Type { get; set; }
 }
 
 public class AddNoticeInput : SysNotice

Admin.NET/Admin.NET.Core/Service/Notice/SysNoticeService.cs

@@ -137,7 +137,7 @@ public class SysNoticeService : IDynamicApiController, ITransient
         return await _sysNoticeRep.AsSugarClient().Queryable<SysNoticeUser>().Includes(u => u.SysNotice)
             .Where(u => u.UserId == _userManager.UserId)
             .WhereIF(!string.IsNullOrWhiteSpace(input.Title), u => u.SysNotice.Title.Contains(input.Title.Trim()))
-            .WhereIF(input.Type > 0, u => u.SysNotice.Type == input.Type)
+            .WhereIF(input.Type is > 0, u => u.SysNotice.Type == input.Type)
             .OrderBy(u => u.SysNotice.CreateTime, OrderByType.Desc)
             .ToPagedListAsync(input.Page, input.PageSize);
     }

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

@@ -110,6 +110,7 @@ const handleQuery = async () => {
 const resetQuery = () => {
 	state.queryParams.name = undefined;
 	state.queryParams.code = undefined;
+	state.queryParams.groupCode = undefined;
 	handleQuery();
 };
 

Web/src/views/system/database/index.vue

@@ -8,7 +8,7 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item label="表名" prop="tableName">
-					<el-select v-model="state.tableName" placeholder="表名" filterable clearable @change="handleQueryColunm">
+					<el-select v-model="state.tableName" placeholder="表名" filterable clearable @change="handleQueryColumn">
 						<el-option v-for="item in state.tableData" :key="item.name" :label="item.name + '[' + item.description + ']'" :value="item.name" />
 					</el-select>
 				</el-form-item>
@@ -110,12 +110,12 @@ onMounted(async () => {
 		handleQueryTable();
 	});
 	mittBus.on('submitRefreshColumn', () => {
-		handleQueryColunm();
+		handleQueryColumn();
 	});
 	mittBus.on('addTableSubmitted', (res: any) => {
 		handleQueryTable();
 		state.tableName = res;
-		handleQueryColunm();
+		handleQueryColumn();
 	});
 });
 
@@ -137,7 +137,10 @@ const handleQueryTable = async () => {
 };
 
 // 列查询操作
-const handleQueryColunm = async () => {
+const handleQueryColumn = async () => {
+	state.columnData = [];
+	if (state.tableName == '') return;
+
 	state.loading1 = true;
 	var res = await getAPI(SysDatabaseApi).apiSysDatabaseColumnListTableNameConfigIdGet(state.tableName, state.configId);
 	state.columnData = res.data.result ?? [];

Web/src/views/system/notice/index.vue

@@ -6,7 +6,7 @@
 					<el-input placeholder="标题" clearable @keyup.enter="handleQuery" v-model="state.queryParams.title" />
 				</el-form-item>
 				<el-form-item label="类型" prop="type">
-					<el-select v-model="state.queryParams.type" placeholder="类型" style="width: 100%">
+					<el-select v-model="state.queryParams.type" placeholder="类型" clearable style="width: 100%">
 						<el-option label="通知" :value="1" />
 						<el-option label="公告" :value="2" />
 					</el-select>

Web/src/views/system/role/component/editRole.vue

@@ -94,6 +94,7 @@ onMounted(async () => {
 
 // 打开弹窗
 const openDialog = async (row: any) => {
+	treeRef.value?.setCheckedKeys([]); // 清空选中值
 	state.ruleForm = JSON.parse(JSON.stringify(row));
 	if (JSON.stringify(row) !== '{}') {
 		var res = await getAPI(SysRoleApi).apiSysRoleOwnMenuListGet(row.id);

Web/src/views/system/user/component/editUser.vue

@@ -7,7 +7,7 @@
 					<span>{{ props.title }}</span>
 				</div>
 			</template>
-			<el-tabs v-loading="state.loading">
+			<el-tabs v-loading="state.loading" v-model="state.selectedTabName">
 				<el-tab-pane label="基础信息">
 					<el-form :model="state.ruleForm" ref="ruleFormRef" size="default" label-width="100px">
 						<el-row :gutter="35">
@@ -252,6 +252,7 @@ const ruleFormRef = ref();
 const state = reactive({
 	loading: false,
 	isShowDialog: false,
+	selectedTabName: '0', // 选中的 tab 页
 	ruleForm: {} as UpdateUserInput,
 	posData: [] as Array<SysPos>, // 职位数据
 	roleData: [] as Array<RoleOutput>, // 角色数据
@@ -268,6 +269,7 @@ onMounted(async () => {
 
 // 打开弹窗
 const openDialog = async (row: any) => {
+	state.selectedTabName = '0'; // 重置为第一个 tab 页
 	state.ruleForm = JSON.parse(JSON.stringify(row));
 	if (JSON.stringify(row) !== '{}') {
 		var resRole = await getAPI(SysUserApi).apiSysUserOwnRoleListUserIdGet(row.id);