Merge branch 'master' of https://gitee.com/youlaiorg/vue3-element-admin

src/api/log.ts

@@ -52,6 +52,8 @@ export default LogAPI;
 export interface LogPageQuery extends PageQuery {
   /** 搜索关键字 */
   keywords?: string;
+  /** 操作时间 */
+  createTime?: [string, string];
 }
 
 /**

src/layout/components/Sidebar/components/SidebarMenu.vue

@@ -1,6 +1,7 @@
 <!-- 左侧边菜单：包括左侧布局(left)、顶部布局(all)、混合布局(left) -->
 <template>
   <el-menu
+    ref="menuRef"
     :default-active="currentRoute.path"
     :collapse="!appStore.sidebar.opened"
     :background-color="variables['menu-background']"
@@ -9,6 +10,8 @@
     :unique-opened="false"
     :collapse-transition="false"
     :mode="mode"
+    @open="handleOpen"
+    @close="handleClose"
   >
     <SidebarMenuItem
       v-for="route in menuList"
@@ -25,7 +28,9 @@ import { isExternal } from "@/utils/index";
 import path from "path-browserify";
 import variables from "@/styles/variables.module.scss";
 import { LayoutEnum } from "@/enums/LayoutEnum";
+import type { MenuInstance } from "element-plus";
 
+const menuRef = ref<MenuInstance>();
 const settingsStore = useSettingsStore();
 const appStore = useAppStore();
 const currentRoute = useRoute();
@@ -63,4 +68,22 @@ function resolvePath(routePath: string) {
   const fullPath = path.resolve(props.basePath, routePath);
   return fullPath;
 }
+/**
+ * 修复切换到horizontal时，展开的菜单显示问题，切换时关闭全部菜单
+ */
+const menuIndexArray = ref<string[]>([]);
+const handleOpen = (index: string, keyPath: string[]) => {
+  menuIndexArray.value.push(index);
+};
+const handleClose = (index: string) => {
+  menuIndexArray.value = menuIndexArray.value.filter((item) => item !== index);
+};
+watch(
+  () => mode.value,
+  () => {
+    if (mode.value === "horizontal") {
+      menuIndexArray.value.map((item: string) => menuRef.value!.close(item));
+    }
+  }
+);
 </script>

src/views/system/log/index.vue

@@ -10,12 +10,28 @@
             @keyup.enter="handleQuery"
           />
         </el-form-item>
+        <el-form-item prop="createTime" label="操作时间">
+          <el-date-picker
+            :editable="false"
+            class="!w-[240px]"
+            v-model="queryParams.createTime"
+            type="daterange"
+            range-separator="~"
+            start-placeholder="开始时间"
+            end-placeholder="截止时间"
+            value-format="YYYY-MM-DD"
+          />
+        </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" @click="handleQuery"
+          <el-button type="primary" @click="handleQuery">
-            ><i-ep-search />搜索</el-button
+            <i-ep-search />
-          >
+            搜索
-          <el-button @click="handleResetQuery"><i-ep-refresh />重置</el-button>
+          </el-button>
+          <el-button @click="handleResetQuery">
+            <i-ep-refresh />
+            重置
+          </el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -75,6 +91,7 @@ const queryParams = reactive<LogPageQuery>({
   pageNum: 1,
   pageSize: 10,
   keywords: "",
+  createTime: ["", ""],
 });
 
 // 日志表格数据
@@ -96,6 +113,7 @@ function handleQuery() {
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
+  queryParams.createTime = undefined;
   handleQuery();
 }