From 41526014d734253c83ce5fb1beda39e031c4c3f7 Mon Sep 17 00:00:00 2001 From: Anyon Date: Sat, 7 Dec 2019 14:53:44 +0800 Subject: [PATCH] =?UTF-8?q?ComposerUpdate=20=E5=A2=9E=E5=8A=A0=E6=97=A0=20?= =?UTF-8?q?spm=20=E5=85=A8=E5=B1=8F=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/view/full.html | 33 +++++++++++++++++++ composer.lock | 10 +++--- public/static/admin.js | 4 +-- vendor/composer/ClassLoader.php | 8 ++--- vendor/composer/installed.json | 8 ++--- vendor/services.php | 2 +- .../think-library/src/helper/PageHelper.php | 12 +++++-- 7 files changed, 59 insertions(+), 18 deletions(-) create mode 100644 app/admin/view/full.html diff --git a/app/admin/view/full.html b/app/admin/view/full.html new file mode 100644 index 000000000..008027658 --- /dev/null +++ b/app/admin/view/full.html @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + {block name="style"}{/block} + + + + + +{block name='body'} + +{block name='content'}{/block} + +{/block} + + + +{block name='script'}{/block} + + + diff --git a/composer.lock b/composer.lock index b1646fc9c..7582a08d4 100644 --- a/composer.lock +++ b/composer.lock @@ -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": [], diff --git a/public/static/admin.js b/public/static/admin.js index 83aa7212f..80a2ca562 100644 --- a/public/static/admin.js +++ b/public/static/admin.js @@ -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); }); diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index 2c72175e7..fce8549f0 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -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; } } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 0cae271de..8906fb4a2 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -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": { diff --git a/vendor/services.php b/vendor/services.php index 7c511165d..2aaeb1f15 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/helper/PageHelper.php b/vendor/zoujingli/think-library/src/helper/PageHelper.php index 86277630f..39f392836 100644 --- a/vendor/zoujingli/think-library/src/helper/PageHelper.php +++ b/vendor/zoujingli/think-library/src/helper/PageHelper.php @@ -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, ""); } $select = ""; $html = "
共 {$paginate->total()} 条记录，每页显示 {$select} 条，共 {$paginate->lastPage()} 页当前显示第 {$paginate->currentPage()} 页。{$paginate->render()}
"; - $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()];