mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-06 03:58:04 +08:00
ComposerUpdate 增加无 spm 全屏模式
This commit is contained in:
Anyon
parent
8106d73046
commit
41526014d7
33
app/admin/view/full.html
Normal file
33
app/admin/view/full.html
Normal file
@ -0,0 +1,33 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh">
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="renderer" content="webkit">
|
||||
<meta name="format-detection" content="telephone=no">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=0.4">
|
||||
<link rel="shortcut icon" href="{:sysconf('site_icon')}">
|
||||
<link rel="stylesheet" href="__ROOT__/static/plugs/awesome/fonts.css?at={:date('md')}">
|
||||
<link rel="stylesheet" href="__ROOT__/static/plugs/layui/css/layui.css?at={:date('md')}">
|
||||
<link rel="stylesheet" href="__ROOT__/static/theme/css/console.css?at={:date('md')}">
|
||||
{block name="style"}{/block}
|
||||
<script>window.ROOT_URL = '__ROOT__';</script>
|
||||
<script src="__ROOT__/static/plugs/jquery/pace.min.js"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
{block name='body'}
|
||||
<!-- 主体内容 开始 -->
|
||||
{block name='content'}{/block}
|
||||
<!-- 主体内容 结束 -->
|
||||
{/block}
|
||||
<script src="__ROOT__/static/plugs/layui/layui.all.js"></script>
|
||||
<script src="__ROOT__/static/plugs/require/require.js"></script>
|
||||
<script src="__ROOT__/static/admin.js"></script>
|
||||
{block name='script'}{/block}
|
||||
</body>
|
||||
|
||||
</html>
|
||||
10
composer.lock
generated
10
composer.lock
generated
@ -1,7 +1,7 @@
|
||||
{
|
||||
"_readme": [
|
||||
"This file locks the dependencies of your project to a known state",
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "44a6bc247971794be9edd9df4f3dd0b9",
|
||||
@ -783,12 +783,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/ThinkLibrary.git",
|
||||
"reference": "e919d8616a5e1497d5bb917d4a39c6ea7c4ccd56"
|
||||
"reference": "a53c211c23698ff2299b499714ba16001af84551"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e919d8616a5e1497d5bb917d4a39c6ea7c4ccd56",
|
||||
"reference": "e919d8616a5e1497d5bb917d4a39c6ea7c4ccd56",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a53c211c23698ff2299b499714ba16001af84551",
|
||||
"reference": "a53c211c23698ff2299b499714ba16001af84551",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -832,7 +832,7 @@
|
||||
],
|
||||
"description": "ThinkPHP v6.0 Development Library",
|
||||
"homepage": "http://framework.thinkadmin.top",
|
||||
"time": "2019-12-06T09:02:27+00:00"
|
||||
"time": "2019-12-07T06:46:30+00:00"
|
||||
}
|
||||
],
|
||||
"packages-dev": [],
|
||||
|
||||
@ -668,8 +668,8 @@ $(function () {
|
||||
});
|
||||
|
||||
/*! 注册 data-iframe 事件行为 */
|
||||
$body.on('click', '[data-iframe]', function (index) {
|
||||
index = $.form.iframe($(this).attr('data-iframe'), $(this).attr('data-title') || '窗口');
|
||||
$body.on('click', '[data-iframe]', function (index, href) {
|
||||
index = $.form.iframe($(this).attr('data-iframe'), $(this).attr('data-title') || '窗口', $(this).attr('data-area') || undefined);
|
||||
$(this).attr('data-index', index);
|
||||
});
|
||||
|
||||
|
||||
8
vendor/composer/ClassLoader.php
vendored
8
vendor/composer/ClassLoader.php
vendored
@ -279,7 +279,7 @@ class ClassLoader
|
||||
*/
|
||||
public function setApcuPrefix($apcuPrefix)
|
||||
{
|
||||
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
|
||||
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -377,11 +377,11 @@ class ClassLoader
|
||||
$subPath = $class;
|
||||
while (false !== $lastPos = strrpos($subPath, '\\')) {
|
||||
$subPath = substr($subPath, 0, $lastPos);
|
||||
$search = $subPath.'\\';
|
||||
$search = $subPath . '\\';
|
||||
if (isset($this->prefixDirsPsr4[$search])) {
|
||||
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
|
||||
foreach ($this->prefixDirsPsr4[$search] as $dir) {
|
||||
$length = $this->prefixLengthsPsr4[$first][$search];
|
||||
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
|
||||
if (file_exists($file = $dir . $pathEnd)) {
|
||||
return $file;
|
||||
}
|
||||
}
|
||||
|
||||
8
vendor/composer/installed.json
vendored
8
vendor/composer/installed.json
vendored
@ -805,12 +805,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/ThinkLibrary.git",
|
||||
"reference": "e919d8616a5e1497d5bb917d4a39c6ea7c4ccd56"
|
||||
"reference": "a53c211c23698ff2299b499714ba16001af84551"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e919d8616a5e1497d5bb917d4a39c6ea7c4ccd56",
|
||||
"reference": "e919d8616a5e1497d5bb917d4a39c6ea7c4ccd56",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a53c211c23698ff2299b499714ba16001af84551",
|
||||
"reference": "a53c211c23698ff2299b499714ba16001af84551",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -826,7 +826,7 @@
|
||||
"ext-json": "*",
|
||||
"topthink/framework": "^6.0"
|
||||
},
|
||||
"time": "2019-12-06T09:02:27+00:00",
|
||||
"time": "2019-12-07T06:46:30+00:00",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"think": {
|
||||
|
||||
2
vendor/services.php
vendored
2
vendor/services.php
vendored
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
// This file is automatically generated at:2019-12-06 20:09:37
|
||||
// This file is automatically generated at:2019-12-07 14:48:02
|
||||
declare (strict_types = 1);
|
||||
return array (
|
||||
0 => 'think\\app\\Service',
|
||||
|
||||
@ -93,12 +93,20 @@ class PageHelper extends Helper
|
||||
$paginate = $this->query->paginate(['list_rows' => $limit, 'query' => $query], $this->total);
|
||||
foreach ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200] as $num) {
|
||||
list($query['limit'], $query['page'], $selected) = [$num, '1', $limit === $num ? 'selected' : ''];
|
||||
$url = url('@admin') . '#' . $this->app->request->baseUrl() . '?' . urldecode(http_build_query($query));
|
||||
if (stripos($this->app->request->get('spm', '-'), 'm-') === 0) {
|
||||
$url = url('@admin') . '#' . $this->app->request->baseUrl() . '?' . urldecode(http_build_query($query));
|
||||
} else {
|
||||
$url = $this->app->request->baseUrl() . '?' . urldecode(http_build_query($query));
|
||||
}
|
||||
array_push($options, "<option data-num='{$num}' value='{$url}' {$selected}>{$num}</option>");
|
||||
}
|
||||
$select = "<select onchange='location.href=this.options[this.selectedIndex].value' data-auto-none>" . join('', $options) . "</select>";
|
||||
$html = "<div class='pagination-container nowrap'><span>共 {$paginate->total()} 条记录，每页显示 {$select} 条，共 {$paginate->lastPage()} 页当前显示第 {$paginate->currentPage()} 页。</span>{$paginate->render()}</div>";
|
||||
$this->controller->assign('pagehtml', preg_replace('|href="(.*?)"|', 'data-open="$1" onclick="return false" href="$1"', $html));
|
||||
if (stripos($this->app->request->get('spm', '-'), 'm-') === 0) {
|
||||
$this->controller->assign('pagehtml', preg_replace('|href="(.*?)"|', 'data-open="$1" onclick="return false" href="$1"', $html));
|
||||
} else {
|
||||
$this->controller->assign('pagehtml', $html);
|
||||
}
|
||||
$result = ['page' => ['limit' => intval($limit), 'total' => intval($paginate->total()), 'pages' => intval($paginate->lastPage()), 'current' => intval($paginate->currentPage())], 'list' => $paginate->items()];
|
||||
} else {
|
||||
$result = ['list' => $this->query->select()->toArray()];
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user