Merge remote-tracking branch 'origin/zhuo_dev' into leng_dev

# Conflicts:
#	src/views/gen/table/preview.vue

src/theme/element.scss

@@ -308,6 +308,12 @@
 	padding: 15px 20px;
 }
 
+// 日历
+.el-calendar-table .el-calendar-day {
+	height: 50px;
+	padding: 0;
+}
+
 /* Table 表格 element plus 2.2.0 版本
 ------------------------------- */
 // 表格修改默认颜色

src/views/gen/table/preview.vue

@@ -21,6 +21,7 @@
 						:name="item.codePath"
 						:key="item.codePath"
 					>
+						<el-button style="position: absolute; top: 10px; right: 20px; z-index: 9" type="primary" @click="copyText(item.code)">复制代码</el-button>
 						<el-scrollbar height="calc(100vh - 300px)">
 							<highlightjs autodetect :code="item.code" />
 						</el-scrollbar>
@@ -33,6 +34,9 @@
 <script setup lang="ts" name="preview">
 import { useGeneratorPreviewApi } from '/@/api/gen/table';
 import { handleTree } from '/@/utils/other';
+import commonFunction from '/@/utils/commonFunction';
+
+const { copyText } = commonFunction();
 
 const visible = ref(false);
 // ======== 显示页面 ========

src/views/home/favorite.vue

@@ -6,8 +6,10 @@
 			</div>
 		</template>
 		<el-row :gutter="10" v-if="favoriteRoutes.length > 0">
-			<el-col :span="6" :key="shortcut.id" v-for="shortcut in favoriteRoutes">
+			<el-col class="shortcutCard" :span="6" :key="shortcut.id" v-for="(shortcut, index) in favoriteRoutes">
+				<div class="shortcutCardClose" @click="handleCloseFavorite(shortcut)">×</div>
 				<shortcutCard :icon="shortcut.meta?.icon" :label="shortcut.name" @click="handleRoute(shortcut.path)" />
+				<!-- <el-icon v-if="index == currentIndex"><CircleCloseFilled /></el-icon> -->
 			</el-col>
 		</el-row>
 		<el-empty :description="$t('home.addFavoriteRoutesTip')" v-else />
@@ -44,4 +46,31 @@ const handleRoute = (path: string) => {
 const handleCloseFavorite = (item: any) => {
 	storesTagsViewRoutes.delFavoriteRoutes(item); // 从收藏路由列表中删除指定路由
 };
+
+/*  */
+let currentIndex = ref();
+
+/*  */
+const handleShowCloseBtn = (item: any, index: any) => {
+	currentIndex.value = index;
+};
+/*  */
+const handleHideCloseBtn = () => {
+	currentIndex.value = null;
+};
 </script>
+
+<style lang="scss" scoped>
+.shortcutCard {
+	position: relative;
+	.shortcutCardClose {
+		position: absolute;
+		top: 0;
+		right: 50%;
+		font-weight: 700;
+		font-size: 20px;
+		cursor: pointer;
+		color: #6d6b6b;
+	}
+}
+</style>

src/views/home/schedule/calendar.vue

@@ -1,4 +1,6 @@
 <template>
+	<el-card class="box-card" style="height: 100%; overflow: auto">
+		<template #header> 日程 </template>
 		<el-calendar v-model="calendar">
 			<template #date-cell="{ data }">
 				<div class="calendar-cell" @click="handleSchedule(data)">
@@ -7,6 +9,7 @@
 				</div>
 			</template>
 		</el-calendar>
+	</el-card>
 
 	<!-- 新增日程的表单 -->
 	<schedule-form ref="scheduleFormRef" @refresh="initscheduleList(formatDate(calendar, 'YYYY-mm'))" />