新增加系统配置文件
This commit is contained in:
parent
2b263fb64d
commit
2b10934e09
@ -1,23 +1,169 @@
|
|||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using SqlSugar;
|
||||||
|
using Infrastructure;
|
||||||
|
using Infrastructure.Attribute;
|
||||||
|
using Infrastructure.Enums;
|
||||||
|
using Infrastructure.Model;
|
||||||
|
using Mapster;
|
||||||
|
using ZR.Model.Dto;
|
||||||
|
using ZR.Model.Models;
|
||||||
|
using ZR.Service.Business;
|
||||||
|
using ZR.Admin.WebApi.Extensions;
|
||||||
using ZR.Admin.WebApi.Filters;
|
using ZR.Admin.WebApi.Filters;
|
||||||
|
using ZR.Common;
|
||||||
|
using ZR.Service.System;
|
||||||
|
using ZR.Model.System;
|
||||||
|
using Infrastructure.Extensions;
|
||||||
|
|
||||||
namespace ZR.Admin.WebApi.Controllers.System
|
namespace ZR.Admin.WebApi.Controllers
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 配置文件
|
/// 参数配置Controller
|
||||||
|
///
|
||||||
|
/// @author zhaorui
|
||||||
|
/// @date 2021-09-29
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Verify]
|
[Verify]
|
||||||
[Route("system/config")]
|
[Route("system/config")]
|
||||||
public class SysConfigController : BaseController
|
public class SysConfigController : BaseController
|
||||||
{
|
{
|
||||||
[HttpGet("list")]
|
/// <summary>
|
||||||
public IActionResult Index()
|
/// 参数配置接口
|
||||||
|
/// </summary>
|
||||||
|
private readonly ISysConfigService _SysConfigService;
|
||||||
|
|
||||||
|
public SysConfigController(ISysConfigService SysConfigService)
|
||||||
{
|
{
|
||||||
return SUCCESS(1);
|
_SysConfigService = SysConfigService;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查询参数配置列表
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpGet("list")]
|
||||||
|
[ActionPermissionFilter(Permission = "system:config:list")]
|
||||||
|
public IActionResult QuerySysConfig([FromQuery] SysConfigQueryDto parm)
|
||||||
|
{
|
||||||
|
//开始拼装查询条件
|
||||||
|
var predicate = Expressionable.Create<SysConfig>();
|
||||||
|
|
||||||
|
//TODO 搜索条件
|
||||||
|
predicate = predicate.AndIF(!parm.ConfigType.IsEmpty(),m => m.ConfigType == parm.ConfigType);
|
||||||
|
predicate = predicate.AndIF(!parm.ConfigName.IsEmpty(),m => m.ConfigName.Contains(parm.ConfigType));
|
||||||
|
predicate = predicate.AndIF(!parm.ConfigKey.IsEmpty(),m => m.ConfigKey.Contains(parm.ConfigKey));
|
||||||
|
predicate = predicate.AndIF(!parm.BeginTime.IsEmpty(),m => m.Create_time >= parm.BeginTime );
|
||||||
|
predicate = predicate.AndIF(!parm.BeginTime.IsEmpty(),m => m.Create_time <= parm.EndTime);
|
||||||
|
|
||||||
|
var response = _SysConfigService.GetPages(predicate.ToExpression(), parm);
|
||||||
|
|
||||||
|
return SUCCESS(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查询参数配置详情
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ConfigId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpGet("{ConfigId}")]
|
||||||
|
[ActionPermissionFilter(Permission = "system:config:query")]
|
||||||
|
public IActionResult GetSysConfig(int ConfigId)
|
||||||
|
{
|
||||||
|
var response = _SysConfigService.GetId(ConfigId);
|
||||||
|
|
||||||
|
return SUCCESS(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据参数键名查询参数值
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="configKey"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpGet("configKey/{configKey}")]
|
||||||
|
public IActionResult GetConfigKey(string configKey)
|
||||||
|
{
|
||||||
|
//TODO 增加缓存
|
||||||
|
var response = _SysConfigService.Queryable().First(f=> f.ConfigKey == configKey);
|
||||||
|
|
||||||
|
return SUCCESS(response?.ConfigValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 添加参数配置
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
[ActionPermissionFilter(Permission = "system:config:add")]
|
||||||
|
[Log(Title = "参数配置添加", BusinessType = BusinessType.INSERT)]
|
||||||
|
public IActionResult AddSysConfig([FromBody] SysConfigDto parm)
|
||||||
|
{
|
||||||
|
if (parm == null)
|
||||||
|
{
|
||||||
|
throw new CustomException("请求参数错误");
|
||||||
|
}
|
||||||
|
//从 Dto 映射到 实体
|
||||||
|
var model = parm.Adapt<SysConfig>().ToCreate();
|
||||||
|
|
||||||
|
return SUCCESS(_SysConfigService.Add(model, it => new
|
||||||
|
{
|
||||||
|
it.ConfigName,
|
||||||
|
it.ConfigKey,
|
||||||
|
it.ConfigValue,
|
||||||
|
it.ConfigType,
|
||||||
|
it.Create_by,
|
||||||
|
it.Create_time,
|
||||||
|
it.Remark,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新参数配置
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPut]
|
||||||
|
[ActionPermissionFilter(Permission = "system:config:update")]
|
||||||
|
[Log(Title = "参数配置修改", BusinessType = BusinessType.UPDATE)]
|
||||||
|
public IActionResult UpdateSysConfig([FromBody] SysConfigDto parm)
|
||||||
|
{
|
||||||
|
if (parm == null)
|
||||||
|
{
|
||||||
|
throw new CustomException("请求实体不能为空");
|
||||||
|
}
|
||||||
|
//从 Dto 映射到 实体
|
||||||
|
var model = parm.Adapt<SysConfig>().ToUpdate(HttpContext);
|
||||||
|
|
||||||
|
var response = _SysConfigService.Update(w => w.ConfigId == model.ConfigId, it => new SysConfig()
|
||||||
|
{
|
||||||
|
//Update 字段映射
|
||||||
|
ConfigName = model.ConfigName,
|
||||||
|
ConfigKey = model.ConfigKey,
|
||||||
|
ConfigValue = model.ConfigValue,
|
||||||
|
ConfigType = model.ConfigType,
|
||||||
|
Update_by = model.Update_by,
|
||||||
|
Update_time = model.Update_time,
|
||||||
|
});
|
||||||
|
|
||||||
|
return SUCCESS(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 删除参数配置
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpDelete("{ids}")]
|
||||||
|
[ActionPermissionFilter(Permission = "system:config:remove")]
|
||||||
|
[Log(Title = "参数配置删除", BusinessType = BusinessType.DELETE)]
|
||||||
|
public IActionResult DeleteSysConfig(string ids)
|
||||||
|
{
|
||||||
|
int[] idsArr = Tools.SpitIntArrary(ids);
|
||||||
|
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
|
||||||
|
|
||||||
|
var response = _SysConfigService.Delete(idsArr);
|
||||||
|
|
||||||
|
return SUCCESS(response);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -79,9 +79,7 @@ namespace ZR.Admin.WebApi.Controllers.System
|
|||||||
throw new CustomException(ResultCode.PARAM_ERROR, "请求参数错误");
|
throw new CustomException(ResultCode.PARAM_ERROR, "请求参数错误");
|
||||||
}
|
}
|
||||||
//从 Dto 映射到 实体
|
//从 Dto 映射到 实体
|
||||||
var user = userDto.Adapt<SysUser>();
|
var user = userDto.Adapt<SysUser>().ToUpdate(HttpContext);
|
||||||
user.Update_by = User.Identity.Name;
|
|
||||||
user.Update_time = DateTime.Now;
|
|
||||||
|
|
||||||
int result = UserService.ChangeUser(user);
|
int result = UserService.ChangeUser(user);
|
||||||
return ToResponse(result);
|
return ToResponse(result);
|
||||||
|
|||||||
@ -57,9 +57,9 @@ namespace ZR.Admin.WebApi.Extensions
|
|||||||
{
|
{
|
||||||
types.GetProperty("UpdateTime").SetValue(source, DateTime.Now, null);
|
types.GetProperty("UpdateTime").SetValue(source, DateTime.Now, null);
|
||||||
}
|
}
|
||||||
if (types.GetProperty("Update_Time") != null)
|
if (types.GetProperty("Update_time") != null)
|
||||||
{
|
{
|
||||||
types.GetProperty("Update_Time").SetValue(source, DateTime.Now, null);
|
types.GetProperty("Update_time").SetValue(source, DateTime.Now, null);
|
||||||
}
|
}
|
||||||
//if (types.GetProperty("UpdateID") != null)
|
//if (types.GetProperty("UpdateID") != null)
|
||||||
//{
|
//{
|
||||||
|
|||||||
@ -14,6 +14,7 @@ using {ServicesNamespace}.Business;
|
|||||||
using {ApiControllerNamespace}.Extensions;
|
using {ApiControllerNamespace}.Extensions;
|
||||||
using {ApiControllerNamespace}.Filters;
|
using {ApiControllerNamespace}.Filters;
|
||||||
using ZR.Common;
|
using ZR.Common;
|
||||||
|
using Infrastructure.Extensions;
|
||||||
|
|
||||||
namespace {ApiControllerNamespace}.Controllers
|
namespace {ApiControllerNamespace}.Controllers
|
||||||
{
|
{
|
||||||
@ -76,7 +77,7 @@ namespace {ApiControllerNamespace}.Controllers
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
[ActionPermissionFilter(Permission = "{Permission}:add")]
|
[ActionPermissionFilter(Permission = "{Permission}:add")]
|
||||||
[Log(Title = "{TableDesc}添加", BusinessType = BusinessType.INSERT)]
|
[Log(Title = "{FunctionName}添加", BusinessType = BusinessType.INSERT)]
|
||||||
public IActionResult Add{ModelName}([FromBody] {ModelName}Dto parm)
|
public IActionResult Add{ModelName}([FromBody] {ModelName}Dto parm)
|
||||||
{
|
{
|
||||||
if (parm == null)
|
if (parm == null)
|
||||||
@ -84,7 +85,7 @@ namespace {ApiControllerNamespace}.Controllers
|
|||||||
throw new CustomException("请求参数错误");
|
throw new CustomException("请求参数错误");
|
||||||
}
|
}
|
||||||
//从 Dto 映射到 实体
|
//从 Dto 映射到 实体
|
||||||
var model = parm.Adapt<{ModelName}>().ToCreate();
|
var model = parm.Adapt<{ModelName}>().ToCreate(HttpContext);
|
||||||
|
|
||||||
return SUCCESS(_{ModelName}Service.Add(model, it => new
|
return SUCCESS(_{ModelName}Service.Add(model, it => new
|
||||||
{
|
{
|
||||||
@ -98,7 +99,7 @@ namespace {ApiControllerNamespace}.Controllers
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpPut]
|
[HttpPut]
|
||||||
[ActionPermissionFilter(Permission = "{Permission}:update")]
|
[ActionPermissionFilter(Permission = "{Permission}:update")]
|
||||||
[Log(Title = "{TableDesc}修改", BusinessType = BusinessType.UPDATE)]
|
[Log(Title = "{FunctionName}修改", BusinessType = BusinessType.UPDATE)]
|
||||||
public IActionResult Update{ModelName}([FromBody] {ModelName}Dto parm)
|
public IActionResult Update{ModelName}([FromBody] {ModelName}Dto parm)
|
||||||
{
|
{
|
||||||
if (parm == null)
|
if (parm == null)
|
||||||
@ -106,7 +107,7 @@ namespace {ApiControllerNamespace}.Controllers
|
|||||||
throw new CustomException("请求实体不能为空");
|
throw new CustomException("请求实体不能为空");
|
||||||
}
|
}
|
||||||
//从 Dto 映射到 实体
|
//从 Dto 映射到 实体
|
||||||
var model = parm.Adapt<{ModelName}>().ToUpdate();
|
var model = parm.Adapt<{ModelName}>().ToUpdate(HttpContext);
|
||||||
|
|
||||||
var response = _{ModelName}Service.Update(w => w.{PrimaryKey} == model.{PrimaryKey}, it => new {ModelName}()
|
var response = _{ModelName}Service.Update(w => w.{PrimaryKey} == model.{PrimaryKey}, it => new {ModelName}()
|
||||||
{
|
{
|
||||||
@ -123,7 +124,7 @@ namespace {ApiControllerNamespace}.Controllers
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpDelete("{ids}")]
|
[HttpDelete("{ids}")]
|
||||||
[ActionPermissionFilter(Permission = "{Permission}:delete")]
|
[ActionPermissionFilter(Permission = "{Permission}:delete")]
|
||||||
[Log(Title = "{TableDesc}删除", BusinessType = BusinessType.DELETE)]
|
[Log(Title = "{FunctionName}删除", BusinessType = BusinessType.DELETE)]
|
||||||
public IActionResult Delete{ModelName}(string ids)
|
public IActionResult Delete{ModelName}(string ids)
|
||||||
{
|
{
|
||||||
int[] idsArr = Tools.SpitIntArrary(ids);
|
int[] idsArr = Tools.SpitIntArrary(ids);
|
||||||
|
|||||||
@ -1,12 +1,5 @@
|
|||||||
using Infrastructure;
|
using Infrastructure;
|
||||||
using Infrastructure.Attribute;
|
using Infrastructure.Attribute;
|
||||||
using Infrastructure.Extensions;
|
|
||||||
using SqlSugar;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using ZR.Common;
|
|
||||||
using {ModelsNamespace}.Models;
|
using {ModelsNamespace}.Models;
|
||||||
using {IRepositoriesNamespace};
|
using {IRepositoriesNamespace};
|
||||||
|
|
||||||
|
|||||||
@ -33,7 +33,7 @@ namespace ZR.CodeGenerator.Service
|
|||||||
{
|
{
|
||||||
tableList = tableList.Where(f => f.Name.ToLower().Contains(tableName.ToLower())).ToList();
|
tableList = tableList.Where(f => f.Name.ToLower().Contains(tableName.ToLower())).ToList();
|
||||||
}
|
}
|
||||||
tableList = tableList.Where(f => !new string[] { "gen", "sys_" }.Contains(f.Name)).ToList();
|
//tableList = tableList.Where(f => !new string[] { "gen", "sys_" }.Contains(f.Name)).ToList();
|
||||||
pager.TotalNum = tableList.Count;
|
pager.TotalNum = tableList.Count;
|
||||||
return tableList.Skip(pager.PageSize * (pager.PageNum - 1)).Take(pager.PageSize).OrderBy(f => f.Name).ToList();
|
return tableList.Skip(pager.PageSize * (pager.PageNum - 1)).Take(pager.PageSize).OrderBy(f => f.Name).ToList();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,13 +1,38 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="drawer-container">
|
<div class="drawer-container">
|
||||||
<div>
|
<div class="setting-drawer-content">
|
||||||
<h3 class="drawer-title">系统布局配置</h3>
|
<div class="setting-drawer-title">
|
||||||
|
<h3 class="drawer-title">主题风格设置</h3>
|
||||||
|
</div>
|
||||||
|
<div class="setting-drawer-block-checbox">
|
||||||
|
<div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
|
||||||
|
<img src="@/assets/image/dark.svg" alt="dark">
|
||||||
|
<div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
|
||||||
|
<i aria-label="图标: check" class="anticon anticon-check">
|
||||||
|
<svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class="">
|
||||||
|
<path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z" />
|
||||||
|
</svg>
|
||||||
|
</i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-light')">
|
||||||
|
<img src="@/assets/image/light.svg" alt="light">
|
||||||
|
<div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
|
||||||
|
<i aria-label="图标: check" class="anticon anticon-check">
|
||||||
|
<svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class="">
|
||||||
|
<path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z" />
|
||||||
|
</svg>
|
||||||
|
</i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="drawer-item">
|
<div class="drawer-item">
|
||||||
<span>主题颜色</span>
|
<span>主题颜色</span>
|
||||||
<theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
|
<theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<el-divider/>
|
||||||
<div class="drawer-item">
|
<div class="drawer-item">
|
||||||
<span>开启 Tags-Views</span>
|
<span>开启 Tags-Views</span>
|
||||||
<el-switch v-model="tagsView" class="drawer-switch" />
|
<el-switch v-model="tagsView" class="drawer-switch" />
|
||||||
@ -22,66 +47,143 @@
|
|||||||
<span>显示 Logo</span>
|
<span>显示 Logo</span>
|
||||||
<el-switch v-model="sidebarLogo" class="drawer-switch" />
|
<el-switch v-model="sidebarLogo" class="drawer-switch" />
|
||||||
</div>
|
</div>
|
||||||
|
<el-divider />
|
||||||
|
|
||||||
|
<el-button size="small" type="primary" plain icon="el-icon-document-add" @click="saveSetting">保存配置</el-button>
|
||||||
|
<el-button size="small" plain icon="el-icon-refresh" @click="resetSetting">重置配置</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import ThemePicker from '@/components/ThemePicker'
|
import ThemePicker from "@/components/ThemePicker";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: { ThemePicker },
|
components: { ThemePicker },
|
||||||
data() {
|
data() {
|
||||||
return {}
|
return {
|
||||||
|
theme: this.$store.state.settings.theme,
|
||||||
|
sideTheme: this.$store.state.settings.sideTheme,
|
||||||
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
fixedHeader: {
|
fixedHeader: {
|
||||||
get() {
|
get() {
|
||||||
return this.$store.state.settings.fixedHeader
|
return this.$store.state.settings.fixedHeader;
|
||||||
},
|
},
|
||||||
set(val) {
|
set(val) {
|
||||||
this.$store.dispatch('settings/changeSetting', {
|
this.$store.dispatch("settings/changeSetting", {
|
||||||
key: 'fixedHeader',
|
key: "fixedHeader",
|
||||||
value: val
|
value: val,
|
||||||
})
|
});
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
tagsView: {
|
tagsView: {
|
||||||
get() {
|
get() {
|
||||||
return this.$store.state.settings.tagsView
|
return this.$store.state.settings.tagsView;
|
||||||
},
|
},
|
||||||
set(val) {
|
set(val) {
|
||||||
this.$store.dispatch('settings/changeSetting', {
|
this.$store.dispatch("settings/changeSetting", {
|
||||||
key: 'tagsView',
|
key: "tagsView",
|
||||||
value: val
|
value: val,
|
||||||
})
|
});
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
sidebarLogo: {
|
sidebarLogo: {
|
||||||
get() {
|
get() {
|
||||||
return this.$store.state.settings.sidebarLogo
|
return this.$store.state.settings.sidebarLogo;
|
||||||
},
|
},
|
||||||
set(val) {
|
set(val) {
|
||||||
this.$store.dispatch('settings/changeSetting', {
|
this.$store.dispatch("settings/changeSetting", {
|
||||||
key: 'sidebarLogo',
|
key: "sidebarLogo",
|
||||||
value: val
|
value: val,
|
||||||
})
|
});
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
themeChange(val) {
|
themeChange(val) {
|
||||||
this.$store.dispatch('settings/changeSetting', {
|
this.$store.dispatch("settings/changeSetting", {
|
||||||
key: 'theme',
|
key: "theme",
|
||||||
value: val
|
value: val,
|
||||||
})
|
});
|
||||||
}
|
},
|
||||||
}
|
handleTheme(val) {
|
||||||
}
|
this.$store.dispatch("settings/changeSetting", {
|
||||||
|
key: "sideTheme",
|
||||||
|
value: val,
|
||||||
|
});
|
||||||
|
this.sideTheme = val;
|
||||||
|
},
|
||||||
|
// 保存配置好
|
||||||
|
saveSetting() {
|
||||||
|
// this.$modal.loading("正在保存到本地,请稍后...");
|
||||||
|
localStorage.setItem(
|
||||||
|
"layout-setting",
|
||||||
|
`{
|
||||||
|
"tagsView":${this.tagsView},
|
||||||
|
"fixedHeader":${this.fixedHeader},
|
||||||
|
"sidebarLogo":${this.sidebarLogo},
|
||||||
|
"sideTheme":"${this.sideTheme}",
|
||||||
|
"theme":"${this.theme}"
|
||||||
|
}`
|
||||||
|
);
|
||||||
|
this.msgSuccess("保存成功");
|
||||||
|
// setTimeout(this.$modal.closeLoading(), 1000);
|
||||||
|
},
|
||||||
|
resetSetting() {
|
||||||
|
// this.$modal.loading("正在清除设置缓存并刷新,请稍后...");
|
||||||
|
localStorage.removeItem("layout-setting");
|
||||||
|
setTimeout("window.location.reload()", 1000);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
.setting-drawer-content {
|
||||||
|
.setting-drawer-title {
|
||||||
|
margin-bottom: 12px;
|
||||||
|
color: rgba(0, 0, 0, 0.85);
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 22px;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setting-drawer-block-checbox {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: center;
|
||||||
|
margin-top: 10px;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
|
||||||
|
.setting-drawer-block-checbox-item {
|
||||||
|
position: relative;
|
||||||
|
margin-right: 16px;
|
||||||
|
border-radius: 2px;
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
img {
|
||||||
|
width: 48px;
|
||||||
|
height: 48px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setting-drawer-block-checbox-selectIcon {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
padding-top: 15px;
|
||||||
|
padding-left: 24px;
|
||||||
|
color: #1890ff;
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.drawer-container {
|
.drawer-container {
|
||||||
padding: 24px;
|
padding: 24px;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
@ -90,19 +192,20 @@ export default {
|
|||||||
|
|
||||||
.drawer-title {
|
.drawer-title {
|
||||||
margin-bottom: 12px;
|
margin-bottom: 12px;
|
||||||
color: rgba(0, 0, 0, .85);
|
color: rgba(0, 0, 0, 0.85);
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
line-height: 22px;
|
line-height: 22px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.drawer-item {
|
.drawer-item {
|
||||||
color: rgba(0, 0, 0, .65);
|
color: rgba(0, 0, 0, 0.65);
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
padding: 12px 0;
|
padding: 12px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.drawer-switch {
|
.drawer-switch {
|
||||||
float: right
|
float: right;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div :class="classObj" class="app-wrapper">
|
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
|
||||||
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
|
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
|
||||||
<sidebar class="sidebar-container" />
|
<sidebar class="sidebar-container" />
|
||||||
<div :class="{hasTagsView:needTagsView}" class="main-container">
|
<div :class="{hasTagsView:needTagsView}" class="main-container">
|
||||||
@ -34,6 +34,8 @@ export default {
|
|||||||
mixins: [ResizeMixin],
|
mixins: [ResizeMixin],
|
||||||
computed: {
|
computed: {
|
||||||
...mapState({
|
...mapState({
|
||||||
|
theme: state => state.settings.theme,
|
||||||
|
sideTheme: state => state.settings.sideTheme,
|
||||||
sidebar: state => state.app.sidebar,
|
sidebar: state => state.app.sidebar,
|
||||||
device: state => state.app.device,
|
device: state => state.app.device,
|
||||||
showSettings: state => state.settings.showSettings,
|
showSettings: state => state.settings.showSettings,
|
||||||
|
|||||||
@ -15,15 +15,20 @@ import permission from './directive/permission'
|
|||||||
import './assets/icons' // icon
|
import './assets/icons' // icon
|
||||||
import './permission' // permission control
|
import './permission' // permission control
|
||||||
import { getDicts } from "@/api/system/dict/data";
|
import { getDicts } from "@/api/system/dict/data";
|
||||||
// import { getConfigKey } from "@/api/system/config";
|
import { getConfigKey } from "@/api/system/config";
|
||||||
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
|
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
|
||||||
|
//分页组件
|
||||||
import Pagination from "@/components/Pagination";
|
import Pagination from "@/components/Pagination";
|
||||||
//自定义表格工具扩展
|
//自定义表格工具扩展
|
||||||
import RightToolbar from "@/components/RightToolbar"
|
import RightToolbar from "@/components/RightToolbar"
|
||||||
|
// 字典标签组件
|
||||||
|
import DictTag from '@/components/DictTag'
|
||||||
|
// 字典数据组件
|
||||||
|
// import DictData from '@/components/DictData'
|
||||||
|
|
||||||
// 全局方法挂载
|
// 全局方法挂载
|
||||||
Vue.prototype.getDicts = getDicts
|
Vue.prototype.getDicts = getDicts
|
||||||
// Vue.prototype.getConfigKey = getConfigKey
|
Vue.prototype.getConfigKey = getConfigKey
|
||||||
Vue.prototype.parseTime = parseTime
|
Vue.prototype.parseTime = parseTime
|
||||||
Vue.prototype.resetForm = resetForm
|
Vue.prototype.resetForm = resetForm
|
||||||
Vue.prototype.addDateRange = addDateRange
|
Vue.prototype.addDateRange = addDateRange
|
||||||
@ -47,6 +52,7 @@ Vue.prototype.msgInfo = function (msg) {
|
|||||||
// 全局组件挂载
|
// 全局组件挂载
|
||||||
Vue.component('Pagination', Pagination)
|
Vue.component('Pagination', Pagination)
|
||||||
Vue.component('RightToolbar', RightToolbar)
|
Vue.component('RightToolbar', RightToolbar)
|
||||||
|
Vue.component('DictTag', DictTag)
|
||||||
|
|
||||||
Vue.use(permission)
|
Vue.use(permission)
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,12 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
title: 'ZrAdmin.NET',
|
title: 'ZrAdmin.NET',
|
||||||
|
/**
|
||||||
|
* 侧边栏主题 深色主题theme-dark,浅色主题theme-light
|
||||||
|
*/
|
||||||
|
sideTheme: 'theme-dark',
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 是否系统布局配置
|
* 显示是否系统布局配置
|
||||||
*/
|
*/
|
||||||
showSettings: false,
|
showSettings: false,
|
||||||
|
|
||||||
|
|||||||
@ -1,14 +1,17 @@
|
|||||||
import variables from '@/assets/styles/element-variables.scss'
|
|
||||||
import defaultSettings from '@/settings'
|
import defaultSettings from '@/settings'
|
||||||
|
|
||||||
const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings
|
const { sideTheme, showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings
|
||||||
|
|
||||||
|
const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
|
||||||
const state = {
|
const state = {
|
||||||
theme: variables.theme,
|
theme: storageSetting.theme || '#409EFF',
|
||||||
|
sideTheme: storageSetting.sideTheme || sideTheme,
|
||||||
showSettings: showSettings,
|
showSettings: showSettings,
|
||||||
tagsView: tagsView,
|
tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
|
||||||
fixedHeader: fixedHeader,
|
fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
|
||||||
sidebarLogo: sidebarLogo
|
sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
|
||||||
|
// topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
|
||||||
|
// dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle
|
||||||
}
|
}
|
||||||
|
|
||||||
const mutations = {
|
const mutations = {
|
||||||
@ -20,6 +23,7 @@ const mutations = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const actions = {
|
const actions = {
|
||||||
|
//修改布局设置
|
||||||
changeSetting({ commit }, data) {
|
changeSetting({ commit }, data) {
|
||||||
commit('CHANGE_SETTING', data)
|
commit('CHANGE_SETTING', data)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -57,6 +57,8 @@ service.interceptors.response.use(res => {
|
|||||||
location.href = '/index';
|
location.href = '/index';
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
return Promise.reject()
|
||||||
}
|
}
|
||||||
else if (code == 0 || code == 110 || code == 101 || code == 403 || code == 500) {
|
else if (code == 0 || code == 110 || code == 101 || code == 403 || code == 500) {
|
||||||
Message({
|
Message({
|
||||||
@ -91,8 +93,6 @@ service.interceptors.response.use(res => {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get方法,对应get请求
|
* get方法,对应get请求
|
||||||
* @param {String} url [请求的url地址]
|
* @param {String} url [请求的url地址]
|
||||||
|
|||||||
@ -346,9 +346,9 @@ export default {
|
|||||||
this.getDicts("sys_user_sex").then((response) => {
|
this.getDicts("sys_user_sex").then((response) => {
|
||||||
this.sexOptions = response.data;
|
this.sexOptions = response.data;
|
||||||
});
|
});
|
||||||
// this.getConfigKey("sys.user.initPassword").then(response => {
|
this.getConfigKey("sys.user.initPassword").then(response => {
|
||||||
// this.initPassword = response.msg;
|
this.initPassword = response.data;
|
||||||
// });
|
});
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
/** 查询用户列表 */
|
/** 查询用户列表 */
|
||||||
|
|||||||
50
ZRAdmin.xml
50
ZRAdmin.xml
@ -281,11 +281,57 @@
|
|||||||
</summary>
|
</summary>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="T:ZR.Admin.WebApi.Controllers.System.SysConfigController">
|
<member name="T:ZR.Admin.WebApi.Controllers.SysConfigController">
|
||||||
|
<summary>
|
||||||
|
参数配置Controller
|
||||||
|
|
||||||
|
@author zhaorui
|
||||||
|
@date 2021-09-29
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="F:ZR.Admin.WebApi.Controllers.SysConfigController._SysConfigService">
|
||||||
<summary>
|
<summary>
|
||||||
配置文件
|
参数配置接口
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:ZR.Admin.WebApi.Controllers.SysConfigController.QuerySysConfig(ZR.Model.Dto.SysConfigQueryDto)">
|
||||||
|
<summary>
|
||||||
|
查询参数配置列表
|
||||||
|
</summary>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:ZR.Admin.WebApi.Controllers.SysConfigController.GetSysConfig(System.Int32)">
|
||||||
|
<summary>
|
||||||
|
查询参数配置详情
|
||||||
|
</summary>
|
||||||
|
<param name="ConfigId"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:ZR.Admin.WebApi.Controllers.SysConfigController.GetConfigKey(System.String)">
|
||||||
|
<summary>
|
||||||
|
根据参数键名查询参数值
|
||||||
|
</summary>
|
||||||
|
<param name="configKey"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:ZR.Admin.WebApi.Controllers.SysConfigController.AddSysConfig(ZR.Model.Dto.SysConfigDto)">
|
||||||
|
<summary>
|
||||||
|
添加参数配置
|
||||||
|
</summary>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:ZR.Admin.WebApi.Controllers.SysConfigController.UpdateSysConfig(ZR.Model.Dto.SysConfigDto)">
|
||||||
|
<summary>
|
||||||
|
更新参数配置
|
||||||
|
</summary>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:ZR.Admin.WebApi.Controllers.SysConfigController.DeleteSysConfig(System.String)">
|
||||||
|
<summary>
|
||||||
|
删除参数配置
|
||||||
|
</summary>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="T:ZR.Admin.WebApi.Controllers.System.SysDeptController">
|
<member name="T:ZR.Admin.WebApi.Controllers.System.SysDeptController">
|
||||||
<summary>
|
<summary>
|
||||||
部门
|
部门
|
||||||
|
|||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user