mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-05 05:52:43 +08:00
同步更新 Admin 插件
This commit is contained in:
邹景立
parent
63afce68e8
commit
1d528383ed
@ -47,24 +47,6 @@ class Auth extends Controller
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加系统权限
|
||||
* @auth true
|
||||
*/
|
||||
public function add()
|
||||
{
|
||||
SystemAuth::mForm('form');
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑系统权限
|
||||
* @auth true
|
||||
*/
|
||||
public function edit()
|
||||
{
|
||||
SystemAuth::mForm('form');
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改权限状态
|
||||
* @auth true
|
||||
@ -86,17 +68,36 @@ class Auth extends Controller
|
||||
SystemAuth::mDelete();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 权限配置节点
|
||||
* 添加系统权限
|
||||
* @auth true
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public function apply()
|
||||
public function add()
|
||||
{
|
||||
$map = $this->_vali(['auth.require#id' => '权限ID不能为空！']);
|
||||
if (input('action') === 'get') {
|
||||
SystemAuth::mForm('form');
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑系统权限
|
||||
* @auth true
|
||||
*/
|
||||
public function edit()
|
||||
{
|
||||
SystemAuth::mForm('form');
|
||||
}
|
||||
|
||||
/**
|
||||
* 表单后置数据处理
|
||||
* @param array $data
|
||||
*/
|
||||
protected function _form_filter(array $data)
|
||||
{
|
||||
if ($this->request->isGet()) {
|
||||
$this->title = empty($data['title']) ? "添加访问授权" : "编辑【{$data['title']}】授权";
|
||||
} elseif ($this->request->post('action') === 'json') {
|
||||
if ($this->app->isDebug()) AdminService::clear();
|
||||
$ztree = AdminService::getTree(SystemNode::mk()->where($map)->column('node'));
|
||||
$ztree = AdminService::getTree(empty($data['id']) ? [] : SystemNode::mk()->where(['auth' => $data['id']])->column('node'));
|
||||
usort($ztree, static function ($a, $b) {
|
||||
if (explode('-', $a['node'])[0] !== explode('-', $b['node'])[0]) {
|
||||
if (stripos($a['node'], 'plugin-') === 0) return 1;
|
||||
@ -106,28 +107,26 @@ class Auth extends Controller
|
||||
[$ps, $cs] = [Plugin::get(), (array)$this->app->config->get('app.app_names', [])];
|
||||
foreach ($ztree as &$n) $n['title'] = lang($cs[$n['node']] ?? (($ps[$n['node']] ?? [])['name'] ?? $n['title']));
|
||||
$this->success('获取权限节点成功！', $ztree);
|
||||
} elseif (input('action') === 'save') {
|
||||
[$post, $data] = [$this->request->post(), []];
|
||||
foreach ($post['nodes'] ?? [] as $node) {
|
||||
$data[] = ['auth' => $map['auth'], 'node' => $node];
|
||||
}
|
||||
SystemNode::mk()->where($map)->delete();
|
||||
SystemNode::mk()->insertAll($data);
|
||||
sysoplog('系统权限管理', "配置系统权限[{$map['auth']}]授权成功");
|
||||
$this->success('访问权限修改成功！', 'javascript:history.back()');
|
||||
} else {
|
||||
SystemAuth::mForm('apply');
|
||||
} elseif (empty($data['nodes'])) {
|
||||
$this->error('未配置功能节点！');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 表单后置数据处理
|
||||
* @param array $data
|
||||
* 节点更新处理
|
||||
* @param boolean $state
|
||||
* @param array $post
|
||||
* @return void
|
||||
*/
|
||||
protected function _apply_form_filter(array $data)
|
||||
protected function _form_result(bool $state, array $post)
|
||||
{
|
||||
if ($this->request->isGet()) {
|
||||
$this->title = "编辑【{$data['title']}】授权";
|
||||
if ($state && $this->request->post('action') === 'save') {
|
||||
[$map, $data] = [['auth' => $post['id']], []];
|
||||
foreach ($post['nodes'] ?? [] as $node) $data[] = $map + ['node' => $node];
|
||||
SystemNode::mk()->where($map)->delete();
|
||||
count($data) > 0 && SystemNode::mk()->insertAll($data);
|
||||
sysoplog('系统权限管理', "配置系统权限[{$map['auth']}]授权成功");
|
||||
$this->success('权限修改成功！', 'javascript:history.back()');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -63,7 +63,7 @@ class Config extends Controller
|
||||
$this->thinkadmin = ModuleService::getLibrarys('zoujingli/think-library');
|
||||
if (AdminService::isSuper() && $this->app->session->get('user.password') === md5('admin')) {
|
||||
$url = url('admin/index/pass', ['id' => AdminService::getUserId()]);
|
||||
$this->showErrorMessage = "超级管理员账号的密码未修改，建议立即<a data-modal='{$url}'>修改密码</a>！";
|
||||
$this->showErrorMessage = lang("超级管理员账号的密码未修改，建议立即<a data-modal='%s'>修改密码</a>！", [$url]);
|
||||
}
|
||||
uasort($this->plugins, static function ($a, $b) {
|
||||
if ($a['space'] === $b['space']) return 0;
|
||||
|
||||
@ -30,7 +30,6 @@ class Index extends Controller
|
||||
{
|
||||
/**
|
||||
* 显示后台首页
|
||||
* @throws \ReflectionException
|
||||
* @throws \think\admin\Exception
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
|
||||
@ -94,7 +94,6 @@ class Menu extends Controller
|
||||
/**
|
||||
* 表单数据处理
|
||||
* @param array $vo
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
protected function _form_filter(array &$vo)
|
||||
{
|
||||
|
||||
@ -116,30 +116,30 @@ class User extends Controller
|
||||
protected function _form_filter(array &$data)
|
||||
{
|
||||
if ($this->request->isPost()) {
|
||||
// 账号权限绑定处理
|
||||
// 检查资料是否完整
|
||||
empty($data['username']) && $this->error('登录账号不能为空！');
|
||||
if ($data['username'] !== AdminService::getSuperName()) {
|
||||
empty($data['authorize']) && $this->error('未配置权限！');
|
||||
}
|
||||
// 处理上传的权限格式
|
||||
$data['authorize'] = arr2str($data['authorize'] ?? []);
|
||||
if (isset($data['id']) && $data['id'] > 0) {
|
||||
unset($data['username']);
|
||||
} else {
|
||||
if (empty($data['id'])) {
|
||||
// 检查账号是否重复
|
||||
if (empty($data['username'])) {
|
||||
$this->error('登录账号不能为空！');
|
||||
}
|
||||
$map = ['username' => $data['username'], 'is_deleted' => 0];
|
||||
if (SystemUser::mk()->where($map)->count() > 0) {
|
||||
$this->error("账号已经存在，请使用其它账号！");
|
||||
}
|
||||
// 新添加的用户密码与账号相同
|
||||
$data['password'] = md5($data['username']);
|
||||
} else {
|
||||
unset($data['username']);
|
||||
}
|
||||
} else {
|
||||
// 权限绑定处理
|
||||
$data['authorize'] = str2arr($data['authorize'] ?? '');
|
||||
// 用户身份数据
|
||||
$this->auths = SystemAuth::items();
|
||||
$this->bases = SystemBase::items('身份权限');
|
||||
// 用户权限管理
|
||||
$this->superName = AdminService::getSuperName();
|
||||
$this->authorizes = SystemAuth::items();
|
||||
$this->super = AdminService::getSuperName();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -36,12 +36,16 @@ $extra['点击可复制【服务启动指令】'] = "Click to copy the 'Service
|
||||
$extra['待处理 %s 个任务，处理中 %s 个任务，已完成 %s 个任务，已失败 %s 个任务。'] = 'There are %s tasks to be processed, %s tasks in progress, %s tasks completed, and %s tasks failed.';
|
||||
$extra['确定要切换到生产模式运行吗？'] = 'Are you sure you want to switch to Production mode?';
|
||||
$extra['确定要切换到开发模式运行吗？'] = 'Are you sure you want to switch to Development mode?';
|
||||
$extra["超级管理员账号的密码未修改，建议立即<a data-modal='%s'>修改密码</a>！"] = "The super administrator password has not been changed. Suggest <a data-modal='%s'>changing password</a>.";
|
||||
|
||||
$extra['等待处理'] = 'Pending';
|
||||
$extra['正在处理'] = 'Processing';
|
||||
$extra['处理完成'] = 'Completed';
|
||||
$extra['处理失败'] = 'Failed';
|
||||
|
||||
$extra['条件搜索'] = 'Search';
|
||||
$extra['批量删除'] = 'Batch Delete';
|
||||
|
||||
$extra['上传进度 %s'] = 'Upload progress %s';
|
||||
$extra['文件上传出错！'] = 'File upload error.';
|
||||
$extra['文件上传失败！'] = 'File upload failed.';
|
||||
@ -61,6 +65,7 @@ return array_merge($extra, [
|
||||
'配色方案' => 'Color scheme',
|
||||
'立即登录' => 'Login',
|
||||
'退出登录' => 'Logout',
|
||||
'系统提示：' => 'System Notify: ',
|
||||
'清空日志缓存成功！' => 'Successfully cleared the log cache.',
|
||||
'获取任务进度成功！' => 'Successfully obtained task progress.',
|
||||
'网站缓存加速成功！' => 'Website cache acceleration successful.',
|
||||
|
||||
@ -1,25 +1,143 @@
|
||||
<form action="{:sysuri()}" method="post" data-auto="true" class="layui-form layui-card" data-table-id="RoleTable">
|
||||
{extend name='main'}
|
||||
|
||||
<div class="layui-card-body padding-left-40">
|
||||
{block name="button"}
|
||||
<button data-target-submit class='layui-btn layui-btn-sm'>{:lang('保存数据')}</button>
|
||||
<button data-target-backup class="layui-btn layui-btn-sm layui-btn-danger">{:lang('取消编辑')}</button>
|
||||
{/block}
|
||||
|
||||
<label class="layui-form-item relative block">
|
||||
<span class="help-label"><b>{:lang('权限名称')}</b>Permission Name</span>
|
||||
<input maxlength="100" class="layui-input" name="title" value='{$vo.title|default=""}' required vali-name="{:lang('权限名称')}" placeholder="{:lang('请输入权限名称')}">
|
||||
<span class="help-block">{:lang('访问权限名称需要保持不重复，在给用户授权时需要根据名称选择！')}</span>
|
||||
</label>
|
||||
{block name="content"}
|
||||
<div class="think-box-shadow">
|
||||
<form method="post" id="RoleForm" class="layui-form layui-card">
|
||||
<div class="layui-card-body">
|
||||
<label class="layui-form-item relative block">
|
||||
<span class="help-label"><b>{:lang('权限名称')}</b>Auth Name</span>
|
||||
<input maxlength="100" class="layui-input" name="title" value='{$vo.title|default=""}' required vali-name="{:lang('权限名称')}" placeholder="{:lang('请输入权限名称')}">
|
||||
<span class="help-block">{:lang('访问权限名称需要保持不重复，在给用户授权时需要根据名称选择！')}</span>
|
||||
</label>
|
||||
<label class="layui-form-item relative block">
|
||||
<span class="help-label"><b>{:lang('权限描述')}</b>Auth Remark</span>
|
||||
<textarea placeholder="{:lang('请输入权限描述')}" maxlength="200" class="layui-textarea" name="desc">{$vo.desc|default=""}</textarea>
|
||||
</label>
|
||||
<div class="layui-form-item">
|
||||
<span class="help-label label-required-prev"><b>{:lang('功能节点')}</b>Auth Nodes</span>
|
||||
<ul id="zTree" class="ztree notselect"></ul>
|
||||
</div>
|
||||
<div class="hr-line-dashed"></div>
|
||||
{notempty name='vo.id'}<input name="id" value="{$vo.id}" type="hidden"/>{/notempty}
|
||||
<div class="layui-form-item text-center">
|
||||
<button data-target-submit class="layui-btn">{:lang('保存数据')}</button>
|
||||
<button data-target-backup class="layui-btn layui-btn-danger" type="button">{:lang('取消编辑')}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
{/block}
|
||||
|
||||
<label class="layui-form-item relative block">
|
||||
<span class="help-label"><b>{:lang('权限描述')}</b>Permission Description</span>
|
||||
<textarea placeholder="{:lang('请输入权限描述')}" maxlength="200" class="layui-textarea" name="desc">{$vo.desc|default=""}</textarea>
|
||||
</label>
|
||||
{block name="script"}
|
||||
<script>
|
||||
require(['jquery.ztree'], function () {
|
||||
new function () {
|
||||
let that = this;
|
||||
this.data = {}, this.ztree = null, this.setting = {
|
||||
view: {showLine: false, showIcon: false, dblClickExpand: false},
|
||||
check: {enable: true, nocheck: false, chkboxType: {"Y": "ps", "N": "ps"}}, callback: {
|
||||
beforeClick: function (id, node) {
|
||||
node.children.length < 1 ? that.ztree.checkNode(node, !node.checked, true, true) : that.ztree.expandNode(node);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
};
|
||||
this.renderChildren = function (list, level) {
|
||||
let childrens = [];
|
||||
for (let i in list) childrens.push({
|
||||
open: true, node: list[i].node, name: list[i].title || list[i].node,
|
||||
checked: list[i].checked || false, children: this.renderChildren(list[i]._sub_, level + 1)
|
||||
});
|
||||
return childrens;
|
||||
};
|
||||
this.syncData = function () {
|
||||
$.form.load('{:sysuri()}', {id: '{$vo.id|default=0}', action: 'json'}, 'post', function (ret) {
|
||||
return (that.data = that.renderChildren(ret.data, 1)), that.showTree(), false;
|
||||
});
|
||||
};
|
||||
this.showTree = function () {
|
||||
this.ztree = $.fn.zTree.init($("#zTree"), this.setting, this.data);
|
||||
while (true) {
|
||||
let nodes = this.ztree.getNodesByFilter(function (node) {
|
||||
return (!node.node && node.children.length < 1);
|
||||
});
|
||||
if (nodes.length < 1) break;
|
||||
for (let i in nodes) this.ztree.removeNode(nodes[i]);
|
||||
}
|
||||
};
|
||||
// 刷新数据
|
||||
this.syncData();
|
||||
// 监听表单提交
|
||||
$('#RoleForm').vali(function (form) {
|
||||
let data = that.ztree.getCheckedNodes(true);
|
||||
Object.assign(form, {nodes: [], action: 'save'})
|
||||
for (let i in data) if (data[i].node) form.nodes.push(data[i].node);
|
||||
$.form.load('{:sysuri()}', form, 'post');
|
||||
});
|
||||
};
|
||||
});
|
||||
</script>
|
||||
{/block}
|
||||
|
||||
</div>
|
||||
{block name="style"}
|
||||
<style>
|
||||
ul.ztree li {
|
||||
line-height: 24px;
|
||||
white-space: normal !important;
|
||||
}
|
||||
|
||||
<div class="hr-line-dashed"></div>
|
||||
{notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
|
||||
ul.ztree li span.button.switch {
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
<div class="layui-form-item text-center">
|
||||
<button class="layui-btn" type='submit'>{:lang('保存数据')}</button>
|
||||
<button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>{:lang('取消编辑')}</button>
|
||||
</div>
|
||||
</form>
|
||||
ul.ztree ul ul li {
|
||||
display: inline-block;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
ul.ztree > li {
|
||||
border: 1px solid rgba(0, 0, 0, 0.10);
|
||||
padding: 15px;
|
||||
background: rgba(0, 0, 0, 0.05);
|
||||
border-radius: 3px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
ul.ztree > li > ul {
|
||||
padding: 10px;
|
||||
margin-top: 10px;
|
||||
background: rgba(0, 0, 0, 0.05);
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
ul.ztree > li > ul > li {
|
||||
padding: 5px 0;
|
||||
}
|
||||
|
||||
ul.ztree > li > a > span {
|
||||
font-size: 15px;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
ul.ztree .level2 .button.level2 {
|
||||
width: 0;
|
||||
}
|
||||
|
||||
ul.ztree li span.button.noline_open {
|
||||
background-position-y: -73px;
|
||||
}
|
||||
|
||||
ul.ztree li span.button.noline_close {
|
||||
background-position-y: -73px;
|
||||
}
|
||||
|
||||
ul.ztree .level1 > .node_name {
|
||||
font-weight: bold;
|
||||
}
|
||||
</style>
|
||||
{/block}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
{block name="button"}
|
||||
<!--{if auth("add")}-->
|
||||
<button data-modal='{:url("add")}' data-width="600px" data-table-id="RoleTable" class='layui-btn layui-btn-sm layui-btn-primary'>{:lang('添加权限')}</button>
|
||||
<button data-open='{:url("add")}' data-table-id="RoleTable" class='layui-btn layui-btn-sm layui-btn-primary'>{:lang('添加权限')}</button>
|
||||
<!--{/if}-->
|
||||
|
||||
<!--{if auth("remove")}-->
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
// 数据状态切换操作
|
||||
layui.form.on('switch(StatusSwitchRoleTable)', function (obj) {
|
||||
var data = {id: obj.value, status: obj.elem.checked > 0 ? 1 : 0};
|
||||
let data = {id: obj.value, status: obj.elem.checked > 0 ? 1 : 0};
|
||||
$.form.load("{:url('state')}", data, 'post', function (ret) {
|
||||
if (ret.code < 1) $.msg.error(ret.info, 3, function () {
|
||||
$('#RoleTable').trigger('reload');
|
||||
@ -66,15 +66,11 @@
|
||||
<!-- 数据操作工具条模板 -->
|
||||
<script type="text/html" id="ToolbarRoleTableTpl">
|
||||
<!--{if auth('edit')}-->
|
||||
<a class="layui-btn layui-btn-primary layui-btn-sm" data-event-dbclick data-width="600px" data-title="{:lang('编辑权限')}" data-modal='{:url("edit")}?id={{d.id}}'>{:lang("编 辑")}</a>
|
||||
<!--{/if}-->
|
||||
|
||||
<!--{if auth("apply")}-->
|
||||
<a class="layui-btn layui-btn-normal layui-btn-sm" data-open='{:url("apply")}?id={{d.id}}'>{:lang('授 权')}</a>
|
||||
<a class="layui-btn layui-btn-primary layui-btn-sm" data-open='{:url("edit")}?id={{d.id}}'>{:lang("编 辑")}</a>
|
||||
<!--{/if}-->
|
||||
|
||||
<!--{if auth("remove")}-->
|
||||
<a class="layui-btn layui-btn-danger layui-btn-sm" data-confirm="{:lang('确定要删除权限吗?')}" data-action="{:url('remove')}" data-value="id#{{d.id}}">{:lang("删 除")}</a>
|
||||
<a class="layui-btn layui-btn-danger layui-btn-sm" data-action="{:url('remove')}" data-value="id#{{d.id}}" data-confirm="{:lang('确定要删除权限吗?')}">{:lang("删 除")}</a>
|
||||
<!--{/if}-->
|
||||
</script>
|
||||
{/block}
|
||||
@ -13,7 +13,7 @@
|
||||
<div class="layui-card-html">
|
||||
{notempty name='showErrorMessage'}
|
||||
<div class="think-box-notify" type="error">
|
||||
<b>系统提示：</b><span>{$showErrorMessage|raw}</span>
|
||||
<b>{:lang('系统提示：')}</b><span>{$showErrorMessage|raw}</span>
|
||||
</div>
|
||||
{/notempty}
|
||||
{block name='content'}{/block}
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
<div class="layui-card-table">
|
||||
{notempty name='showErrorMessage'}
|
||||
<div class="think-box-notify" type="error">
|
||||
<b>系统提示：</b><span>{$showErrorMessage|raw}</span>
|
||||
<b>{:lang('系统提示：')}</b><span>{$showErrorMessage|raw}</span>
|
||||
</div>
|
||||
{/notempty}
|
||||
{block name='content'}{/block}
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
<label class="block relative">
|
||||
<span class="help-label"><b>登录账号</b>User Name</span>
|
||||
{if isset($vo) and isset($vo.username)}
|
||||
<input disabled value='{$vo.username|default=""}' required class="layui-input think-bg-gray">
|
||||
<input name="username" value='{$vo.username|default=""}' required readonly class="layui-input think-bg-gray">
|
||||
{else}
|
||||
<input name="username" value='{$vo.username|default=""}' required pattern="^.{4,}$" vali-name="登录账号" placeholder="请输入登录账号" class="layui-input">
|
||||
{/if}
|
||||
@ -31,7 +31,7 @@
|
||||
|
||||
</fieldset>
|
||||
|
||||
{if !empty($bases) || !empty($authorizes)}
|
||||
{if !empty($bases) || !empty($auths)}
|
||||
<fieldset class="layui-bg-gray">
|
||||
<legend><b class="layui-badge think-bg-violet">用户权限</b></legend>
|
||||
{if !empty($bases)}
|
||||
@ -50,13 +50,13 @@
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
{if !empty($authorizes)}
|
||||
{if !empty($auths)}
|
||||
<div class="layui-form-item">
|
||||
<div class="help-label"><b>访问权限</b>Role Permission</div>
|
||||
<div class="layui-textarea help-checks">
|
||||
{if isset($vo.username) and $vo.username eq $superName}
|
||||
{if isset($vo.username) and $vo.username eq $super}
|
||||
<span class="color-desc padding-left-5">超级用户拥所有访问权限，不需要配置权限。</span>
|
||||
{else}{foreach $authorizes as $authorize}
|
||||
{else}{foreach $auths as $authorize}
|
||||
<label class="think-checkbox">
|
||||
{if in_array($authorize.id, $vo.authorize)}
|
||||
<input type="checkbox" checked name="authorize[]" value="{$authorize.id}" lay-ignore>{$authorize.title}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<button data-modal='{:url("add")}' data-title="{:lang('添加用户')}" class='layui-btn layui-btn-sm layui-btn-primary'>{:lang('添加用户')}</button>
|
||||
<!--{/if}-->
|
||||
<!--{if auth("state")}-->
|
||||
<a data-confirm="确定要启用该用户吗？" data-table-id="UserTable" data-action="{:url('state')}" data-rule="id#{id};status#0" class='layui-btn layui-btn-sm layui-btn-primary'>{:lang('批量禁用')}</a>
|
||||
<a data-confirm="确定要禁用这些用户吗？" data-table-id="UserTable" data-action="{:url('state')}" data-rule="id#{id};status#0" class='layui-btn layui-btn-sm layui-btn-primary'>{:lang('批量禁用')}</a>
|
||||
<!--{/if}-->
|
||||
{else}
|
||||
<!--{if auth("state")}-->
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user