diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index 93cce6fe..e6f6cb00 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -17,7 +17,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/Admin.NET/Admin.NET.Core/Entity/SysFile.cs b/Admin.NET/Admin.NET.Core/Entity/SysFile.cs index aec7f774..9121cb2c 100644 --- a/Admin.NET/Admin.NET.Core/Entity/SysFile.cs +++ b/Admin.NET/Admin.NET.Core/Entity/SysFile.cs @@ -104,8 +104,8 @@ public partial class SysFile : EntityBaseData /// /// 是否公开 - /// 如果设置true，所有人都可以查看，默认只有自己或有权限的人可以查看 + /// 若为true则所有人都可以查看，默认只有自己或有权限的可以查看 /// - [SugarColumn(ColumnDescription = "是否公开", DefaultValue = "false")] + [SugarColumn(ColumnDescription = "是否公开")] public bool IsPublic { get; set; } = false; } \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs b/Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs index bea23d1b..2fbac9d2 100644 --- a/Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs +++ b/Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs @@ -74,7 +74,6 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData new SysMenu{ Id=1310000000174, Pid=1310000000171, Title="增加", Permission="sysNotice/add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, new SysMenu{ Id=1310000000175, Pid=1310000000171, Title="删除", Permission="sysNotice/delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, new SysMenu{ Id=1310000000176, Pid=1310000000171, Title="发布", Permission="sysNotice/public", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, - new SysMenu{ Id=1310000000177, Pid=1310000000171, Title="撤回", Permission="sysNotice/cancel", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, new SysMenu{ Id=1310000000181, Pid=1310000000101, Title="三方账号", Path="/system/oAuthUser", Name="sysOAuthUser", Component="/system/oAuthUser/index",Icon="ele-ChatDotRound", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=160 }, new SysMenu{ Id=1310000000182, Pid=1310000000181, Title="查询", Permission="sysOAuthUser/page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, diff --git a/Admin.NET/Admin.NET.Core/Service/File/Dto/FileInput.cs b/Admin.NET/Admin.NET.Core/Service/File/Dto/FileInput.cs index 93933b7f..27224c3c 100644 --- a/Admin.NET/Admin.NET.Core/Service/File/Dto/FileInput.cs +++ b/Admin.NET/Admin.NET.Core/Service/File/Dto/FileInput.cs @@ -20,7 +20,7 @@ public class FileInput : BaseIdInput /// /// 是否公开 - /// 如果设置true，所有人都可以查看，默认只有自己或有权限的人可以查看 + /// 若为true则所有人都可以查看，默认只有自己或有权限的可以查看 /// public bool IsPublic { get; set; } diff --git a/Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs b/Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs index ddb028f1..a18eafbe 100644 --- a/Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs +++ b/Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs @@ -44,16 +44,17 @@ public class SysFileService : IDynamicApiController, ITransient [DisplayName("获取文件分页列表")] public async Task> Page(PageFileInput input) { - //获取所有公开附件 + // 获取所有公开附件 var publicList = _sysFileRep.AsQueryable().ClearFilter().Where(u => u.IsPublic == true); - //获取私有附件 + // 获取私有附件 var privateList = _sysFileRep.AsQueryable().Where(u => u.IsPublic == false); - //合并公开和私有附件并分页 - return await _sysFileRep.Context.UnionAll(publicList, privateList).WhereIF(!string.IsNullOrWhiteSpace(input.FileName), u => u.FileName.Contains(input.FileName.Trim())) - .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()), + // 合并公开和私有附件并分页 + return await _sysFileRep.Context.UnionAll(publicList, privateList) + .WhereIF(!string.IsNullOrWhiteSpace(input.FileName), u => u.FileName.Contains(input.FileName.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) - .ToPagedListAsync(input.Page, input.PageSize); + .OrderBy(u => u.CreateTime, OrderByType.Desc) + .ToPagedListAsync(input.Page, input.PageSize); } /// diff --git a/Admin.NET/Admin.NET.Core/Service/Notice/SysNoticeService.cs b/Admin.NET/Admin.NET.Core/Service/Notice/SysNoticeService.cs index c5896ba2..fe38d7aa 100644 --- a/Admin.NET/Admin.NET.Core/Service/Notice/SysNoticeService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Notice/SysNoticeService.cs @@ -141,7 +141,7 @@ public class SysNoticeService : IDynamicApiController, ITransient /// /// [DisplayName("获取接收的通知公告")] - public async Task> GetPageReceived([FromQuery] PageNoticeInput input) + public async Task> PageReceived(PageNoticeInput input) { return await _sysNoticeUserRep.AsQueryable().Includes(u => u.SysNotice) .Where(u => u.UserId == _userManager.UserId) diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/upload/logo.png b/Admin.NET/Admin.NET.Web.Entry/wwwroot/upload/logo.png index 5de6838f..ffb58195 100644 Binary files a/Admin.NET/Admin.NET.Web.Entry/wwwroot/upload/logo.png and b/Admin.NET/Admin.NET.Web.Entry/wwwroot/upload/logo.png differ diff --git a/Web/package.json b/Web/package.json index 338a202f..40462259 100644 --- a/Web/package.json +++ b/Web/package.json @@ -2,7 +2,7 @@ "name": "admin.net.pro", "type": "module", "version": "2.4.33", - "lastBuildTime": "2024.08.10", + "lastBuildTime": "2024.08.14", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "author": "zuohuaijun", "license": "MIT", @@ -75,7 +75,7 @@ "vue-router": "^4.4.3", "vue-signature-pad": "^3.0.2", "vue3-tree-org": "^4.2.2", - "vxe-pc-ui": "^4.0.93", + "vxe-pc-ui": "^4.0.94", "vxe-table": "^4.7.59", "vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-export-xlsx": "^4.0.5", @@ -102,7 +102,7 @@ "prettier": "^3.3.3", "rollup-plugin-visualizer": "^5.12.0", "sass": "^1.77.8", - "terser": "^5.31.5", + "terser": "^5.31.6", "typescript": "^5.5.4", "vite": "^5.4.0", "vite-plugin-cdn-import": "^1.0.1", diff --git a/Web/src/api-services/apis/sys-file-api.ts b/Web/src/api-services/apis/sys-file-api.ts index c0054725..fbf15d3d 100644 --- a/Web/src/api-services/apis/sys-file-api.ts +++ b/Web/src/api-services/apis/sys-file-api.ts @@ -183,7 +183,7 @@ export const SysFileApiAxiosParamCreator = function (configuration?: Configurati * @param {number} id 主键Id * @param {string} [fileName] 文件名称 * @param {string} [fileType] 文件类型 - * @param {boolean} [isPublic] 是否公开 如果设置true，所有人都可以查看，默认只有自己或有权限的人可以查看 + * @param {boolean} [isPublic] 是否公开 若为true则所有人都可以查看，默认只有自己或有权限的可以查看 * @param {string} [url] 文件Url * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -786,7 +786,7 @@ export const SysFileApiFp = function(configuration?: Configuration) { * @param {number} id 主键Id * @param {string} [fileName] 文件名称 * @param {string} [fileType] 文件类型 - * @param {boolean} [isPublic] 是否公开 如果设置true，所有人都可以查看，默认只有自己或有权限的人可以查看 + * @param {boolean} [isPublic] 是否公开 若为true则所有人都可以查看，默认只有自己或有权限的可以查看 * @param {string} [url] 文件Url * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -975,7 +975,7 @@ export const SysFileApiFactory = function (configuration?: Configuration, basePa * @param {number} id 主键Id * @param {string} [fileName] 文件名称 * @param {string} [fileType] 文件类型 - * @param {boolean} [isPublic] 是否公开 如果设置true，所有人都可以查看，默认只有自己或有权限的人可以查看 + * @param {boolean} [isPublic] 是否公开 若为true则所有人都可以查看，默认只有自己或有权限的可以查看 * @param {string} [url] 文件Url * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -1128,7 +1128,7 @@ export class SysFileApi extends BaseAPI { * @param {number} id 主键Id * @param {string} [fileName] 文件名称 * @param {string} [fileType] 文件类型 - * @param {boolean} [isPublic] 是否公开 如果设置true，所有人都可以查看，默认只有自己或有权限的人可以查看 + * @param {boolean} [isPublic] 是否公开 若为true则所有人都可以查看，默认只有自己或有权限的可以查看 * @param {string} [url] 文件Url * @param {*} [options] Override http request option. * @throws {RequiredError} diff --git a/Web/src/api-services/apis/sys-notice-api.ts b/Web/src/api-services/apis/sys-notice-api.ts index 446f6b12..2ffba22e 100644 --- a/Web/src/api-services/apis/sys-notice-api.ts +++ b/Web/src/api-services/apis/sys-notice-api.ts @@ -22,11 +22,7 @@ import { AdminResultListSysNotice } from '../models'; import { AdminResultSqlSugarPagedListSysNotice } from '../models'; import { AdminResultSqlSugarPagedListSysNoticeUser } from '../models'; import { DeleteNoticeInput } from '../models'; -import { Filter } from '../models'; -import { FilterLogicEnum } from '../models'; -import { FilterOperatorEnum } from '../models'; import { NoticeInput } from '../models'; -import { NoticeTypeEnum } from '../models'; import { PageNoticeInput } from '../models'; import { UpdateNoticeInput } from '../models'; /** @@ -182,25 +178,11 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura /** * * @summary 获取接收的通知公告 - * @param {string} [title] 标题 - * @param {NoticeTypeEnum} [type] 类型（1通知 2公告） - * @param {number} [page] 当前页码 - * @param {number} [pageSize] 页码容量 - * @param {string} [field] 排序字段 - * @param {string} [order] 排序方向 - * @param {string} [descStr] 降序排序 - * @param {Array} [searchFields] 字段名称集合 - * @param {string} [searchKeyword] 关键字 - * @param {string} [keyword] 模糊查询关键字 - * @param {FilterLogicEnum} [filterLogic] 过滤条件 - * @param {Array} [filterFilters] 筛选过滤条件子项 - * @param {string} [filterField] 字段名称 - * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符 - * @param {any} [filterValue] 字段值 + * @param {PageNoticeInput} [body] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - apiSysNoticePageReceivedGet: async (title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options: AxiosRequestConfig = {}): Promise => { + apiSysNoticePageReceivedPost: async (body?: PageNoticeInput, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/api/sysNotice/pageReceived`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, 'https://example.com'); @@ -208,7 +190,7 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura if (configuration) { baseOptions = configuration.baseOptions; } - const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options}; + const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options}; const localVarHeaderParameter = {} as any; const localVarQueryParameter = {} as any; @@ -221,65 +203,7 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura localVarHeaderParameter["Authorization"] = "Bearer " + accessToken; } - if (title !== undefined) { - localVarQueryParameter['Title'] = title; - } - - if (type !== undefined) { - localVarQueryParameter['Type'] = type; - } - - if (page !== undefined) { - localVarQueryParameter['Page'] = page; - } - - if (pageSize !== undefined) { - localVarQueryParameter['PageSize'] = pageSize; - } - - if (field !== undefined) { - localVarQueryParameter['Field'] = field; - } - - if (order !== undefined) { - localVarQueryParameter['Order'] = order; - } - - if (descStr !== undefined) { - localVarQueryParameter['DescStr'] = descStr; - } - - if (searchFields) { - localVarQueryParameter['Search.Fields'] = searchFields; - } - - if (searchKeyword !== undefined) { - localVarQueryParameter['Search.Keyword'] = searchKeyword; - } - - if (keyword !== undefined) { - localVarQueryParameter['Keyword'] = keyword; - } - - if (filterLogic !== undefined) { - localVarQueryParameter['Filter.Logic'] = filterLogic; - } - - if (filterFilters) { - localVarQueryParameter['Filter.Filters'] = filterFilters; - } - - if (filterField !== undefined) { - localVarQueryParameter['Filter.Field'] = filterField; - } - - if (filterOperator !== undefined) { - localVarQueryParameter['Filter.Operator'] = filterOperator; - } - - if (filterValue !== undefined) { - localVarQueryParameter['Filter.Value'] = filterValue; - } + localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; const query = new URLSearchParams(localVarUrlObj.search); for (const key in localVarQueryParameter) { @@ -291,6 +215,8 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura localVarUrlObj.search = (new URLSearchParams(query)).toString(); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json'; + localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash, @@ -538,26 +464,12 @@ export const SysNoticeApiFp = function(configuration?: Configuration) { /** * * @summary 获取接收的通知公告 - * @param {string} [title] 标题 - * @param {NoticeTypeEnum} [type] 类型（1通知 2公告） - * @param {number} [page] 当前页码 - * @param {number} [pageSize] 页码容量 - * @param {string} [field] 排序字段 - * @param {string} [order] 排序方向 - * @param {string} [descStr] 降序排序 - * @param {Array} [searchFields] 字段名称集合 - * @param {string} [searchKeyword] 关键字 - * @param {string} [keyword] 模糊查询关键字 - * @param {FilterLogicEnum} [filterLogic] 过滤条件 - * @param {Array} [filterFilters] 筛选过滤条件子项 - * @param {string} [filterField] 字段名称 - * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符 - * @param {any} [filterValue] 字段值 + * @param {PageNoticeInput} [body] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async apiSysNoticePageReceivedGet(title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { - const localVarAxiosArgs = await SysNoticeApiAxiosParamCreator(configuration).apiSysNoticePageReceivedGet(title, type, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options); + async apiSysNoticePageReceivedPost(body?: PageNoticeInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { + const localVarAxiosArgs = await SysNoticeApiAxiosParamCreator(configuration).apiSysNoticePageReceivedPost(body, options); return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); @@ -660,26 +572,12 @@ export const SysNoticeApiFactory = function (configuration?: Configuration, base /** * * @summary 获取接收的通知公告 - * @param {string} [title] 标题 - * @param {NoticeTypeEnum} [type] 类型（1通知 2公告） - * @param {number} [page] 当前页码 - * @param {number} [pageSize] 页码容量 - * @param {string} [field] 排序字段 - * @param {string} [order] 排序方向 - * @param {string} [descStr] 降序排序 - * @param {Array} [searchFields] 字段名称集合 - * @param {string} [searchKeyword] 关键字 - * @param {string} [keyword] 模糊查询关键字 - * @param {FilterLogicEnum} [filterLogic] 过滤条件 - * @param {Array} [filterFilters] 筛选过滤条件子项 - * @param {string} [filterField] 字段名称 - * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符 - * @param {any} [filterValue] 字段值 + * @param {PageNoticeInput} [body] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async apiSysNoticePageReceivedGet(title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig): Promise> { - return SysNoticeApiFp(configuration).apiSysNoticePageReceivedGet(title, type, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options).then((request) => request(axios, basePath)); + async apiSysNoticePageReceivedPost(body?: PageNoticeInput, options?: AxiosRequestConfig): Promise> { + return SysNoticeApiFp(configuration).apiSysNoticePageReceivedPost(body, options).then((request) => request(axios, basePath)); }, /** * @@ -766,27 +664,13 @@ export class SysNoticeApi extends BaseAPI { /** * * @summary 获取接收的通知公告 - * @param {string} [title] 标题 - * @param {NoticeTypeEnum} [type] 类型（1通知 2公告） - * @param {number} [page] 当前页码 - * @param {number} [pageSize] 页码容量 - * @param {string} [field] 排序字段 - * @param {string} [order] 排序方向 - * @param {string} [descStr] 降序排序 - * @param {Array} [searchFields] 字段名称集合 - * @param {string} [searchKeyword] 关键字 - * @param {string} [keyword] 模糊查询关键字 - * @param {FilterLogicEnum} [filterLogic] 过滤条件 - * @param {Array} [filterFilters] 筛选过滤条件子项 - * @param {string} [filterField] 字段名称 - * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符 - * @param {any} [filterValue] 字段值 + * @param {PageNoticeInput} [body] * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof SysNoticeApi */ - public async apiSysNoticePageReceivedGet(title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig) : Promise> { - return SysNoticeApiFp(this.configuration).apiSysNoticePageReceivedGet(title, type, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options).then((request) => request(this.axios, this.basePath)); + public async apiSysNoticePageReceivedPost(body?: PageNoticeInput, options?: AxiosRequestConfig) : Promise> { + return SysNoticeApiFp(this.configuration).apiSysNoticePageReceivedPost(body, options).then((request) => request(this.axios, this.basePath)); } /** * diff --git a/Web/src/api-services/models/file-input.ts b/Web/src/api-services/models/file-input.ts index 13792ff4..542c8e70 100644 --- a/Web/src/api-services/models/file-input.ts +++ b/Web/src/api-services/models/file-input.ts @@ -45,7 +45,7 @@ export interface FileInput { fileType?: string | null; /** - * 是否公开 如果设置true，所有人都可以查看，默认只有自己或有权限的人可以查看 + * 是否公开 若为true则所有人都可以查看，默认只有自己或有权限的可以查看 * * @type {boolean} * @memberof FileInput diff --git a/Web/src/api-services/models/sys-file-upload-file-body.ts b/Web/src/api-services/models/sys-file-upload-file-body.ts index fa808d9e..0839b354 100644 --- a/Web/src/api-services/models/sys-file-upload-file-body.ts +++ b/Web/src/api-services/models/sys-file-upload-file-body.ts @@ -36,6 +36,14 @@ export interface SysFileUploadFileBody { */ fileType?: string; + /** + * 是否公开 如果设置true，所有人都可以查看，默认只有自己或有权限的人可以查看 + * + * @type {boolean} + * @memberof SysFileUploadFileBody + */ + isPublic?: boolean; + /** * 文件路径 * diff --git a/Web/src/api-services/models/sys-file.ts b/Web/src/api-services/models/sys-file.ts index e37dac9a..1b8964ad 100644 --- a/Web/src/api-services/models/sys-file.ts +++ b/Web/src/api-services/models/sys-file.ts @@ -84,6 +84,22 @@ export interface SysFile { */ isDelete?: boolean; + /** + * 创建者部门Id + * + * @type {number} + * @memberof SysFile + */ + createOrgId?: number | null; + + /** + * 创建者部门名称 + * + * @type {string} + * @memberof SysFile + */ + createOrgName?: string | null; + /** * 提供者 * @@ -187,4 +203,12 @@ export interface SysFile { * @memberof SysFile */ fileType?: string | null; + + /** + * 是否公开 若为true则所有人都可以查看，默认只有自己或有权限的可以查看 + * + * @type {boolean} + * @memberof SysFile + */ + isPublic?: boolean; } diff --git a/Web/src/api-services/models/upload-file-from-base64-input.ts b/Web/src/api-services/models/upload-file-from-base64-input.ts index 4dbb2b7a..e3245504 100644 --- a/Web/src/api-services/models/upload-file-from-base64-input.ts +++ b/Web/src/api-services/models/upload-file-from-base64-input.ts @@ -59,4 +59,12 @@ export interface UploadFileFromBase64Input { * @memberof UploadFileFromBase64Input */ fileType?: string | null; + + /** + * 是否公开 如果设置true，所有人都可以查看，默认只有自己或有权限的人可以查看 + * + * @type {boolean} + * @memberof UploadFileFromBase64Input + */ + isPublic?: boolean; } diff --git a/Web/src/views/home/notice/index.vue b/Web/src/views/home/notice/index.vue index ca53c114..050e6b9a 100644 --- a/Web/src/views/home/notice/index.vue +++ b/Web/src/views/home/notice/index.vue @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - 查询 + 查询 重置 @@ -142,7 +142,7 @@ onMounted(() => { // 查询api const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, sort: VxeGridPropTypes.ProxyAjaxQuerySortCheckedParams) => { const params = Object.assign(state.queryParams, { page: page.currentPage, pageSize: page.pageSize, field: sort.field, order: sort.order, descStr: 'desc' }) as PageNoticeInput; - return getAPI(SysNoticeApi).apiSysNoticePageReceivedGet(params); + return getAPI(SysNoticeApi).apiSysNoticePageReceivedPost(params); }; // 查询操作 diff --git a/Web/src/views/system/dict/index.vue b/Web/src/views/system/dict/index.vue index 2cbba354..a20c946c 100644 --- a/Web/src/views/system/dict/index.vue +++ b/Web/src/views/system/dict/index.vue @@ -32,7 +32,7 @@