blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

增加后台菜单外链支持

Browse Source
This commit is contained in:
Anyon 2020-09-02 11:25:07 +08:00
parent 27dd871878
commit 4cdf6dcdf6
15 changed files with 103 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/admin/controller/Menu.php
View File

@ -19,6 +19,7 @@ use think\admin\Controller;
use think\admin\extend\DataExtend;
use think\admin\service\AdminService;
use think\admin\service\MenuService;
use think\admin\service\NodeService;
/**
* 系统菜单管理
@ -102,7 +103,13 @@ class Menu extends Controller
// 选择自己的上级菜单
$vo['pid'] = $vo['pid'] ?? input('pid', '0');
// 读取系统功能节点
$this->auths = [];
$this->nodes = MenuService::instance()->getList();
foreach (NodeService::instance()->getMethods() as $node => $item) {
if ($item['isauth'] && substr_count($node, '/') >= 2) {
$this->auths[] = ['node' => $node, 'title' => $item['title']];
}
}
// 列出可选上级菜单
$menus = $this->app->db->name($this->table)->order('sort desc,id asc')->column('id,pid,icon,url,title,params', 'id');
$this->menus = DataExtend::arr2table(array_merge($menus, [['id' => '0', 'pid' => '-1', 'url' => '#', 'title' => '顶部菜单']]));

2
app/admin/view/config/index.html
View File

@ -110,7 +110,7 @@
<tbody>
<tr>
<td>核心框架</td>
<td>ThinkPHP Version {$app->version()}</td>
<td><a target="_blank" href="https://www.thinkphp.cn">ThinkPHP Version {$app->version()}</a></td>
</tr>
<tr>
<td>管理程序</td>

29
app/admin/view/menu/form.html
View File

@ -14,7 +14,7 @@
{/eq}
{/foreach}
</select>
<p class="help-block">必选，请选择上级菜单或顶级菜单（目前最多支持三级菜单）</p>
<p class="help-block"><b>必选</b>，请选择上级菜单或顶级菜单（目前最多支持三级菜单）</p>
</div>
</div>
@ -22,7 +22,7 @@
<label class="layui-form-label">菜单名称</label>
<div class="layui-input-block">
<input name="title" value='{$vo.title|default=""}' required placeholder="请输入菜单名称" class="layui-input">
<p class="help-block">必填，请填写菜单名称（如：系统管理），建议字符不要太长，一般4-6个汉字</p>
<p class="help-block"><b>必选</b>，请填写菜单名称（如：系统管理），建议字符不要太长，一般4-6个汉字</p>
</div>
</div>
@ -31,8 +31,8 @@
<div class="layui-input-block">
<input onblur="this.value=this.value === ''?'#':this.value" name="url" required placeholder="请输入菜单链接" value="{$vo.url|default='#'}" class="layui-input">
<p class="help-block">
必填，请填写系统节点（如：admin/user/index），节点加入权限管理时菜单才会自动隐藏，非规则内的不会隐藏；
<br>正常情况下，在输入的时候会有自动提示。如果是上级菜单时，请填写"#"符号，不要填写地址或节点地址
<b>必选</b>，请填写链接地址或选择系统节点（如：https://domain.com/admin/user/index.html 或 admin/user/index）
<br>当填写链接地址时，以下面的“权限节点”来判断菜单自动隐藏或显示，注意未填写“权限节点”时将不会隐藏该菜单哦
</p>
</div>
</div>
@ -45,6 +45,14 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">权限节点</label>
<div class="layui-input-block">
<input name="node" placeholder="请输入权限节点" value="{$vo.node|default=''}" class="layui-input">
<p class="help-block">可选，请填写系统权限节点（如：admin/user/index），未填写时默认解释"菜单链接"判断是否拥有访问权限；</p>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">菜单图标</label>
<div class="layui-input-block">
@ -68,22 +76,29 @@
<button class="layui-btn" type='submit'>保存数据</button>
<button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
</div>
</form>
{block name='script'}
<script>
layui.form.render();
require(['jquery.autocompleter'], function () {
layui.form.render();
$('[name="icon"]').on('change', function () {
$(this).parent().next().find('i').get(0).className = this.value
});
$('input[name=url]').autocompleter({
limit: 6, highlightMatches: true, template: '{{ label }} <span> {{ title }} </span>', source: (function (subjects, data) {
limit: 6, highlightMatches: true, template: '{{ label }} <span> {{ title }} </span>', callback: function (node) {
$('input[name=node]').val(node);
}, source: (function (subjects, data) {
for (var i in subjects) data.push({value: subjects[i].node, label: subjects[i].node, title: subjects[i].title});
return data;
})(JSON.parse('{$nodes|raw|json_encode}'), [])
});
$('input[name=node]').autocompleter({
limit: 5, highlightMatches: true, template: '{{ label }} <span> {{ title }} </span>', source: (function (subjects, data) {
for (var i in subjects) data.push({value: subjects[i].node, label: subjects[i].node, title: subjects[i].title});
return data;
})(JSON.parse('{$auths|raw|json_encode}'), [])
});
});
</script>
{/block}

12
vendor/composer/installed.json vendored
View File

@ -958,17 +958,17 @@
},
{
"name": "zoujingli/think-library",
"version": "v6.0.2",
"version_normalized": "6.0.2.0",
"version": "v6.0.3",
"version_normalized": "6.0.3.0",
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "a498595d637568481601091985ae22d5cd05a057"
"reference": "98f56d2c2a589cfa4074733c655021d38d78b4aa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a498595d637568481601091985ae22d5cd05a057",
"reference": "a498595d637568481601091985ae22d5cd05a057",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/98f56d2c2a589cfa4074733c655021d38d78b4aa",
"reference": "98f56d2c2a589cfa4074733c655021d38d78b4aa",
"shasum": "",
"mirrors": [
{
@ -985,7 +985,7 @@
"ext-mbstring": "*",
"topthink/framework": "^6.0"
},
"time": "2020-08-31T11:59:58+00:00",
"time": "2020-09-02T03:17:43+00:00",
"type": "library",
"extra": {
"think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php
// This file is automatically generated at:2020-08-31 20:25:48
// This file is automatically generated at:2020-09-02 11:24:55
declare (strict_types = 1);
return array (
0 => 'think\\admin\\Library',

10
vendor/zoujingli/think-library/.gitignore vendored
View File

@ -1,8 +1,8 @@
.git
.svn
.idea
!.gitignore
!composer.json
composer.lock
app
config
vendor
public
/composer.lock
/vendor
/test.php

8
vendor/zoujingli/think-library/src/Command.php vendored
View File

@ -44,7 +44,7 @@ abstract class Command extends ThinkCommand
* 初始化指令变量
* @param Input $input
* @param Output $output
* @return $this
* @return static
* @throws Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
@ -69,7 +69,7 @@ abstract class Command extends ThinkCommand
* 设置进度消息并继续执行
* @param null|string $message 进度消息
* @param null|integer $progress 进度数值
* @return Command
* @return static
*/
protected function setQueueProgress($message = null, $progress = null)
{
@ -84,7 +84,7 @@ abstract class Command extends ThinkCommand
/**
* 设置失败消息并结束进程
* @param string $message 消息内容
* @return Command
* @return static
* @throws Exception
*/
protected function setQueueError($message)
@ -100,7 +100,7 @@ abstract class Command extends ThinkCommand
/**
* 设置成功消息并结束进程
* @param string $message 消息内容
* @return Command
* @return static
* @throws Exception
*/
protected function setQueueSuccess($message)

2
vendor/zoujingli/think-library/src/Library.php vendored
View File

@ -41,7 +41,7 @@ class Library extends Service
/**
* 扩展库版本号
*/
const VERSION = '6.0.2';
const VERSION = '6.0.3';
/**
* 启动服务

7
vendor/zoujingli/think-library/src/Storage.php vendored
View File

@ -119,10 +119,9 @@ abstract class Storage
*/
public static function name($url, $ext = '', $pre = '', $fun = 'md5')
{
if (empty($ext)) $ext = pathinfo($url, 4);
[$xmd, $ext] = [$fun($url), trim($ext, '.\\/')];
$attr = [trim($pre, '.\\/'), substr($xmd, 0, 2), substr($xmd, 2, 30)];
return trim(join('/', $attr), '/') . '.' . strtolower($ext ? $ext : 'tmp');
[$hah, $ext] = [$fun($url), trim($ext ?: pathinfo($url, 4), '.\\/')];
$attr = [trim($pre, '.\\/'), substr($hah, 0, 2), substr($hah, 2, 30)];
return trim(join('/', $attr), '/') . '.' . strtolower($ext ?: 'tmp');
}
/**

2
vendor/zoujingli/think-library/src/extend/Parsedown.php vendored
View File

@ -3,7 +3,7 @@
// +----------------------------------------------------------------------
// | Library for ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// | 此文件版权所有归原作者所有，在此特别感觉 ！！！！！！！！！！！！！！！
// +----------------------------------------------------------------------
// | 官方网站: https://gitee.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------

15
vendor/zoujingli/think-library/src/multiple/App.php vendored
View File

@ -20,13 +20,16 @@ use think\Request;
use think\Response;
/**
* 多应用支持
* Class MultiApp
* 多应用支持组件
* Class App
* @package think\admin\multiple
*/
class App
{
/** @var \think\App */
/**
* 应用实例
* @var \think\App
*/
protected $app;
/**
@ -118,8 +121,7 @@ class App
}
if (isset($map[$name])) {
if ($map[$name] instanceof Closure) {
$result = call_user_func_array($map[$name], [$this->app]);
$appName = $result ?: $name;
$appName = call_user_func_array($map[$name], [$this->app]) ?: $name;
} else {
$appName = $map[$name];
}
@ -131,8 +133,7 @@ class App
$appName = $name ?: $defaultApp;
$appPath = $this->path ?: $this->app->getBasePath() . $appName . DIRECTORY_SEPARATOR;
if (!is_dir($appPath)) {
$express = $this->app->config->get('app.app_express', false);
if ($express) {
if ($this->app->config->get('app.app_express', false)) {
$this->setApp($defaultApp);
return true;
} else {

4
vendor/zoujingli/think-library/src/service/InterfaceService.php vendored
View File

@ -105,8 +105,8 @@ class InterfaceService extends Service
/**
* 设置授权账号
* @param string $appid
* @param string $appkey
* @param string $appid 接口账号
* @param string $appkey 接口密钥
* @return $this
*/
public function setAuth($appid, $appkey)

36
vendor/zoujingli/think-library/src/service/MenuService.php vendored
View File

@ -31,7 +31,7 @@ class MenuService extends Service
* @return array
* @throws \ReflectionException
*/
public function getList()
public function getList(): array
{
static $nodes = [];
if (count($nodes) > 0) return $nodes;
@ -49,32 +49,42 @@ class MenuService extends Service
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function getTree()
public function getTree(): array
{
$result = $this->app->db->name('SystemMenu')->where(['status' => '1'])->order('sort desc,id asc')->select();
return $this->_buildData(DataExtend::arr2tree($result->toArray()), NodeService::instance()->getMethods());
$query = $this->app->db->name('SystemMenu');
$query->where(['status' => '1'])->order('sort desc,id asc');
return $this->_buildData(DataExtend::arr2tree($query->select()->toArray()));
}
/**
* 后台主菜单权限过滤
* @param array $menus 当前菜单列表
* @param array $nodes 系统权限节点
* @return array
* @throws \ReflectionException
*/
private function _buildData($menus, $nodes)
private function _buildData(array $menus): array
{
$service = AdminService::instance();
foreach ($menus as $key => &$menu) {
if (!empty($menu['sub'])) {
$menu['sub'] = $this->_buildData($menu['sub'], $nodes);
$menu['sub'] = $this->_buildData($menu['sub']);
}
if (!empty($menu['sub'])) $menu['url'] = '#';
elseif ($menu['url'] === '#') unset($menus[$key]);
elseif (preg_match('|^https?://|i', $menu['url'])) continue;
else {
if (!empty($menu['sub'])) {
$menu['url'] = '#';
} elseif ($menu['url'] === '#') {
unset($menus[$key]);
} elseif (preg_match('|^https?://|i', $menu['url'])) {
if (!!$menu['node'] && !$service->check($menu['node'])) {
unset($menus[$key]);
} elseif ($menu['params']) {
$menu['url'] .= (strpos($menu['url'], '?') === false ? '?' : '&') . $menu['params'];
}
} elseif (!!$menu['node'] && !$service->check($menu['node'])) {
unset($menus[$key]);
} else {
$node = join('/', array_slice(explode('/', $menu['url']), 0, 3));
$menu['url'] = url($menu['url']) . (empty($menu['params']) ? '' : "?{$menu['params']}");
if (!AdminService::instance()->check($node)) unset($menus[$key]);
$menu['url'] = url($menu['url']) . ($menu['params'] ? '' : "?{$menu['params']}");
if (!$service->check($node)) unset($menus[$key]);
}
}
return $menus;

26
vendor/zoujingli/think-library/src/service/SystemService.php vendored
View File

@ -49,15 +49,19 @@ class SystemService extends Service
*/
public function set($name, $value = '')
{
[$this->data, $count] = [[], 0];
[$type, $field] = $this->parse($name, 'base');
$this->data = [];
[$type, $field] = $this->_parse($name, 'base');
if (is_array($value)) {
foreach ($value as $kk => $vv) $count += $this->set("{$field}.{$kk}", $vv);
$count = 0;
foreach ($value as $kk => $vv) {
$count += $this->set("{$field}.{$kk}", $vv);
}
return $count;
} else {
$this->app->cache->delete($this->table);
$data = ['type' => $type, 'name' => $field, 'value' => $value];
$query = $this->app->db->name($this->table)->where(['type' => $type, 'name' => $field]);
$map = ['type' => $type, 'name' => $field];
$data = array_merge($map, ['value' => $value]);
$query = $this->app->db->name($this->table)->master(true)->where($map);
return (clone $query)->count() > 0 ? $query->update($data) : $query->insert($data);
}
}
@ -73,10 +77,12 @@ class SystemService extends Service
*/
public function get($name = '', $default = '')
{
[$type, $field, $outer] = $this->parse($name, 'base');
if (empty($this->data)) $this->app->db->name($this->table)->cache($this->table)->select()->map(function ($item) {
$this->data[$item['type']][$item['name']] = $item['value'];
});
if (empty($this->data)) {
$this->app->db->name($this->table)->cache($this->table)->select()->map(function ($item) {
$this->data[$item['type']][$item['name']] = $item['value'];
});
}
[$type, $field, $outer] = $this->_parse($name, 'base');
if (empty($name)) {
return $this->data;
} elseif (isset($this->data[$type])) {
@ -115,7 +121,7 @@ class SystemService extends Service
* @param string $type 配置类型
* @return array
*/
private function parse($rule, $type = 'base')
private function _parse($rule, $type = 'base')
{
if (stripos($rule, '.') !== false) {
[$type, $rule] = explode('.', $rule, 2);

6
vendor/zoujingli/think-library/src/service/ZtSmsService.php vendored
View File

@ -45,8 +45,8 @@ class ZtSmsService extends Service
*/
protected function initialize()
{
$this->username = sysconf('ztsms.username');
$this->password = sysconf('ztsms.password');
$this->username = sysconf('ztsms.username') ?: '';
$this->password = sysconf('ztsms.password') ?: '';
}
/**
@ -55,7 +55,7 @@ class ZtSmsService extends Service
* @param string $password 账号密码
* @return static
*/
public function make(string $username, string $password)
public function setAuth(string $username, string $password)
{
$this->username = $username;
$this->password = $password;