Prechádzať zdrojové kódy

优化 1.避免表格行高在单行时被按钮、tag等撑高,使视觉更协调; 2.右上角的通知消息弹出

夜鹰 7 mesiacov pred
rodič
commit
4099f0bc05

+ 18 - 12
Web/src/layout/navBars/topBar/userNews.vue

@@ -12,10 +12,10 @@
 							<div class="notice-title">{{ v.type == 1 ? '【通知】' : '【公告】' }}{{ v.title }}</div>
 							<div class="notice-content">{{ removeHtmlSub(v.content) }}</div>
 							<div class="notice-time">{{ v.publicTime }}</div>
-							<el-divider border-style="dashed" style="margin: 10px 0" />
+							<!-- <el-divider border-style="dashed" style="margin: 0" /> -->
 						</div>
 					</template>
-					<el-empty description="空" v-else></el-empty>
+					<el-empty description="没有新消息" v-else style="height: 85%;"></el-empty>
 				</div>
 				<div class="notice-foot" @click="goToNotice" v-if="noticeList.length > 0">前往通知中心</div>
 			</el-tab-pane>
@@ -24,8 +24,8 @@
 					<el-icon><ele-Position /></el-icon>
 					<span style="margin-left: 5px">我的</span>
 				</template>
-				<div style="height: 400px; overflow-y: auto; padding-right: 10px">
-					<el-empty description=""></el-empty>
+				<div class="notice-box" style="height: 435px;">
+					<el-empty description="没有新消息" style="height: 85%;"></el-empty>
 				</div>
 			</el-tab-pane>
 		</el-tabs>
@@ -86,14 +86,13 @@ const viewNoticeDetail = async (notice: any) => {
 		font-size: 12px;
 		.notice-box {
 			height: 400px;
-			padding-right: 10px;
-
-			margin-bottom: 35px;
-			&:hover {
-				overflow-y: scroll;
-			}
+			padding: 0 5px;
+            overflow-y: auto;
 		}
 		.notice-item {
+            padding: 10px 0;
+            border-bottom: 1px dashed var(--el-border-color);
+
 			&:hover {
 				background-color: rgba(#b8b8b8, 0.1);
 			}
@@ -117,12 +116,19 @@ const viewNoticeDetail = async (notice: any) => {
 		color: var(--el-color-primary);
 		font-size: 14px;
 		cursor: pointer;
-		position: absolute;
-		bottom: 0px;
 		background-color: #fff;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
 }
+.el-tabs {
+    :deep(.el-tabs__header) {
+        margin: 0;
+    }
+    .el-tab-pane {
+        display: flex;
+        flex-direction: column;
+    }
+}
 </style>

+ 11 - 0
Web/src/stores/themeConfig.ts

@@ -152,6 +152,17 @@ export const useThemeConfig = defineStore('themeConfig', {
 			icp: '',
 			// Icp地址
 			icpUrl: '',
+
+			// 是否开启二级验证
+			secondVer: false,
+			// 是否开启注册功能
+			registration: false,
+			// 登录时隐藏租户
+			hideTenantForLogin: false,
+			// 是否开启验证码
+			captcha: false,
+			// 是否加载完成
+			isLoaded: false,
 		},
 	}),
 	actions: {

+ 35 - 0
Web/src/theme/element.scss

@@ -2,6 +2,9 @@
 
 /* Button 按钮
 ------------------------------- */
+.el-button {
+    font-family: var(--el-font-family);
+}
 // 第三方字体图标大小
 .el-button:not(.is-circle) i.el-icon,
 .el-button i.iconfont,
@@ -509,6 +512,38 @@
     --el-tree-node-content-height: 30px;
 }
 
+.el-table .el-table__cell {
+    &:has(.cell .el-button, .el-tag, .el-switch, .el-avatar) {
+        padding: 0;
+        .cell { text-overflow: clip; }
+    }
+
+    .el-button.is-text {
+        height: 20px;
+    }
+
+    .el-text--large {
+        font-size: var(--el-font-size-base);;
+    }
+    .el-button--large {
+        --el-button-size: 32px;
+    }
+    .el-tag--large {
+        height: 28px;
+    }
+    .el-button--default {
+        height: 28px;
+    }
+    .el-button [class*=el-icon]+span{
+        margin-left: 0;
+    }
+}
+.el-table [class*=el-table__row--level] .el-table__expand-icon {
+    height: 14px;
+    line-height: 14px;
+    width: 14px;
+}
+
 $--el-table-text-color: #fb6d49;
 
 // hack列表页

+ 2 - 2
Web/src/views/system/org/index.vue

@@ -42,7 +42,7 @@
                             </template>
                         </el-table-column>
                         <el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
-                        <el-table-column label="状态" width="70" align="center" show-overflow-tooltip>
+                        <el-table-column label="状态" width="70" align="center">
                             <template #default="scope">
                                 <g-sys-dict v-model="scope.row.status" code="StatusEnum" />
                             </template>
@@ -52,7 +52,7 @@
                                 <ModifyRecord :data="scope.row" />
                             </template>
                         </el-table-column>
-                        <el-table-column label="操作" width="210" fixed="right" align="center" show-overflow-tooltip>
+                        <el-table-column label="操作" width="210" fixed="right" align="center">
                             <template #default="scope">
                                 <el-button icon="ele-Edit" text type="primary" @click="openEditOrg(scope.row)"
                                     v-auth="'sysOrg:update'"> 编辑 </el-button>