feat(File): 在文件分页查询中添加文件路径筛选

- 在 PageFileInput 类中新增 FilePath 属性，用于筛选文件路径
- 这个改动允许用户在分页查询时根据文件路径进行筛选，提高了文件查询的灵活性和效率

Admin.NET/Admin.NET.Core/Service/File/Dto/FileInput.cs

@@ -16,6 +16,11 @@ public class PageFileInput : BasePageInput
     /// </summary>
     public string FileName { get; set; }
 
+    /// <summary>
+    /// 文件路径
+    /// </summary>
+    public string FilePath { get; set; }
+
     /// <summary>
     /// 文件后缀
     /// </summary>

Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs

@@ -51,6 +51,7 @@ public class SysFileService : IDynamicApiController, ITransient
         // 合并公开和私有附件并分页
         return await _sysFileRep.Context.UnionAll(publicList, privateList)
             .WhereIF(!string.IsNullOrWhiteSpace(input.FileName), u => u.FileName.Contains(input.FileName.Trim()))
+            .WhereIF(!string.IsNullOrWhiteSpace(input.FilePath), u => u.FilePath.Contains(input.FilePath.Trim()))
             .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
                 u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime)
             .OrderBy(u => u.CreateTime, OrderByType.Desc)
@@ -273,6 +274,7 @@ public class SysFileService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="id"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "File"), HttpGet]
     [DisplayName("获取文件")]
     public async Task<SysFile> GetFile([FromQuery] long id)
     {
@@ -280,6 +282,36 @@ public class SysFileService : IDynamicApiController, ITransient
         return file ?? throw Oops.Oh(ErrorCodeEnum.D8000);
     }
 
+    /// <summary>
+    /// 获取文件路径 🔖
+    /// </summary>
+    /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Folder"), HttpGet]
+    [DisplayName("获取文件路径")]
+    public async Task<dynamic> GetFolder()
+    {
+        var files = await _sysFileRep.AsQueryable().ToListAsync();
+        var folders = files.GroupBy(x => x.FilePath).Select(g => g.First().FilePath).ToList();
+        var result = folders
+            .GroupBy(p => p.Split('/').First())
+            .Select((g, index) => new
+            {
+                id = index + 1, // 组的索引加1作为id
+                pid = 0,
+                name = g.Key,
+                children = g.Select((item, subIndex) => new
+                {
+                    id = (index + 1 * 100) + subIndex + 1, // 子项的索引加1作为id
+                    pid = index + 1,
+                    name = item.Split('/').Last(),
+                    children = new List<string>()
+                })
+                .ToList()
+            })
+            .ToList();
+        return result;
+    }
+
     /// <summary>
     /// 上传文件 🔖
     /// </summary>

Web/src/api-services/apis/sys-file-api.ts

@@ -20,6 +20,7 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr
 import { AccountTypeEnum } from '../models';
 import { AdminResultIActionResult } from '../models';
 import { AdminResultListSysFile } from '../models';
+import { AdminResultObject } from '../models';
 import { AdminResultSqlSugarPagedListSysFile } from '../models';
 import { AdminResultString } from '../models';
 import { AdminResultSysFile } from '../models';
