diff --git a/Web/src/api-services/apis/sys-file-api.ts b/Web/src/api-services/apis/sys-file-api.ts index 47226790..ce204532 100644 --- a/Web/src/api-services/apis/sys-file-api.ts +++ b/Web/src/api-services/apis/sys-file-api.ts @@ -20,7 +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 { AdminResultListTreeNode } from '../models'; import { AdminResultSqlSugarPagedListSysFile } from '../models'; import { AdminResultString } from '../models'; import { AdminResultSysFile } from '../models'; @@ -1959,7 +1959,7 @@ export const SysFileApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async apiSysFileFolderGet(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { + async apiSysFileFolderGet(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { const localVarAxiosArgs = await SysFileApiAxiosParamCreator(configuration).apiSysFileFolderGet(options); return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; @@ -2379,7 +2379,7 @@ export const SysFileApiFactory = function (configuration?: Configuration, basePa * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async apiSysFileFolderGet(options?: AxiosRequestConfig): Promise> { + async apiSysFileFolderGet(options?: AxiosRequestConfig): Promise> { return SysFileApiFp(configuration).apiSysFileFolderGet(options).then((request) => request(axios, basePath)); }, /** @@ -2765,7 +2765,7 @@ export class SysFileApi extends BaseAPI { * @throws {RequiredError} * @memberof SysFileApi */ - public async apiSysFileFolderGet(options?: AxiosRequestConfig) : Promise> { + public async apiSysFileFolderGet(options?: AxiosRequestConfig) : Promise> { return SysFileApiFp(this.configuration).apiSysFileFolderGet(options).then((request) => request(this.axios, this.basePath)); } /** diff --git a/Web/src/api-services/models/admin-result-list-tree-node.ts b/Web/src/api-services/models/admin-result-list-tree-node.ts new file mode 100644 index 00000000..40c10c42 --- /dev/null +++ b/Web/src/api-services/models/admin-result-list-tree-node.ts @@ -0,0 +1,71 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { TreeNode } from './tree-node'; + /** + * 全局返回结果 + * + * @export + * @interface AdminResultListTreeNode + */ +export interface AdminResultListTreeNode { + + /** + * 状态码 + * + * @type {number} + * @memberof AdminResultListTreeNode + */ + code?: number; + + /** + * 类型success、warning、error + * + * @type {string} + * @memberof AdminResultListTreeNode + */ + type?: string | null; + + /** + * 错误信息 + * + * @type {string} + * @memberof AdminResultListTreeNode + */ + message?: string | null; + + /** + * 数据 + * + * @type {Array} + * @memberof AdminResultListTreeNode + */ + result?: Array | null; + + /** + * 附加数据 + * + * @type {any} + * @memberof AdminResultListTreeNode + */ + extras?: any | null; + + /** + * 时间 + * + * @type {Date} + * @memberof AdminResultListTreeNode + */ + time?: Date; +} diff --git a/Web/src/api-services/models/index.ts b/Web/src/api-services/models/index.ts index 670c1c82..d1760dd8 100644 --- a/Web/src/api-services/models/index.ts +++ b/Web/src/api-services/models/index.ts @@ -68,6 +68,7 @@ export * from './admin-result-list-sys-user'; export * from './admin-result-list-sys-user-ext-org'; export * from './admin-result-list-sys-wechat-refund'; export * from './admin-result-list-table-output'; +export * from './admin-result-list-tree-node'; export * from './admin-result-login-output'; export * from './admin-result-login-user-output'; export * from './admin-result-object'; @@ -389,6 +390,7 @@ export * from './tenant-type-enum'; export * from './tenant-user-input'; export * from './text-info'; export * from './tianditu-input'; +export * from './tree-node'; export * from './trigger-status'; export * from './type'; export * from './type-attributes'; diff --git a/Web/src/api-services/models/sys-region.ts b/Web/src/api-services/models/sys-region.ts index 87f69beb..7980f636 100644 --- a/Web/src/api-services/models/sys-region.ts +++ b/Web/src/api-services/models/sys-region.ts @@ -29,14 +29,6 @@ export interface SysRegion { */ id?: number; - /** - * 名称 - * - * @type {string} - * @memberof SysRegion - */ - name: string; - /** * 父Id * @@ -45,6 +37,14 @@ export interface SysRegion { */ pid?: number; + /** + * 名称 + * + * @type {string} + * @memberof SysRegion + */ + name: string; + /** * 简称 * diff --git a/Web/src/api-services/models/sys-schedule.ts b/Web/src/api-services/models/sys-schedule.ts index 1e2474fd..be23b7fd 100644 --- a/Web/src/api-services/models/sys-schedule.ts +++ b/Web/src/api-services/models/sys-schedule.ts @@ -93,14 +93,6 @@ export interface SysSchedule { */ tenantId?: number | null; - /** - * 日程内容 - * - * @type {string} - * @memberof SysSchedule - */ - content: string; - /** * 用户Id * @@ -133,6 +125,14 @@ export interface SysSchedule { */ endTime?: string | null; + /** + * 日程内容 + * + * @type {string} + * @memberof SysSchedule + */ + content: string; + /** * @type {FinishStatusEnum} * @memberof SysSchedule diff --git a/Web/src/api-services/models/tree-node.ts b/Web/src/api-services/models/tree-node.ts new file mode 100644 index 00000000..fc72f011 --- /dev/null +++ b/Web/src/api-services/models/tree-node.ts @@ -0,0 +1,47 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { TreeNode } from './tree-node'; + /** + * 树形节点 + * + * @export + * @interface TreeNode + */ +export interface TreeNode { + + /** + * @type {number} + * @memberof TreeNode + */ + id?: number; + + /** + * @type {number} + * @memberof TreeNode + */ + pid?: number; + + /** + * @type {string} + * @memberof TreeNode + */ + name?: string | null; + + /** + * @type {Array} + * @memberof TreeNode + */ + children?: Array | null; +} diff --git a/Web/src/views/system/file/component/folderTree.vue b/Web/src/views/system/file/component/folderTree.vue index 36c79149..a8c9af93 100644 --- a/Web/src/views/system/file/component/folderTree.vue +++ b/Web/src/views/system/file/component/folderTree.vue @@ -60,6 +60,7 @@ import { Search, MoreFilled } from '@element-plus/icons-vue'; import { getAPI } from '/@/utils/axios-utils'; import { SysFileApi } from '/@/api-services/api'; +import { TreeNode } from '/@/api-services/models'; import { TreeKey } from 'element-plus/es/components/tree/src/tree.type'; const props = defineProps({ @@ -70,7 +71,7 @@ const filterText = ref(''); const treeRef = ref>(); const state = reactive({ loading: false, - folderData: [] as any, + folderData: [] as Array, isShowCheckbox: false, strictly: false, });