diff --git a/Yi.Framework.Net6/Yi.Framework.sln b/Yi.Framework.Net6/Yi.Framework.sln index ec3138e3..964974c0 100644 --- a/Yi.Framework.Net6/Yi.Framework.sln +++ b/Yi.Framework.Net6/Yi.Framework.sln @@ -83,6 +83,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.RBAC.Application", "src\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.RBAC.Web", "src\project\rbac\Yi.RBAC.Web\Yi.RBAC.Web.csproj", "{0C031C7D-6F80-4559-977C-AC001036EC44}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.ThumbnailSharp", "src\module\Yi.Framework.ThumbnailSharp\Yi.Framework.ThumbnailSharp.csproj", "{60E54034-792C-4A90-BCDF-4D5FFB45089E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -225,6 +227,10 @@ Global {0C031C7D-6F80-4559-977C-AC001036EC44}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C031C7D-6F80-4559-977C-AC001036EC44}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C031C7D-6F80-4559-977C-AC001036EC44}.Release|Any CPU.Build.0 = Release|Any CPU + {60E54034-792C-4A90-BCDF-4D5FFB45089E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {60E54034-792C-4A90-BCDF-4D5FFB45089E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {60E54034-792C-4A90-BCDF-4D5FFB45089E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {60E54034-792C-4A90-BCDF-4D5FFB45089E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -267,6 +273,7 @@ Global {478DA36E-F547-49CD-8B48-41DC5551C5C2} = {07C9E949-DB5E-4315-A497-FF73746667D8} {2074EA00-59A4-49CE-97A6-735F4B77443B} = {07C9E949-DB5E-4315-A497-FF73746667D8} {0C031C7D-6F80-4559-977C-AC001036EC44} = {07C9E949-DB5E-4315-A497-FF73746667D8} + {60E54034-792C-4A90-BCDF-4D5FFB45089E} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6C1A3808-0F4F-43FB-A9FE-5F27A3BB2ECF} diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Auth.JwtBearer/Authentication/YiJwtAuthenticationHandler.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Auth.JwtBearer/Authentication/YiJwtAuthenticationHandler.cs index 4c1cf792..332fa901 100644 --- a/Yi.Framework.Net6/src/framework/Yi.Framework.Auth.JwtBearer/Authentication/YiJwtAuthenticationHandler.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Auth.JwtBearer/Authentication/YiJwtAuthenticationHandler.cs @@ -53,7 +53,7 @@ namespace Yi.Framework.Auth.JwtBearer.Authentication resp = p.GetString(); break; case JsonValueKind.Number: - resp = p.GetInt32().ToString(); + resp = p.GetInt64().ToString(); break; } claims.Add(new Claim(claim.Key, resp ?? "")); diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.ThumbnailSharp/ThumbnailSharpManager.cs b/Yi.Framework.Net6/src/module/Yi.Framework.ThumbnailSharp/ThumbnailSharpManager.cs new file mode 100644 index 00000000..44936e58 --- /dev/null +++ b/Yi.Framework.Net6/src/module/Yi.Framework.ThumbnailSharp/ThumbnailSharpManager.cs @@ -0,0 +1,410 @@ +/*MIT License + +Copyright(c) 2017 Mirza Ghulam Rasyid + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +using System; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Drawing.Imaging; +using System.IO; +using System.Net.Http; +using System.Threading.Tasks; + +namespace Yi.Framework.ThumbnailSharp +{ + /// + /// Image format to use when creating a thumbnail. + /// + public enum Format + { + Jpeg, + Bmp, + Png, + Gif, + Tiff + + } + /// + /// Thumbnail class that holds various methods to create an image thumbnail. + /// + public class ThumbnailSharpManager + { + private Bitmap CreateBitmapThumbnail(uint thumbnailSize, string imageFileLocation) + { + Bitmap bitmap = null; + Image image = null; + float actualHeight = default(float); + float actualWidth = default(float); + uint thumbnailHeight = default(uint); + uint thumbnailWidth = default(uint); + try + { + image = Image.FromFile(imageFileLocation); + } + catch + { + if (image != null) + image = null; + } + if (image != null) + { + actualHeight = image.Height; + actualWidth = image.Width; + if (actualHeight > actualWidth) + { + if ((uint)actualHeight <= thumbnailSize) + throw new Exception("Thumbnail size must be less than actual height (portrait image)"); + thumbnailHeight = thumbnailSize; + thumbnailWidth = (uint)((actualWidth / actualHeight) * thumbnailSize); + } + else if (actualWidth > actualHeight) + { + + if ((uint)actualWidth <= thumbnailSize) + throw new Exception("Thumbnail size must be less than actual width (landscape image)"); + thumbnailWidth = thumbnailSize; + thumbnailHeight = (uint)((actualHeight / actualWidth) * thumbnailSize); + } + else + { + if ((uint)actualWidth <= thumbnailSize) + throw new Exception("Thumbnail size must be less than image's size"); + thumbnailWidth = thumbnailSize; + thumbnailHeight = thumbnailSize; + } + try + { + + bitmap = new Bitmap((int)thumbnailWidth, (int)thumbnailHeight); + Graphics resizedImage = Graphics.FromImage(bitmap); + resizedImage.InterpolationMode = InterpolationMode.HighQualityBicubic; + resizedImage.CompositingQuality = CompositingQuality.HighQuality; + resizedImage.SmoothingMode = SmoothingMode.HighQuality; + resizedImage.DrawImage(image, 0, 0, thumbnailWidth, thumbnailHeight); + } + catch + { + if (bitmap != null) + bitmap = null; + } + } + return bitmap; + } + private Bitmap CreateBitmapThumbnail(uint thumbnailSize, Stream imageStream) + { + Bitmap bitmap = null; + Image image = null; + float actualHeight = default(float); + float actualWidth = default(float); + uint thumbnailHeight = default(uint); + uint thumbnailWidth = default(uint); + try + { + image = Image.FromStream(imageStream); + } + catch + { + if (image != null) + image = null; + } + if (image != null) + { + actualHeight = image.Height; + actualWidth = image.Width; + if (actualHeight > actualWidth) + { + if ((uint)actualHeight <= thumbnailSize) + throw new Exception("Thumbnail size must be less than actual height (portrait image)"); + thumbnailHeight = thumbnailSize; + thumbnailWidth = (uint)((actualWidth / actualHeight) * thumbnailSize); + } + else if (actualWidth > actualHeight) + { + + if ((uint)actualWidth <= thumbnailSize) + throw new Exception("Thumbnail size must be less than actual width (landscape image)"); + thumbnailWidth = thumbnailSize; + thumbnailHeight = (uint)((actualHeight / actualWidth) * thumbnailSize); + } + else + { + if ((uint)actualWidth <= thumbnailSize) + throw new Exception("Thumbnail size must be less than image's size"); + thumbnailWidth = thumbnailSize; + thumbnailHeight = thumbnailSize; + } + try + { + bitmap = new Bitmap((int)thumbnailWidth, (int)thumbnailHeight); + Graphics resizedImage = Graphics.FromImage(bitmap); + resizedImage.InterpolationMode = InterpolationMode.HighQualityBicubic; + resizedImage.CompositingQuality = CompositingQuality.HighQuality; + resizedImage.SmoothingMode = SmoothingMode.HighQuality; + resizedImage.DrawImage(image, 0, 0, thumbnailWidth, thumbnailHeight); + } + catch + { + if (bitmap != null) + bitmap = null; + } + } + return bitmap; + } + private ImageFormat GetImageFormat(Format format) + { + switch (format) + { + case Format.Jpeg: + return ImageFormat.Jpeg; + case Format.Bmp: + return ImageFormat.Bmp; + case Format.Png: + return ImageFormat.Png; + case Format.Gif: + return ImageFormat.Gif; + default: + return ImageFormat.Tiff; + } + } + private async Task GetImageStreamFromUrl(Uri urlAddress) + { + Stream result = null; + try + { + byte[] bytes = await GetImageBytesFromUrl(urlAddress); + result = new MemoryStream(bytes); + } + catch + { + result = null; + } + return result; + } + private async Task GetImageBytesFromUrl(Uri urlAddress) + { + byte[] buffer = null; + try + { + using (HttpClient client = new HttpClient()) + { + buffer = await client.GetByteArrayAsync(urlAddress); + } + } + catch + { + buffer = null; + } + return buffer; + } + + /// + /// Create a thumbnail from file and returns as stream. + /// + /// Thumbnail size. For portrait image, thumbnail size must be less than its height. + /// For landscape image, thumbnail size must be less than its width. For the same size image (Proportional), thumbnail size must be less than its width and height. + /// Correct image file location. + /// Image format to use. + /// A thumbnail image as stream. Returns null if it fails. + /// 'imageFileLocation' is null. + /// 'imageFileLocation' does not exist. + public Stream CreateThumbnailStream(uint thumbnailSize, string imageFileLocation, Format imageFormat) + { + if (String.IsNullOrEmpty(imageFileLocation)) + throw new ArgumentNullException(nameof(imageFileLocation), "'imageFileLocation' cannot be null"); + if (!File.Exists(imageFileLocation)) + throw new FileNotFoundException($"'{imageFileLocation}' cannot be found"); + Bitmap bitmap = CreateBitmapThumbnail(thumbnailSize, imageFileLocation); + if (bitmap != null) + { + MemoryStream stream = new MemoryStream(); + bitmap.Save(stream, GetImageFormat(imageFormat)); + stream.Position = 0; + return stream; + } + return null; + } + /// + /// Create a thumbnail from image stream and returns as stream. + /// + /// Thumbnail size. For portrait image, thumbnail size must be less than its height. + /// For landscape image, thumbnail size must be less than its width. For the same size image (Proportional), thumbnail size must be less than its width and height. + /// Valid image stream object. + /// Image format to use. + /// A thumbnail image as stream. Returns null if it fails. + /// 'imageStream' is null. + public Stream CreateThumbnailStream(uint thumbnailSize, Stream imageStream, Format imageFormat) + { + if (imageStream == null) + throw new ArgumentNullException(nameof(imageStream), "'imageStream' cannot be null"); + Bitmap bitmap = CreateBitmapThumbnail(thumbnailSize, imageStream); + if (bitmap != null) + { + MemoryStream stream = new MemoryStream(); + bitmap.Save(stream, GetImageFormat(imageFormat)); + stream.Position = 0; + return stream; + } + return null; + } + /// + /// Create a thumbnail from image in bytes and returns as stream. + /// + /// Thumbnail size. For portrait image, thumbnail size must be less than its height. + /// For landscape image, thumbnail size must be less than its width. For the same size image (Proportional), thumbnail size must be less than its width and height. + /// Valid image bytes array. + /// Image format to use. + /// A thumbnail image as stream. Returns null if it fails. + /// 'imageBytes' is null. + public Stream CreateThumbnailStream(uint thumbnailSize, byte[] imageBytes, Format imageFormat) + { + if (imageBytes == null) + throw new ArgumentNullException(nameof(imageBytes), "'imageStream' cannot be null"); + Bitmap bitmap = CreateBitmapThumbnail(thumbnailSize, new MemoryStream(imageBytes)); + if (bitmap != null) + { + MemoryStream stream = new MemoryStream(); + bitmap.Save(stream, GetImageFormat(imageFormat)); + stream.Position = 0; + return stream; + } + return null; + } + /// + /// Create a thumbnail from file and returns as bytes. + /// + /// Thumbnail size. For portrait image, thumbnail size must be less than its height. + /// For landscape image, thumbnail size must be less than its width. For the same size image (Proportional), thumbnail size must be less than its width and height. + /// Correct image file location. + /// Image format to use. + /// A thumbnail image as bytes. Returns null if it fails. + /// 'imageFileLocation' is null. + /// 'imageFileLocation' does not exist. + public byte[] CreateThumbnailBytes(uint thumbnailSize, string imageFileLocation, Format imageFormat) + { + if (String.IsNullOrEmpty(imageFileLocation)) + throw new ArgumentNullException(nameof(imageFileLocation), "'imageFileLocation' cannot be null"); + if (!File.Exists(imageFileLocation)) + throw new FileNotFoundException($"'{imageFileLocation}' cannot be found"); + Stream stream = CreateThumbnailStream(thumbnailSize, imageFileLocation, imageFormat); + if (stream != null) + { + byte[] streamBytes = new byte[stream.Length]; + stream.Read(streamBytes, 0, streamBytes.Length); + return streamBytes; + } + return null; + } + /// + /// Create a thumbnail from image stream and returns as bytes. + /// + /// Thumbnail size. For portrait image, thumbnail size must be less than its height. + /// For landscape image, thumbnail size must be less than its width. For the same size image (Proportional), thumbnail size must be less than its width and height. + /// Valid image stream object. + /// Image format to use. + /// A thumbnail image as bytes. Returns null if it fails. + /// 'imageStream' is null. + public byte[] CreateThumbnailBytes(uint thumbnailSize, Stream imageStream, Format imageFormat) + { + if (imageStream == null) + throw new ArgumentNullException(nameof(imageStream), "'imageStream' cannot be null"); + + Stream stream = CreateThumbnailStream(thumbnailSize, imageStream, imageFormat); + if (stream != null) + { + byte[] streamBytes = new byte[stream.Length]; + stream.Read(streamBytes, 0, streamBytes.Length); + return streamBytes; + } + return null; + } + /// + /// Create a thumbnail from image in bytes and returns as bytes. + /// + /// Thumbnail size. For portrait image, thumbnail size must be less than its height. + /// For landscape image, thumbnail size must be less than its width. For the same size image (Proportional), thumbnail size must be less than its width and height. + /// Valid image bytes array. + /// Image format to use. + /// A thumbnail image as bytes. Returns null if it fails. + /// 'imageBytes' is null. + public byte[] CreateThumbnailBytes(uint thumbnailSize, byte[] imageBytes, Format imageFormat) + { + if (imageBytes == null) + throw new ArgumentNullException(nameof(imageBytes), "'imageStream' cannot be null"); + Stream stream = CreateThumbnailStream(thumbnailSize, imageBytes, imageFormat); + if (stream != null) + { + byte[] streamBytes = new byte[stream.Length]; + stream.Read(streamBytes, 0, streamBytes.Length); + return streamBytes; + } + return null; + } + + + /// + /// Create a thumbnail from valid image url asynchronously. + /// + /// Thumbnail size. For portrait image, thumbnail size must be less than its height. + /// For landscape image, thumbnail size must be less than its width. For the same size image (Proportional), thumbnail size must be less than its width and height. + /// Valid absolute url address with proper scheme. + /// Image format to use. + /// A thumbnail image as stream. Returns null if it fails. + /// 'urlAddress' is null. + public async Task CreateThumbnailStreamAsync(uint thumbnailSize, Uri urlAddress, Format imageFormat) + { + if (urlAddress == null) + throw new ArgumentNullException(nameof(urlAddress), "'urlAddress' cannot be null"); + Stream result = null; + Stream stream = await GetImageStreamFromUrl(urlAddress); + if (stream != null) + { + result = CreateThumbnailStream(thumbnailSize, stream, imageFormat); + } + return result; + } + + /// + /// Create a thumbnail from valid image url asynchronously. + /// + /// Thumbnail size. For portrait image, thumbnail size must be less than its height. + /// For landscape image, thumbnail size must be less than its width. For the same size image (Proportional), thumbnail size must be less than its width and height. + /// Valid absolute url address with proper scheme. + /// Image format to use. + /// A thumbnail image as bytes. Returns null if it fails. + /// 'urlAddress' is null. + public async Task CreateThumbnailBytesAsync(uint thumbnailSize, Uri urlAddress, Format imageFormat) + { + if (urlAddress == null) + throw new ArgumentNullException(nameof(urlAddress), "'urlAddress' cannot be null"); + byte[] result = null; + byte[] imageBytes = await GetImageBytesFromUrl(urlAddress); + if (imageBytes != null) + { + result = CreateThumbnailBytes(thumbnailSize, imageBytes, imageFormat); + } + return result; + } + + + + } +} \ No newline at end of file diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.ThumbnailSharp/Yi.Framework.ThumbnailSharp.csproj b/Yi.Framework.Net6/src/module/Yi.Framework.ThumbnailSharp/Yi.Framework.ThumbnailSharp.csproj new file mode 100644 index 00000000..0b02fc1f --- /dev/null +++ b/Yi.Framework.Net6/src/module/Yi.Framework.ThumbnailSharp/Yi.Framework.ThumbnailSharp.csproj @@ -0,0 +1,17 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.ThumbnailSharp/YiFrameworkThumbnailSharpModule.cs b/Yi.Framework.Net6/src/module/Yi.Framework.ThumbnailSharp/YiFrameworkThumbnailSharpModule.cs new file mode 100644 index 00000000..4239cafc --- /dev/null +++ b/Yi.Framework.Net6/src/module/Yi.Framework.ThumbnailSharp/YiFrameworkThumbnailSharpModule.cs @@ -0,0 +1,23 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using StartupModules; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.ThumbnailSharp +{ + public class YiFrameworkThumbnailSharpModule : IStartupModule + { + public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) + { + } + + public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) + { + services.AddSingleton(); + } + } +} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/Account/CaptchaImageDto.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/Account/CaptchaImageDto.cs new file mode 100644 index 00000000..362ac0e3 --- /dev/null +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/Account/CaptchaImageDto.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.RBAC.Application.Contracts.Identity.Dtos.Account +{ + public class CaptchaImageDto + { + public string Uuid { get; set; }=string.Empty; + public byte[] Img { get; set; } + } +} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml index 95b149fb..5f111fc7 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml @@ -11,6 +11,31 @@ + + + 查询已登录的账户信息 + + + + + + + 获取当前登录用户的前端路由 + + + + + + 退出登录 + + + + + + 生成验证码 + + + Dept服务实现 diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs index 04be9890..e2161013 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs @@ -1,5 +1,10 @@ -using Microsoft.AspNetCore.Identity; +using Hei.Captcha; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; using NET.AutoWebApi.Setting; +using SqlSugar; using System; using System.Collections.Generic; using System.Linq; @@ -7,13 +12,20 @@ using System.Text; using System.Threading.Tasks; using Yi.Framework.Auth.JwtBearer.Authentication; using Yi.Framework.Core.CurrentUsers; +using Yi.Framework.Core.Enums; using Yi.Framework.Core.Exceptions; +using Yi.Framework.Ddd.Repositories; using Yi.Framework.Ddd.Services; +using Yi.Framework.ThumbnailSharp; using Yi.RBAC.Application.Contracts.Account.Dtos; +using Yi.RBAC.Application.Contracts.Identity; +using Yi.RBAC.Application.Contracts.Identity.Dtos.Account; using Yi.RBAC.Domain.Identity; +using Yi.RBAC.Domain.Identity.Dtos; using Yi.RBAC.Domain.Identity.Entities; using Yi.RBAC.Domain.Identity.Repositories; using Yi.RBAC.Domain.Shared.Identity.ConstClasses; +using Yi.RBAC.Domain.Shared.Identity.Dtos; namespace Yi.RBAC.Application.Identity { @@ -29,12 +41,17 @@ namespace Yi.RBAC.Application.Identity [Autowired] private AccountManager _accountManager { get; set; } + [Autowired] + private IRepository _menuRepository { get; set; } + + [Autowired] + private SecurityCodeHelper _securityCode { get; set; } /// /// 登录 /// /// /// - public async Task PostLoginAsync(LoginInputVo input) + public async Task PostLoginAsync(LoginInputVo input) { UserEntity user = new(); //登录成功 @@ -50,7 +67,79 @@ namespace Yi.RBAC.Application.Identity //创建token var token = _jwtTokenManager.CreateToken(_accountManager.UserInfoToClaim(userInfo)); - return token; + return new { Token = token }; + } + + /// + /// 查询已登录的账户信息 + /// + /// + /// + [Route("/api/account")] + [Authorize] + public async Task Get() + { + //通过鉴权jwt获取到用户的id + var userId = _currentUser.Id; + //此处从缓存中获取即可 + //var data = _cacheDb.Get($"Yi:UserInfo:{userId}"); + var data = await _userRepository.GetUserAllInfoAsync(userId); + //系统用户数据被重置，老前端访问重新授权 + if (data is null) + { + throw new AuthException(); + } + + data.Menus.Clear(); + return data; + } + + + /// + /// 获取当前登录用户的前端路由 + /// + /// + [Authorize] + public async Task> GetVue3Router() + { + var userId = _currentUser.Id; + var data = await _userRepository.GetUserAllInfoAsync(userId); + var menus = data.Menus.ToList(); + + //为超级管理员直接给全部路由 + if (UserConst.Admin.Equals(data.User.UserName)) + { + menus = await _menuRepository.GetListAsync(); + } + //将后端菜单转换成前端路由，组件级别需要过滤 + List routers = menus.Vue3RouterBuild(); + return routers; + } + + /// + /// 退出登录 + /// + /// + public Task PostLogout() + { + return Task.FromResult(true); + } + + /// + /// 生成验证码 + /// + /// + + [AllowAnonymous] + public CaptchaImageDto GetCaptchaImage() + { + var uuid = Guid.NewGuid(); + var code = _securityCode.GetRandomEnDigitalText(4); + //将uuid与code，Redis缓存中心化保存起来，登录根据uuid比对即可 + //10分钟过期 + //_cacheDb.Set($"Yi:Captcha:{uuid}", code, new TimeSpan(0, 10, 0)); + var imgbyte = _securityCode.GetEnDigitalCodeByte(code); + return new CaptchaImageDto { Img = imgbyte, Uuid = code }; } } } diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain.Shared/School/ConstClasses/StudentConst.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain.Shared/School/ConstClasses/StudentConst.cs deleted file mode 100644 index 3582a1e7..00000000 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain.Shared/School/ConstClasses/StudentConst.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Yi.RBAC.Domain.Shared.School.ConstClasses -{ - /// - /// 常量定义 - /// - - public class StudentConst - { - } -} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DataSeeds/MenuDataSeed.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DataSeeds/MenuDataSeed.cs new file mode 100644 index 00000000..5e3d933e --- /dev/null +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DataSeeds/MenuDataSeed.cs @@ -0,0 +1,1149 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Data.DataSeeds; +using Yi.Framework.Ddd.Repositories; +using Yi.RBAC.Domain.Identity.Entities; +using Yi.RBAC.Domain.Shared.Identity.EnumClasses; + +namespace Yi.RBAC.Domain.DataSeeds +{ + [AppService(typeof(IDataSeed))] + public class MenuDataSeed : AbstractDataSeed + { + public MenuDataSeed(IRepository repository) : base(repository) + { + } + + public override List GetSeedData() + { + List entities = new List(); + //系统管理 + MenuEntity system = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "系统管理", + MenuType = MenuTypeEnum.Catalogue, + Router = "/system", + IsShow = true, + IsLink = false, + MenuIcon = "system", + OrderNum = 100, + ParentId = 0, + IsDeleted = false + }; + entities.Add(system); + + //系统监控 + MenuEntity monitoring = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "系统监控", + MenuType = MenuTypeEnum.Catalogue, + Router = "/monitor", + IsShow = true, + IsLink = false, + MenuIcon = "monitor", + OrderNum = 99, + ParentId = 0, + IsDeleted = false + }; + entities.Add(monitoring); + + + //在线用户 + MenuEntity online = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "在线用户", + PermissionCode = "monitor:online:list", + MenuType = MenuTypeEnum.Menu, + Router = "online", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "monitor/online/index", + MenuIcon = "online", + OrderNum = 100, + ParentId = monitoring.Id, + IsDeleted = false + }; + entities.Add(online); + + + + + //系统工具 + MenuEntity tool = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "系统工具", + MenuType = MenuTypeEnum.Catalogue, + Router = "/tool", + IsShow = true, + IsLink = false, + MenuIcon = "tool", + OrderNum = 98, + ParentId = 0, + IsDeleted = false + }; + entities.Add(tool); + //swagger文档 + MenuEntity swagger = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "接口文档", + MenuType = MenuTypeEnum.Menu, + Router = "http://localhost:19001", + IsShow = true, + IsLink = true, + MenuIcon = "list", + OrderNum = 100, + ParentId = tool.Id, + IsDeleted = false, + }; + entities.Add(swagger); + + + //BBS + MenuEntity bbs = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "BBS", + MenuType = MenuTypeEnum.Catalogue, + Router = "/bbs", + IsShow = true, + IsLink = false, + MenuIcon = "international", + OrderNum = 97, + ParentId = 0, + IsDeleted = false + }; + entities.Add(bbs); + //文章管理 + MenuEntity article = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "文章管理", + PermissionCode = "bbs:article:list", + MenuType = MenuTypeEnum.Menu, + Router = "article", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "bbs/article/index", + MenuIcon = "education", + OrderNum = 100, + ParentId = bbs.Id, + IsDeleted = false + }; + entities.Add(article); + + MenuEntity articleQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "文章查询", + PermissionCode = "bbs:article:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = article.Id, + IsDeleted = false + }; + entities.Add(articleQuery); + + MenuEntity articleAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "文章新增", + PermissionCode = "bbs:article:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = article.Id, + IsDeleted = false + }; + entities.Add(articleAdd); + + MenuEntity articleEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "文章修改", + PermissionCode = "bbs:article:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = article.Id, + IsDeleted = false + }; + entities.Add(articleEdit); + + MenuEntity articleRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "文章删除", + PermissionCode = "bbs:article:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = article.Id, + IsDeleted = false + }; + entities.Add(articleRemove); + + //ERP + MenuEntity erp = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "ERP", + MenuType = MenuTypeEnum.Catalogue, + Router = "/erp", + IsShow = true, + IsLink = false, + MenuIcon = "international", + OrderNum = 96, + ParentId = 0, + IsDeleted = false + }; + entities.Add(erp); + + + + //供应商定义 + MenuEntity supplier = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "供应商定义", + PermissionCode = "erp:supplier:list", + MenuType = MenuTypeEnum.Menu, + Router = "supplier", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "erp/supplier/index", + MenuIcon = "education", + OrderNum = 100, + ParentId = erp.Id, + IsDeleted = false + }; + entities.Add(supplier); + + MenuEntity supplierQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "供应商查询", + PermissionCode = "erp:supplier:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = supplier.Id, + IsDeleted = false + }; + entities.Add(supplierQuery); + + MenuEntity supplierAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "供应商新增", + PermissionCode = "erp:supplier:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = supplier.Id, + IsDeleted = false + }; + entities.Add(supplierAdd); + + MenuEntity supplierEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "供应商修改", + PermissionCode = "erp:supplier:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = supplier.Id, + IsDeleted = false + }; + entities.Add(supplierEdit); + + MenuEntity supplierRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "供应商删除", + PermissionCode = "erp:supplier:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = supplier.Id, + IsDeleted = false + }; + entities.Add(supplierRemove); + + + //仓库定义 + MenuEntity warehouse = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "仓库定义", + PermissionCode = "erp:warehouse:list", + MenuType = MenuTypeEnum.Menu, + Router = "warehouse", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "erp/warehouse/index", + MenuIcon = "education", + OrderNum = 100, + ParentId = erp.Id, + IsDeleted = false + }; + entities.Add(warehouse); + + MenuEntity warehouseQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "仓库查询", + PermissionCode = "erp:warehouse:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = warehouse.Id, + IsDeleted = false + }; + entities.Add(warehouseQuery); + + MenuEntity warehouseAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "仓库新增", + PermissionCode = "erp:warehouse:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = warehouse.Id, + IsDeleted = false + }; + entities.Add(warehouseAdd); + + MenuEntity warehouseEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "仓库修改", + PermissionCode = "erp:warehouse:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = warehouse.Id, + IsDeleted = false + }; + entities.Add(warehouseEdit); + + MenuEntity warehouseRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "仓库删除", + PermissionCode = "erp:warehouse:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = warehouse.Id, + IsDeleted = false + }; + entities.Add(warehouseRemove); + + + //单位定义 + MenuEntity unit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "单位定义", + PermissionCode = "erp:unit:list", + MenuType = MenuTypeEnum.Menu, + Router = "unit", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "erp/unit/index", + MenuIcon = "education", + OrderNum = 100, + ParentId = erp.Id, + IsDeleted = false + }; + entities.Add(unit); + + MenuEntity unitQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "单位查询", + PermissionCode = "erp:unit:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = unit.Id, + IsDeleted = false + }; + entities.Add(unitQuery); + + MenuEntity unitAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "单位新增", + PermissionCode = "erp:unit:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = unit.Id, + IsDeleted = false + }; + entities.Add(unitAdd); + + MenuEntity unitEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "单位修改", + PermissionCode = "erp:unit:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = unit.Id, + IsDeleted = false + }; + entities.Add(unitEdit); + + MenuEntity unitRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "单位删除", + PermissionCode = "erp:unit:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = unit.Id, + IsDeleted = false + }; + entities.Add(unitRemove); + + + //物料定义 + MenuEntity material = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "物料定义", + PermissionCode = "erp:material:list", + MenuType = MenuTypeEnum.Menu, + Router = "material", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "erp/material/index", + MenuIcon = "education", + OrderNum = 100, + ParentId = erp.Id, + IsDeleted = false + }; + entities.Add(material); + + MenuEntity materialQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "物料查询", + PermissionCode = "erp:material:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = material.Id, + IsDeleted = false + }; + entities.Add(materialQuery); + + MenuEntity materialAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "物料新增", + PermissionCode = "erp:material:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = material.Id, + IsDeleted = false + }; + entities.Add(materialAdd); + + MenuEntity materialEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "物料修改", + PermissionCode = "erp:material:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = material.Id, + IsDeleted = false + }; + entities.Add(materialEdit); + + MenuEntity materialRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "物料删除", + PermissionCode = "erp:material:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = material.Id, + IsDeleted = false + }; + entities.Add(materialRemove); + + + //采购订单 + MenuEntity purchase = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "采购订单", + PermissionCode = "erp:purchase:list", + MenuType = MenuTypeEnum.Menu, + Router = "purchase", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "erp/purchase/index", + MenuIcon = "education", + OrderNum = 100, + ParentId = erp.Id, + IsDeleted = false + }; + entities.Add(purchase); + + MenuEntity purchaseQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "采购订单查询", + PermissionCode = "erp:purchase:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = purchase.Id, + IsDeleted = false + }; + entities.Add(purchaseQuery); + + MenuEntity purchaseAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "采购订单新增", + PermissionCode = "erp:purchase:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = purchase.Id, + IsDeleted = false + }; + entities.Add(purchaseAdd); + + MenuEntity purchaseEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "采购订单修改", + PermissionCode = "erp:purchase:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = purchase.Id, + IsDeleted = false + }; + entities.Add(purchaseEdit); + + MenuEntity purchaseRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "采购订单删除", + PermissionCode = "erp:purchase:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = purchase.Id, + IsDeleted = false + }; + entities.Add(purchaseRemove); + + + + //Yi框架 + MenuEntity guide = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "Yi框架", + MenuType = MenuTypeEnum.Catalogue, + Router = "https://gitee.com/ccnetcore/yi", + IsShow = true, + IsLink = true, + MenuIcon = "guide", + OrderNum = 90, + ParentId = 0, + IsDeleted = false, + }; + entities.Add(guide); + + //用户管理 + MenuEntity user = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "用户管理", + PermissionCode = "system:user:list", + MenuType = MenuTypeEnum.Menu, + Router = "user", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "system/user/index", + MenuIcon = "user", + OrderNum = 100, + ParentId = system.Id, + IsDeleted = false + }; + entities.Add(user); + + MenuEntity userQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "用户查询", + PermissionCode = "system:user:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = user.Id, + IsDeleted = false + }; + entities.Add(userQuery); + + MenuEntity userAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "用户新增", + PermissionCode = "system:user:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = user.Id, + IsDeleted = false + }; + entities.Add(userAdd); + + MenuEntity userEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "用户修改", + PermissionCode = "system:user:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = user.Id, + IsDeleted = false + }; + entities.Add(userEdit); + + MenuEntity userRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "用户删除", + PermissionCode = "system:user:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = user.Id, + IsDeleted = false + }; + entities.Add(userRemove); + + + //角色管理 + MenuEntity role = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "角色管理", + PermissionCode = "system:role:list", + MenuType = MenuTypeEnum.Menu, + Router = "role", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "system/role/index", + MenuIcon = "peoples", + OrderNum = 100, + ParentId = system.Id, + IsDeleted = false + }; + entities.Add(role); + + MenuEntity roleQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "角色查询", + PermissionCode = "system:role:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = role.Id, + IsDeleted = false + }; + entities.Add(roleQuery); + + MenuEntity roleAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "角色新增", + PermissionCode = "system:role:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = role.Id, + IsDeleted = false + }; + entities.Add(roleAdd); + + MenuEntity roleEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "角色修改", + PermissionCode = "system:role:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = role.Id, + IsDeleted = false + }; + entities.Add(roleEdit); + + MenuEntity roleRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "角色删除", + PermissionCode = "system:role:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = role.Id, + IsDeleted = false + }; + entities.Add(roleRemove); + + + //菜单管理 + MenuEntity menu = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "菜单管理", + PermissionCode = "system:menu:list", + MenuType = MenuTypeEnum.Menu, + Router = "menu", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "system/menu/index", + MenuIcon = "tree-table", + OrderNum = 100, + ParentId = system.Id, + IsDeleted = false + }; + entities.Add(menu); + + MenuEntity menuQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "菜单查询", + PermissionCode = "system:menu:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = menu.Id, + IsDeleted = false + }; + entities.Add(menuQuery); + + MenuEntity menuAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "菜单新增", + PermissionCode = "system:menu:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = menu.Id, + IsDeleted = false + }; + entities.Add(menuAdd); + + MenuEntity menuEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "菜单修改", + PermissionCode = "system:menu:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = menu.Id, + IsDeleted = false + }; + entities.Add(menuEdit); + + MenuEntity menuRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "菜单删除", + PermissionCode = "system:menu:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = menu.Id, + IsDeleted = false + }; + entities.Add(menuRemove); + + //部门管理 + MenuEntity dept = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "部门管理", + PermissionCode = "system:dept:list", + MenuType = MenuTypeEnum.Menu, + Router = "dept", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "system/dept/index", + MenuIcon = "tree", + OrderNum = 100, + ParentId = system.Id, + IsDeleted = false + }; + entities.Add(dept); + + MenuEntity deptQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "部门查询", + PermissionCode = "system:dept:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = dept.Id, + IsDeleted = false + }; + entities.Add(deptQuery); + + MenuEntity deptAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "部门新增", + PermissionCode = "system:dept:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = dept.Id, + IsDeleted = false + }; + entities.Add(deptAdd); + + MenuEntity deptEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "部门修改", + PermissionCode = "system:dept:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = dept.Id, + IsDeleted = false + }; + entities.Add(deptEdit); + + MenuEntity deptRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "部门删除", + PermissionCode = "system:dept:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = dept.Id, + IsDeleted = false + }; + entities.Add(deptRemove); + + + + //岗位管理 + MenuEntity post = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "岗位管理", + PermissionCode = "system:post:list", + MenuType = MenuTypeEnum.Menu, + Router = "post", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "system/post/index", + MenuIcon = "post", + OrderNum = 100, + ParentId = system.Id, + IsDeleted = false + }; + entities.Add(post); + + MenuEntity postQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "岗位查询", + PermissionCode = "system:post:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = post.Id, + IsDeleted = false + }; + entities.Add(postQuery); + + MenuEntity postAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "岗位新增", + PermissionCode = "system:post:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = post.Id, + IsDeleted = false + }; + entities.Add(postAdd); + + MenuEntity postEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "岗位修改", + PermissionCode = "system:post:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = post.Id, + IsDeleted = false + }; + entities.Add(postEdit); + + MenuEntity postRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "岗位删除", + PermissionCode = "system:post:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = post.Id, + IsDeleted = false + }; + entities.Add(postRemove); + + //字典管理 + MenuEntity dict = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "字典管理", + PermissionCode = "system:dict:list", + MenuType = MenuTypeEnum.Menu, + Router = "dict", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "system/dict/index", + MenuIcon = "dict", + OrderNum = 100, + ParentId = system.Id, + IsDeleted = false + }; + entities.Add(dict); + + MenuEntity dictQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "字典查询", + PermissionCode = "system:dict:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = dict.Id, + IsDeleted = false + }; + entities.Add(dictQuery); + + MenuEntity dictAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "字典新增", + PermissionCode = "system:dict:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = dict.Id, + IsDeleted = false + }; + entities.Add(dictAdd); + + MenuEntity dictEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "字典修改", + PermissionCode = "system:dict:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = dict.Id, + IsDeleted = false + }; + entities.Add(dictEdit); + + MenuEntity dictRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "字典删除", + PermissionCode = "system:dict:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = dict.Id, + IsDeleted = false + }; + entities.Add(dictRemove); + + + //参数设置 + MenuEntity config = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "参数设置", + PermissionCode = "system:config:list", + MenuType = MenuTypeEnum.Menu, + Router = "config", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "system/config/index", + MenuIcon = "edit", + OrderNum = 100, + ParentId = system.Id, + IsDeleted = false + }; + entities.Add(config); + + MenuEntity configQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "参数查询", + PermissionCode = "system:config:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = config.Id, + IsDeleted = false + }; + entities.Add(configQuery); + + MenuEntity configAdd = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "参数新增", + PermissionCode = "system:config:add", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = config.Id, + IsDeleted = false + }; + entities.Add(configAdd); + + MenuEntity configEdit = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "参数修改", + PermissionCode = "system:config:edit", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = config.Id, + IsDeleted = false + }; + entities.Add(configEdit); + + MenuEntity configRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "参数删除", + PermissionCode = "system:config:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = config.Id, + IsDeleted = false + }; + entities.Add(configRemove); + + + + + //日志管理 + MenuEntity log = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "日志管理", + MenuType = MenuTypeEnum.Catalogue, + Router = "log", + IsShow = true, + IsLink = false, + MenuIcon = "log", + OrderNum = 100, + ParentId = system.Id, + IsDeleted = false + }; + entities.Add(log); + + //操作日志 + MenuEntity operationLog = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "操作日志", + PermissionCode = "monitor:operlog:list", + MenuType = MenuTypeEnum.Menu, + Router = "operlog", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "monitor/operlog/index", + MenuIcon = "form", + OrderNum = 100, + ParentId = log.Id, + IsDeleted = false + }; + entities.Add(operationLog); + + MenuEntity operationLogQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "操作查询", + PermissionCode = "monitor:operlog:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = operationLog.Id, + IsDeleted = false + }; + entities.Add(operationLogQuery); + + MenuEntity operationLogRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "操作删除", + PermissionCode = "monitor:operlog:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = operationLog.Id, + IsDeleted = false + }; + entities.Add(operationLogRemove); + + + //登录日志 + MenuEntity loginLog = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "登录日志", + PermissionCode = "monitor:logininfor:list", + MenuType = MenuTypeEnum.Menu, + Router = "logininfor", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "monitor/logininfor/index", + MenuIcon = "logininfor", + OrderNum = 100, + ParentId = log.Id, + IsDeleted = false + }; + entities.Add(loginLog); + + MenuEntity loginLogQuery = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "登录查询", + PermissionCode = "monitor:logininfor:query", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = loginLog.Id, + IsDeleted = false + }; + entities.Add(loginLogQuery); + + MenuEntity loginLogRemove = new MenuEntity() + { + Id = SnowflakeHelper.NextId, + MenuName = "登录删除", + PermissionCode = "monitor:logininfor:remove", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = loginLog.Id, + IsDeleted = false + }; + entities.Add(loginLogRemove); + return entities; + } + } +} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj index 4037c4cf..b602d472 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj @@ -10,8 +10,12 @@ + + + + diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs index 30b51299..368ac54f 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs @@ -1,3 +1,4 @@ +using Hei.Captcha; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using StartupModules; @@ -8,13 +9,15 @@ using System.Text; using System.Threading.Tasks; using Yi.Framework.Core.Attributes; using Yi.Framework.Data; +using Yi.Framework.ThumbnailSharp; using Yi.RBAC.Domain.Shared; namespace Yi.RBAC.Domain { [DependsOn( typeof(YiRBACDomainSharedModule), - typeof(YiFrameworkDataModule) + typeof(YiFrameworkDataModule), + typeof(YiFrameworkThumbnailSharpModule) )] public class YiRBACDomainModule : IStartupModule { @@ -24,7 +27,7 @@ namespace Yi.RBAC.Domain public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) { - //services.AddTransient(); + services.AddHeiCaptcha(); } } } diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/Yi.RBAC.Web.csproj b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/Yi.RBAC.Web.csproj index f583bac8..8c910776 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/Yi.RBAC.Web.csproj +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/Yi.RBAC.Web.csproj @@ -22,6 +22,9 @@ Always + + Always + diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db index 1307f09b..bd2a8b2e 100644 Binary files a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db differ diff --git a/Yi.RuoYi.Vue3/.env.development b/Yi.RuoYi.Vue3/.env.development new file mode 100644 index 00000000..fa4ea55e --- /dev/null +++ b/Yi.RuoYi.Vue3/.env.development @@ -0,0 +1,17 @@ +# 页面标题 +VITE_APP_TITLE = 意框架管理系统 + +# 开发环境配置 +VITE_APP_ENV = 'development' + +# 若依管理系统/开发环境 +VITE_APP_BASE_API = '/dev-api' + +# ws/开发环境 +VITE_APP_BASE_WS = '/dev-ws' + + +VITE_APP_BASE_URL='http://localhost:19001/api' + + + diff --git a/Yi.RuoYi.Vue3/.env.production b/Yi.RuoYi.Vue3/.env.production new file mode 100644 index 00000000..565a45ef --- /dev/null +++ b/Yi.RuoYi.Vue3/.env.production @@ -0,0 +1,15 @@ +# 页面标题 +VITE_APP_TITLE = 意框架管理系统 + +# 生产环境配置 +VITE_APP_ENV = 'production' + +# 意框架管理系统/生产环境 +VITE_APP_BASE_API = '/prod-api' + +# ws/开发环境 +VITE_APP_BASE_WS = '/prod-ws' + +# 是否在打包时开启压缩，支持 gzip 和 brotli +VITE_BUILD_COMPRESS = gzip + diff --git a/Yi.RuoYi.Vue3/.env.staging b/Yi.RuoYi.Vue3/.env.staging new file mode 100644 index 00000000..58e3fbcd --- /dev/null +++ b/Yi.RuoYi.Vue3/.env.staging @@ -0,0 +1,15 @@ +# 页面标题 +VITE_APP_TITLE = 意框架管理系统 + +# 生产环境配置 +VITE_APP_ENV = 'staging' + +# 若依管理系统/生产环境 +VITE_APP_BASE_API = '/stage-api' + +# ws/开发环境 +VITE_APP_BASE_WS = '/stage-ws' + +# 是否在打包时开启压缩，支持 gzip 和 brotli +VITE_BUILD_COMPRESS = gzip + diff --git a/Yi.RuoYi.Vue3/.gitignore b/Yi.RuoYi.Vue3/.gitignore new file mode 100644 index 00000000..78a752d8 --- /dev/null +++ b/Yi.RuoYi.Vue3/.gitignore @@ -0,0 +1,23 @@ +.DS_Store +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log + +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local + +package-lock.json +yarn.lock diff --git a/Yi.RuoYi.Vue3/README.md b/Yi.RuoYi.Vue3/README.md new file mode 100644 index 00000000..5fcd4739 --- /dev/null +++ b/Yi.RuoYi.Vue3/README.md @@ -0,0 +1,109 @@ +

+ logo +

+

RuoYi v3.8.3

+

基于SpringBoot+Vue3前后端分离的Java快速开发框架

+

+ + + +

+ +## 平台简介 + +* 本仓库为前端技术栈 [Vue3](https://v3.cn.vuejs.org) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev) 版本。 +* 配套后端代码仓库地址[RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue) 或 [RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast) 版本。 +* 前端技术栈（[Vue2](https://cn.vuejs.org) + [Element](https://github.com/ElemeFE/element) + [Vue CLI](https://cli.vuejs.org/zh)），请移步[RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue/tree/master/ruoyi-ui)。 +* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)   +* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)   + +## 前端运行 + +```bash +# 克隆项目 +git clone https://github.com/yangzongzhuan/RuoYi-Vue3.git + +# 进入项目目录 +cd RuoYi-Vue3 + +# 安装依赖 +yarn --registry=https://registry.npmmirror.com + +# 启动服务 +yarn dev + +# 构建测试环境 yarn build:stage +# 构建生产环境 yarn build:prod +# 前端访问地址 http://localhost:80 +``` + +## 内置功能 + +1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。 +2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。 +3. 岗位管理：配置系统用户所属担任职务。 +4. 菜单管理：配置系统菜单，操作权限，按钮权限标识等。 +5. 角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。 +6. 字典管理：对系统中经常使用的一些较为固定的数据进行维护。 +7. 参数管理：对系统动态配置常用参数。 +8. 通知公告：系统通知公告信息发布维护。 +9. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。 +10. 登录日志：系统登录日志记录查询包含登录异常。 +11. 在线用户：当前系统中活跃用户状态监控。 +12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。 +13. 代码生成：前后端代码的生成（java、html、xml、sql）支持CRUD下载 。 +14. 系统接口：根据业务代码自动生成相关的api接口文档。 +15. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。 +16. 缓存监控：对系统的缓存信息查询，命令统计等。 +17. 在线构建器：拖动表单元素生成相应的HTML代码。 +18. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。 + +## 在线体验 + +- admin/admin123 +- 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 + +演示地址：http://vue.ruoyi.vip +文档地址：http://doc.ruoyi.vip + +## 演示图 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +## 若依前后端分离交流群 + +QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) 点击按钮入群。 \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/html/ie.html b/Yi.RuoYi.Vue3/html/ie.html new file mode 100644 index 00000000..052ffcd6 --- /dev/null +++ b/Yi.RuoYi.Vue3/html/ie.html @@ -0,0 +1,46 @@ + + + + + + 请升级您的浏览器 + + + + + + +

请升级您的浏览器，以便我们更好的为您提供服务！

+

您正在使用 Internet Explorer 的早期版本（IE11以下版本或使用该内核的浏览器）。这意味着在升级浏览器前，您将无法访问此网站。

+
+

请注意：微软公司对Windows XP 及 Internet Explorer 早期版本的支持已经结束

+

自 2016 年 1 月 12 日起，Microsoft 不再为 IE 11 以下版本提供相应支持和更新。没有关键的浏览器安全更新，您的电脑可能易受有害病毒、间谍软件和其他恶意软件的攻击，它们可以窃取或损害您的业务数据和信息。请参阅 微软对 Internet Explorer 早期版本的支持将于 2016 年 1 月 12 日结束的说明 。

+
+

您可以选择更先进的浏览器

+

推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问即可。

+ +
+ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/index.html b/Yi.RuoYi.Vue3/index.html new file mode 100644 index 00000000..12948d99 --- /dev/null +++ b/Yi.RuoYi.Vue3/index.html @@ -0,0 +1,215 @@ + + + + + + + + + + Yi意框架-ruoyi管理系统 + + + + + +
+
+
+
+
+
正在加载系统资源，请耐心等待
+
+
+ + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/package.json b/Yi.RuoYi.Vue3/package.json new file mode 100644 index 00000000..70de9e98 --- /dev/null +++ b/Yi.RuoYi.Vue3/package.json @@ -0,0 +1,46 @@ +{ + "name": "ruoyi", + "version": "2.0.0", + "description": "意框架管理系统", + "author": "意框架", + "license": "MIT", + "scripts": { + "dev": "vite", + "build:prod": "vite build", + "build:stage": "vite build --mode staging", + "preview": "vite preview" + }, + "repository": { + "type": "git", + "url": "https://gitee.com/y_project/RuoYi-Vue.git" + }, + "dependencies": { + "@element-plus/icons-vue": "1.1.4", + "@microsoft/signalr": "^6.0.9", + "@vueuse/core": "8.5.0", + "axios": "0.26.1", + "echarts": "5.3.2", + "element-plus": "2.1.8", + "file-saver": "2.0.5", + "fuse.js": "6.5.3", + "js-cookie": "3.0.1", + "jsencrypt": "3.2.1", + "json-bigint": "^1.0.0", + "nprogress": "0.2.0", + "pinia": "2.0.14", + "typeface-roboto": "^1.1.13", + "vue": "3.2.37", + "vue-cropper": "1.0.3", + "vue-router": "^4.0.14" + }, + "devDependencies": { + "@vitejs/plugin-vue": "2.3.3", + "@vue/compiler-sfc": "3.2.36", + "sass": "1.52.1", + "unplugin-auto-import": "0.8.5", + "vite": "2.9.14", + "vite-plugin-compression": "0.5.1", + "vite-plugin-svg-icons": "2.0.1", + "vite-plugin-vue-setup-extend": "0.4.0" + } +} diff --git a/Yi.RuoYi.Vue3/public/favicon.ico b/Yi.RuoYi.Vue3/public/favicon.ico new file mode 100644 index 00000000..e2637602 Binary files /dev/null and b/Yi.RuoYi.Vue3/public/favicon.ico differ diff --git a/Yi.RuoYi.Vue3/src/App.vue b/Yi.RuoYi.Vue3/src/App.vue new file mode 100644 index 00000000..a4b9af94 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/App.vue @@ -0,0 +1,29 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/api/bbs/articleApi.js b/Yi.RuoYi.Vue3/src/api/bbs/articleApi.js new file mode 100644 index 00000000..403e94c0 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/bbs/articleApi.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +// 分页查询 +export function listData(query) { + return request({ + url: '/article/pageList', + method: 'get', + params: query + }) +} + +// id查询 +export function getData(code) { + return request({ + url: '/article/getById/' + code, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/article/add', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(data) { + return request({ + url: '/article/update', + method: 'put', + data: data + }) +} + +// 删除 +export function delData(code) { + return request({ + url: '/article/delList', + method: 'delete', + data:"string"==typeof(code)?[code]:code + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/erp/materialApi.js b/Yi.RuoYi.Vue3/src/api/erp/materialApi.js new file mode 100644 index 00000000..80f472e1 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/erp/materialApi.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +// 分页查询 +export function listData(query) { + return request({ + url: '/material/pageList', + method: 'get', + params: query + }) +} + +// id查询 +export function getData(code) { + return request({ + url: '/material/getById/' + code, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/material/create', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(id,data) { + return request({ + url: `/material/update/${id}`, + method: 'put', + data: data + }) +} + +// 删除 +export function delData(code) { + return request({ + url: '/material/del', + method: 'delete', + data:"string"==typeof(code)?[code]:code + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/erp/purchaseApi.js b/Yi.RuoYi.Vue3/src/api/erp/purchaseApi.js new file mode 100644 index 00000000..98ff7b78 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/erp/purchaseApi.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +// 分页查询 +export function listData(query) { + return request({ + url: '/purchase/pageList', + method: 'get', + params: query + }) +} + +// id查询 +export function getData(code) { + return request({ + url: '/purchase/getById/' + code, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/purchase/create', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(id,data) { + return request({ + url: `/purchase/update/${id}`, + method: 'put', + data: data + }) +} + +// 删除 +export function delData(code) { + return request({ + url: '/purchase/del', + method: 'delete', + data:"string"==typeof(code)?[code]:code + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/erp/purchaseDetailsApi.js b/Yi.RuoYi.Vue3/src/api/erp/purchaseDetailsApi.js new file mode 100644 index 00000000..e4e89b9c --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/erp/purchaseDetailsApi.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' +export function getListByPurchaseId(id){ + return request({ + url: `/purchaseDetails/getListByPurchaseId/${id}`, + method: 'get' + }) +} + +// 分页查询 +export function listData(query) { + return request({ + url: '/purchaseDetails/pageList', + method: 'get', + params: query + }) +} + +// id查询 +export function getData(code) { + return request({ + url: '/purchaseDetails/getById/' + code, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/purchaseDetails/create', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(id,data) { + return request({ + url: `/purchaseDetails/update/${id}`, + method: 'put', + data: data + }) +} + +// 删除 +export function delData(code) { + return request({ + url: '/purchaseDetails/del', + method: 'delete', + data:"string"==typeof(code)?[code]:code + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/erp/stockApi.js b/Yi.RuoYi.Vue3/src/api/erp/stockApi.js new file mode 100644 index 00000000..b18394a0 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/erp/stockApi.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +// 分页查询 +export function listData(query) { + return request({ + url: '/stock/pageList', + method: 'get', + params: query + }) +} + +// id查询 +export function getData(code) { + return request({ + url: '/stock/getById/' + code, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/stock/create', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(id,data) { + return request({ + url: `/stock/update/${id}`, + method: 'put', + data: data + }) +} + +// 删除 +export function delData(code) { + return request({ + url: '/stock/del', + method: 'delete', + data:"string"==typeof(code)?[code]:code + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/erp/stockDetailsApi.js b/Yi.RuoYi.Vue3/src/api/erp/stockDetailsApi.js new file mode 100644 index 00000000..cfda0c22 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/erp/stockDetailsApi.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +// 分页查询 +export function listData(query) { + return request({ + url: '/stockDetails/pageList', + method: 'get', + params: query + }) +} + +// id查询 +export function getData(code) { + return request({ + url: '/stockDetails/getById/' + code, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/stockDetails/create', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(id,data) { + return request({ + url: `/stockDetails/update/${id}`, + method: 'put', + data: data + }) +} + +// 删除 +export function delData(code) { + return request({ + url: '/stockDetails/del', + method: 'delete', + data:"string"==typeof(code)?[code]:code + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/erp/supplierApi.js b/Yi.RuoYi.Vue3/src/api/erp/supplierApi.js new file mode 100644 index 00000000..72dec607 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/erp/supplierApi.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 全查询 +export function allData() { + return request({ + url: '/supplier/getList', + method: 'get' + }) +} + +// 分页查询 +export function listData(query) { + return request({ + url: '/supplier/pageList', + method: 'get', + params: query + }) +} + +// id查询 +export function getData(code) { + return request({ + url: '/supplier/getById/' + code, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/supplier/create', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(id,data) { + return request({ + url: `/supplier/update/${id}`, + method: 'put', + data: data + }) +} + +// 删除 +export function delData(code) { + return request({ + url: '/supplier/del', + method: 'delete', + data:"string"==typeof(code)?[code]:code + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/erp/unitApi.js b/Yi.RuoYi.Vue3/src/api/erp/unitApi.js new file mode 100644 index 00000000..ca925c04 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/erp/unitApi.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 全查询 +export function allData() { + return request({ + url: '/unit/getList', + method: 'get' + }) +} + +// 分页查询 +export function listData(query) { + return request({ + url: '/unit/pageList', + method: 'get', + params: query + }) +} + +// id查询 +export function getData(code) { + return request({ + url: '/unit/getById/' + code, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/unit/create', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(id,data) { + return request({ + url: `/unit/update/${id}`, + method: 'put', + data: data + }) +} + +// 删除 +export function delData(code) { + return request({ + url: '/unit/del', + method: 'delete', + data:"string"==typeof(code)?[code]:code + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/erp/warehouseApi.js b/Yi.RuoYi.Vue3/src/api/erp/warehouseApi.js new file mode 100644 index 00000000..e9f91df4 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/erp/warehouseApi.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +// 分页查询 +export function listData(query) { + return request({ + url: '/warehouse/pageList', + method: 'get', + params: query + }) +} + +// id查询 +export function getData(code) { + return request({ + url: '/warehouse/getById/' + code, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/warehouse/create', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(id,data) { + return request({ + url: `/warehouse/update/${id}`, + method: 'put', + data: data + }) +} + +// 删除 +export function delData(code) { + return request({ + url: '/warehouse/del', + method: 'delete', + data:"string"==typeof(code)?[code]:code + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/file.js b/Yi.RuoYi.Vue3/src/api/file.js new file mode 100644 index 00000000..2dc681e9 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/file.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' + +export function + upload(type,data){ + return request({ + url: `/file/upload/${type}`, + headers:{"Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"}, + method: 'POST', + data:data + }); +} diff --git a/Yi.RuoYi.Vue3/src/api/login.js b/Yi.RuoYi.Vue3/src/api/login.js new file mode 100644 index 00000000..83852fcb --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/login.js @@ -0,0 +1,59 @@ +import request from '@/utils/request' + +// 登录方法 +export function login(username, password, code, uuid) { + const data = { + username, + password, + code, + uuid + } + return request({ + url: '/account/login', + headers: { + isToken: false + }, + method: 'post', + data: data + }) +} + +// 注册方法 +export function register(data) { + return request({ + url: '/register', + headers: { + isToken: false + }, + method: 'post', + data: data + }) +} + +// 获取用户详细信息 +export function getInfo() { + return request({ + url: '/account', + method: 'get' + }) +} + +// 退出方法 +export function logout() { + return request({ + url: '/account/logout', + method: 'post' + }) +} + +// 获取验证码 +export function getCodeImg() { + return request({ + url: '/account/captcha-image', + headers: { + isToken: false + }, + method: 'get', + timeout: 20000 + }) +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/api/menu.js b/Yi.RuoYi.Vue3/src/api/menu.js new file mode 100644 index 00000000..aabe5625 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/menu.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +// 获取路由 +export const getRouters = () => { + return request({ + url: '/account/Vue3Router', + method: 'get' + }) +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/api/monitor/cache.js b/Yi.RuoYi.Vue3/src/api/monitor/cache.js new file mode 100644 index 00000000..72c5f6a3 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/monitor/cache.js @@ -0,0 +1,57 @@ +import request from '@/utils/request' + +// 查询缓存详细 +export function getCache() { + return request({ + url: '/monitor/cache', + method: 'get' + }) +} + +// 查询缓存名称列表 +export function listCacheName() { + return request({ + url: '/monitor/cache/getNames', + method: 'get' + }) +} + +// 查询缓存键名列表 +export function listCacheKey(cacheName) { + return request({ + url: '/monitor/cache/getKeys/' + cacheName, + method: 'get' + }) +} + +// 查询缓存内容 +export function getCacheValue(cacheName, cacheKey) { + return request({ + url: '/monitor/cache/getValue/' + cacheName + '/' + cacheKey, + method: 'get' + }) +} + +// 清理指定名称缓存 +export function clearCacheName(cacheName) { + return request({ + url: '/monitor/cache/clearCacheName/' + cacheName, + method: 'delete' + }) +} + +// 清理指定键名缓存 +export function clearCacheKey(cacheKey) { + return request({ + url: '/monitor/cache/clearCacheKey/' + cacheKey, + method: 'delete' + }) +} + +// 清理全部缓存 +export function clearCacheAll() { + return request({ + url: '/monitor/cache/clearCacheAll', + method: 'delete' + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/monitor/job.js b/Yi.RuoYi.Vue3/src/api/monitor/job.js new file mode 100644 index 00000000..38155693 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/monitor/job.js @@ -0,0 +1,71 @@ +import request from '@/utils/request' + +// 查询定时任务调度列表 +export function listJob(query) { + return request({ + url: '/monitor/job/list', + method: 'get', + params: query + }) +} + +// 查询定时任务调度详细 +export function getJob(jobId) { + return request({ + url: '/monitor/job/' + jobId, + method: 'get' + }) +} + +// 新增定时任务调度 +export function addJob(data) { + return request({ + url: '/monitor/job', + method: 'post', + data: data + }) +} + +// 修改定时任务调度 +export function updateJob(data) { + return request({ + url: '/monitor/job', + method: 'put', + data: data + }) +} + +// 删除定时任务调度 +export function delJob(jobId) { + return request({ + url: '/monitor/job/' + jobId, + method: 'delete' + }) +} + +// 任务状态修改 +export function changeJobStatus(jobId, status) { + const data = { + jobId, + status + } + return request({ + url: '/monitor/job/changeStatus', + method: 'put', + data: data + }) +} + + +// 定时任务立即执行一次 +export function runJob(jobId, jobGroup) { + const data = { + jobId, + jobGroup + } + return request({ + url: '/monitor/job/run', + method: 'put', + data: data + }) +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/api/monitor/jobLog.js b/Yi.RuoYi.Vue3/src/api/monitor/jobLog.js new file mode 100644 index 00000000..6e0be616 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/monitor/jobLog.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 查询调度日志列表 +export function listJobLog(query) { + return request({ + url: '/monitor/jobLog/list', + method: 'get', + params: query + }) +} + +// 删除调度日志 +export function delJobLog(jobLogId) { + return request({ + url: '/monitor/jobLog/' + jobLogId, + method: 'delete' + }) +} + +// 清空调度日志 +export function cleanJobLog() { + return request({ + url: '/monitor/jobLog/clean', + method: 'delete' + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/monitor/logininfor.js b/Yi.RuoYi.Vue3/src/api/monitor/logininfor.js new file mode 100644 index 00000000..a3881ea4 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/monitor/logininfor.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +// 查询登录日志列表 +export function list(query) { + return request({ + url: '/loginLog/pageList', + method: 'get', + params: query + }) +} + +// 删除登录日志 +export function delLogininfor(infoId) { + return request({ + url: '/loginLog/delList', + method: 'delete', + data:"string"==typeof(infoId)?[infoId]:infoId + }) +} + +// 解锁用户登录状态 +export function unlockLogininfor(userName) { + return request({ + url: '/monitor/logininfor/unlock/' + userName, + method: 'get' + }) +} + +// 清空登录日志 +export function cleanLogininfor() { + return request({ + url: '/monitor/logininfor/clean', + method: 'delete' + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/monitor/online.js b/Yi.RuoYi.Vue3/src/api/monitor/online.js new file mode 100644 index 00000000..434aadc4 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/monitor/online.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' + +// 查询在线用户列表 +export function list(query) { + return request({ + url: '/online/pageList', + method: 'get', + params: query + }) +} + +// 强退用户 +export function forceLogout(tokenId) { + return request({ + url: '/online/ForceOut/' + tokenId, + method: 'delete' + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/monitor/operlog.js b/Yi.RuoYi.Vue3/src/api/monitor/operlog.js new file mode 100644 index 00000000..17c3470a --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/monitor/operlog.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +// 查询操作日志列表 +export function list(query) { + return request({ + url: '/operationLog/pageList', + method: 'get', + params: query + }) +} + +// 删除操作日志 +export function delOperlog(operId) { + return request({ + url: '/operationLog/delList', + method: 'delete', + data:"string"==typeof(operId)?[operId]:operId + }) +} + +// 清空操作日志 +export function cleanOperlog() { + return request({ + url: '/operationLog/clear', + method: 'delete' + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/monitor/server.js b/Yi.RuoYi.Vue3/src/api/monitor/server.js new file mode 100644 index 00000000..e1f9ca21 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/monitor/server.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +// 获取服务信息 +export function getServer() { + return request({ + url: '/monitor/server', + method: 'get' + }) +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/api/system/config.js b/Yi.RuoYi.Vue3/src/api/system/config.js new file mode 100644 index 00000000..e1d549e6 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/system/config.js @@ -0,0 +1,66 @@ +import request from '@/utils/request' + +// 查询参数列表 +export function listConfig(query) { + return request({ + url: '/config/pageList', + method: 'get', + params: query + }) +} + +// 查询参数详细 +export function getConfig(configId) { + return request({ + url: '/config/getById/' + configId, + method: 'get' + }) +} + +// 根据参数键名查询参数值 +export function getConfigKey(configKey) { + return request({ + url: '/system/config/configKey/' + configKey, + method: 'get' + }) +} + +// 新增参数配置 +export function addConfig(data) { + return request({ + url: '/config/add', + method: 'post', + data: data + }) +} + +// 修改参数配置 +export function updateConfig(data) { + return request({ + url: '/config/update', + method: 'put', + data: data + }) +} + +// 删除参数配置 +export function delConfig(configId) { + +if("string"==typeof(configId)) +{ + configId=[configId]; +} + return request({ + url: '/config/delList', + method: 'delete', + data:configId + }) +} + +// 刷新参数缓存 +export function refreshCache() { + return request({ + url: '/system/config/refreshCache', + method: 'delete' + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/system/dept.js b/Yi.RuoYi.Vue3/src/api/system/dept.js new file mode 100644 index 00000000..cf28c932 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/system/dept.js @@ -0,0 +1,66 @@ +import request from '@/utils/request' + +// 查询部门列表 +export function listDept(query) { + return request({ + url: '/dept/SelctGetList', + method: 'get', + params: query + }) +} + +// // 查询部门列表（排除节点） +// export function listDeptExcludeChild(deptId) { +// return request({ +// url: '/system/dept/list/exclude/' + deptId, +// method: 'get' +// }) +// } + +// 查询部门详细 +export function getDept(deptId) { + return request({ + url: '/dept/getById/' + deptId, + method: 'get' + }) +} + +// 新增部门 +export function addDept(data) { + return request({ + url: '/dept/add', + method: 'post', + data: data + }) +} + +// 修改部门 +export function updateDept(data) { + return request({ + url: '/dept/update', + method: 'put', + data: data + }) +} + +// 删除部门 +export function delDept(deptId) { + if("string"==typeof(deptId)) + { + deptId=[deptId]; + } + return request({ + url: '/dept/delList', + method: 'delete', + data:deptId + }) +} + + +// 根据角色ID查询菜单下拉树结构 +export function roleDeptTreeselect(roleId) { + return request({ + url: '/dept/getListByRoleId/' + roleId, + method: 'get' + }) +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/api/system/dict/data.js b/Yi.RuoYi.Vue3/src/api/system/dict/data.js new file mode 100644 index 00000000..8f7766ea --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/system/dict/data.js @@ -0,0 +1,58 @@ +import request from '@/utils/request' + +// 查询字典数据列表 +export function listData(query) { + return request({ + url: '/dictionaryInfo/pageList', + method: 'get', + params: query + }) +} + +// 查询字典数据详细 +export function getData(dictCode) { + return request({ + url: '/dictionaryInfo/getById/' + dictCode, + method: 'get' + }) +} + +// 根据字典类型查询字典数据信息 +export function getDicts(dictType) { + return request({ + url: '/dictionaryInfo/GetListByType/' + dictType, + method: 'get' + }) +} + +// 新增字典数据 +export function addData(data) { + return request({ + url: '/dictionaryInfo/add', + method: 'post', + data: data + }) +} + +// 修改字典数据 +export function updateData(data) { + return request({ + url: '/dictionaryInfo/update', + method: 'put', + data: data + }) +} + +// 删除字典数据 +export function delData(dictCode) { + +if("string"==typeof(dictCode)) +{ + dictCode=[dictCode]; +} + return request({ + url: '/dictionaryInfo/delList', + method: 'delete', + data:dictCode + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/system/dict/type.js b/Yi.RuoYi.Vue3/src/api/system/dict/type.js new file mode 100644 index 00000000..347686d6 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/system/dict/type.js @@ -0,0 +1,65 @@ +import request from '@/utils/request' + +// 查询字典类型列表 +export function listType(query) { + return request({ + url: '/dictionary/pageList', + method: 'get', + params: query + }) +} + +// 查询字典类型详细 +export function getType(dictId) { + return request({ + url: '/dictionary/getById/' + dictId, + method: 'get' + }) +} + +// 新增字典类型 +export function addType(data) { + return request({ + url: '/dictionary/add', + method: 'post', + data: data + }) +} + +// 修改字典类型 +export function updateType(data) { + return request({ + url: '/dictionary/update', + method: 'put', + data: data + }) +} + +// 删除字典类型 +export function delType(dictId) { + if("string"==typeof(dictId)) +{ + dictId=[dictId]; +} + return request({ + url: '/dictionary/delList', + method: 'delete', + data:dictId + }) +} + +// 刷新字典缓存 +export function refreshCache() { + return request({ + url: '/system/dict/type/refreshCache', + method: 'delete' + }) +} + +// 获取字典选择框列表 +export function optionselect() { + return request({ + url: '/dictionary/getList', + method: 'get' + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/system/menu.js b/Yi.RuoYi.Vue3/src/api/system/menu.js new file mode 100644 index 00000000..2cab2ce1 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/system/menu.js @@ -0,0 +1,65 @@ +import request from '@/utils/request' + +// 查询菜单列表 +export function listMenu(query) { + return request({ + url: '/menu/selctGetList', + method: 'get', + params: query + }) +} + +// 查询菜单详细 +export function getMenu(menuId) { + return request({ + url: '/menu/getById/' + menuId, + method: 'get' + }) +} + +// 查询菜单下拉树结构 +export function treeselect() { + return request({ + url: '/system/menu/treeselect', + method: 'get' + }) +} + +// 根据角色ID查询菜单下拉树结构 +export function roleMenuTreeselect(roleId) { + return request({ + url: '/menu/getListByRoleId/' + roleId, + method: 'get' + }) +} + +// 新增菜单 +export function addMenu(data) { + return request({ + url: '/menu/add', + method: 'post', + data: data + }) +} + +// 修改菜单 +export function updateMenu(data) { + return request({ + url: '/menu/update', + method: 'put', + data: data + }) +} + +// 删除菜单 +export function delMenu(menuId) { + if("string"==typeof(menuId)) + { + menuId=[menuId]; + } + return request({ + url: '/menu/delList', + method: 'delete', + data:menuId + }) +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/api/system/notice.js b/Yi.RuoYi.Vue3/src/api/system/notice.js new file mode 100644 index 00000000..c274ea5b --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/system/notice.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询公告列表 +export function listNotice(query) { + return request({ + url: '/system/notice/list', + method: 'get', + params: query + }) +} + +// 查询公告详细 +export function getNotice(noticeId) { + return request({ + url: '/system/notice/' + noticeId, + method: 'get' + }) +} + +// 新增公告 +export function addNotice(data) { + return request({ + url: '/system/notice', + method: 'post', + data: data + }) +} + +// 修改公告 +export function updateNotice(data) { + return request({ + url: '/system/notice', + method: 'put', + data: data + }) +} + +// 删除公告 +export function delNotice(noticeId) { + return request({ + url: '/system/notice/' + noticeId, + method: 'delete' + }) +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/api/system/post.js b/Yi.RuoYi.Vue3/src/api/system/post.js new file mode 100644 index 00000000..dd1eebf4 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/system/post.js @@ -0,0 +1,58 @@ +import request from '@/utils/request' + +// 查询岗位列表 +export function listPost(query) { + return request({ + url: '/post/pageList', + method: 'get', + params: query + }) +} + +// 查询岗位详细 +export function getPost(postId) { + return request({ + url: '/post/getById/' + postId, + method: 'get' + }) +} + +// 新增岗位 +export function addPost(data) { + return request({ + url: '/post/add', + method: 'post', + data: data + }) +} + +// 修改岗位 +export function updatePost(data) { + return request({ + url: '/post/update', + method: 'put', + data: data + }) +} + +// 删除岗位 +export function delPost(postId) { + if("string"==typeof(postId)) + { + postId=[postId]; + } + return request({ + url: '/post/delList', + method: 'delete', + data:postId + }) +} + +// 获取角色选择框列表 +export function postOptionselect() { + return request({ + url: '/post/getList', + method: 'get' + }) + +} diff --git a/Yi.RuoYi.Vue3/src/api/system/role.js b/Yi.RuoYi.Vue3/src/api/system/role.js new file mode 100644 index 00000000..f000bd81 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/system/role.js @@ -0,0 +1,129 @@ +import request from '@/utils/request' + +// 查询角色列表 +export function listRole(query) { + return request({ + url: '/role/pageList', + method: 'get', + params: query + }) +} + + + +// 查询角色详细 +export function getRole(roleId) { + return request({ + url: '/role/getById/' + roleId, + method: 'get' + }) +} + +// 新增角色 +export function addRole(data) { + return request({ + url: '/role/add', + method: 'post', + data: data + }) +} + +// 修改角色 +export function updateRole(data) { + return request({ + url: '/role/update', + method: 'put', + data: data + }) +} + +// 角色数据权限 +export function dataScope(data) { + return request({ + url: '/role/UpdateDataScpoce', + method: 'put', + data: data + }) +} + +// 角色状态修改 +export function changeRoleStatus(roleId, isDel) { + return request({ + url: `/role/updateStatus?roleId=${roleId}&isDel=${isDel}`, + method: 'put' + }) +} + +// 删除角色 +export function delRole(roleId) { + if("string"==typeof(roleId)) + { + roleId=[roleId]; + } + return request({ + url: '/role/delList', + method: 'delete', + data:roleId + }) +} + +// 查询角色已授权用户列表 +export function allocatedUserList(query) { + return request({ + url: '/system/role/authUser/allocatedList', + method: 'get', + params: query + }) +} + +// 查询角色未授权用户列表 +export function unallocatedUserList(query) { + return request({ + url: '/system/role/authUser/unallocatedList', + method: 'get', + params: query + }) +} + +// 取消用户授权角色 +export function authUserCancel(data) { + return request({ + url: '/system/role/authUser/cancel', + method: 'put', + data: data + }) +} + +// 批量取消用户授权角色 +export function authUserCancelAll(data) { + return request({ + url: '/system/role/authUser/cancelAll', + method: 'put', + params: data + }) +} + +// 授权用户选择 +export function authUserSelectAll(data) { + return request({ + url: '/system/role/authUser/selectAll', + method: 'put', + params: data + }) +} + +// 根据角色ID查询部门树结构 +// export function deptTreeSelect(roleId) { +// return request({ +// url: '/system/role/deptTree/' + roleId, +// method: 'get' +// }) +// } +// 获取角色选择框列表 +export function roleOptionselect() { + return request({ + url: '/role/getList', + method: 'get' + }) + +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/api/system/user.js b/Yi.RuoYi.Vue3/src/api/system/user.js new file mode 100644 index 00000000..aa88ec0f --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/system/user.js @@ -0,0 +1,137 @@ +import request from '@/utils/request.js' +import { parseStrEmpty } from "@/utils/ruoyi"; + +// 查询用户列表 +export function listUser(query) { + return request({ + url: '/user/pageList', + method: 'get', + params: query + }) +} + +// 查询用户详细 +export function getUser(userId) { + return request({ + url: '/user/getById/' + parseStrEmpty(userId), + method: 'get' + }) +} + +// 新增用户 +export function addUser(data) { + return request({ + url: '/user/add', + method: 'post', + data: data + }) +} + +// 修改用户 +export function updateUser(data) { + return request({ + url: '/user/update', + method: 'put', + data: data + }) +} + +// 删除用户 +export function delUser(userId) { + if("string"==typeof(userId)) + { + userId=[userId]; + } + return request({ + url: '/user/delList', + method: 'delete', + data:userId + }) +} + +// 用户密码重置 +export function resetUserPwd(id, password) { + const data = { + id, + password + } + + + return request({ + url: '/user/restPassword', + method: 'put', + data: data + }) +} + +// 用户状态修改 +export function changeUserStatus(userId, isDel) { + return request({ + url: `/user/updateStatus?userId=${userId}&isDel=${isDel}`, + method: 'put' + }) +} + +// 查询用户个人信息 +export function getUserProfile() { + return request({ + url: '/account/getUserAllInfo', + method: 'get' + }) +} + +// 修改用户个人信息 +export function updateUserProfile(data) { + return request({ + url: '/user/UpdateProfile', + method: 'put', + data: {user:data} + }) +} + +// 用户密码重置 +export function updateUserPwd(oldPassword, newPassword) { + const data = { + oldPassword, + newPassword + } + return request({ + url: '/account/UpdatePassword', + method: 'put', + data: data + }) +} + +// 用户头像上传 +export function uploadAvatar(data) { + return request({ + url: '/system/user/profile/avatar', + method: 'post', + data: data + }) +} + +// 查询授权角色 +export function getAuthRole(userId) { + return request({ + url: '/system/user/authRole/' + userId, + method: 'get' + }) +} + +// 保存授权角色 +export function updateAuthRole(data) { + return request({ + url: '/system/user/authRole', + method: 'put', + params: data + }) +} + +// // 查询部门下拉树结构 +// export function deptTreeSelect() { +// return request({ +// url: '/system/user/deptTree', +// method: 'get' +// }) +// } diff --git a/Yi.RuoYi.Vue3/src/api/tool/gen.js b/Yi.RuoYi.Vue3/src/api/tool/gen.js new file mode 100644 index 00000000..45069278 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/tool/gen.js @@ -0,0 +1,76 @@ +import request from '@/utils/request' + +// 查询生成表数据 +export function listTable(query) { + return request({ + url: '/tool/gen/list', + method: 'get', + params: query + }) +} +// 查询db数据库列表 +export function listDbTable(query) { + return request({ + url: '/tool/gen/db/list', + method: 'get', + params: query + }) +} + +// 查询表详细信息 +export function getGenTable(tableId) { + return request({ + url: '/tool/gen/' + tableId, + method: 'get' + }) +} + +// 修改代码生成信息 +export function updateGenTable(data) { + return request({ + url: '/tool/gen', + method: 'put', + data: data + }) +} + +// 导入表 +export function importTable(data) { + return request({ + url: '/tool/gen/importTable', + method: 'post', + params: data + }) +} + +// 预览生成代码 +export function previewTable(tableId) { + return request({ + url: '/tool/gen/preview/' + tableId, + method: 'get' + }) +} + +// 删除表数据 +export function delTable(tableId) { + return request({ + url: '/tool/gen/' + tableId, + method: 'delete' + }) +} + +// 生成代码（自定义路径） +export function genCode(tableName) { + return request({ + url: '/tool/gen/genCode/' + tableName, + method: 'get' + }) +} + +// 同步数据库 +export function synchDb(tableName) { + return request({ + url: '/tool/gen/synchDb/' + tableName, + method: 'get' + }) +} diff --git a/Yi.RuoYi.Vue3/src/assets/401_images/401.gif b/Yi.RuoYi.Vue3/src/assets/401_images/401.gif new file mode 100644 index 00000000..cd6e0d94 Binary files /dev/null and b/Yi.RuoYi.Vue3/src/assets/401_images/401.gif differ diff --git a/Yi.RuoYi.Vue3/src/assets/404_images/404.png b/Yi.RuoYi.Vue3/src/assets/404_images/404.png new file mode 100644 index 00000000..3d8e2305 Binary files /dev/null and b/Yi.RuoYi.Vue3/src/assets/404_images/404.png differ diff --git a/Yi.RuoYi.Vue3/src/assets/404_images/404_cloud.png b/Yi.RuoYi.Vue3/src/assets/404_images/404_cloud.png new file mode 100644 index 00000000..c6281d09 Binary files /dev/null and b/Yi.RuoYi.Vue3/src/assets/404_images/404_cloud.png differ diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/404.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/404.svg new file mode 100644 index 00000000..6df50190 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/404.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/bug.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/bug.svg new file mode 100644 index 00000000..05a150dc --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/bug.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/build.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/build.svg new file mode 100644 index 00000000..97c46886 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/build.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/button.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/button.svg new file mode 100644 index 00000000..904fddc8 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/button.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/cascader.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/cascader.svg new file mode 100644 index 00000000..e256024f --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/cascader.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/chart.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/chart.svg new file mode 100644 index 00000000..27728fb0 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/chart.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/checkbox.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/checkbox.svg new file mode 100644 index 00000000..013fd3a2 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/checkbox.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/clipboard.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/clipboard.svg new file mode 100644 index 00000000..90923ff6 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/clipboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/code.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/code.svg new file mode 100644 index 00000000..ed4d23cf --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/code.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/color.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/color.svg new file mode 100644 index 00000000..44a81aab --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/color.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/component.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/component.svg new file mode 100644 index 00000000..29c34580 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/component.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/dashboard.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/dashboard.svg new file mode 100644 index 00000000..5317d370 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/date-range.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/date-range.svg new file mode 100644 index 00000000..fda571e7 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/date-range.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/date.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/date.svg new file mode 100644 index 00000000..52dc73ee --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/date.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/dict.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/dict.svg new file mode 100644 index 00000000..48493773 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/dict.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/documentation.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/documentation.svg new file mode 100644 index 00000000..70431228 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/documentation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/download.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/download.svg new file mode 100644 index 00000000..c8969513 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/download.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/drag.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/drag.svg new file mode 100644 index 00000000..4185d3ce --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/drag.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/druid.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/druid.svg new file mode 100644 index 00000000..a2b4b4ed --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/druid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/edit.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/edit.svg new file mode 100644 index 00000000..d26101f2 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/edit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/education.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/education.svg new file mode 100644 index 00000000..7bfb01d1 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/education.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/email.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/email.svg new file mode 100644 index 00000000..74d25e21 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/email.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/example.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/example.svg new file mode 100644 index 00000000..46f42b53 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/example.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/excel.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/excel.svg new file mode 100644 index 00000000..74d97b80 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/excel.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/exit-fullscreen.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/exit-fullscreen.svg new file mode 100644 index 00000000..485c128b --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/exit-fullscreen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/eye-open.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/eye-open.svg new file mode 100644 index 00000000..88dcc98e --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/eye-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/eye.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/eye.svg new file mode 100644 index 00000000..16ed2d87 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/form.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/form.svg new file mode 100644 index 00000000..dcbaa185 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/form.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/fullscreen.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/fullscreen.svg new file mode 100644 index 00000000..0e86b6fa --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/fullscreen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/github.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/github.svg new file mode 100644 index 00000000..db0a0d43 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/guide.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/guide.svg new file mode 100644 index 00000000..b2710017 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/guide.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/icon.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/icon.svg new file mode 100644 index 00000000..82be8eee --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/input.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/input.svg new file mode 100644 index 00000000..ab91381e --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/input.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/international.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/international.svg new file mode 100644 index 00000000..e9b56eee --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/international.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/job.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/job.svg new file mode 100644 index 00000000..2a93a251 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/job.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/language.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/language.svg new file mode 100644 index 00000000..0082b577 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/language.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/link.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/link.svg new file mode 100644 index 00000000..48197ba4 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/list.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/list.svg new file mode 100644 index 00000000..20259edd --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/list.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/lock.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/lock.svg new file mode 100644 index 00000000..74fee543 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/lock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/log.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/log.svg new file mode 100644 index 00000000..d879d33b --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/log.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/logininfor.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/logininfor.svg new file mode 100644 index 00000000..267f8447 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/logininfor.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/message.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/message.svg new file mode 100644 index 00000000..14ca8172 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/message.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/money.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/money.svg new file mode 100644 index 00000000..c1580de1 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/money.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/monitor.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/monitor.svg new file mode 100644 index 00000000..bc308cb0 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/monitor.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/nested.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/nested.svg new file mode 100644 index 00000000..06713a86 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/nested.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/number.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/number.svg new file mode 100644 index 00000000..ad5ce9af --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/number.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/online.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/online.svg new file mode 100644 index 00000000..330a2029 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/online.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/password.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/password.svg new file mode 100644 index 00000000..6c64defe --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/password.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/pdf.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/pdf.svg new file mode 100644 index 00000000..957aa0cc --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/pdf.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/people.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/people.svg new file mode 100644 index 00000000..2bd54aeb --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/peoples.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/peoples.svg new file mode 100644 index 00000000..aab852e5 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/peoples.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/phone.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/phone.svg new file mode 100644 index 00000000..ab8e8c4e --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/phone.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/post.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/post.svg new file mode 100644 index 00000000..2922c613 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/post.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/qq.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/qq.svg new file mode 100644 index 00000000..ee13d4ec --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/qq.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/question.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/question.svg new file mode 100644 index 00000000..cf75bd4b --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/question.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/radio.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/radio.svg new file mode 100644 index 00000000..0cde3452 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/radio.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/rate.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/rate.svg new file mode 100644 index 00000000..aa3b14d7 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/rate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/redis-list.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/redis-list.svg new file mode 100644 index 00000000..98a15b2a --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/redis-list.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/redis.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/redis.svg new file mode 100644 index 00000000..2f1d62df --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/redis.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/row.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/row.svg new file mode 100644 index 00000000..07809922 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/row.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/search.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/search.svg new file mode 100644 index 00000000..84233dda --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/select.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/select.svg new file mode 100644 index 00000000..d6283828 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/select.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/server.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/server.svg new file mode 100644 index 00000000..ca37b001 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/server.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/shopping.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/shopping.svg new file mode 100644 index 00000000..87513e7c --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/shopping.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/size.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/size.svg new file mode 100644 index 00000000..ddb25b8d --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/size.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/skill.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/skill.svg new file mode 100644 index 00000000..a3b73121 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/skill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/slider.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/slider.svg new file mode 100644 index 00000000..fbe4f39f --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/slider.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/star.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/star.svg new file mode 100644 index 00000000..6cf86e66 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/star.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/swagger.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/swagger.svg new file mode 100644 index 00000000..05d4e7bc --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/swagger.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/switch.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/switch.svg new file mode 100644 index 00000000..0ba61e38 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/switch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/system.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/system.svg new file mode 100644 index 00000000..dba28cf6 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/system.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/tab.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/tab.svg new file mode 100644 index 00000000..b4b48e48 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/tab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/table.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/table.svg new file mode 100644 index 00000000..0e3dc9de --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/textarea.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/textarea.svg new file mode 100644 index 00000000..2709f292 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/textarea.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/theme.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/theme.svg new file mode 100644 index 00000000..5982a2f7 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/theme.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/time-range.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/time-range.svg new file mode 100644 index 00000000..13c1202b --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/time-range.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/time.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/time.svg new file mode 100644 index 00000000..b376e32a --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/time.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/tool.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/tool.svg new file mode 100644 index 00000000..c813067e --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/tool.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/tree-table.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/tree-table.svg new file mode 100644 index 00000000..8aafdb82 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/tree-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/tree.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/tree.svg new file mode 100644 index 00000000..dd4b7dd2 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/tree.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/upload.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/upload.svg new file mode 100644 index 00000000..bae49c0a --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/upload.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/user.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/user.svg new file mode 100644 index 00000000..0ba0716a --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/validCode.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/validCode.svg new file mode 100644 index 00000000..cfb10214 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/validCode.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/wechat.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/wechat.svg new file mode 100644 index 00000000..c586e551 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/wechat.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/icons/svg/zip.svg b/Yi.RuoYi.Vue3/src/assets/icons/svg/zip.svg new file mode 100644 index 00000000..f806fc48 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/icons/svg/zip.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/images/dark.svg b/Yi.RuoYi.Vue3/src/assets/images/dark.svg new file mode 100644 index 00000000..f646bd7e --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/images/dark.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/images/light.svg b/Yi.RuoYi.Vue3/src/assets/images/light.svg new file mode 100644 index 00000000..ab7cc088 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/images/light.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/images/login-background.jpg b/Yi.RuoYi.Vue3/src/assets/images/login-background.jpg new file mode 100644 index 00000000..3607a99d Binary files /dev/null and b/Yi.RuoYi.Vue3/src/assets/images/login-background.jpg differ diff --git a/Yi.RuoYi.Vue3/src/assets/images/profile.jpg b/Yi.RuoYi.Vue3/src/assets/images/profile.jpg new file mode 100644 index 00000000..aa4daf73 Binary files /dev/null and b/Yi.RuoYi.Vue3/src/assets/images/profile.jpg differ diff --git a/Yi.RuoYi.Vue3/src/assets/logo/logo.png b/Yi.RuoYi.Vue3/src/assets/logo/logo.png new file mode 100644 index 00000000..e2637602 Binary files /dev/null and b/Yi.RuoYi.Vue3/src/assets/logo/logo.png differ diff --git a/Yi.RuoYi.Vue3/src/assets/styles/btn.scss b/Yi.RuoYi.Vue3/src/assets/styles/btn.scss new file mode 100644 index 00000000..3590d8d2 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/styles/btn.scss @@ -0,0 +1,99 @@ +@import './variables.module.scss'; + +@mixin colorBtn($color) { + background: $color; + + &:hover { + color: $color; + + &:before, + &:after { + background: $color; + } + } +} + +.blue-btn { + @include colorBtn($blue) +} + +.light-blue-btn { + @include colorBtn($light-blue) +} + +.red-btn { + @include colorBtn($red) +} + +.pink-btn { + @include colorBtn($pink) +} + +.green-btn { + @include colorBtn($green) +} + +.tiffany-btn { + @include colorBtn($tiffany) +} + +.yellow-btn { + @include colorBtn($yellow) +} + +.pan-btn { + font-size: 14px; + color: #fff; + padding: 14px 36px; + border-radius: 8px; + border: none; + outline: none; + transition: 600ms ease all; + position: relative; + display: inline-block; + + &:hover { + background: #fff; + + &:before, + &:after { + width: 100%; + transition: 600ms ease all; + } + } + + &:before, + &:after { + content: ''; + position: absolute; + top: 0; + right: 0; + height: 2px; + width: 0; + transition: 400ms ease all; + } + + &::after { + right: inherit; + top: inherit; + left: 0; + bottom: 0; + } +} + +.custom-button { + display: inline-block; + line-height: 1; + white-space: nowrap; + cursor: pointer; + background: #fff; + color: #fff; + -webkit-appearance: none; + text-align: center; + box-sizing: border-box; + outline: 0; + margin: 0; + padding: 10px 15px; + font-size: 14px; + border-radius: 4px; +} diff --git a/Yi.RuoYi.Vue3/src/assets/styles/element-ui.scss b/Yi.RuoYi.Vue3/src/assets/styles/element-ui.scss new file mode 100644 index 00000000..0f175f25 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/styles/element-ui.scss @@ -0,0 +1,96 @@ +// cover some element-ui styles + +.el-breadcrumb__inner, +.el-breadcrumb__inner a { + font-weight: 400 !important; +} + +.el-upload { + input[type="file"] { + display: none !important; + } +} + +.el-upload__input { + display: none; +} + +.cell { + .el-tag { + margin-right: 0px; + } +} + +.small-padding { + .cell { + padding-left: 5px; + padding-right: 5px; + } +} + +.fixed-width { + .el-button--mini { + padding: 7px 10px; + width: 60px; + } +} + +.status-col { + .cell { + padding: 0 10px; + text-align: center; + + .el-tag { + margin-right: 0px; + } + } +} + +// to fixed https://github.com/ElemeFE/element/issues/2461 +.el-dialog { + transform: none; + left: 0; + position: relative; + margin: 0 auto; +} + +// refine element ui upload +.upload-container { + .el-upload { + width: 100%; + + .el-upload-dragger { + width: 100%; + height: 200px; + } + } +} + +// dropdown +.el-dropdown-menu { + a { + display: block + } +} + +// fix date-picker ui bug in filter-item +.el-range-editor.el-input__inner { + display: inline-flex !important; +} + +// to fix el-date-picker css style +.el-range-separator { + box-sizing: content-box; +} + +.el-menu--collapse + > div + > .el-submenu + > .el-submenu__title + .el-submenu__icon-arrow { + display: none; +} + +.el-dropdown .el-dropdown-link{ + color: var(--el-color-primary) !important; +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/assets/styles/index.scss b/Yi.RuoYi.Vue3/src/assets/styles/index.scss new file mode 100644 index 00000000..29dd2b9e --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/styles/index.scss @@ -0,0 +1,193 @@ +@import './variables.module.scss'; +@import './mixin.scss'; +@import './transition.scss'; +@import './element-ui.scss'; +@import './sidebar.scss'; +@import './btn.scss'; +@import './ruoyi.scss'; + +body { + height: 100%; + margin: 0; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; +} + +label { + font-weight: 700; +} + +html { + height: 100%; + box-sizing: border-box; +} + +#app { + height: 100%; +} + +*, +*:before, +*:after { + box-sizing: inherit; +} + +.no-padding { + padding: 0px !important; +} + +.padding-content { + padding: 4px 0; +} + +a:focus, +a:active { + outline: none; +} + +a, +a:focus, +a:hover { + cursor: pointer; + color: inherit; + text-decoration: none; +} + +div:focus { + outline: none; +} + +.fr { + float: right; +} + +.fl { + float: left; +} + +.pr-5 { + padding-right: 5px; +} + +.pl-5 { + padding-left: 5px; +} + +.block { + display: block; +} + +.pointer { + cursor: pointer; +} + +.inlineBlock { + display: block; +} + +.clearfix { + &:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; + } +} + +aside { + background: #eef1f6; + padding: 8px 24px; + margin-bottom: 20px; + border-radius: 2px; + display: block; + line-height: 32px; + font-size: 16px; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; + color: #2c3e50; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + a { + color: #337ab7; + cursor: pointer; + + &:hover { + color: rgb(32, 160, 255); + } + } +} + +//main-container全局样式 +.app-container { + padding: 20px; +} + +.components-container { + margin: 30px 50px; + position: relative; +} + +.pagination-container { + margin-top: 30px; +} + +.text-center { + text-align: center +} + +.sub-navbar { + height: 50px; + line-height: 50px; + position: relative; + width: 100%; + text-align: right; + padding-right: 20px; + transition: 600ms ease position; + background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%); + + .subtitle { + font-size: 20px; + color: #fff; + } + + &.draft { + background: #d0d0d0; + } + + &.deleted { + background: #d0d0d0; + } +} + +.link-type, +.link-type:focus { + color: #337ab7; + cursor: pointer; + + &:hover { + color: rgb(32, 160, 255); + } +} + +.filter-container { + padding-bottom: 10px; + + .filter-item { + display: inline-block; + vertical-align: middle; + margin-bottom: 10px; + } +} + +//refine vue-multiselect plugin +.multiselect { + line-height: 16px; +} + +.multiselect--active { + z-index: 1000 !important; +} diff --git a/Yi.RuoYi.Vue3/src/assets/styles/mixin.scss b/Yi.RuoYi.Vue3/src/assets/styles/mixin.scss new file mode 100644 index 00000000..06fa0612 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/styles/mixin.scss @@ -0,0 +1,66 @@ +@mixin clearfix { + &:after { + content: ""; + display: table; + clear: both; + } +} + +@mixin scrollBar { + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } +} + +@mixin relative { + position: relative; + width: 100%; + height: 100%; +} + +@mixin pct($pct) { + width: #{$pct}; + position: relative; + margin: 0 auto; +} + +@mixin triangle($width, $height, $color, $direction) { + $width: $width/2; + $color-border-style: $height solid $color; + $transparent-border-style: $width solid transparent; + height: 0; + width: 0; + + @if $direction==up { + border-bottom: $color-border-style; + border-left: $transparent-border-style; + border-right: $transparent-border-style; + } + + @else if $direction==right { + border-left: $color-border-style; + border-top: $transparent-border-style; + border-bottom: $transparent-border-style; + } + + @else if $direction==down { + border-top: $color-border-style; + border-left: $transparent-border-style; + border-right: $transparent-border-style; + } + + @else if $direction==left { + border-right: $color-border-style; + border-top: $transparent-border-style; + border-bottom: $transparent-border-style; + } +} diff --git a/Yi.RuoYi.Vue3/src/assets/styles/ruoyi.scss b/Yi.RuoYi.Vue3/src/assets/styles/ruoyi.scss new file mode 100644 index 00000000..68c7d900 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/styles/ruoyi.scss @@ -0,0 +1,274 @@ + /** + * 通用css样式布局处理 + * Copyright (c) 2019 ruoyi + */ + + /** 基础通用 **/ +.pt5 { + padding-top: 5px; +} +.pr5 { + padding-right: 5px; +} +.pb5 { + padding-bottom: 5px; +} +.mt5 { + margin-top: 5px; +} +.mr5 { + margin-right: 5px; +} +.mb5 { + margin-bottom: 5px; +} +.mb8 { + margin-bottom: 8px; +} +.ml5 { + margin-left: 5px; +} +.mt10 { + margin-top: 10px; +} +.mr10 { + margin-right: 10px; +} +.mb10 { + margin-bottom: 10px; +} +.ml10 { + margin-left: 10px; +} +.mt20 { + margin-top: 20px; +} +.mr20 { + margin-right: 20px; +} +.mb20 { + margin-bottom: 20px; +} +.ml20 { + margin-left: 20px; +} + +.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { + font-family: inherit; + font-weight: 500; + line-height: 1.1; + color: inherit; +} + +.el-dialog:not(.is-fullscreen) { + margin-top: 6vh !important; +} + +.el-dialog.scrollbar .el-dialog__body { + overflow: auto; + overflow-x: hidden; + max-height: 70vh; + padding: 10px 20px 0; +} + +.el-table { + .el-table__header-wrapper, .el-table__fixed-header-wrapper { + th { + word-break: break-word; + background-color: #f8f8f9 !important; + color: #515a6e; + height: 40px !important; + font-size: 13px; + } + } + .el-table__body-wrapper { + .el-button [class*="el-icon-"] + span { + margin-left: 1px; + } + } +} + +/** 表单布局 **/ +.form-header { + font-size:15px; + color:#6379bb; + border-bottom:1px solid #ddd; + margin:8px 10px 25px 10px; + padding-bottom:5px +} + +/** 表格布局 **/ +.pagination-container { + // position: relative; + height: 25px; + margin-bottom: 10px; + margin-top: 15px; + padding: 10px 20px !important; +} + +/* tree border */ +.tree-border { + margin-top: 5px; + border: 1px solid #e5e6e7; + background: #FFFFFF none; + border-radius:4px; + width: 100%; +} + +.pagination-container .el-pagination { + right: 0; + position: absolute; +} + +@media ( max-width : 768px) { + .pagination-container .el-pagination > .el-pagination__jump { + display: none !important; + } + .pagination-container .el-pagination > .el-pagination__sizes { + display: none !important; + } +} + +.el-table .fixed-width .el-button--small { + padding-left: 0; + padding-right: 0; + width: inherit; +} + +/** 表格更多操作下拉样式 */ +.el-table .el-dropdown-link { + cursor: pointer; + color: #409EFF; + margin-left: 10px; +} + +.el-table .el-dropdown, .el-icon-arrow-down { + font-size: 12px; +} + +.el-tree-node__content > .el-checkbox { + margin-right: 8px; +} + +.list-group-striped > .list-group-item { + border-left: 0; + border-right: 0; + border-radius: 0; + padding-left: 0; + padding-right: 0; +} + +.list-group { + padding-left: 0px; + list-style: none; +} + +.list-group-item { + border-bottom: 1px solid #e7eaec; + border-top: 1px solid #e7eaec; + margin-bottom: -1px; + padding: 11px 0px; + font-size: 13px; +} + +.pull-right { + float: right !important; +} + +.el-card__header { + padding: 14px 15px 7px !important; + min-height: 40px; +} + +.el-card__body { + padding: 15px 20px 20px 20px !important; +} + +.card-box { + padding-right: 15px; + padding-left: 15px; + margin-bottom: 10px; +} + +/* button color */ +.el-button--cyan.is-active, +.el-button--cyan:active { + background: #20B2AA; + border-color: #20B2AA; + color: #FFFFFF; +} + +.el-button--cyan:focus, +.el-button--cyan:hover { + background: #48D1CC; + border-color: #48D1CC; + color: #FFFFFF; +} + +.el-button--cyan { + background-color: #20B2AA; + border-color: #20B2AA; + color: #FFFFFF; +} + +/* text color */ +.text-navy { + color: #1ab394; +} + +.text-primary { + color: inherit; +} + +.text-success { + color: #1c84c6; +} + +.text-info { + color: #23c6c8; +} + +.text-warning { + color: #f8ac59; +} + +.text-danger { + color: #ed5565; +} + +.text-muted { + color: #888888; +} + +/* image */ +.img-circle { + border-radius: 50%; +} + +.img-lg { + width: 120px; + height: 120px; +} + +.avatar-upload-preview { + position: absolute; + top: 50%; + transform: translate(50%, -50%); + width: 200px; + height: 200px; + border-radius: 50%; + box-shadow: 0 0 4px #ccc; + overflow: hidden; +} + +/* 拖拽列样式 */ +.sortable-ghost{ + opacity: .8; + color: #fff!important; + background: #42b983!important; +} + +/* 表格右侧工具栏样式 */ +.top-right-btn { + margin-left: auto; +} diff --git a/Yi.RuoYi.Vue3/src/assets/styles/sidebar.scss b/Yi.RuoYi.Vue3/src/assets/styles/sidebar.scss new file mode 100644 index 00000000..0808812d --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/styles/sidebar.scss @@ -0,0 +1,238 @@ +#app { + + .main-container { + min-height: 100%; + transition: margin-left .28s; + margin-left: $base-sidebar-width; + position: relative; + } + + .sidebarHide { + margin-left: 0!important; + } + + .sidebar-container { + -webkit-transition: width .28s; + transition: width 0.28s; + width: $base-sidebar-width !important; + background-color: $base-menu-background; + height: 100%; + position: fixed; + font-size: 0px; + top: 0; + bottom: 0; + left: 0; + z-index: 1001; + overflow: hidden; + -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35); + box-shadow: 2px 0 6px rgba(0,21,41,.35); + + // reset element-ui css + .horizontal-collapse-transition { + transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; + } + + .scrollbar-wrapper { + overflow-x: hidden !important; + } + + .el-scrollbar__bar.is-vertical { + right: 0px; + } + + .el-scrollbar { + height: 100%; + } + + &.has-logo { + .el-scrollbar { + height: calc(100% - 50px); + } + } + + .is-horizontal { + display: none; + } + + a { + display: inline-block; + width: 100%; + overflow: hidden; + } + + .svg-icon { + margin-right: 16px; + } + + .el-menu { + border: none; + height: 100%; + width: 100% !important; + } + + .el-menu-item, .menu-title { + overflow: hidden !important; + text-overflow: ellipsis !important; + white-space: nowrap !important; + } + + .el-menu-item .el-menu-tooltip__trigger { + display: inline-block !important; + } + + // menu hover + .sub-menu-title-noDropdown, + .el-sub-menu__title { + &:hover { + background-color: rgba(0, 0, 0, 0.06) !important; + } + } + + & .theme-dark .is-active > .el-sub-menu__title { + color: $base-menu-color-active !important; + } + + & .nest-menu .el-sub-menu>.el-sub-menu__title, + & .el-sub-menu .el-menu-item { + min-width: $base-sidebar-width !important; + + &:hover { + background-color: rgba(0, 0, 0, 0.06) !important; + } + } + + & .theme-dark .nest-menu .el-sub-menu>.el-sub-menu__title, + & .theme-dark .el-sub-menu .el-menu-item { + background-color: $base-sub-menu-background !important; + + &:hover { + background-color: $base-sub-menu-hover !important; + } + } + } + + .hideSidebar { + .sidebar-container { + width: 54px !important; + } + + .main-container { + margin-left: 54px; + } + + .sub-menu-title-noDropdown { + padding: 0 !important; + position: relative; + + .el-tooltip { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + } + } + + .el-sub-menu { + overflow: hidden; + + &>.el-sub-menu__title { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + } + } + + .el-menu--collapse { + .el-sub-menu { + &>.el-sub-menu__title { + &>span { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + &>i { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + } + } + } + } + + .el-menu--collapse .el-menu .el-sub-menu { + min-width: $base-sidebar-width !important; + } + + // mobile responsive + .mobile { + .main-container { + margin-left: 0px; + } + + .sidebar-container { + transition: transform .28s; + width: $base-sidebar-width !important; + } + + &.hideSidebar { + .sidebar-container { + pointer-events: none; + transition-duration: 0.3s; + transform: translate3d(-$base-sidebar-width, 0, 0); + } + } + } + + .withoutAnimation { + + .main-container, + .sidebar-container { + transition: none; + } + } +} + +// when menu collapsed +.el-menu--vertical { + &>.el-menu { + .svg-icon { + margin-right: 16px; + } + } + + .nest-menu .el-sub-menu>.el-sub-menu__title, + .el-menu-item { + &:hover { + // you can use $sub-menuHover + background-color: rgba(0, 0, 0, 0.06) !important; + } + } + + // the scroll bar appears when the sub-menu is too long + >.el-menu--popup { + max-height: 100vh; + overflow-y: auto; + + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } + } +} diff --git a/Yi.RuoYi.Vue3/src/assets/styles/transition.scss b/Yi.RuoYi.Vue3/src/assets/styles/transition.scss new file mode 100644 index 00000000..eb498955 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/styles/transition.scss @@ -0,0 +1,53 @@ +// global transition css + +/* fade */ +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.28s; +} + +.fade-enter, +.fade-leave-active { + opacity: 0; +} + +/* fade-transform */ +.fade-transform--move, +.fade-transform-leave-active, +.fade-transform-enter-active { + transition: all .5s; +} + +.fade-transform-leave-active { + position: absolute; +} + +.fade-transform-enter { + opacity: 0; + transform: translateX(-30px); +} + +.fade-transform-leave-to { + opacity: 0; + transform: translateX(30px); +} + +/* breadcrumb transition */ +.breadcrumb-enter-active, +.breadcrumb-leave-active { + transition: all .5s; +} + +.breadcrumb-enter, +.breadcrumb-leave-active { + opacity: 0; + transform: translateX(20px); +} + +.breadcrumb-move { + transition: all .5s; +} + +.breadcrumb-leave-active { + position: absolute; +} diff --git a/Yi.RuoYi.Vue3/src/assets/styles/variables.module.scss b/Yi.RuoYi.Vue3/src/assets/styles/variables.module.scss new file mode 100644 index 00000000..3dbfaa7c --- /dev/null +++ b/Yi.RuoYi.Vue3/src/assets/styles/variables.module.scss @@ -0,0 +1,65 @@ +// base color +$blue: #324157; +$light-blue: #3A71A8; +$red: #C03639; +$pink: #E65D6E; +$green: #30B08F; +$tiffany: #4AB7BD; +$yellow: #FEC171; +$panGreen: #30B08F; + +// 默认菜单主题风格 +$base-menu-color: #bfcbd9; +$base-menu-color-active: #f4f4f5; +$base-menu-background: #304156; +$base-logo-title-color: #ffffff; + +$base-menu-light-color: rgba(0, 0, 0, 0.7); +$base-menu-light-background: #ffffff; +$base-logo-light-title-color: #001529; + +$base-sub-menu-background: #1f2d3d; +$base-sub-menu-hover: #001528; + +// 自定义暗色菜单风格 +/** +$base-menu-color:hsla(0,0%,100%,.65); +$base-menu-color-active:#fff; +$base-menu-background:#001529; +$base-logo-title-color: #ffffff; + +$base-menu-light-color:rgba(0,0,0,.70); +$base-menu-light-background:#ffffff; +$base-logo-light-title-color: #001529; + +$base-sub-menu-background:#000c17; +$base-sub-menu-hover:#001528; +*/ + +$--color-primary: #409EFF; +$--color-success: #67C23A; +$--color-warning: #E6A23C; +$--color-danger: #F56C6C; +$--color-info: #909399; + +$base-sidebar-width: 200px; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + menuColor: $base-menu-color; + menuLightColor: $base-menu-light-color; + menuColorActive: $base-menu-color-active; + menuBackground: $base-menu-background; + menuLightBackground: $base-menu-light-background; + subMenuBackground: $base-sub-menu-background; + subMenuHover: $base-sub-menu-hover; + sideBarWidth: $base-sidebar-width; + logoTitleColor: $base-logo-title-color; + logoLightTitleColor: $base-logo-light-title-color; + primaryColor: $--color-primary; + successColor: $--color-success; + dangerColor: $--color-danger; + infoColor: $--color-info; + warningColor: $--color-warning; +} diff --git a/Yi.RuoYi.Vue3/src/components/Breadcrumb/index.vue b/Yi.RuoYi.Vue3/src/components/Breadcrumb/index.vue new file mode 100644 index 00000000..489cba15 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/Breadcrumb/index.vue @@ -0,0 +1,66 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/components/DictTag/index.vue b/Yi.RuoYi.Vue3/src/components/DictTag/index.vue new file mode 100644 index 00000000..c03a1a6f --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/DictTag/index.vue @@ -0,0 +1,49 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/components/FileUpload/index.vue b/Yi.RuoYi.Vue3/src/components/FileUpload/index.vue new file mode 100644 index 00000000..7ab1e8b6 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/FileUpload/index.vue @@ -0,0 +1,212 @@ + + + + + diff --git a/Yi.RuoYi.Vue3/src/components/Hamburger/index.vue b/Yi.RuoYi.Vue3/src/components/Hamburger/index.vue new file mode 100644 index 00000000..18c201e6 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/Hamburger/index.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/Yi.RuoYi.Vue3/src/components/HeaderSearch/index.vue b/Yi.RuoYi.Vue3/src/components/HeaderSearch/index.vue new file mode 100644 index 00000000..7963095b --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/HeaderSearch/index.vue @@ -0,0 +1,180 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/components/IconSelect/index.vue b/Yi.RuoYi.Vue3/src/components/IconSelect/index.vue new file mode 100644 index 00000000..5b068060 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/IconSelect/index.vue @@ -0,0 +1,74 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/components/IconSelect/requireIcons.js b/Yi.RuoYi.Vue3/src/components/IconSelect/requireIcons.js new file mode 100644 index 00000000..ac22fd78 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/IconSelect/requireIcons.js @@ -0,0 +1,8 @@ +let icons = [] +const modules = import.meta.glob('./../../assets/icons/svg/*.svg'); +for (const path in modules) { + const p = path.split('assets/icons/svg/')[1].split('.svg')[0]; + icons.push(p); +} + +export default icons \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/components/ImagePreview/index.vue b/Yi.RuoYi.Vue3/src/components/ImagePreview/index.vue new file mode 100644 index 00000000..b607ab66 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/ImagePreview/index.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/Yi.RuoYi.Vue3/src/components/ImageUpload/index.vue b/Yi.RuoYi.Vue3/src/components/ImageUpload/index.vue new file mode 100644 index 00000000..55dafb84 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/ImageUpload/index.vue @@ -0,0 +1,213 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/components/Pagination/index.vue b/Yi.RuoYi.Vue3/src/components/Pagination/index.vue new file mode 100644 index 00000000..38de953f --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/Pagination/index.vue @@ -0,0 +1,105 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/components/ParentView/index.vue b/Yi.RuoYi.Vue3/src/components/ParentView/index.vue new file mode 100644 index 00000000..7bf61489 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/ParentView/index.vue @@ -0,0 +1,3 @@ + diff --git a/Yi.RuoYi.Vue3/src/components/RightToolbar/index.vue b/Yi.RuoYi.Vue3/src/components/RightToolbar/index.vue new file mode 100644 index 00000000..becb12c1 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/RightToolbar/index.vue @@ -0,0 +1,105 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/components/RuoYi/Doc/index.vue b/Yi.RuoYi.Vue3/src/components/RuoYi/Doc/index.vue new file mode 100644 index 00000000..51f13cb6 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/RuoYi/Doc/index.vue @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/components/RuoYi/Git/index.vue b/Yi.RuoYi.Vue3/src/components/RuoYi/Git/index.vue new file mode 100644 index 00000000..b4459f3f --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/RuoYi/Git/index.vue @@ -0,0 +1,13 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/components/Screenfull/index.vue b/Yi.RuoYi.Vue3/src/components/Screenfull/index.vue new file mode 100644 index 00000000..7ad28ead --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/Screenfull/index.vue @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/components/SizeSelect/index.vue b/Yi.RuoYi.Vue3/src/components/SizeSelect/index.vue new file mode 100644 index 00000000..4c2e7e95 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/SizeSelect/index.vue @@ -0,0 +1,45 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/components/SvgIcon/index.vue b/Yi.RuoYi.Vue3/src/components/SvgIcon/index.vue new file mode 100644 index 00000000..8c101f64 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/SvgIcon/index.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/Yi.RuoYi.Vue3/src/components/SvgIcon/svgicon.js b/Yi.RuoYi.Vue3/src/components/SvgIcon/svgicon.js new file mode 100644 index 00000000..4431719a --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/SvgIcon/svgicon.js @@ -0,0 +1,10 @@ +import * as components from '@element-plus/icons-vue' + +export default { + install: (app) => { + for (const key in components) { + const componentConfig = components[key]; + app.component(componentConfig.name, componentConfig); + } + }, +}; diff --git a/Yi.RuoYi.Vue3/src/components/TopNav/index.vue b/Yi.RuoYi.Vue3/src/components/TopNav/index.vue new file mode 100644 index 00000000..aa34103b --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/TopNav/index.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/Yi.RuoYi.Vue3/src/components/TreeSelect/index.vue b/Yi.RuoYi.Vue3/src/components/TreeSelect/index.vue new file mode 100644 index 00000000..4ff0e76d --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/TreeSelect/index.vue @@ -0,0 +1,156 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/components/iFrame/index.vue b/Yi.RuoYi.Vue3/src/components/iFrame/index.vue new file mode 100644 index 00000000..091b1a24 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/components/iFrame/index.vue @@ -0,0 +1,31 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/layout/components/Navbar.vue b/Yi.RuoYi.Vue3/src/layout/components/Navbar.vue new file mode 100644 index 00000000..ab4d5f36 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/layout/components/Navbar.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/Yi.RuoYi.Vue3/src/layout/components/Settings/index.vue b/Yi.RuoYi.Vue3/src/layout/components/Settings/index.vue new file mode 100644 index 00000000..3360959c --- /dev/null +++ b/Yi.RuoYi.Vue3/src/layout/components/Settings/index.vue @@ -0,0 +1,241 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/layout/components/Sidebar/Link.vue b/Yi.RuoYi.Vue3/src/layout/components/Sidebar/Link.vue new file mode 100644 index 00000000..80114316 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/layout/components/Sidebar/Link.vue @@ -0,0 +1,40 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/layout/components/Sidebar/Logo.vue b/Yi.RuoYi.Vue3/src/layout/components/Sidebar/Logo.vue new file mode 100644 index 00000000..e994dfd1 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/layout/components/Sidebar/Logo.vue @@ -0,0 +1,81 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/layout/components/Sidebar/SidebarItem.vue b/Yi.RuoYi.Vue3/src/layout/components/Sidebar/SidebarItem.vue new file mode 100644 index 00000000..c423fb18 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/layout/components/Sidebar/SidebarItem.vue @@ -0,0 +1,102 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/layout/components/Sidebar/index.vue b/Yi.RuoYi.Vue3/src/layout/components/Sidebar/index.vue new file mode 100644 index 00000000..9b14dfc0 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/layout/components/Sidebar/index.vue @@ -0,0 +1,54 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/layout/components/TagsView/ScrollPane.vue b/Yi.RuoYi.Vue3/src/layout/components/TagsView/ScrollPane.vue new file mode 100644 index 00000000..5b0db3e1 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/layout/components/TagsView/ScrollPane.vue @@ -0,0 +1,105 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/layout/components/TagsView/index.vue b/Yi.RuoYi.Vue3/src/layout/components/TagsView/index.vue new file mode 100644 index 00000000..4fbd8d81 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/layout/components/TagsView/index.vue @@ -0,0 +1,338 @@ + + + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/layout/components/index.js b/Yi.RuoYi.Vue3/src/layout/components/index.js new file mode 100644 index 00000000..fd577313 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/layout/components/index.js @@ -0,0 +1,4 @@ +export { default as AppMain } from './AppMain' +export { default as Navbar } from './Navbar' +export { default as Settings } from './Settings' +export { default as TagsView } from './TagsView/index.vue' diff --git a/Yi.RuoYi.Vue3/src/layout/index.vue b/Yi.RuoYi.Vue3/src/layout/index.vue new file mode 100644 index 00000000..3ddb1657 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/layout/index.vue @@ -0,0 +1,111 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/main.js b/Yi.RuoYi.Vue3/src/main.js new file mode 100644 index 00000000..8d35b53c --- /dev/null +++ b/Yi.RuoYi.Vue3/src/main.js @@ -0,0 +1,86 @@ +import { createApp } from 'vue' + +import Cookies from 'js-cookie' + +import ElementPlus from 'element-plus' +import locale from 'element-plus/lib/locale/lang/zh-cn' // 中文语言 + +import '@/assets/styles/index.scss' // global css + +import App from './App' +import store from './store' +import router from './router' +import directive from './directive' // directive + + +// 注册指令 +import plugins from './plugins' // plugins +import { download } from '@/utils/ruoyi.js' + +// svg图标 +import 'virtual:svg-icons-register' +import SvgIcon from '@/components/SvgIcon' +import elementIcons from '@/components/SvgIcon/svgicon' +import signalR from '@/utils/signalR' + +import './permission' // permission control + +import { useDict } from '@/utils/dict' +import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi' + +// 分页组件 +import Pagination from '@/components/Pagination' +// 自定义表格工具组件 +import RightToolbar from '@/components/RightToolbar' +// 文件上传组件 +import FileUpload from "@/components/FileUpload" +// 图片上传组件 +import ImageUpload from "@/components/ImageUpload" +// 图片预览组件 +import ImagePreview from "@/components/ImagePreview" +// 自定义树选择组件 +import TreeSelect from '@/components/TreeSelect' +// 字典标签组件 +import DictTag from '@/components/DictTag' + +const app = createApp(App) + +// 全局方法挂载 +app.config.globalProperties.useDict = useDict +app.config.globalProperties.download = download +app.config.globalProperties.parseTime = parseTime +app.config.globalProperties.resetForm = resetForm +app.config.globalProperties.handleTree = handleTree +app.config.globalProperties.addDateRange = addDateRange +app.config.globalProperties.selectDictLabel = selectDictLabel +app.config.globalProperties.selectDictLabels = selectDictLabels + +// 全局组件挂载 +app.component('DictTag', DictTag) +app.component('Pagination', Pagination) +app.component('TreeSelect', TreeSelect) +app.component('FileUpload', FileUpload) +app.component('ImageUpload', ImageUpload) +app.component('ImagePreview', ImagePreview) +app.component('RightToolbar', RightToolbar) + +app.use(router) +app.use(store) +app.use(plugins) +app.use(elementIcons) +app.component('svg-icon', SvgIcon) + +directive(app) + +// 使用element-plus 并且设置全局的大小 +app.use(ElementPlus, { + locale: locale, + // 支持 large、default、small + size: Cookies.get('size') || 'default' +}) +// app.prototype.signalr = signalR + +signalR.init(`${import.meta.env.VITE_APP_BASE_WS}/hub/main`); +// signalR.start(); +app.mount('#app') + diff --git a/Yi.RuoYi.Vue3/src/permission.js b/Yi.RuoYi.Vue3/src/permission.js new file mode 100644 index 00000000..eca0c0cd --- /dev/null +++ b/Yi.RuoYi.Vue3/src/permission.js @@ -0,0 +1,65 @@ +import router from './router' +import { ElMessage } from 'element-plus' +import NProgress from 'nprogress' +import 'nprogress/nprogress.css' +import { getToken } from '@/utils/auth' +import { isHttp } from '@/utils/validate' +import { isRelogin } from '@/utils/request' +import useUserStore from '@/store/modules/user' +import useSettingsStore from '@/store/modules/settings' +import usePermissionStore from '@/store/modules/permission' + +NProgress.configure({ showSpinner: false }); + +const whiteList = ['/login', '/auth-redirect', '/bind', '/register']; + +router.beforeEach((to, from, next) => { + NProgress.start() + if (getToken()) { + to.meta.title && useSettingsStore().setTitle(to.meta.title) + /* has token*/ + if (to.path === '/login') { + next({ path: '/' }) + NProgress.done() + } else { + + if (useUserStore().roles.length === 0) + { + isRelogin.show = true + // 判断当前用户是否已拉取完user_info信息 + useUserStore().getInfo().then(() => { + isRelogin.show = false + usePermissionStore().generateRoutes().then(accessRoutes => { + // 根据roles权限生成可访问的路由表 + accessRoutes.forEach(route => { + if (!isHttp(route.path)) { + router.addRoute(route) // 动态添加可访问路由表 + } + }) + next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 + }) + }).catch(err => { + useUserStore().logOut().then(() => { + ElMessage.error(err) + next({ path: '/' }) + }) + }) + } else { + next() + } + } + } else { + // 没有token + if (whiteList.indexOf(to.path) !== -1) { + // 在免登录白名单，直接进入 + next() + } else { + next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 + NProgress.done() + } + } +}) + +router.afterEach(() => { + NProgress.done() +}) diff --git a/Yi.RuoYi.Vue3/src/plugins/auth.js b/Yi.RuoYi.Vue3/src/plugins/auth.js new file mode 100644 index 00000000..5e8c28de --- /dev/null +++ b/Yi.RuoYi.Vue3/src/plugins/auth.js @@ -0,0 +1,60 @@ +import useUserStore from '@/store/modules/user' + +function authPermission(permission) { + const all_permission = "*:*:*"; + const permissions = useUserStore().permissions + if (permission && permission.length > 0) { + return permissions.some(v => { + return all_permission === v || v === permission + }) + } else { + return false + } +} + +function authRole(role) { + const super_admin = "admin"; + const roles = useUserStore().roles + if (role && role.length > 0) { + return roles.some(v => { + return super_admin === v || v === role + }) + } else { + return false + } +} + +export default { + // 验证用户是否具备某权限 + hasPermi(permission) { + return authPermission(permission); + }, + // 验证用户是否含有指定权限，只需包含其中一个 + hasPermiOr(permissions) { + return permissions.some(item => { + return authPermission(item) + }) + }, + // 验证用户是否含有指定权限，必须全部拥有 + hasPermiAnd(permissions) { + return permissions.every(item => { + return authPermission(item) + }) + }, + // 验证用户是否具备某角色 + hasRole(role) { + return authRole(role); + }, + // 验证用户是否含有指定角色，只需包含其中一个 + hasRoleOr(roles) { + return roles.some(item => { + return authRole(item) + }) + }, + // 验证用户是否含有指定角色，必须全部拥有 + hasRoleAnd(roles) { + return roles.every(item => { + return authRole(item) + }) + } +} diff --git a/Yi.RuoYi.Vue3/src/plugins/cache.js b/Yi.RuoYi.Vue3/src/plugins/cache.js new file mode 100644 index 00000000..6b5c00b9 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/plugins/cache.js @@ -0,0 +1,77 @@ +const sessionCache = { + set (key, value) { + if (!sessionStorage) { + return + } + if (key != null && value != null) { + sessionStorage.setItem(key, value) + } + }, + get (key) { + if (!sessionStorage) { + return null + } + if (key == null) { + return null + } + return sessionStorage.getItem(key) + }, + setJSON (key, jsonValue) { + if (jsonValue != null) { + this.set(key, JSON.stringify(jsonValue)) + } + }, + getJSON (key) { + const value = this.get(key) + if (value != null) { + return JSON.parse(value) + } + }, + remove (key) { + sessionStorage.removeItem(key); + } +} +const localCache = { + set (key, value) { + if (!localStorage) { + return + } + if (key != null && value != null) { + localStorage.setItem(key, value) + } + }, + get (key) { + if (!localStorage) { + return null + } + if (key == null) { + return null + } + return localStorage.getItem(key) + }, + setJSON (key, jsonValue) { + if (jsonValue != null) { + this.set(key, JSON.stringify(jsonValue)) + } + }, + getJSON (key) { + const value = this.get(key) + if (value != null) { + return JSON.parse(value) + } + }, + remove (key) { + localStorage.removeItem(key); + } +} + +export default { + /** + * 会话级缓存 + */ + session: sessionCache, + /** + * 本地缓存 + */ + local: localCache +} diff --git a/Yi.RuoYi.Vue3/src/plugins/download.js b/Yi.RuoYi.Vue3/src/plugins/download.js new file mode 100644 index 00000000..c31a0642 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/plugins/download.js @@ -0,0 +1,72 @@ +import axios from 'axios' +import { ElMessage } from 'element-plus' +import { saveAs } from 'file-saver' +import { getToken } from '@/utils/auth' +import errorCode from '@/utils/errorCode' +import { blobValidate } from '@/utils/ruoyi' + +const baseURL = import.meta.env.VITE_APP_BASE_API + +export default { + name(name, isDelete = true) { + var url = baseURL + "/common/download?fileName=" + encodeURI(name) + "&delete=" + isDelete + axios({ + method: 'get', + url: url, + responseType: 'blob', + headers: { 'Authorization': 'Bearer ' + getToken() } + }).then(async (res) => { + const isLogin = await blobValidate(res.data); + if (isLogin) { + const blob = new Blob([res.data]) + this.saveAs(blob, decodeURI(res.headers['download-filename'])) + } else { + this.printErrMsg(res.data); + } + }) + }, + resource(resource) { + var url = baseURL + "/common/download/resource?resource=" + encodeURI(resource); + axios({ + method: 'get', + url: url, + responseType: 'blob', + headers: { 'Authorization': 'Bearer ' + getToken() } + }).then(async (res) => { + const isLogin = await blobValidate(res.data); + if (isLogin) { + const blob = new Blob([res.data]) + this.saveAs(blob, decodeURI(res.headers['download-filename'])) + } else { + this.printErrMsg(res.data); + } + }) + }, + zip(url, name) { + var url = baseURL + url + axios({ + method: 'get', + url: url, + responseType: 'blob', + headers: { 'Authorization': 'Bearer ' + getToken() } + }).then(async (res) => { + const isLogin = await blobValidate(res.data); + if (isLogin) { + const blob = new Blob([res.data], { type: 'application/zip' }) + this.saveAs(blob, name) + } else { + this.printErrMsg(res.data); + } + }) + }, + saveAs(text, name, opts) { + saveAs(text, name, opts); + }, + async printErrMsg(data) { + const resText = await data.text(); + const rspObj = JSON.parse(resText); + const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'] + ElMessage.error(errMsg); + } +} + diff --git a/Yi.RuoYi.Vue3/src/plugins/index.js b/Yi.RuoYi.Vue3/src/plugins/index.js new file mode 100644 index 00000000..47d1b41f --- /dev/null +++ b/Yi.RuoYi.Vue3/src/plugins/index.js @@ -0,0 +1,18 @@ +import tab from './tab' +import auth from './auth' +import cache from './cache' +import modal from './modal' +import download from './download' + +export default function installPlugins(app){ + // 页签操作 + app.config.globalProperties.$tab = tab + // 认证对象 + app.config.globalProperties.$auth = auth + // 缓存对象 + app.config.globalProperties.$cache = cache + // 模态框对象 + app.config.globalProperties.$modal = modal + // 下载文件 + app.config.globalProperties.$download = download +} diff --git a/Yi.RuoYi.Vue3/src/plugins/modal.js b/Yi.RuoYi.Vue3/src/plugins/modal.js new file mode 100644 index 00000000..b59e14d6 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/plugins/modal.js @@ -0,0 +1,82 @@ +import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus' + +let loadingInstance; + +export default { + // 消息提示 + msg(content) { + ElMessage.info(content) + }, + // 错误消息 + msgError(content) { + ElMessage.error(content) + }, + // 成功消息 + msgSuccess(content) { + ElMessage.success(content) + }, + // 警告消息 + msgWarning(content) { + ElMessage.warning(content) + }, + // 弹出提示 + alert(content) { + ElMessageBox.alert(content, "系统提示") + }, + // 错误提示 + alertError(content) { + ElMessageBox.alert(content, "系统提示", { type: 'error' }) + }, + // 成功提示 + alertSuccess(content) { + ElMessageBox.alert(content, "系统提示", { type: 'success' }) + }, + // 警告提示 + alertWarning(content) { + ElMessageBox.alert(content, "系统提示", { type: 'warning' }) + }, + // 通知提示 + notify(content) { + ElNotification.info(content) + }, + // 错误通知 + notifyError(content) { + ElNotification.error(content); + }, + // 成功通知 + notifySuccess(content) { + ElNotification.success(content) + }, + // 警告通知 + notifyWarning(content) { + ElNotification.warning(content) + }, + // 确认窗体 + confirm(content) { + return ElMessageBox.confirm(content, "系统提示", { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: "warning", + }) + }, + // 提交内容 + prompt(content) { + return ElMessageBox.prompt(content, "系统提示", { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: "warning", + }) + }, + // 打开遮罩层 + loading(content) { + loadingInstance = ElLoading.service({ + lock: true, + text: content, + background: "rgba(0, 0, 0, 0.7)", + }) + }, + // 关闭遮罩层 + closeLoading() { + loadingInstance.close(); + } +} diff --git a/Yi.RuoYi.Vue3/src/plugins/tab.js b/Yi.RuoYi.Vue3/src/plugins/tab.js new file mode 100644 index 00000000..59e7006b --- /dev/null +++ b/Yi.RuoYi.Vue3/src/plugins/tab.js @@ -0,0 +1,65 @@ +import useTagsViewStore from '@/store/modules/tagsView' +import router from '@/router' + +export default { + // 刷新当前tab页签 + refreshPage(obj) { + const { path, query, matched } = router.currentRoute.value; + if (obj === undefined) { + matched.forEach((m) => { + if (m.components && m.components.default && m.components.default.name) { + if (!['Layout', 'ParentView'].includes(m.components.default.name)) { + obj = { name: m.components.default.name, path: path, query: query }; + } + } + }); + } + return useTagsViewStore().delCachedView(obj).then(() => { + const { path, query } = obj + router.replace({ + path: '/redirect' + path, + query: query + }) + }) + }, + // 关闭当前tab页签，打开新页签 + closeOpenPage(obj) { + useTagsViewStore().delView(router.currentRoute.value); + if (obj !== undefined) { + return router.push(obj); + } + }, + // 关闭指定tab页签 + closePage(obj) { + if (obj === undefined) { + return useTagsViewStore().delView(router.currentRoute.value).then(({ lastPath }) => { + return router.push(lastPath || '/index'); + }); + } + return useTagsViewStore().delView(obj); + }, + // 关闭所有tab页签 + closeAllPage() { + return useTagsViewStore().delAllViews(); + }, + // 关闭左侧tab页签 + closeLeftPage(obj) { + return useTagsViewStore().delLeftTags(obj || router.currentRoute.value); + }, + // 关闭右侧tab页签 + closeRightPage(obj) { + return useTagsViewStore().delRightTags(obj || router.currentRoute.value); + }, + // 关闭其他tab页签 + closeOtherPage(obj) { + return useTagsViewStore().delOthersViews(obj || router.currentRoute.value); + }, + // 打开tab页签 + openPage(url) { + return router.push(url); + }, + // 修改tab页签 + updatePage(obj) { + return useTagsViewStore().updateVisitedView(obj); + } +} diff --git a/Yi.RuoYi.Vue3/src/router/index.js b/Yi.RuoYi.Vue3/src/router/index.js new file mode 100644 index 00000000..41e44aee --- /dev/null +++ b/Yi.RuoYi.Vue3/src/router/index.js @@ -0,0 +1,175 @@ +import { createWebHistory, createRouter } from 'vue-router' +/* Layout */ +import Layout from '@/layout' + +/** + * Note: 路由配置项 + * + * hidden: true // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1 + * alwaysShow: true // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面 + * // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面 + * // 若你想不管路由下面的 children 声明的个数都显示你的根路由 + * // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由 + * redirect: noRedirect // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 + * name:'router-name' // 设定路由的名字，一定要填写不然使用时会出现各种问题 + * query: '{"id": 1, "name": "ry"}' // 访问路由的默认传递参数 + * roles: ['admin', 'common'] // 访问路由的角色权限 + * permissions: ['a:a:a', 'b:b:b'] // 访问路由的菜单权限 + * meta : { + noCache: true // 如果设置为true，则不会被 缓存(默认 false) + title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字 + icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg + breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示 + activeMenu: '/system/user' // 当路由设置了该属性，则会高亮相对应的侧边栏。 + } + */ + +// 公共路由 +export const constantRoutes = [ + { + path: '/redirect', + component: Layout, + hidden: true, + children: [ + { + path: '/redirect/:path(.*)', + component: () => import('@/views/redirect/index.vue') + } + ] + }, + { + path: '/login', + component: () => import('@/views/login'), + hidden: true + }, + { + path: '/register', + component: () => import('@/views/register'), + hidden: true + }, + { + path: "/:pathMatch(.*)*", + component: () => import('@/views/error/404'), + hidden: true + }, + { + path: '/401', + component: () => import('@/views/error/401'), + hidden: true + }, + { + path: '', + component: Layout, + redirect: '/index', + children: [ + { + path: '/index', + component: () => import('@/views/index'), + name: 'Index', + meta: { title: '首页', icon: 'dashboard', affix: true } + } + ] + }, + { + path: '/user', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [ + { + path: 'profile', + component: () => import('@/views/system/user/profile/index'), + name: 'Profile', + meta: { title: '个人中心', icon: 'user' } + } + ] + } +] + +// 动态路由，基于用户权限动态去加载 +export const dynamicRoutes = [ + { + path: '/system/user-auth', + component: Layout, + hidden: true, + permissions: ['system:user:edit'], + children: [ + { + path: 'role/:userId(\\d+)', + component: () => import('@/views/system/user/authRole'), + name: 'AuthRole', + meta: { title: '分配角色', activeMenu: '/system/user' } + } + ] + }, + { + path: '/system/role-auth', + component: Layout, + hidden: true, + permissions: ['system:role:edit'], + children: [ + { + path: 'user/:roleId(\\d+)', + component: () => import('@/views/system/role/authUser'), + name: 'AuthUser', + meta: { title: '分配用户', activeMenu: '/system/role' } + } + ] + }, + { + path: '/system/dict-data', + component: Layout, + hidden: true, + permissions: ['system:dict:list'], + children: [ + { + path: 'index/:dictId(\\d+)', + component: () => import('@/views/system/dict/data'), + name: 'Data', + meta: { title: '字典数据', activeMenu: '/system/dict' } + } + ] + }, + { + path: '/monitor/job-log', + component: Layout, + hidden: true, + permissions: ['monitor:job:list'], + children: [ + { + path: 'index', + component: () => import('@/views/monitor/job/log'), + name: 'JobLog', + meta: { title: '调度日志', activeMenu: '/monitor/job' } + } + ] + }, + { + path: '/tool/gen-edit', + component: Layout, + hidden: true, + permissions: ['tool:gen:edit'], + children: [ + { + path: 'index/:tableId(\\d+)', + component: () => import('@/views/tool/gen/editTable'), + name: 'GenEdit', + meta: { title: '修改生成配置', activeMenu: '/tool/gen' } + } + ] + } +] + +const router = createRouter({ + history: createWebHistory(), + routes: constantRoutes, + scrollBehavior(to, from, savedPosition) { + if (savedPosition) { + return savedPosition + } else { + return { top: 0 } + } + }, +}); + +export default router; diff --git a/Yi.RuoYi.Vue3/src/settings.js b/Yi.RuoYi.Vue3/src/settings.js new file mode 100644 index 00000000..10e1db41 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/settings.js @@ -0,0 +1,47 @@ +export default { + /** + * 网页标题 + */ + title: import.meta.env.VITE_APP_TITLE, + /** + * 侧边栏主题 深色主题theme-dark，浅色主题theme-light + */ + sideTheme: 'theme-dark', + /** + * 是否系统布局配置 + */ + showSettings: false, + + /** + * 是否显示顶部导航 + */ + topNav: false, + + /** + * 是否显示 tagsView + */ + tagsView: true, + + /** + * 是否固定头部 + */ + fixedHeader: false, + + /** + * 是否显示logo + */ + sidebarLogo: true, + + /** + * 是否显示动态标题 + */ + dynamicTitle: false, + + /** + * @type {string | array} 'production' | ['production', 'development'] + * @description Need show err logs component. + * The default is only used in the production env + * If you want to also use it in dev, you can pass ['production', 'development'] + */ + errorLog: 'production' +} diff --git a/Yi.RuoYi.Vue3/src/store/index.js b/Yi.RuoYi.Vue3/src/store/index.js new file mode 100644 index 00000000..f10f3895 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/store/index.js @@ -0,0 +1,3 @@ +const store = createPinia() + +export default store \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/store/modules/app.js b/Yi.RuoYi.Vue3/src/store/modules/app.js new file mode 100644 index 00000000..6cb2c819 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/store/modules/app.js @@ -0,0 +1,46 @@ +import Cookies from 'js-cookie' + +const useAppStore = defineStore( + 'app', + { + state: () => ({ + sidebar: { + opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, + withoutAnimation: false, + hide: false + }, + device: 'desktop', + size: Cookies.get('size') || 'default' + }), + actions: { + toggleSideBar(withoutAnimation) { + if (this.sidebar.hide) { + return false; + } + this.sidebar.opened = !this.sidebar.opened + this.sidebar.withoutAnimation = withoutAnimation + if (this.sidebar.opened) { + Cookies.set('sidebarStatus', 1) + } else { + Cookies.set('sidebarStatus', 0) + } + }, + closeSideBar(withoutAnimation) { + Cookies.set('sidebarStatus', 0) + this.sidebar.opened = false + this.sidebar.withoutAnimation = withoutAnimation + }, + toggleDevice(device) { + this.device = device + }, + setSize(size) { + this.size = size; + Cookies.set('size', size) + }, + toggleSideBarHide(status) { + this.sidebar.hide = status + } + } + }) + +export default useAppStore diff --git a/Yi.RuoYi.Vue3/src/store/modules/dict.js b/Yi.RuoYi.Vue3/src/store/modules/dict.js new file mode 100644 index 00000000..27fc3086 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/store/modules/dict.js @@ -0,0 +1,57 @@ +const useDictStore = defineStore( + 'dict', + { + state: () => ({ + dict: new Array() + }), + actions: { + // 获取字典 + getDict(_key) { + if (_key == null && _key == "") { + return null; + } + try { + for (let i = 0; i < this.dict.length; i++) { + if (this.dict[i].key == _key) { + return this.dict[i].value; + } + } + } catch (e) { + return null; + } + }, + // 设置字典 + setDict(_key, value) { + if (_key !== null && _key !== "") { + this.dict.push({ + key: _key, + value: value + }); + } + }, + // 删除字典 + removeDict(_key) { + var bln = false; + try { + for (let i = 0; i < this.dict.length; i++) { + if (this.dict[i].key == _key) { + this.dict.splice(i, 1); + return true; + } + } + } catch (e) { + bln = false; + } + return bln; + }, + // 清空字典 + cleanDict() { + this.dict = new Array(); + }, + // 初始字典 + initDict() { + } + } + }) + +export default useDictStore diff --git a/Yi.RuoYi.Vue3/src/store/modules/permission.js b/Yi.RuoYi.Vue3/src/store/modules/permission.js new file mode 100644 index 00000000..4c0c1867 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/store/modules/permission.js @@ -0,0 +1,454 @@ +import auth from '@/plugins/auth' +import router, { constantRoutes, dynamicRoutes } from '@/router' +import { getRouters } from '@/api/menu' +import Layout from '@/layout/index' +import ParentView from '@/components/ParentView' +import InnerLink from '@/layout/components/InnerLink' + +// 匹配views里面所有的.vue文件 +const modules = import.meta.glob('./../../views/**/*.vue') + +const usePermissionStore = defineStore( + 'permission', + { + state: () => ({ + routes: [], + addRoutes: [], + defaultRoutes: [], + topbarRouters: [], + sidebarRouters: [] + }), + actions: { + setRoutes(routes) { + this.addRoutes = routes + this.routes = constantRoutes.concat(routes) + }, + setDefaultRoutes(routes) { + this.defaultRoutes = constantRoutes.concat(routes) + }, + setTopbarRoutes(routes) { + this.topbarRouters = routes + }, + setSidebarRouters(routes) { + this.sidebarRouters = routes + }, + generateRoutes(roles) { + return new Promise(resolve => { + // 向后端请求路由数据 + + getRouters().then(response => { + + + +// const res=[ +// { +// "name": "System", +// "path": "/system", +// "hidden": false, +// "redirect": "noRedirect", +// "component": "Layout", +// "alwaysShow": true, +// "meta": { +// "title": "系统管理", +// "icon": "system", +// "noCache": false, +// "link": null +// }, +// "children": [ +// { +// "name": "User", +// "path": "user", +// "hidden": false, +// "component": "system/user/index", +// "meta": { +// "title": "用户管理", +// "icon": "user", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Role", +// "path": "role", +// "hidden": false, +// "component": "system/role/index", +// "meta": { +// "title": "角色管理", +// "icon": "peoples", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Menu", +// "path": "menu", +// "hidden": false, +// "component": "system/menu/index", +// "meta": { +// "title": "菜单管理", +// "icon": "tree-table", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Dept", +// "path": "dept", +// "hidden": false, +// "component": "system/dept/index", +// "meta": { +// "title": "部门管理", +// "icon": "tree", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Post", +// "path": "post", +// "hidden": false, +// "component": "system/post/index", +// "meta": { +// "title": "岗位管理", +// "icon": "post", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Dict", +// "path": "dict", +// "hidden": false, +// "component": "system/dict/index", +// "meta": { +// "title": "字典管理", +// "icon": "dict", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Config", +// "path": "config", +// "hidden": false, +// "component": "system/config/index", +// "meta": { +// "title": "参数设置", +// "icon": "edit", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Notice", +// "path": "notice", +// "hidden": false, +// "component": "system/notice/index", +// "meta": { +// "title": "通知公告", +// "icon": "message", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Log", +// "path": "log", +// "hidden": false, +// "redirect": "noRedirect", +// "component": "ParentView", +// "alwaysShow": true, +// "meta": { +// "title": "日志管理", +// "icon": "log", +// "noCache": false, +// "link": null +// }, +// "children": [ +// { +// "name": "Operlog", +// "path": "operlog", +// "hidden": false, +// "component": "monitor/operlog/index", +// "meta": { +// "title": "操作日志", +// "icon": "form", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Logininfor", +// "path": "logininfor", +// "hidden": false, +// "component": "monitor/logininfor/index", +// "meta": { +// "title": "登录日志", +// "icon": "logininfor", +// "noCache": false, +// "link": null +// } +// } +// ] +// } +// ] +// }, +// { +// "name": "Monitor", +// "path": "/monitor", +// "hidden": false, +// "redirect": "noRedirect", +// "component": "Layout", +// "alwaysShow": true, +// "meta": { +// "title": "系统监控", +// "icon": "monitor", +// "noCache": false, +// "link": null +// }, +// "children": [ +// { +// "name": "Online", +// "path": "online", +// "hidden": false, +// "component": "monitor/online/index", +// "meta": { +// "title": "在线用户", +// "icon": "online", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Job", +// "path": "job", +// "hidden": false, +// "component": "monitor/job/index", +// "meta": { +// "title": "定时任务", +// "icon": "job", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Druid", +// "path": "druid", +// "hidden": false, +// "component": "monitor/druid/index", +// "meta": { +// "title": "数据监控", +// "icon": "druid", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Server", +// "path": "server", +// "hidden": false, +// "component": "monitor/server/index", +// "meta": { +// "title": "服务监控", +// "icon": "server", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Cache", +// "path": "cache", +// "hidden": false, +// "component": "monitor/cache/index", +// "meta": { +// "title": "缓存监控", +// "icon": "redis", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "CacheList", +// "path": "cacheList", +// "hidden": false, +// "component": "monitor/cache/list", +// "meta": { +// "title": "缓存列表", +// "icon": "redis-list", +// "noCache": false, +// "link": null +// } +// } +// ] +// }, +// { +// "name": "Tool", +// "path": "/tool", +// "hidden": false, +// "redirect": "noRedirect", +// "component": "Layout", +// "alwaysShow": true, +// "meta": { +// "title": "系统工具", +// "icon": "tool", +// "noCache": false, +// "link": null +// }, +// "children": [ +// { +// "name": "Build", +// "path": "build", +// "hidden": false, +// "component": "tool/build/index", +// "meta": { +// "title": "表单构建", +// "icon": "build", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Gen", +// "path": "gen", +// "hidden": false, +// "component": "tool/gen/index", +// "meta": { +// "title": "代码生成", +// "icon": "code", +// "noCache": false, +// "link": null +// } +// }, +// { +// "name": "Swagger", +// "path": "swagger", +// "hidden": false, +// "component": "tool/swagger/index", +// "meta": { +// "title": "系统接口", +// "icon": "swagger", +// "noCache": false, +// "link": null +// } +// } +// ] +// }, +// { +// "name": "Http://ruoyi.vip", +// "path": "http://ruoyi.vip", +// "hidden": false, +// "component": "Layout", +// "meta": { +// "title": "若依官网", +// "icon": "guide", +// "noCache": false, +// "link": "http://ruoyi.vip" +// } +// } +// ]; +console.log(response.data,"response.data") + const res=response.data; + +const sdata = JSON.parse(JSON.stringify(res)) +const rdata = JSON.parse(JSON.stringify(res)) +const defaultData = JSON.parse(JSON.stringify(res)) +const sidebarRoutes = filterAsyncRouter(sdata) +const rewriteRoutes = filterAsyncRouter(rdata, false, true) +const defaultRoutes = filterAsyncRouter(defaultData) +const asyncRoutes = filterDynamicRoutes(dynamicRoutes) +asyncRoutes.forEach(route => { router.addRoute(route) }) +this.setRoutes(rewriteRoutes) +this.setSidebarRouters(constantRoutes.concat(sidebarRoutes)) +this.setDefaultRoutes(sidebarRoutes) +this.setTopbarRoutes(defaultRoutes) +resolve(rewriteRoutes) + + + + }) + }) + } + } + }) + +// 遍历后台传来的路由字符串，转换为组件对象 +function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { + return asyncRouterMap.filter(route => { + if (type && route.children) { + route.children = filterChildren(route.children) + } + if (route.component) { + // Layout ParentView 组件特殊处理 + if (route.component === 'Layout') { + route.component = Layout + } else if (route.component === 'ParentView') { + route.component = ParentView + } else if (route.component === 'InnerLink') { + route.component = InnerLink + } else { + route.component = loadView(route.component) + } + } + if (route.children != null && route.children && route.children.length) { + route.children = filterAsyncRouter(route.children, route, type) + } else { + delete route['children'] + delete route['redirect'] + } + return true + }) +} + +function filterChildren(childrenMap, lastRouter = false) { + var children = [] + childrenMap.forEach((el, index) => { + if (el.children && el.children.length) { + if (el.component === 'ParentView' && !lastRouter) { + el.children.forEach(c => { + c.path = el.path + '/' + c.path + if (c.children && c.children.length) { + children = children.concat(filterChildren(c.children, c)) + return + } + children.push(c) + }) + return + } + } + if (lastRouter) { + el.path = lastRouter.path + '/' + el.path + } + children = children.concat(el) + }) + return children +} + +// 动态路由遍历，验证是否具备权限 +export function filterDynamicRoutes(routes) { + const res = [] + routes.forEach(route => { + if (route.permissions) { + if (auth.hasPermiOr(route.permissions)) { + res.push(route) + } + } else if (route.roles) { + if (auth.hasRoleOr(route.roles)) { + res.push(route) + } + } + }) + return res +} + +export const loadView = (view) => { + let res; + for (const path in modules) { + const dir = path.split('views/')[1].split('.vue')[0]; + if (dir === view) { + res = () => modules[path](); + } + } + return res; +} + +export default usePermissionStore diff --git a/Yi.RuoYi.Vue3/src/store/modules/settings.js b/Yi.RuoYi.Vue3/src/store/modules/settings.js new file mode 100644 index 00000000..22b73366 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/store/modules/settings.js @@ -0,0 +1,38 @@ +import defaultSettings from '@/settings' +import { useDynamicTitle } from '@/utils/dynamicTitle' + +const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings + +const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || '' + +const useSettingsStore = defineStore( + 'settings', + { + state: () => ({ + title: '', + theme: storageSetting.theme || '#409EFF', + sideTheme: storageSetting.sideTheme || sideTheme, + showSettings: showSettings, + topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav, + tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView, + fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader, + sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo, + dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle + }), + actions: { + // 修改布局设置 + changeSetting(data) { + const { key, value } = data + if (this.hasOwnProperty(key)) { + this[key] = value + } + }, + // 设置网页标题 + setTitle(title) { + this.title = title + useDynamicTitle(); + } + } + }) + +export default useSettingsStore diff --git a/Yi.RuoYi.Vue3/src/store/modules/socket.js b/Yi.RuoYi.Vue3/src/store/modules/socket.js new file mode 100644 index 00000000..0efc9c41 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/store/modules/socket.js @@ -0,0 +1,20 @@ +const socketStore = defineStore( + 'socket', + { + state: () => ({ + onlineNum: 1 + }), + actions: { + // 获取在线总数 + getOnlineNum() { + return this.onlineNum; + }, + // 设置在线总数 + setOnlineNum(value) { + this.onlineNum = value; + } + + } + }) + +export default socketStore diff --git a/Yi.RuoYi.Vue3/src/store/modules/tagsView.js b/Yi.RuoYi.Vue3/src/store/modules/tagsView.js new file mode 100644 index 00000000..9d07f33d --- /dev/null +++ b/Yi.RuoYi.Vue3/src/store/modules/tagsView.js @@ -0,0 +1,182 @@ +const useTagsViewStore = defineStore( + 'tags-view', + { + state: () => ({ + visitedViews: [], + cachedViews: [], + iframeViews: [] + }), + actions: { + addView(view) { + this.addVisitedView(view) + this.addCachedView(view) + }, + addIframeView(view) { + if (this.iframeViews.some(v => v.path === view.path)) return + this.iframeViews.push( + Object.assign({}, view, { + title: view.meta.title || 'no-name' + }) + ) + }, + addVisitedView(view) { + if (this.visitedViews.some(v => v.path === view.path)) return + this.visitedViews.push( + Object.assign({}, view, { + title: view.meta.title || 'no-name' + }) + ) + }, + addCachedView(view) { + if (this.cachedViews.includes(view.name)) return + if (!view.meta.noCache) { + this.cachedViews.push(view.name) + } + }, + delView(view) { + return new Promise(resolve => { + this.delVisitedView(view) + this.delCachedView(view) + resolve({ + visitedViews: [...this.visitedViews], + cachedViews: [...this.cachedViews] + }) + }) + }, + delVisitedView(view) { + return new Promise(resolve => { + for (const [i, v] of this.visitedViews.entries()) { + if (v.path === view.path) { + this.visitedViews.splice(i, 1) + break + } + } + this.iframeViews = this.iframeViews.filter(item => item.path !== view.path) + resolve([...this.visitedViews]) + }) + }, + delIframeView(view) { + return new Promise(resolve => { + this.iframeViews = this.iframeViews.filter(item => item.path !== view.path) + resolve([...this.iframeViews]) + }) + }, + delCachedView(view) { + return new Promise(resolve => { + const index = this.cachedViews.indexOf(view.name) + index > -1 && this.cachedViews.splice(index, 1) + resolve([...this.cachedViews]) + }) + }, + delOthersViews(view) { + return new Promise(resolve => { + this.delOthersVisitedViews(view) + this.delOthersCachedViews(view) + resolve({ + visitedViews: [...this.visitedViews], + cachedViews: [...this.cachedViews] + }) + }) + }, + delOthersVisitedViews(view) { + return new Promise(resolve => { + this.visitedViews = this.visitedViews.filter(v => { + return v.meta.affix || v.path === view.path + }) + this.iframeViews = this.iframeViews.filter(item => item.path === view.path) + resolve([...this.visitedViews]) + }) + }, + delOthersCachedViews(view) { + return new Promise(resolve => { + const index = this.cachedViews.indexOf(view.name) + if (index > -1) { + this.cachedViews = this.cachedViews.slice(index, index + 1) + } else { + this.cachedViews = [] + } + resolve([...this.cachedViews]) + }) + }, + delAllViews(view) { + return new Promise(resolve => { + this.delAllVisitedViews(view) + this.delAllCachedViews(view) + resolve({ + visitedViews: [...this.visitedViews], + cachedViews: [...this.cachedViews] + }) + }) + }, + delAllVisitedViews(view) { + return new Promise(resolve => { + const affixTags = this.visitedViews.filter(tag => tag.meta.affix) + this.visitedViews = affixTags + this.iframeViews = [] + resolve([...this.visitedViews]) + }) + }, + delAllCachedViews(view) { + return new Promise(resolve => { + this.cachedViews = [] + resolve([...this.cachedViews]) + }) + }, + updateVisitedView(view) { + for (let v of this.visitedViews) { + if (v.path === view.path) { + v = Object.assign(v, view) + break + } + } + }, + delRightTags(view) { + return new Promise(resolve => { + const index = this.visitedViews.findIndex(v => v.path === view.path) + if (index === -1) { + return + } + this.visitedViews = this.visitedViews.filter((item, idx) => { + if (idx <= index || (item.meta && item.meta.affix)) { + return true + } + const i = this.cachedViews.indexOf(item.name) + if (i > -1) { + this.cachedViews.splice(i, 1) + } + if(item.meta.link) { + const fi = this.iframeViews.findIndex(v => v.path === item.path) + this.iframeViews.splice(fi, 1) + } + return false + }) + resolve([...this.visitedViews]) + }) + }, + delLeftTags(view) { + return new Promise(resolve => { + const index = this.visitedViews.findIndex(v => v.path === view.path) + if (index === -1) { + return + } + this.visitedViews = this.visitedViews.filter((item, idx) => { + if (idx >= index || (item.meta && item.meta.affix)) { + return true + } + const i = this.cachedViews.indexOf(item.name) + if (i > -1) { + this.cachedViews.splice(i, 1) + } + if(item.meta.link) { + const fi = this.iframeViews.findIndex(v => v.path === item.path) + this.iframeViews.splice(fi, 1) + } + return false + }) + resolve([...this.visitedViews]) + }) + } + } + }) + +export default useTagsViewStore diff --git a/Yi.RuoYi.Vue3/src/store/modules/user.js b/Yi.RuoYi.Vue3/src/store/modules/user.js new file mode 100644 index 00000000..621e3224 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/store/modules/user.js @@ -0,0 +1,80 @@ +import { login, logout, getInfo } from '@/api/login' +import { getToken, setToken, removeToken } from '@/utils/auth' +import defAva from '@/assets/images/profile.jpg' + +const useUserStore = defineStore( + 'user', + { + state: () => ({ + token: getToken(), + name: '', + avatar: '', + roles: [], + permissions: [] + }), + actions: { + // 登录 + login(userInfo) { + const username = userInfo.username.trim() + const password = userInfo.password + const code = userInfo.code + const uuid = userInfo.uuid + return new Promise((resolve, reject) => { + login(username, password, code, uuid).then(res => { + setToken(res.data.token); + this.token = res.data.token; + resolve(); + }).catch(error => { + reject(error) + }) + }) + }, + // 获取用户信息 + getInfo() { + + return new Promise((resolve, reject) => { + getInfo().then(response => { + const res=response.data; + const user = res.user + const avatar = (user.icon == "" || user.icon == null) ? defAva : import.meta.env.VITE_APP_BASE_API + "/file/"+user.icon; + + if (res.roleCodes && res.roleCodes.length > 0) { // 验证返回的roles是否是一个非空数组 + this.roles = res.roleCodes + this.permissions = res.permissionCodes + // this.roles = ["admin"]; + // this.permissions=["*:*:*"] + + } else { + this.roles = ['ROLE_DEFAULT'] + } + // this.roles = ["admin"]; + // this.permissions=["*:*:*"] + this.name = user.userName + this.avatar = avatar; + resolve(res) + }).catch(error => { + reject(error) + }) + + + + }) + }, + // 退出系统 + logOut() { + return new Promise((resolve, reject) => { + logout(this.token).then(() => { + this.token = '' + this.roles = [] + this.permissions = [] + removeToken() + resolve() + }).catch(error => { + reject(error) + }) + }) + } + } + }) + +export default useUserStore diff --git a/Yi.RuoYi.Vue3/src/utils/auth.js b/Yi.RuoYi.Vue3/src/utils/auth.js new file mode 100644 index 00000000..08a43d6e --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/auth.js @@ -0,0 +1,15 @@ +import Cookies from 'js-cookie' + +const TokenKey = 'Admin-Token' + +export function getToken() { + return Cookies.get(TokenKey) +} + +export function setToken(token) { + return Cookies.set(TokenKey, token) +} + +export function removeToken() { + return Cookies.remove(TokenKey) +} diff --git a/Yi.RuoYi.Vue3/src/utils/dict.js b/Yi.RuoYi.Vue3/src/utils/dict.js new file mode 100644 index 00000000..9648f149 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/dict.js @@ -0,0 +1,24 @@ +import useDictStore from '@/store/modules/dict' +import { getDicts } from '@/api/system/dict/data' + +/** + * 获取字典数据 + */ +export function useDict(...args) { + const res = ref({}); + return (() => { + args.forEach((dictType, index) => { + res.value[dictType] = []; + const dicts = useDictStore().getDict(dictType); + if (dicts) { + res.value[dictType] = dicts; + } else { + getDicts(dictType).then(resp => { + res.value[dictType] = resp.data.map(p => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass })) + useDictStore().setDict(dictType, res.value[dictType]); + }) + } + }) + return toRefs(res.value); + })() +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/utils/dynamicTitle.js b/Yi.RuoYi.Vue3/src/utils/dynamicTitle.js new file mode 100644 index 00000000..64404b20 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/dynamicTitle.js @@ -0,0 +1,15 @@ +import store from '@/store' +import defaultSettings from '@/settings' +import useSettingsStore from '@/store/modules/settings' + +/** + * 动态修改标题 + */ +export function useDynamicTitle() { + const settingsStore = useSettingsStore(); + if (settingsStore.dynamicTitle) { + document.title = settingsStore.title + ' - ' + defaultSettings.title; + } else { + document.title = defaultSettings.title; + } +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/utils/errorCode.js b/Yi.RuoYi.Vue3/src/utils/errorCode.js new file mode 100644 index 00000000..d2111ee1 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/errorCode.js @@ -0,0 +1,6 @@ +export default { + '401': '认证失败，无法访问系统资源', + '403': '当前操作没有权限', + '404': '访问资源不存在', + 'default': '系统未知错误，请反馈给管理员' +} diff --git a/Yi.RuoYi.Vue3/src/utils/index.js b/Yi.RuoYi.Vue3/src/utils/index.js new file mode 100644 index 00000000..cbacab0d --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/index.js @@ -0,0 +1,390 @@ +import { parseTime } from '@/ruoyi' + +/** + * 表格时间格式化 + */ +export function formatDate(cellValue) { + if (cellValue == null || cellValue == "") return ""; + var date = new Date(cellValue) + var year = date.getFullYear() + var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 + var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() + var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() + var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() + var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() + return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds +} + +/** + * @param {number} time + * @param {string} option + * @returns {string} + */ +export function formatTime(time, option) { + if (('' + time).length === 10) { + time = parseInt(time) * 1000 + } else { + time = +time + } + const d = new Date(time) + const now = Date.now() + + const diff = (now - d) / 1000 + + if (diff < 30) { + return '刚刚' + } else if (diff < 3600) { + // less 1 hour + return Math.ceil(diff / 60) + '分钟前' + } else if (diff < 3600 * 24) { + return Math.ceil(diff / 3600) + '小时前' + } else if (diff < 3600 * 24 * 2) { + return '1天前' + } + if (option) { + return parseTime(time, option) + } else { + return ( + d.getMonth() + + 1 + + '月' + + d.getDate() + + '日' + + d.getHours() + + '时' + + d.getMinutes() + + '分' + ) + } +} + +/** + * @param {string} url + * @returns {Object} + */ +export function getQueryObject(url) { + url = url == null ? window.location.href : url + const search = url.substring(url.lastIndexOf('?') + 1) + const obj = {} + const reg = /([^?&=]+)=([^?&=]*)/g + search.replace(reg, (rs, $1, $2) => { + const name = decodeURIComponent($1) + let val = decodeURIComponent($2) + val = String(val) + obj[name] = val + return rs + }) + return obj +} + +/** + * @param {string} input value + * @returns {number} output value + */ +export function byteLength(str) { + // returns the byte length of an utf8 string + let s = str.length + for (var i = str.length - 1; i >= 0; i--) { + const code = str.charCodeAt(i) + if (code > 0x7f && code <= 0x7ff) s++ + else if (code > 0x7ff && code <= 0xffff) s += 2 + if (code >= 0xDC00 && code <= 0xDFFF) i-- + } + return s +} + +/** + * @param {Array} actual + * @returns {Array} + */ +export function cleanArray(actual) { + const newArray = [] + for (let i = 0; i < actual.length; i++) { + if (actual[i]) { + newArray.push(actual[i]) + } + } + return newArray +} + +/** + * @param {Object} json + * @returns {Array} + */ +export function param(json) { + if (!json) return '' + return cleanArray( + Object.keys(json).map(key => { + if (json[key] === undefined) return '' + return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]) + }) + ).join('&') +} + +/** + * @param {string} url + * @returns {Object} + */ +export function param2Obj(url) { + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + if (!search) { + return {} + } + const obj = {} + const searchArr = search.split('&') + searchArr.forEach(v => { + const index = v.indexOf('=') + if (index !== -1) { + const name = v.substring(0, index) + const val = v.substring(index + 1, v.length) + obj[name] = val + } + }) + return obj +} + +/** + * @param {string} val + * @returns {string} + */ +export function html2Text(val) { + const div = document.createElement('div') + div.innerHTML = val + return div.textContent || div.innerText +} + +/** + * Merges two objects, giving the last one precedence + * @param {Object} target + * @param {(Object|Array)} source + * @returns {Object} + */ +export function objectMerge(target, source) { + if (typeof target !== 'object') { + target = {} + } + if (Array.isArray(source)) { + return source.slice() + } + Object.keys(source).forEach(property => { + const sourceProperty = source[property] + if (typeof sourceProperty === 'object') { + target[property] = objectMerge(target[property], sourceProperty) + } else { + target[property] = sourceProperty + } + }) + return target +} + +/** + * @param {HTMLElement} element + * @param {string} className + */ +export function toggleClass(element, className) { + if (!element || !className) { + return + } + let classString = element.className + const nameIndex = classString.indexOf(className) + if (nameIndex === -1) { + classString += '' + className + } else { + classString = + classString.substr(0, nameIndex) + + classString.substr(nameIndex + className.length) + } + element.className = classString +} + +/** + * @param {string} type + * @returns {Date} + */ +export function getTime(type) { + if (type === 'start') { + return new Date().getTime() - 3600 * 1000 * 24 * 90 + } else { + return new Date(new Date().toDateString()) + } +} + +/** + * @param {Function} func + * @param {number} wait + * @param {boolean} immediate + * @return {*} + */ +export function debounce(func, wait, immediate) { + let timeout, args, context, timestamp, result + + const later = function() { + // 据上一次触发时间间隔 + const last = +new Date() - timestamp + + // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait + if (last < wait && last > 0) { + timeout = setTimeout(later, wait - last) + } else { + timeout = null + // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用 + if (!immediate) { + result = func.apply(context, args) + if (!timeout) context = args = null + } + } + } + + return function(...args) { + context = this + timestamp = +new Date() + const callNow = immediate && !timeout + // 如果延时不存在，重新设定延时 + if (!timeout) timeout = setTimeout(later, wait) + if (callNow) { + result = func.apply(context, args) + context = args = null + } + + return result + } +} + +/** + * This is just a simple version of deep copy + * Has a lot of edge cases bug + * If you want to use a perfect deep copy, use lodash's _.cloneDeep + * @param {Object} source + * @returns {Object} + */ +export function deepClone(source) { + if (!source && typeof source !== 'object') { + throw new Error('error arguments', 'deepClone') + } + const targetObj = source.constructor === Array ? [] : {} + Object.keys(source).forEach(keys => { + if (source[keys] && typeof source[keys] === 'object') { + targetObj[keys] = deepClone(source[keys]) + } else { + targetObj[keys] = source[keys] + } + }) + return targetObj +} + +/** + * @param {Array} arr + * @returns {Array} + */ +export function uniqueArr(arr) { + return Array.from(new Set(arr)) +} + +/** + * @returns {string} + */ +export function createUniqueString() { + const timestamp = +new Date() + '' + const randomNum = parseInt((1 + Math.random()) * 65536) + '' + return (+(randomNum + timestamp)).toString(32) +} + +/** + * Check if an element has a class + * @param {HTMLElement} elm + * @param {string} cls + * @returns {boolean} + */ +export function hasClass(ele, cls) { + return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)')) +} + +/** + * Add class to element + * @param {HTMLElement} elm + * @param {string} cls + */ +export function addClass(ele, cls) { + if (!hasClass(ele, cls)) ele.className += ' ' + cls +} + +/** + * Remove class from element + * @param {HTMLElement} elm + * @param {string} cls + */ +export function removeClass(ele, cls) { + if (hasClass(ele, cls)) { + const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)') + ele.className = ele.className.replace(reg, ' ') + } +} + +export function makeMap(str, expectsLowerCase) { + const map = Object.create(null) + const list = str.split(',') + for (let i = 0; i < list.length; i++) { + map[list[i]] = true + } + return expectsLowerCase + ? val => map[val.toLowerCase()] + : val => map[val] +} + +export const exportDefault = 'export default ' + +export const beautifierConf = { + html: { + indent_size: '2', + indent_char: ' ', + max_preserve_newlines: '-1', + preserve_newlines: false, + keep_array_indentation: false, + break_chained_methods: false, + indent_scripts: 'separate', + brace_style: 'end-expand', + space_before_conditional: true, + unescape_strings: false, + jslint_happy: false, + end_with_newline: true, + wrap_line_length: '110', + indent_inner_html: true, + comma_first: false, + e4x: true, + indent_empty_lines: true + }, + js: { + indent_size: '2', + indent_char: ' ', + max_preserve_newlines: '-1', + preserve_newlines: false, + keep_array_indentation: false, + break_chained_methods: false, + indent_scripts: 'normal', + brace_style: 'end-expand', + space_before_conditional: true, + unescape_strings: false, + jslint_happy: true, + end_with_newline: true, + wrap_line_length: '110', + indent_inner_html: true, + comma_first: false, + e4x: true, + indent_empty_lines: true + } +} + +// 首字母大小 +export function titleCase(str) { + return str.replace(/( |^)[a-z]/g, L => L.toUpperCase()) +} + +// 下划转驼峰 +export function camelCase(str) { + return str.replace(/_[a-z]/g, str1 => str1.substr(-1).toUpperCase()) +} + +export function isNumberStr(str) { + return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str) +} + diff --git a/Yi.RuoYi.Vue3/src/utils/jsencrypt.js b/Yi.RuoYi.Vue3/src/utils/jsencrypt.js new file mode 100644 index 00000000..78d95234 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/jsencrypt.js @@ -0,0 +1,30 @@ +import JSEncrypt from 'jsencrypt/bin/jsencrypt.min' + +// 密钥对生成 http://web.chacuo.net/netrsakeypair + +const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n' + + 'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==' + +const privateKey = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n' + + '7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' + + 'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' + + 'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' + + 'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' + + 'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' + + 'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' + + 'UP8iWi1Qw0Y=' + +// 加密 +export function encrypt(txt) { + const encryptor = new JSEncrypt() + encryptor.setPublicKey(publicKey) // 设置公钥 + return encryptor.encrypt(txt) // 对数据进行加密 +} + +// 解密 +export function decrypt(txt) { + const encryptor = new JSEncrypt() + encryptor.setPrivateKey(privateKey) // 设置私钥 + return encryptor.decrypt(txt) // 对数据进行解密 +} + diff --git a/Yi.RuoYi.Vue3/src/utils/permission.js b/Yi.RuoYi.Vue3/src/utils/permission.js new file mode 100644 index 00000000..93fee87f --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/permission.js @@ -0,0 +1,51 @@ +import useUserStore from '@/store/modules/user' + +/** + * 字符权限校验 + * @param {Array} value 校验值 + * @returns {Boolean} + */ +export function checkPermi(value) { + if (value && value instanceof Array && value.length > 0) { + const permissions = useUserStore().permissions + const permissionDatas = value + const all_permission = "*:*:*"; + + const hasPermission = permissions.some(permission => { + return all_permission === permission || permissionDatas.includes(permission) + }) + + if (!hasPermission) { + return false + } + return true + } else { + console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`) + return false + } +} + +/** + * 角色权限校验 + * @param {Array} value 校验值 + * @returns {Boolean} + */ +export function checkRole(value) { + if (value && value instanceof Array && value.length > 0) { + const roles = useUserStore().roles + const permissionRoles = value + const super_admin = "admin"; + + const hasRole = roles.some(role => { + return super_admin === role || permissionRoles.includes(role) + }) + + if (!hasRole) { + return false + } + return true + } else { + console.error(`need roles! Like checkRole="['admin','editor']"`) + return false + } +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/utils/request.js b/Yi.RuoYi.Vue3/src/utils/request.js new file mode 100644 index 00000000..7903a0a4 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/request.js @@ -0,0 +1,170 @@ +import axios from 'axios' +import { ElNotification , ElMessageBox, ElMessage, ElLoading } from 'element-plus' +import { getToken } from '@/utils/auth' +import errorCode from '@/utils/errorCode' +import { tansParams, blobValidate } from '@/utils/ruoyi' +import cache from '@/plugins/cache' +import { saveAs } from 'file-saver' +import useUserStore from '@/store/modules/user' +import JsonBig from 'json-bigint' + + +let downloadLoadingInstance; +// 是否显示重新登录 +export let isRelogin = { show: false }; + +axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' +// 创建axios实例 +const service = axios.create({ + // axios中请求配置有baseURL选项，表示请求URL公共部分 + baseURL: import.meta.env.VITE_APP_BASE_API, + // 超时 + timeout: 10000, + transformResponse: [ data => { + const json = JsonBig({ + storeAsString: true + }) + return json.parse(data) + }], +}) + +// request拦截器 +service.interceptors.request.use(config => { + // 是否需要设置 token + const isToken = (config.headers || {}).isToken === false + // 是否需要防止数据重复提交 + const isRepeatSubmit = (config.headers || {}).repeatSubmit === false + if (getToken() && !isToken) { + config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + } + // get请求映射params参数 + if (config.method === 'get' && config.params) { + let url = config.url + '?' + tansParams(config.params); + url = url.slice(0, -1); + config.params = {}; + config.url = url; + } + if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) { + const requestObj = { + url: config.url, + data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data, + time: new Date().getTime() + } + const sessionObj = cache.session.getJSON('sessionObj') + if (sessionObj === undefined || sessionObj === null || sessionObj === '') { + cache.session.setJSON('sessionObj', requestObj) + } else { + const s_url = sessionObj.url; // 请求地址 + const s_data = sessionObj.data; // 请求数据 + const s_time = sessionObj.time; // 请求时间 + const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交 + if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { + const message = '数据正在处理，请勿重复提交'; + console.warn(`[${s_url}]: ` + message) + return Promise.reject(new Error(message)) + } else { + cache.session.setJSON('sessionObj', requestObj) + } + } + } + return config +}, error => { + Promise.reject(error) +}) + +// 响应拦截器 +service.interceptors.response.use(res => { + // // 未设置状态码则默认成功状态 + // const code = res.data.code || 200; + // // 获取错误信息 + // const msg = errorCode[code] || res.data.message || errorCode['default'] + + const code=200; + const msg="成功"; + + // 二进制数据则直接返回 + if(res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer'){ + return res + } + if (code === 401) { + if (!isRelogin.show) { + isRelogin.show = true; + ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + isRelogin.show = false; + useUserStore().logOut().then(() => { + location.href = '/index'; + }) + }).catch(() => { + isRelogin.show = false; + }); + } + return Promise.reject('无效的会话，或者会话已过期，请重新登录。') + } else if (code === 500) { + ElMessage({ + message: msg, + type: 'error' + }) + return Promise.reject(new Error(msg)) + } else if (code !== 200) { + ElNotification.error({ + title: msg + }) + return Promise.reject('error') + } else { + return Promise.resolve(res) + } + }, + error => { + + let { message } = error; + + if (message == "Network Error") { + message = "后端接口连接异常"; + } + else if (message.includes("timeout")) { + message = "系统接口请求超时"; + } + else if (message.includes("Request failed with status code")) { + message = "系统接口" + message.substr(message.length - 3) + "异常"; + } + ElMessage({ + message: message, + type: 'error', + duration: 5 * 1000 + }) + return Promise.reject(error) + } +) + +// 通用下载方法 +export function download(url, params, filename) { + downloadLoadingInstance = ElLoading.service({ text: "正在下载数据，请稍候", background: "rgba(0, 0, 0, 0.7)", }) + return service.post(url, params, { + transformRequest: [(params) => { return tansParams(params) }], + headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, + responseType: 'blob' + }).then(async (data) => { + const isLogin = await blobValidate(data); + if (isLogin) { + const blob = new Blob([data]) + saveAs(blob, filename) + } else { + const resText = await data.text(); + const rspObj = JSON.parse(resText); + const errMsg = errorCode[rspObj.code] || rspObj.message || errorCode['default'] + ElMessage.error(errMsg); + } + downloadLoadingInstance.close(); + }).catch((r) => { + console.error(r) + ElMessage.error('下载文件出现错误，请联系管理员！') + downloadLoadingInstance.close(); + }) +} + +export default service diff --git a/Yi.RuoYi.Vue3/src/utils/ruoyi.js b/Yi.RuoYi.Vue3/src/utils/ruoyi.js new file mode 100644 index 00000000..7bf12dbc --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/ruoyi.js @@ -0,0 +1,259 @@ + + +/** + * 通用js方法封装处理 + * Copyright (c) 2019 ruoyi + */ + +// 日期格式化 +export function parseTime(time, pattern) { + if (arguments.length === 0 || !time) { + return null + } + const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { + time = parseInt(time) + } else if (typeof time === 'string') { + time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), ''); + } + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { + let value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] } + if (result.length > 0 && value < 10) { + value = '0' + value + } + return value || 0 + }) + return time_str +} + +// 表单重置 +export function resetForm(refName) { + if (this.$refs[refName]) { + this.$refs[refName].resetFields(); + } +} + +// 添加日期范围 +export function addDateRange(params, dateRange, propName) { + let search = params; + search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}; + dateRange = Array.isArray(dateRange) ? dateRange : []; + if (typeof (propName) === 'undefined') { + // search.params['beginTime'] = dateRange[0]; + // search.params['endTime'] = dateRange[1]; + search.startTime=dateRange[0]; + search.endTime=dateRange[1]; + } else { + search.params['start' + propName] = dateRange[0]; + search.params['end' + propName] = dateRange[1]; + } + return search; +} + +// 回显数据字典 +export function selectDictLabel(datas, value) { + if (value === undefined) { + return ""; + } + var actions = []; + Object.keys(datas).some((key) => { + if (datas[key].value == ('' + value)) { + actions.push(datas[key].label); + return true; + } + }) + if (actions.length === 0) { + actions.push(value); + } + return actions.join(''); +} + +// 回显数据字典（字符串数组） +export function selectDictLabels(datas, value, separator) { + if (value === undefined) { + return ""; + } + var actions = []; + var currentSeparator = undefined === separator ? "," : separator; + var temp = value.split(currentSeparator); + Object.keys(value.split(currentSeparator)).some((val) => { + var match = false; + Object.keys(datas).some((key) => { + if (datas[key].value == ('' + temp[val])) { + actions.push(datas[key].label + currentSeparator); + match = true; + } + }) + if (!match) { + actions.push(temp[val] + currentSeparator); + } + }) + return actions.join('').substring(0, actions.join('').length - 1); +} + +// 字符串格式化(%s ) +export function sprintf(str) { + var args = arguments, flag = true, i = 1; + str = str.replace(/%s/g, function () { + var arg = args[i++]; + if (typeof arg === 'undefined') { + flag = false; + return ''; + } + return arg; + }); + return flag ? str : ''; +} + +// 转换字符串，undefined,null等转化为"" +export function parseStrEmpty(str) { + if (!str || str == "undefined" || str == "null") { + return ""; + } + return str; +} + +// 数据合并 +export function mergeRecursive(source, target) { + for (var p in target) { + try { + if (target[p].constructor == Object) { + source[p] = mergeRecursive(source[p], target[p]); + } else { + source[p] = target[p]; + } + } catch (e) { + source[p] = target[p]; + } + } + return source; +}; + +/** + * 构造树型结构数据 + * @param {*} data 数据源 + * @param {*} id id字段 默认 'id' + * @param {*} parentId 父节点字段 默认 'parentId' + * @param {*} children 孩子节点字段 默认 'children' + */ +export function handleTree(data, id, parentId, children) { + + let config = { + id: id || 'id', + parentId: parentId || 'parentId', + childrenList: children || 'children' + }; + + var childrenListMap = {}; + var nodeIds = {}; + var tree = []; + + for (let d of data) { + let parentId = d[config.parentId]; + if (childrenListMap[parentId] == null) { + childrenListMap[parentId] = []; + } + nodeIds[d[config.id]] = d; + childrenListMap[parentId].push(d); + } + + for (let d of data) { + let parentId = d[config.parentId]; + if (nodeIds[parentId] == null) { + tree.push(d); + } + } + + for (let t of tree) { + adaptToChildrenList(t); + } + + function adaptToChildrenList(o) { + if (childrenListMap[o[config.id]] !== null) { + o[config.childrenList] = childrenListMap[o[config.id]]; + } + if (o[config.childrenList]) { + for (let c of o[config.childrenList]) { + adaptToChildrenList(c); + } + } + } + return tree; +} + +/** +* 参数处理 +* @param {*} params 参数 +*/ +export function tansParams(params) { + let result = '' + for (const propName of Object.keys(params)) { + const value = params[propName]; + var part = encodeURIComponent(propName) + "="; + if (value !== null && value !== "" && typeof (value) !== "undefined") { + if (typeof value === 'object') { + for (const key of Object.keys(value)) { + if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') { + let params = propName + '[' + key + ']'; + var subPart = encodeURIComponent(params) + "="; + result += subPart + encodeURIComponent(value[key]) + "&"; + } + } + } else { + result += part + encodeURIComponent(value) + "&"; + } + } + } + return result +} + + +// 返回项目路径 +export function getNormalPath(p) { + if (p.length === 0 || !p || p == 'undefined') { + return p + }; + let res = p.replace('//', '/') + if (res[res.length - 1] === '/') { + return res.slice(0, res.length - 1) + } + return res; +} + +// 验证是否为blob格式 +export async function blobValidate(data) { + try { + const text = await data.text(); + JSON.parse(text); + return false; + } catch (error) { + return true; + } +} + +// 通用下载方法 +export function download(url) { + // window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true; + // window.open(baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true) + window.open(import.meta.env.VITE_APP_BASE_API + url) +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/utils/scroll-to.js b/Yi.RuoYi.Vue3/src/utils/scroll-to.js new file mode 100644 index 00000000..c5d8e04e --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/scroll-to.js @@ -0,0 +1,58 @@ +Math.easeInOutQuad = function(t, b, c, d) { + t /= d / 2 + if (t < 1) { + return c / 2 * t * t + b + } + t-- + return -c / 2 * (t * (t - 2) - 1) + b +} + +// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts +var requestAnimFrame = (function() { + return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) } +})() + +/** + * Because it's so fucking difficult to detect the scrolling element, just move them all + * @param {number} amount + */ +function move(amount) { + document.documentElement.scrollTop = amount + document.body.parentNode.scrollTop = amount + document.body.scrollTop = amount +} + +function position() { + return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop +} + +/** + * @param {number} to + * @param {number} duration + * @param {Function} callback + */ +export function scrollTo(to, duration, callback) { + const start = position() + const change = to - start + const increment = 20 + let currentTime = 0 + duration = (typeof (duration) === 'undefined') ? 500 : duration + var animateScroll = function() { + // increment the time + currentTime += increment + // find the value with the quadratic in-out easing function + var val = Math.easeInOutQuad(currentTime, start, change, duration) + // move the document.body + move(val) + // do the animation unless its over + if (currentTime < duration) { + requestAnimFrame(animateScroll) + } else { + if (callback && typeof (callback) === 'function') { + // the animation is done so lets callback + callback() + } + } + } + animateScroll() +} diff --git a/Yi.RuoYi.Vue3/src/utils/signalR.js b/Yi.RuoYi.Vue3/src/utils/signalR.js new file mode 100644 index 00000000..77019867 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/signalR.js @@ -0,0 +1,103 @@ +// 官方文档：https://docs.microsoft.com/zh-cn/aspnet/core/signalr/javascript-client?view=aspnetcore-6.0&viewFallbackFrom=aspnetcore-2.2&tabs=visual-studio +import * as signalR from '@microsoft/signalr' +import useSocketStore from '@/store/modules/socket' +import { getToken } from '@/utils/auth' +import useUserStore from '@/store/modules/user' +import { ElMessage } from 'element-plus' + +export default { + // signalR对象 + SR: {}, + // 失败连接重试次数 + failNum: 4, + baseUrl: '', + init(url) { + const connection = new signalR.HubConnectionBuilder() + .withUrl(url, { accessTokenFactory: () => getToken() }) + .withAutomaticReconnect()//自动重新连接 + .configureLogging(signalR.LogLevel.Information) + .build(); + this.SR = connection; + // 断线重连 + connection.onclose(async () => { + console.log('断开连接了') + console.assert(connection.state === signalR.HubConnectionState.Disconnected); + // 建议用户重新刷新浏览器 + await this.start(); + }) + + connection.onreconnected(() => { + console.log('断线重新连接成功') + }) + this.receiveMsg(connection); + // 启动 + // this.start(); + }, + /** + * 调用 this.signalR.start().then(async () => { await this.SR.invoke("method")}) + * @returns + */ +async close(){ + var that = this; + await this.SR.stop(); +}, + + + async start() { + var that = this; + + try { + //使用async和await 或 promise的then 和catch 处理来自服务端的异常 + await this.SR.start(); + //console.assert(this.SR.state === signalR.HubConnectionState.Connected); + console.log('signalR 连接成功了', this.SR.state); + return true; + } catch (error) { + that.failNum--; + console.log(`失败重试剩余次数${that.failNum}`, error) + if (that.failNum > 0) { + setTimeout(async () => { + await this.SR.start() + }, 5000); + } + return false; + } + }, + // 接收消息处理 + receiveMsg(connection) { + connection.on("onlineNum", (data) => { + const socketStore = useSocketStore(); + socketStore.setOnlineNum(data) + }); + connection.on("forceOut", (msg) => { + useUserStore().logOut().then(() => { + ElMessage.error(msg); + location.href = '/index'; + }) + }); + // connection.on("onlineNum", (data) => { + // store.dispatch("socket/changeOnlineNum", data); + // }); + // // 接收欢迎语 + // connection.on("welcome", (data) => { + // console.log('welcome', data) + // Notification.info(data) + // }); + // // 接收后台手动推送消息 + // connection.on("receiveNotice", (title, data) => { + // Notification({ + // type: 'info', + // title: title, + // message: data, + // dangerouslyUseHTMLString: true, + // duration: 0 + // }) + // }) + // // 接收系统通知/公告 + // connection.on("moreNotice", (data) => { + // if (data.code == 200) { + // store.dispatch("socket/getNoticeList", data.data); + // } + // }) + } +} \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/utils/theme.js b/Yi.RuoYi.Vue3/src/utils/theme.js new file mode 100644 index 00000000..f4badc67 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/theme.js @@ -0,0 +1,49 @@ +// 处理主题样式 +export function handleThemeStyle(theme) { + document.documentElement.style.setProperty('--el-color-primary', theme) + for (let i = 1; i <= 9; i++) { + document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, `${getLightColor(theme, i / 10)}`) + } + for (let i = 1; i <= 9; i++) { + document.documentElement.style.setProperty(`--el-color-primary-dark-${i}`, `${getDarkColor(theme, i / 10)}`) + } +} + +// hex颜色转rgb颜色 +export function hexToRgb(str) { + str = str.replace('#', '') + let hexs = str.match(/../g) + for (let i = 0; i < 3; i++) { + hexs[i] = parseInt(hexs[i], 16) + } + return hexs +} + +// rgb颜色转Hex颜色 +export function rgbToHex(r, g, b) { + let hexs = [r.toString(16), g.toString(16), b.toString(16)] + for (let i = 0; i < 3; i++) { + if (hexs[i].length == 1) { + hexs[i] = `0${hexs[i]}` + } + } + return `#${hexs.join('')}` +} + +// 变浅颜色值 +export function getLightColor(color, level) { + let rgb = hexToRgb(color) + for (let i = 0; i < 3; i++) { + rgb[i] = Math.floor((255 - rgb[i]) * level + rgb[i]) + } + return rgbToHex(rgb[0], rgb[1], rgb[2]) +} + +// 变深颜色值 +export function getDarkColor(color, level) { + let rgb = hexToRgb(color) + for (let i = 0; i < 3; i++) { + rgb[i] = Math.floor(rgb[i] * (1 - level)) + } + return rgbToHex(rgb[0], rgb[1], rgb[2]) +} diff --git a/Yi.RuoYi.Vue3/src/utils/validate.js b/Yi.RuoYi.Vue3/src/utils/validate.js new file mode 100644 index 00000000..702add4b --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/validate.js @@ -0,0 +1,93 @@ +/** + * 判断url是否是http或https + * @param {string} path + * @returns {Boolean} + */ + export function isHttp(url) { + return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1 +} + +/** + * 判断path是否为外链 + * @param {string} path + * @returns {Boolean} + */ + export function isExternal(path) { + return /^(https?:|mailto:|tel:)/.test(path) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validUsername(str) { + const valid_map = ['admin', 'editor'] + return valid_map.indexOf(str.trim()) >= 0 +} + +/** + * @param {string} url + * @returns {Boolean} + */ +export function validURL(url) { + const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/ + return reg.test(url) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validLowerCase(str) { + const reg = /^[a-z]+$/ + return reg.test(str) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validUpperCase(str) { + const reg = /^[A-Z]+$/ + return reg.test(str) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validAlphabets(str) { + const reg = /^[A-Za-z]+$/ + return reg.test(str) +} + +/** + * @param {string} email + * @returns {Boolean} + */ +export function validEmail(email) { + const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ + return reg.test(email) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function isString(str) { + if (typeof str === 'string' || str instanceof String) { + return true + } + return false +} + +/** + * @param {Array} arg + * @returns {Boolean} + */ +export function isArray(arg) { + if (typeof Array.isArray === 'undefined') { + return Object.prototype.toString.call(arg) === '[object Array]' + } + return Array.isArray(arg) +} diff --git a/Yi.RuoYi.Vue3/src/views/ERP/material/index.vue b/Yi.RuoYi.Vue3/src/views/ERP/material/index.vue new file mode 100644 index 00000000..78b54705 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/ERP/material/index.vue @@ -0,0 +1,402 @@ + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/ERP/purchase/index.vue b/Yi.RuoYi.Vue3/src/views/ERP/purchase/index.vue new file mode 100644 index 00000000..bedefe85 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/ERP/purchase/index.vue @@ -0,0 +1,775 @@ + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/ERP/stock/index.vue b/Yi.RuoYi.Vue3/src/views/ERP/stock/index.vue new file mode 100644 index 00000000..70ae29ae --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/ERP/stock/index.vue @@ -0,0 +1,363 @@ + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/ERP/supplier/index.vue b/Yi.RuoYi.Vue3/src/views/ERP/supplier/index.vue new file mode 100644 index 00000000..3d9564f8 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/ERP/supplier/index.vue @@ -0,0 +1,390 @@ + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/ERP/unit/index.vue b/Yi.RuoYi.Vue3/src/views/ERP/unit/index.vue new file mode 100644 index 00000000..f5180285 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/ERP/unit/index.vue @@ -0,0 +1,363 @@ + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/ERP/warehouse/index.vue b/Yi.RuoYi.Vue3/src/views/ERP/warehouse/index.vue new file mode 100644 index 00000000..90d2d062 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/ERP/warehouse/index.vue @@ -0,0 +1,368 @@ + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/bbs/article/index.vue b/Yi.RuoYi.Vue3/src/views/bbs/article/index.vue new file mode 100644 index 00000000..79065cb0 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/bbs/article/index.vue @@ -0,0 +1,381 @@ + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/error/401.vue b/Yi.RuoYi.Vue3/src/views/error/401.vue new file mode 100644 index 00000000..1ba37922 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/error/401.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/Yi.RuoYi.Vue3/src/views/error/404.vue b/Yi.RuoYi.Vue3/src/views/error/404.vue new file mode 100644 index 00000000..f2053032 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/error/404.vue @@ -0,0 +1,227 @@ + + + + + diff --git a/Yi.RuoYi.Vue3/src/views/index.vue b/Yi.RuoYi.Vue3/src/views/index.vue new file mode 100644 index 00000000..346d475a --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/index.vue @@ -0,0 +1,934 @@ + + + + + + diff --git a/Yi.RuoYi.Vue3/src/views/login.vue b/Yi.RuoYi.Vue3/src/views/login.vue new file mode 100644 index 00000000..4abb826b --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/login.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/Yi.RuoYi.Vue3/src/views/monitor/cache/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/cache/index.vue new file mode 100644 index 00000000..aadbcf44 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/monitor/cache/index.vue @@ -0,0 +1,131 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/monitor/cache/list.vue b/Yi.RuoYi.Vue3/src/views/monitor/cache/list.vue new file mode 100644 index 00000000..49ba7cdd --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/monitor/cache/list.vue @@ -0,0 +1,241 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/monitor/druid/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/druid/index.vue new file mode 100644 index 00000000..13736ec1 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/monitor/druid/index.vue @@ -0,0 +1,13 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/monitor/job/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/job/index.vue new file mode 100644 index 00000000..be65c336 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/monitor/job/index.vue @@ -0,0 +1,503 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/monitor/job/log.vue b/Yi.RuoYi.Vue3/src/views/monitor/job/log.vue new file mode 100644 index 00000000..ac4497c7 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/monitor/job/log.vue @@ -0,0 +1,282 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/monitor/logininfor/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/logininfor/index.vue new file mode 100644 index 00000000..ea272b36 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/monitor/logininfor/index.vue @@ -0,0 +1,224 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/monitor/online/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/online/index.vue new file mode 100644 index 00000000..a031b24e --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/monitor/online/index.vue @@ -0,0 +1,110 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue new file mode 100644 index 00000000..4e2510c4 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue @@ -0,0 +1,279 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/monitor/server/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/server/index.vue new file mode 100644 index 00000000..172443c8 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/monitor/server/index.vue @@ -0,0 +1,187 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/redirect/index.vue b/Yi.RuoYi.Vue3/src/views/redirect/index.vue new file mode 100644 index 00000000..a469960d --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/redirect/index.vue @@ -0,0 +1,14 @@ + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/register.vue b/Yi.RuoYi.Vue3/src/views/register.vue new file mode 100644 index 00000000..cc4f6e46 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/register.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/config/index.vue b/Yi.RuoYi.Vue3/src/views/system/config/index.vue new file mode 100644 index 00000000..522a165c --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/config/index.vue @@ -0,0 +1,316 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/dept/index.vue b/Yi.RuoYi.Vue3/src/views/system/dept/index.vue new file mode 100644 index 00000000..ca4fbc60 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/dept/index.vue @@ -0,0 +1,297 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/dict/data.vue b/Yi.RuoYi.Vue3/src/views/system/dict/data.vue new file mode 100644 index 00000000..e40296af --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/dict/data.vue @@ -0,0 +1,355 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/dict/index.vue b/Yi.RuoYi.Vue3/src/views/system/dict/index.vue new file mode 100644 index 00000000..62d56424 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/dict/index.vue @@ -0,0 +1,318 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/menu/index.vue b/Yi.RuoYi.Vue3/src/views/system/menu/index.vue new file mode 100644 index 00000000..83f71ca7 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/menu/index.vue @@ -0,0 +1,454 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/notice/index.vue b/Yi.RuoYi.Vue3/src/views/system/notice/index.vue new file mode 100644 index 00000000..ac0f5e66 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/notice/index.vue @@ -0,0 +1,296 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/post/index.vue b/Yi.RuoYi.Vue3/src/views/system/post/index.vue new file mode 100644 index 00000000..d1b66a4c --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/post/index.vue @@ -0,0 +1,281 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue b/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue new file mode 100644 index 00000000..4e4bceca --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue @@ -0,0 +1,177 @@ + + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/role/index.vue b/Yi.RuoYi.Vue3/src/views/system/role/index.vue new file mode 100644 index 00000000..3650904e --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/role/index.vue @@ -0,0 +1,740 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue b/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue new file mode 100644 index 00000000..19d5d7cc --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue @@ -0,0 +1,138 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/user/authRole.vue b/Yi.RuoYi.Vue3/src/views/system/user/authRole.vue new file mode 100644 index 00000000..0b5c14bc --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/user/authRole.vue @@ -0,0 +1,112 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/user/index.vue b/Yi.RuoYi.Vue3/src/views/system/user/index.vue new file mode 100644 index 00000000..5946e12a --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/user/index.vue @@ -0,0 +1,550 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/user/profile/index.vue b/Yi.RuoYi.Vue3/src/views/system/user/profile/index.vue new file mode 100644 index 00000000..ecea87d1 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/user/profile/index.vue @@ -0,0 +1,91 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/user/profile/resetPwd.vue b/Yi.RuoYi.Vue3/src/views/system/user/profile/resetPwd.vue new file mode 100644 index 00000000..dec2d79c --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/user/profile/resetPwd.vue @@ -0,0 +1,57 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/system/user/profile/userAvatar.vue b/Yi.RuoYi.Vue3/src/views/system/user/profile/userAvatar.vue new file mode 100644 index 00000000..7f1c4834 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/user/profile/userAvatar.vue @@ -0,0 +1,175 @@ + + + + + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/system/user/profile/userInfo.vue b/Yi.RuoYi.Vue3/src/views/system/user/profile/userInfo.vue new file mode 100644 index 00000000..02775069 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/system/user/profile/userInfo.vue @@ -0,0 +1,56 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/tool/build/index.vue b/Yi.RuoYi.Vue3/src/views/tool/build/index.vue new file mode 100644 index 00000000..c3543a92 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/tool/build/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/tool/gen/basicInfoForm.vue b/Yi.RuoYi.Vue3/src/views/tool/gen/basicInfoForm.vue new file mode 100644 index 00000000..39c85150 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/tool/gen/basicInfoForm.vue @@ -0,0 +1,48 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/tool/gen/editTable.vue b/Yi.RuoYi.Vue3/src/views/tool/gen/editTable.vue new file mode 100644 index 00000000..6529e8ae --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/tool/gen/editTable.vue @@ -0,0 +1,198 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/tool/gen/genInfoForm.vue b/Yi.RuoYi.Vue3/src/views/tool/gen/genInfoForm.vue new file mode 100644 index 00000000..bd14ccc2 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/tool/gen/genInfoForm.vue @@ -0,0 +1,281 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/tool/gen/importTable.vue b/Yi.RuoYi.Vue3/src/views/tool/gen/importTable.vue new file mode 100644 index 00000000..33b56337 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/tool/gen/importTable.vue @@ -0,0 +1,118 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/tool/gen/index.vue b/Yi.RuoYi.Vue3/src/views/tool/gen/index.vue new file mode 100644 index 00000000..24ba79cf --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/tool/gen/index.vue @@ -0,0 +1,306 @@ + + + diff --git a/Yi.RuoYi.Vue3/src/views/tool/swagger/index.vue b/Yi.RuoYi.Vue3/src/views/tool/swagger/index.vue new file mode 100644 index 00000000..a44fa711 --- /dev/null +++ b/Yi.RuoYi.Vue3/src/views/tool/swagger/index.vue @@ -0,0 +1,9 @@ + + + diff --git a/Yi.RuoYi.Vue3/vite.config.js b/Yi.RuoYi.Vue3/vite.config.js new file mode 100644 index 00000000..0e9fb0ab --- /dev/null +++ b/Yi.RuoYi.Vue3/vite.config.js @@ -0,0 +1,68 @@ +import { defineConfig, loadEnv } from 'vite' +import path from 'path' +import createVitePlugins from './vite/plugins' + +// https://vitejs.dev/config/ +export default defineConfig(({ mode, command }) => { + const env = loadEnv(mode, process.cwd()) + const { VITE_APP_ENV, VITE_APP_BASE_URL} = env + return { + // 部署生产环境和开发环境下的URL。 + // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上 + // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 + base: VITE_APP_ENV === 'production' ? '/' : '/', + plugins: createVitePlugins(env, command === 'build'), + resolve: { + // https://cn.vitejs.dev/config/#resolve-alias + alias: { + // 设置路径 + '~': path.resolve(__dirname, './'), + // 设置别名 + '@': path.resolve(__dirname, './src') + }, + // https://cn.vitejs.dev/config/#resolve-extensions + extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue'] + }, + // vite 相关配置 + server: { + port: 18000, + host: true, + open: true, + + + proxy: { + // https://cn.vitejs.dev/config/#server-proxy + '/dev-api': { + target: VITE_APP_BASE_URL, + changeOrigin: true, + rewrite: (p) => p.replace(/^\/dev-api/, ''), + }, + + '/dev-ws': { + target: VITE_APP_BASE_URL, + changeOrigin: true, + rewrite: (p) => p.replace(/^\/dev-ws/, ''), + ws: true + } + + } + }, + //fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file + css: { + postcss: { + plugins: [ + { + postcssPlugin: 'internal:charset-removal', + AtRule: { + charset: (atRule) => { + if (atRule.name === 'charset') { + atRule.remove(); + } + } + } + } + ] + } + } + } +}) diff --git a/Yi.RuoYi.Vue3/vite/plugins/auto-import.js b/Yi.RuoYi.Vue3/vite/plugins/auto-import.js new file mode 100644 index 00000000..a5d35763 --- /dev/null +++ b/Yi.RuoYi.Vue3/vite/plugins/auto-import.js @@ -0,0 +1,12 @@ +import autoImport from 'unplugin-auto-import/vite' + +export default function createAutoImport() { + return autoImport({ + imports: [ + 'vue', + 'vue-router', + 'pinia' + ], + dts: false + }) +} diff --git a/Yi.RuoYi.Vue3/vite/plugins/compression.js b/Yi.RuoYi.Vue3/vite/plugins/compression.js new file mode 100644 index 00000000..e90aaecc --- /dev/null +++ b/Yi.RuoYi.Vue3/vite/plugins/compression.js @@ -0,0 +1,28 @@ +import compression from 'vite-plugin-compression' + +export default function createCompression(env) { + const { VITE_BUILD_COMPRESS } = env + const plugin = [] + if (VITE_BUILD_COMPRESS) { + const compressList = VITE_BUILD_COMPRESS.split(',') + if (compressList.includes('gzip')) { + // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 + plugin.push( + compression({ + ext: '.gz', + deleteOriginFile: false + }) + ) + } + if (compressList.includes('brotli')) { + plugin.push( + compression({ + ext: '.br', + algorithm: 'brotliCompress', + deleteOriginFile: false + }) + ) + } + } + return plugin +} diff --git a/Yi.RuoYi.Vue3/vite/plugins/index.js b/Yi.RuoYi.Vue3/vite/plugins/index.js new file mode 100644 index 00000000..10e17c3d --- /dev/null +++ b/Yi.RuoYi.Vue3/vite/plugins/index.js @@ -0,0 +1,15 @@ +import vue from '@vitejs/plugin-vue' + +import createAutoImport from './auto-import' +import createSvgIcon from './svg-icon' +import createCompression from './compression' +import createSetupExtend from './setup-extend' + +export default function createVitePlugins(viteEnv, isBuild = false) { + const vitePlugins = [vue()] + vitePlugins.push(createAutoImport()) + vitePlugins.push(createSetupExtend()) + vitePlugins.push(createSvgIcon(isBuild)) + isBuild && vitePlugins.push(...createCompression(viteEnv)) + return vitePlugins +} diff --git a/Yi.RuoYi.Vue3/vite/plugins/setup-extend.js b/Yi.RuoYi.Vue3/vite/plugins/setup-extend.js new file mode 100644 index 00000000..a4980f30 --- /dev/null +++ b/Yi.RuoYi.Vue3/vite/plugins/setup-extend.js @@ -0,0 +1,5 @@ +import setupExtend from 'vite-plugin-vue-setup-extend' + +export default function createSetupExtend() { + return setupExtend() +} diff --git a/Yi.RuoYi.Vue3/vite/plugins/svg-icon.js b/Yi.RuoYi.Vue3/vite/plugins/svg-icon.js new file mode 100644 index 00000000..30a4140f --- /dev/null +++ b/Yi.RuoYi.Vue3/vite/plugins/svg-icon.js @@ -0,0 +1,10 @@ +import { createSvgIconsPlugin } from 'vite-plugin-svg-icons' +import path from 'path' + +export default function createSvgIcon(isBuild) { + return createSvgIconsPlugin({ + iconDirs: [path.resolve(process.cwd(), 'src/assets/icons/svg')], + symbolId: 'icon-[dir]-[name]', + svgoOptions: isBuild + }) +} diff --git a/Yi.RuoYi.Vue3/临时 copy.json b/Yi.RuoYi.Vue3/临时 copy.json new file mode 100644 index 00000000..f8d42b7c --- /dev/null +++ b/Yi.RuoYi.Vue3/临时 copy.json @@ -0,0 +1,440 @@ +[ + { + "id": 1621797307555123200, + "parentId": 0, + "orderNum": 100, + "name": "System", + "path": "/system", + "hidden": false, + "redirect": "noRedirect", + "component": "Layout", + "alwaysShow": true, + "meta": { + "title": "系统管理", + "icon": "system", + "noCache": true, + "link": "" + }, + "children": [ + { + "id": 1621797307559317541, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "User", + "path": "user", + "hidden": false, + "redirect": "noRedirect", + "component": "system/user/index", + "alwaysShow": false, + "meta": { + "title": "用户管理", + "icon": "user", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317546, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Role", + "path": "role", + "hidden": false, + "redirect": "noRedirect", + "component": "system/role/index", + "alwaysShow": false, + "meta": { + "title": "角色管理", + "icon": "peoples", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317551, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Menu", + "path": "menu", + "hidden": false, + "redirect": "noRedirect", + "component": "system/menu/index", + "alwaysShow": false, + "meta": { + "title": "菜单管理", + "icon": "tree-table", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317556, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Dept", + "path": "dept", + "hidden": false, + "redirect": "noRedirect", + "component": "system/dept/index", + "alwaysShow": false, + "meta": { + "title": "部门管理", + "icon": "tree", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317561, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Post", + "path": "post", + "hidden": false, + "redirect": "noRedirect", + "component": "system/post/index", + "alwaysShow": false, + "meta": { + "title": "岗位管理", + "icon": "post", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317566, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Dict", + "path": "dict", + "hidden": false, + "redirect": "noRedirect", + "component": "system/dict/index", + "alwaysShow": false, + "meta": { + "title": "字典管理", + "icon": "dict", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317571, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Config", + "path": "config", + "hidden": false, + "redirect": "noRedirect", + "component": "system/config/index", + "alwaysShow": false, + "meta": { + "title": "参数设置", + "icon": "edit", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317576, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Log", + "path": "log", + "hidden": false, + "redirect": "noRedirect", + "component": "ParentView", + "alwaysShow": true, + "meta": { + "title": "日志管理", + "icon": "log", + "noCache": true, + "link": "" + }, + "children": [ + { + "id": 1621797307559317577, + "parentId": 1621797307559317576, + "orderNum": 100, + "name": "Operlog", + "path": "operlog", + "hidden": false, + "redirect": "noRedirect", + "component": "monitor/operlog/index", + "alwaysShow": false, + "meta": { + "title": "操作日志", + "icon": "form", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317580, + "parentId": 1621797307559317576, + "orderNum": 100, + "name": "Logininfor", + "path": "logininfor", + "hidden": false, + "redirect": "noRedirect", + "component": "monitor/logininfor/index", + "alwaysShow": false, + "meta": { + "title": "登录日志", + "icon": "logininfor", + "noCache": false, + "link": "" + }, + "children": null + } + ] + } + ] + }, + { + "id": 1621797307559317504, + "parentId": 0, + "orderNum": 99, + "name": "Monitor", + "path": "/monitor", + "hidden": false, + "redirect": "noRedirect", + "component": "Layout", + "alwaysShow": true, + "meta": { + "title": "系统监控", + "icon": "monitor", + "noCache": true, + "link": "" + }, + "children": [ + { + "id": 1621797307559317505, + "parentId": 1621797307559317504, + "orderNum": 100, + "name": "Online", + "path": "online", + "hidden": false, + "redirect": "noRedirect", + "component": "monitor/online/index", + "alwaysShow": false, + "meta": { + "title": "在线用户", + "icon": "online", + "noCache": false, + "link": "" + }, + "children": null + } + ] + }, + { + "id": 1621797307559317506, + "parentId": 0, + "orderNum": 98, + "name": "Tool", + "path": "/tool", + "hidden": false, + "redirect": "noRedirect", + "component": "Layout", + "alwaysShow": true, + "meta": { + "title": "系统工具", + "icon": "tool", + "noCache": true, + "link": "" + }, + "children": [ + { + "id": 1621797307559317507, + "parentId": 1621797307559317506, + "orderNum": 100, + "name": "Localhost:19001", + "path": "http://localhost:19001", + "hidden": false, + "redirect": "noRedirect", + "component": null, + "alwaysShow": false, + "meta": { + "title": "接口文档", + "icon": "list", + "noCache": true, + "link": "http://localhost:19001" + }, + "children": null + } + ] + }, + { + "id": 1621797307559317508, + "parentId": 0, + "orderNum": 97, + "name": "S", + "path": "s", + "hidden": false, + "redirect": "noRedirect", + "component": "Layout", + "alwaysShow": true, + "meta": { + "title": "BBS", + "icon": "international", + "noCache": true, + "link": "" + }, + "children": [ + { + "id": 1621797307559317509, + "parentId": 1621797307559317508, + "orderNum": 100, + "name": "Article", + "path": "article", + "hidden": false, + "redirect": "noRedirect", + "component": "bbs/article/index", + "alwaysShow": false, + "meta": { + "title": "文章管理", + "icon": "education", + "noCache": false, + "link": "" + }, + "children": null + } + ] + }, + { + "id": 1621797307559317514, + "parentId": 0, + "orderNum": 96, + "name": "Erp", + "path": "/erp", + "hidden": false, + "redirect": "noRedirect", + "component": "Layout", + "alwaysShow": true, + "meta": { + "title": "ERP", + "icon": "international", + "noCache": true, + "link": "" + }, + "children": [ + { + "id": 1621797307559317515, + "parentId": 1621797307559317514, + "orderNum": 100, + "name": "Supplier", + "path": "supplier", + "hidden": false, + "redirect": "noRedirect", + "component": "erp/supplier/index", + "alwaysShow": false, + "meta": { + "title": "供应商定义", + "icon": "education", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317520, + "parentId": 1621797307559317514, + "orderNum": 100, + "name": "Warehouse", + "path": "warehouse", + "hidden": false, + "redirect": "noRedirect", + "component": "erp/warehouse/index", + "alwaysShow": false, + "meta": { + "title": "仓库定义", + "icon": "education", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317525, + "parentId": 1621797307559317514, + "orderNum": 100, + "name": "Unit", + "path": "unit", + "hidden": false, + "redirect": "noRedirect", + "component": "erp/unit/index", + "alwaysShow": false, + "meta": { + "title": "单位定义", + "icon": "education", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317530, + "parentId": 1621797307559317514, + "orderNum": 100, + "name": "Material", + "path": "material", + "hidden": false, + "redirect": "noRedirect", + "component": "erp/material/index", + "alwaysShow": false, + "meta": { + "title": "物料定义", + "icon": "education", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317535, + "parentId": 1621797307559317514, + "orderNum": 100, + "name": "Purchase", + "path": "purchase", + "hidden": false, + "redirect": "noRedirect", + "component": "erp/purchase/index", + "alwaysShow": false, + "meta": { + "title": "采购订单", + "icon": "education", + "noCache": false, + "link": "" + }, + "children": null + } + ] + }, + { + "id": 1621797307559317540, + "parentId": 0, + "orderNum": 90, + "name": "Yi", + "path": "https://gitee.com/ccnetcore/yi", + "hidden": false, + "redirect": "noRedirect", + "component": "Layout", + "alwaysShow": false, + "meta": { + "title": "Yi框架", + "icon": "guide", + "noCache": true, + "link": "https://gitee.com/ccnetcore/yi" + }, + "children": null + } +] \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/临时.json b/Yi.RuoYi.Vue3/临时.json new file mode 100644 index 00000000..f8d42b7c --- /dev/null +++ b/Yi.RuoYi.Vue3/临时.json @@ -0,0 +1,440 @@ +[ + { + "id": 1621797307555123200, + "parentId": 0, + "orderNum": 100, + "name": "System", + "path": "/system", + "hidden": false, + "redirect": "noRedirect", + "component": "Layout", + "alwaysShow": true, + "meta": { + "title": "系统管理", + "icon": "system", + "noCache": true, + "link": "" + }, + "children": [ + { + "id": 1621797307559317541, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "User", + "path": "user", + "hidden": false, + "redirect": "noRedirect", + "component": "system/user/index", + "alwaysShow": false, + "meta": { + "title": "用户管理", + "icon": "user", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317546, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Role", + "path": "role", + "hidden": false, + "redirect": "noRedirect", + "component": "system/role/index", + "alwaysShow": false, + "meta": { + "title": "角色管理", + "icon": "peoples", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317551, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Menu", + "path": "menu", + "hidden": false, + "redirect": "noRedirect", + "component": "system/menu/index", + "alwaysShow": false, + "meta": { + "title": "菜单管理", + "icon": "tree-table", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317556, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Dept", + "path": "dept", + "hidden": false, + "redirect": "noRedirect", + "component": "system/dept/index", + "alwaysShow": false, + "meta": { + "title": "部门管理", + "icon": "tree", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317561, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Post", + "path": "post", + "hidden": false, + "redirect": "noRedirect", + "component": "system/post/index", + "alwaysShow": false, + "meta": { + "title": "岗位管理", + "icon": "post", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317566, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Dict", + "path": "dict", + "hidden": false, + "redirect": "noRedirect", + "component": "system/dict/index", + "alwaysShow": false, + "meta": { + "title": "字典管理", + "icon": "dict", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317571, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Config", + "path": "config", + "hidden": false, + "redirect": "noRedirect", + "component": "system/config/index", + "alwaysShow": false, + "meta": { + "title": "参数设置", + "icon": "edit", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317576, + "parentId": 1621797307555123200, + "orderNum": 100, + "name": "Log", + "path": "log", + "hidden": false, + "redirect": "noRedirect", + "component": "ParentView", + "alwaysShow": true, + "meta": { + "title": "日志管理", + "icon": "log", + "noCache": true, + "link": "" + }, + "children": [ + { + "id": 1621797307559317577, + "parentId": 1621797307559317576, + "orderNum": 100, + "name": "Operlog", + "path": "operlog", + "hidden": false, + "redirect": "noRedirect", + "component": "monitor/operlog/index", + "alwaysShow": false, + "meta": { + "title": "操作日志", + "icon": "form", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317580, + "parentId": 1621797307559317576, + "orderNum": 100, + "name": "Logininfor", + "path": "logininfor", + "hidden": false, + "redirect": "noRedirect", + "component": "monitor/logininfor/index", + "alwaysShow": false, + "meta": { + "title": "登录日志", + "icon": "logininfor", + "noCache": false, + "link": "" + }, + "children": null + } + ] + } + ] + }, + { + "id": 1621797307559317504, + "parentId": 0, + "orderNum": 99, + "name": "Monitor", + "path": "/monitor", + "hidden": false, + "redirect": "noRedirect", + "component": "Layout", + "alwaysShow": true, + "meta": { + "title": "系统监控", + "icon": "monitor", + "noCache": true, + "link": "" + }, + "children": [ + { + "id": 1621797307559317505, + "parentId": 1621797307559317504, + "orderNum": 100, + "name": "Online", + "path": "online", + "hidden": false, + "redirect": "noRedirect", + "component": "monitor/online/index", + "alwaysShow": false, + "meta": { + "title": "在线用户", + "icon": "online", + "noCache": false, + "link": "" + }, + "children": null + } + ] + }, + { + "id": 1621797307559317506, + "parentId": 0, + "orderNum": 98, + "name": "Tool", + "path": "/tool", + "hidden": false, + "redirect": "noRedirect", + "component": "Layout", + "alwaysShow": true, + "meta": { + "title": "系统工具", + "icon": "tool", + "noCache": true, + "link": "" + }, + "children": [ + { + "id": 1621797307559317507, + "parentId": 1621797307559317506, + "orderNum": 100, + "name": "Localhost:19001", + "path": "http://localhost:19001", + "hidden": false, + "redirect": "noRedirect", + "component": null, + "alwaysShow": false, + "meta": { + "title": "接口文档", + "icon": "list", + "noCache": true, + "link": "http://localhost:19001" + }, + "children": null + } + ] + }, + { + "id": 1621797307559317508, + "parentId": 0, + "orderNum": 97, + "name": "S", + "path": "s", + "hidden": false, + "redirect": "noRedirect", + "component": "Layout", + "alwaysShow": true, + "meta": { + "title": "BBS", + "icon": "international", + "noCache": true, + "link": "" + }, + "children": [ + { + "id": 1621797307559317509, + "parentId": 1621797307559317508, + "orderNum": 100, + "name": "Article", + "path": "article", + "hidden": false, + "redirect": "noRedirect", + "component": "bbs/article/index", + "alwaysShow": false, + "meta": { + "title": "文章管理", + "icon": "education", + "noCache": false, + "link": "" + }, + "children": null + } + ] + }, + { + "id": 1621797307559317514, + "parentId": 0, + "orderNum": 96, + "name": "Erp", + "path": "/erp", + "hidden": false, + "redirect": "noRedirect", + "component": "Layout", + "alwaysShow": true, + "meta": { + "title": "ERP", + "icon": "international", + "noCache": true, + "link": "" + }, + "children": [ + { + "id": 1621797307559317515, + "parentId": 1621797307559317514, + "orderNum": 100, + "name": "Supplier", + "path": "supplier", + "hidden": false, + "redirect": "noRedirect", + "component": "erp/supplier/index", + "alwaysShow": false, + "meta": { + "title": "供应商定义", + "icon": "education", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317520, + "parentId": 1621797307559317514, + "orderNum": 100, + "name": "Warehouse", + "path": "warehouse", + "hidden": false, + "redirect": "noRedirect", + "component": "erp/warehouse/index", + "alwaysShow": false, + "meta": { + "title": "仓库定义", + "icon": "education", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317525, + "parentId": 1621797307559317514, + "orderNum": 100, + "name": "Unit", + "path": "unit", + "hidden": false, + "redirect": "noRedirect", + "component": "erp/unit/index", + "alwaysShow": false, + "meta": { + "title": "单位定义", + "icon": "education", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317530, + "parentId": 1621797307559317514, + "orderNum": 100, + "name": "Material", + "path": "material", + "hidden": false, + "redirect": "noRedirect", + "component": "erp/material/index", + "alwaysShow": false, + "meta": { + "title": "物料定义", + "icon": "education", + "noCache": false, + "link": "" + }, + "children": null + }, + { + "id": 1621797307559317535, + "parentId": 1621797307559317514, + "orderNum": 100, + "name": "Purchase", + "path": "purchase", + "hidden": false, + "redirect": "noRedirect", + "component": "erp/purchase/index", + "alwaysShow": false, + "meta": { + "title": "采购订单", + "icon": "education", + "noCache": false, + "link": "" + }, + "children": null + } + ] + }, + { + "id": 1621797307559317540, + "parentId": 0, + "orderNum": 90, + "name": "Yi", + "path": "https://gitee.com/ccnetcore/yi", + "hidden": false, + "redirect": "noRedirect", + "component": "Layout", + "alwaysShow": false, + "meta": { + "title": "Yi框架", + "icon": "guide", + "noCache": true, + "link": "https://gitee.com/ccnetcore/yi" + }, + "children": null + } +] \ No newline at end of file