😁优化在线用户页面、优化代码生成枚举命名、注释重复注册的拖动指令

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm

@@ -59,7 +59,7 @@
             }else if(@column.EffectType == "EnumSelector"){
             @:<el-form-item label="@column.ColumnComment">
               @:<el-select clearable="" v-model="queryParams.@(@column.LowerPropertyName)" placeholder="请选择@(@column.ColumnComment)">
-                @:<el-option v-for="(item,index) in getEnum@(@column.PropertyName)Data" :key="index" :value="item.value" :label="`[${item.value}] ${item.describe}`" />
+                @:<el-option v-for="(item,index) in getEnum@(@column.PropertyName)Data_Index" :key="index" :value="item.value" :label="`[${item.value}] ${item.describe}`" />
                 @:
               </el-select>
               @:
@@ -151,7 +151,7 @@
         else if(@column.EffectType == "EnumSelector"){
           @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" width="@(column.ColumnComment!=null && column.ColumnComment.Length > 5 ? column.ColumnComment.Length * 15 : 140)" show-overflow-tooltip="" >
             @:<template #default="scope">
-              @:<el-tag>{{ getEnumDesc(scope.row.@column.LowerPropertyName, getEnum@(@column.PropertyName)Data)}}</el-tag>
+              @:<el-tag>{{ getEnumDesc(scope.row.@column.LowerPropertyName, getEnum@(@column.PropertyName)Data_Index)}}</el-tag>
             @:</template>
           @:</el-table-column>
         }
@@ -212,7 +212,7 @@
 
   @foreach (var column in Model.QueryWhetherList){
   if(@column.EffectType == "EnumSelector"){
-  @:const getEnum@(@column.PropertyName)Data = ref<any>([]);
+  @:const getEnum@(@column.PropertyName)Data_Index = ref<any>([]);
   }
   }
 
@@ -250,7 +250,7 @@
     loading.value = false;
   @foreach (var column in Model.QueryWhetherList){
   if(@column.EffectType == "EnumSelector"){
-    @:getEnum@(@column.PropertyName)Data.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('@(@column.DictTypeCode)')).data.result ?? [];
+    @:getEnum@(@column.PropertyName)Data_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('@(@column.DictTypeCode)')).data.result ?? [];
   }
   }
   };

Web/src/directive/index.ts

@@ -14,8 +14,8 @@ export function directive(app: App) {
 	authDirective(app);
 	// 按钮波浪指令
 	wavesDirective(app);
-	// 自定义拖动指令
-	dragDirective(app);
+	// // 自定义拖动指令
+	// dragDirective(app);
 	// 重复按钮提交指令
 	reclickDirective(app);
 }

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

@@ -1,14 +1,14 @@
 <template>
 	<div class="sys-onlineUser-container">
-		<el-drawer v-model="state.isVisible" title="在线用户列表" size="40%">
+		<el-drawer v-model="state.isVisible" title="在线用户列表" size="45%">
 			<el-card shadow="hover" :body-style="{ paddingBottom: '0' }" style="margin: 8px">
 				<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-					<el-form-item label="账号名称" prop="userName">
-						<el-input placeholder="账号名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.userName" />
+					<el-form-item label="账号" prop="userName">
+						<el-input placeholder="账号" clearable @keyup.enter="handleQuery" v-model="state.queryParams.userName" />
+					</el-form-item>
+					<el-form-item label="姓名" prop="realName">
+						<el-input placeholder="姓名" clearable @keyup.enter="handleQuery" v-model="state.queryParams.realName" />
 					</el-form-item>
-					<!-- <el-form-item label="真实姓名" prop="realName">
-						<el-input placeholder="账号名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.realName" />
-					</el-form-item> -->
 					<el-form-item>
 						<el-button-group>
 							<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
@@ -21,15 +21,15 @@
 			<el-card shadow="hover" style="margin: 8px; padding-bottom: 15px">
 				<el-table :data="state.onlineUserList" style="width: 100%" v-loading="state.loading" border>
 					<el-table-column type="index" label="序号" width="55" align="center" />
-					<el-table-column prop="userName" label="账号" show-overflow-tooltip />
-					<el-table-column prop="realName" label="姓名" show-overflow-tooltip />
-					<el-table-column prop="ip" label="IP地址" show-overflow-tooltip />
-					<el-table-column prop="browser" label="浏览器" show-overflow-tooltip />
+					<el-table-column prop="userName" label="账号" header-align="center" show-overflow-tooltip />
+					<el-table-column prop="realName" label="姓名" header-align="center" show-overflow-tooltip />
+					<el-table-column prop="ip" label="IP地址" header-align="center" show-overflow-tooltip />
+					<el-table-column prop="browser" label="浏览器" header-align="center" show-overflow-tooltip />
 					<!-- <el-table-column prop="connectionId" label="连接Id" show-overflow-tooltip></el-table-column> -->
-					<el-table-column prop="time" label="登录时间" show-overflow-tooltip />
+					<el-table-column prop="time" label="登录时间" minWidth="120" header-align="center" show-overflow-tooltip />
 					<el-table-column label="操作" width="81" fixed="right" align="center" show-overflow-tooltip>
 						<template #default="scope">
-							<el-button icon="ele-CircleClose" size="small" text type="danger" v-auth="'sysOnlineUser:forceOffline'" @click="forceOffline(scope.row)"> 下线 </el-button>
+							<el-button icon="ele-CircleCloseFilled" size="small" text type="danger" v-auth="'sysOnlineUser:forceOffline'" @click="forceOffline(scope.row)"> 下线 </el-button>
 						</template>
 					</el-table-column>
 				</el-table>