@@ -231,6 +232,49 @@ export const SysFileApiAxiosParamCreator = function (configuration?: Configurati
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 获取文件路径 🔖
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysFileFolderGet: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysFile/folder`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary 获取文件分页列表 🔖
@@ -1909,6 +1953,19 @@ export const SysFileApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * 
+         * @summary 获取文件路径 🔖
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysFileFolderGet(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
+            const localVarAxiosArgs = await SysFileApiAxiosParamCreator(configuration).apiSysFileFolderGet(options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 获取文件分页列表 🔖
@@ -2316,6 +2373,15 @@ export const SysFileApiFactory = function (configuration?: Configuration, basePa
         async apiSysFileFileGet(id?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysFile>> {
             return SysFileApiFp(configuration).apiSysFileFileGet(id, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary 获取文件路径 🔖
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysFileFolderGet(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
+            return SysFileApiFp(configuration).apiSysFileFolderGet(options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 获取文件分页列表 🔖
@@ -2692,6 +2758,16 @@ export class SysFileApi extends BaseAPI {
     public async apiSysFileFileGet(id?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysFile>> {
         return SysFileApiFp(this.configuration).apiSysFileFileGet(id, options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * 
+     * @summary 获取文件路径 🔖
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysFileApi
+     */
+    public async apiSysFileFolderGet(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
+        return SysFileApiFp(this.configuration).apiSysFileFolderGet(options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 获取文件分页列表 🔖

Web/src/api-services/models/page-file-input.ts

@@ -90,6 +90,14 @@ export interface PageFileInput {
      */
     fileName?: string | null;
 
+    /**
+     * 文件路径
+     *
+     * @type {string}
+     * @memberof PageFileInput
+     */
+    filePath?: string | null;
+    
     /**
      * 文件后缀
      *

Web/src/views/system/file/component/folderTree.vue

@@ -0,0 +1,148 @@
+<template lang="">
+	<el-card class="box-card" shadow="hover" body-style="height:100%; overflow:auto;padding:5px;">
+        <template #header>
+			<div class="card-header">
+				<div class="tree-h-flex">
+					<div class="tree-h-left">
+						<el-input :prefix-icon="Search" v-model="filterText" placeholder="文件夹名称" />
+					</div>
+					<div class="tree-h-right">
+						<el-dropdown @command="handleCommand">
+							<el-button style="margin-left: 8px; width: 34px">
+								<el-icon class="el-icon--center">
+									<MoreFilled />
+								</el-icon>
+							</el-button>
+							<template #dropdown>
+								<el-dropdown-menu>
+									<el-dropdown-item command="expandAll">全部展开</el-dropdown-item>
+									<el-dropdown-item command="collapseAll">全部折叠</el-dropdown-item>
+									<el-dropdown-item command="rootNode">根节点</el-dropdown-item>
+									<el-dropdown-item command="refresh">刷新</el-dropdown-item>
+								</el-dropdown-menu>
+							</template>
+						</el-dropdown>
+					</div>
+				</div>
+			</div>
+		</template>
+		<div style="margin-bottom: 45px" v-loading="state.loading">
+			<el-tree
+				ref="treeRef"
+				class="filter-tree"
+				:data="state.folderData"
+				node-key="id"
+				:props="{ children: 'children', label: 'name' }"
+				:filter-node-method="filterNode"
+				@node-click="nodeClick"
+				highlight-current
+				check-strictly
+				accordion
+				lazy
+				:load="loadNode"
+			/>
+		</div>
+    </el-card>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, reactive, ref, watch } from 'vue';
+import type { ElTree } from 'element-plus';
+import { Search, MoreFilled } from '@element-plus/icons-vue';
+
+import { getAPI } from '/@/utils/axios-utils';
+import { SysFileApi } from '/@/api-services/api';
+
+const filterText = ref('');
+const treeRef = ref<InstanceType<typeof ElTree>>();
+const state = reactive({
+	loading: false,
+	folderData: [] as any,
+});
+
+onMounted(() => {
+	initTreeData();
+});
+
+watch(filterText, (val) => {
+	treeRef.value!.filter(val);
+});
+
+const initTreeData = async () => {
+	state.loading = true;
+	var res = await getAPI(SysFileApi).apiSysFileFolderGet();
+	state.folderData = res.data.result ?? [];
+	state.loading = false;
+};
+
+const loadNode = async (node: any, resolve: any) => {
+	console.log(node);
+	if (node.data == undefined || Array.isArray(node.data)) return;
+	state.loading = true;
+	var data = state.folderData.find(u => u.id == node.data.id);
+	state.loading = false;
+	console.log(data);
+	if (data)
+		resolve(data.children);
+	else
+		resolve([]);
+};
+
+// 获取已经选择
+const getCheckedKeys = () => {
+	return treeRef.value!.getCheckedKeys();
+};
+
+const filterNode = (value: string, data: any) => {
+	if (!value) return true;
+	return data.name.includes(value);
+};
+
+const handleCommand = async (command: string | number | object) => {
+	if ('expandAll' == command) {
+		for (let i = 0; i < treeRef.value!.store._getAllNodes().length; i++) {
+			treeRef.value!.store._getAllNodes()[i].expanded = true;
+		}
+	} else if ('collapseAll' == command) {
+		for (let i = 0; i < treeRef.value!.store._getAllNodes().length; i++) {
+			treeRef.value!.store._getAllNodes()[i].expanded = false;
+		}
+	} else if ('refresh' == command) {
+		initTreeData();
+	} else if ('rootNode' == command) {
+		emits('node-click', { id: 0, name: '' });
+	}
+};
+
+// 与父组件的交互逻辑
+const emits = defineEmits(['node-click']);
+
+const nodeClick = (node: any) => {
+	emits('node-click', { id: node.id, name: node.name });
+};
+
+// 导出对象
+defineExpose({ initTreeData, getCheckedKeys });
+</script>
+
+<style lang="scss" scoped>
+.box-card {
+	flex: 1;
+	> :deep(.el-card__header) {
+		padding: 5px;
+	}
+}
+.tree-h-flex {
+	display: flex;
+}
+
+.tree-h-left {
+	flex: 1;
+	width: 100%;
+}
+
+.tree-h-right {
+	width: 42px;
+	min-width: 42px;
+}
+</style>

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

@@ -1,5 +1,11 @@
 <template>
 	<div class="sys-file-container">
+		<splitpanes class="default-theme">
+			<pane size="20" style="display: flex">
+				<FolderTree ref="folderTreeRef" @node-click="handleNodeChange" />
+			</pane>
+
+			<pane size="80" style="display: flex; flex-direction: column">
 				<el-card shadow="hover" :body-style="{ padding: '5px 5px 0 5px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
 					<el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true" label-width="auto" style="flex: 1 1 0%">
 						<el-row :gutter="10">
@@ -114,6 +120,8 @@
 						</span>
 					</template>
 				</el-dialog>
+			</pane>
+		</splitpanes>
 
 		<el-drawer :title="state.fileName" v-model="state.docxVisible" size="70%" destroy-on-close>
 			<vue-office-docx :src="state.docxUrl" style="height: calc(100vh - 37px)" @rendered="handleRendered" @error="handleError" />
@@ -135,13 +143,19 @@ import { ElMessageBox, ElMessage, UploadInstance } from 'element-plus';
 import { VxeGridInstance, VxeGridListeners, VxeGridPropTypes } from 'vxe-table';
 import { useVxeTable } from '/@/hooks/useVxeTableOptionsHook';
 import { Local } from '/@/utils/storage';
+
+import { Splitpanes, Pane } from 'splitpanes';
+import 'splitpanes/dist/splitpanes.css';
+
 import { downloadByUrl } from '/@/utils/download';
+
 import VueOfficeDocx from '@vue-office/docx';
 import VueOfficeExcel from '@vue-office/excel';
 import VueOfficePdf from '@vue-office/pdf';
 import '@vue-office/docx/lib/index.css';
 import '@vue-office/excel/lib/index.css';
 
+import FolderTree from '/@/views/system/file/component/folderTree.vue';
 import EditFile from '/@/views/system/file/component/editFile.vue';
 
 import { getAPI } from '/@/utils/axios-utils';
@@ -152,9 +166,12 @@ const xGrid = ref<VxeGridInstance>();
 // const baseUrl = window.__env__.VITE_API_URL;
 const uploadRef = ref<UploadInstance>();
 const editRef = ref<InstanceType<typeof EditFile>>();
+const folderTreeRef = ref<InstanceType<typeof FolderTree>>();
+
 const state = reactive({
 	queryParams: {
 		fileName: undefined,
+		filePath: undefined,
 		startTime: undefined,
 		endTime: undefined,
 	},
@@ -239,6 +256,7 @@ const handleQuery = async (reset = false) => {
 // 重置操作
 const resetQuery = async () => {
 	state.queryParams.fileName = undefined;
+	state.queryParams.filePath = undefined;
 	state.queryParams.startTime = undefined;
 	state.queryParams.endTime = undefined;
 	await xGrid.value?.commitProxy('reload');
@@ -301,6 +319,15 @@ const gridEvents: VxeGridListeners<SysFile> = {
 	},
 };
 
+// 树组件点击
+const handleNodeChange = async (node: any) => {
+	state.queryParams.fileName = undefined;
+	state.queryParams.filePath = node.name;
+	state.queryParams.startTime = undefined;
+	state.queryParams.endTime = undefined;
+	await handleQuery();
+};
+
 // 打开Pdf预览页面
 const showPreviewDialog = async (row: any) => {
 	if (row.suffix == '.pdf') {