调整默认样式以适应深色主题

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -509,7 +509,7 @@
         </member>
         <member name="P:Admin.NET.Core.SysConfig.SysFlag">
             <summary>
-            是否是系统参数（Y-是，N-否）
+            是否是内置参数（Y-是，N-否）
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysConfig.GroupCode">

Admin.NET/Admin.NET.Core/Entity/SysConfig.cs

@@ -28,9 +28,9 @@ public class SysConfig : EntityBase
     public string Value { get; set; }
 
     /// <summary>
-    /// 是否是系统参数（Y-是，N-否）
+    /// 是否是内置参数（Y-是，N-否）
     /// </summary>
-    [SugarColumn(ColumnDescription = "是否是系统参数")]
+    [SugarColumn(ColumnDescription = "是否是内置参数")]
     public YesNoEnum SysFlag { get; set; }
 
     /// <summary>

Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs

@@ -17,7 +17,7 @@ public class SysConfigSeedData : ISqlSugarEntitySeedData<SysConfig>
             new SysConfig{ Id=252885263003801, Name="默认密码", Code="sys_password", Value="123456", SysFlag=YesNoEnum.Y, Remark="默认密码", Order=2, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=252885263003802, Name="Token过期时间", Code="sys_token_expire", Value="10080", SysFlag=YesNoEnum.Y, Remark="Token过期时间", Order=3, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=252885263003803, Name="操作日志", Code="sys_op_log", Value="True", SysFlag=YesNoEnum.Y, Remark="开启操作日志", Order=4, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysConfig{ Id=252885263003804, Name="单用户登录", Code="sys_single_login", Value="True", SysFlag=YesNoEnum.Y, Remark="开启单用户登录", Order=5, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=252885263003804, Name="单点登录", Code="sys_single_login", Value="True", SysFlag=YesNoEnum.Y, Remark="开启单点登录", Order=5, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=252885263003805, Name="验证码", Code="sys_captcha", Value="True", SysFlag=YesNoEnum.Y, Remark="开启验证码", Order=6, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=252885263003806, Name="管理员角色编码", Code="sys_admin_role", Value="True", SysFlag=YesNoEnum.Y, Remark="管理员角色编码", Order=7, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
         };

Web/src/stores/themeConfig.ts

@@ -19,7 +19,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			 * 全局主题
 			 */
 			// 默认 primary 主题颜色
-			primary: '#FF5C00',
+			primary: '#0033CC', // '#FF5C00',
 			// 是否开启深色模式
 			isIsDark: false,
 

Web/src/theme/element.scss

@@ -67,7 +67,7 @@
 ------------------------------- */
 // 鼠标 hover 时颜色
 .el-menu-hover-bg-color {
-	background-color: var(--el-color-primary-light-8) !important;
+	background-color: var(--el-color-primary-light-7) !important;
 	// border-right: solid 3px var(--el-color-primary);
 }
 // 默认样式修改
@@ -263,12 +263,14 @@
 	.el-button.is-text {
 		padding: 0;
 	}
-	// 标题背景色
-	--el-table-header-bg-color: #fafafa;
-	// 标题字体颜色
-	thead{
+	// 表头背景色
+	//--el-table-header-bg-color: var(--el-text-color-secondary);// #fafafa;
+	// 表头字体颜色
+	thead {
 		color: var(--el-text-color-regular);	
-		font-weight: normal;
+		th {
+			font-weight: 600;
+		}
 	}
 }
 // 分页组件靠右显示

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

@@ -33,7 +33,7 @@
 							<el-button icon="ele-Delete" size="small" type="danger" @click="delCache" v-auth="'sysCache:delete'"> 删除缓存 </el-button>
 						</div>
 					</template>
-					<vue-json-pretty :data="cacheValue" showLength showIcon showLineNumber showSelectController style="background-color: #ffffff" />
+					<vue-json-pretty :data="cacheValue" showLength showIcon showLineNumber showSelectController />
 				</el-card>
 			</el-col>
 		</el-row>

Web/src/views/system/config/component/editConfig.vue

@@ -22,7 +22,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="系统参数" prop="sysFlag" :rules="[{ required: true, message: '系统参数不能为空', trigger: 'blur' }]">
+						<el-form-item label="内置参数" prop="sysFlag" :rules="[{ required: true, message: '内置参数不能为空', trigger: 'blur' }]">
 							<el-radio-group v-model="ruleForm.sysFlag" :disabled="ruleForm.sysFlag == 1 && ruleForm.id != undefined">
 								<el-radio :label="1">是</el-radio>
 								<el-radio :label="2">否</el-radio>

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

@@ -22,7 +22,7 @@
 				<el-table-column prop="name" label="配置名称" show-overflow-tooltip />
 				<el-table-column prop="code" label="配置编码" show-overflow-tooltip />
 				<el-table-column prop="value" label="属性值" show-overflow-tooltip />
-				<el-table-column prop="sysFlag" label="平台参数" width="100" align="center" show-overflow-tooltip>
+				<el-table-column prop="sysFlag" label="内置参数" width="100" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag v-if="scope.row.sysFlag === 1"> 是 </el-tag>
 						<el-tag type="danger" v-else> 否 </el-tag>

Web/src/views/system/menu/component/editMenu.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-menu-container">
-		<el-dialog v-model="isShowDialog" :title="title" draggable width="769px">
+		<el-dialog v-model="isShowDialog" :title="title" draggable :close-on-click-modal="false" width="769px">
 			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="80px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">

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

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-role-container">
-		<el-dialog v-model="isShowDialog" :title="title" draggable width="769px">
+		<el-dialog v-model="isShowDialog" :title="title" draggable :close-on-click-modal="false" width="769px">
 			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="80px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">

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

@@ -87,7 +87,7 @@
 				<el-tag round>
 					<div style="display: inline-flex">
 						<div style="">{{ d.name }}</div>
-						<div style="font-size: 9px; color: black; margin-left: 3px">{{ d.version }}</div>
+						<div style="font-size: 9px; margin-left: 3px">{{ d.version }}</div>
 					</div>
 				</el-tag>
 			</div>

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

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-user-container">
-		<el-dialog v-model="isShowDialog" :title="title" draggable width="769px">
+		<el-dialog v-model="isShowDialog" :title="title" draggable :close-on-click-modal="false" width="769px">
 			<el-tabs v-loading="loading">
 				<el-tab-pane label="基础信息">
 					<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="100px">

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

@@ -14,6 +14,7 @@
 				:only-one-node="state.onlyOneNode"
 				:clone-node-drag="state.cloneNodeDrag"
 				:node-draggable="state.nodeDraggable"
+				style="background-color: var(--el-bg-color)"
 			>
 				<template v-slot="{ node }">
 					<div class="tree-org-node__text node-label">
@@ -52,7 +53,7 @@ const state = reactive({
 	cloneNodeDrag: false,
 	nodeDraggable: false,
 	style: {
-		background: '#FF5C00',
+		background: 'var(--el-color-primary)', //'#FF5C00',
 		color: '#FFFFFF',
 	},
 });

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

@@ -114,7 +114,7 @@
 
 		<el-dialog title="电子签名" v-model="signDialogVisible" draggable width="600px">
 			<div style="border: 1px dashed gray; width: 100%; height: 250px">
-				<VueSignaturePad ref="signaturePadRef" :options="signOptions" />
+				<VueSignaturePad ref="signaturePadRef" :options="signOptions" style="background-color: #fff" />
 			</div>
 			<div style="margin-top: 10px">
 				<div style="display: inline">画笔粗细：<el-input-number v-model="signOptions.minWidth" :min="0.5" :max="2.5" :step="0.1" size="small" /></div>
@@ -313,6 +313,7 @@ export default defineComponent({
 	margin-bottom: 10px;
 	width: 100%;
 	height: 150px;
+	background-color: #fff;
 	text-align: center;
 	vertical-align: middle;
 	border: solid 1px var(--el-border-color);