From 6b3a1bc58019e93850031fe3f3158eb7ff58e5a2 Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 17 Jul 2019 11:12:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]CompoerUpdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 ++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/composer/installed.json | 8 ++++---- .../think-library/src/Controller.php | 20 +++++++++++++++++++ 5 files changed, 36 insertions(+), 16 deletions(-) diff --git a/vendor/autoload.php b/vendor/autoload.php index 004833584..2304c8d28 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit2c3e264f6aacabac4f7c7e4fa8041abe::getLoader(); +return ComposerAutoloaderInit4709a80ce52b64d052d71eeb78f881e1::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index df5eacd0c..cc665bbe3 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit2c3e264f6aacabac4f7c7e4fa8041abe +class ComposerAutoloaderInit4709a80ce52b64d052d71eeb78f881e1 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit2c3e264f6aacabac4f7c7e4fa8041abe return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit2c3e264f6aacabac4f7c7e4fa8041abe', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit4709a80ce52b64d052d71eeb78f881e1', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit2c3e264f6aacabac4f7c7e4fa8041abe', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit4709a80ce52b64d052d71eeb78f881e1', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit2c3e264f6aacabac4f7c7e4fa8041abe::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit4709a80ce52b64d052d71eeb78f881e1::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit2c3e264f6aacabac4f7c7e4fa8041abe $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit2c3e264f6aacabac4f7c7e4fa8041abe::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit4709a80ce52b64d052d71eeb78f881e1::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire2c3e264f6aacabac4f7c7e4fa8041abe($fileIdentifier, $file); + composerRequire4709a80ce52b64d052d71eeb78f881e1($fileIdentifier, $file); } return $loader; } } -function composerRequire2c3e264f6aacabac4f7c7e4fa8041abe($fileIdentifier, $file) +function composerRequire4709a80ce52b64d052d71eeb78f881e1($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 2e2edad64..4e88117c3 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit2c3e264f6aacabac4f7c7e4fa8041abe +class ComposerStaticInit4709a80ce52b64d052d71eeb78f881e1 { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -347,9 +347,9 @@ class ComposerStaticInit2c3e264f6aacabac4f7c7e4fa8041abe public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit2c3e264f6aacabac4f7c7e4fa8041abe::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit2c3e264f6aacabac4f7c7e4fa8041abe::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit2c3e264f6aacabac4f7c7e4fa8041abe::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit4709a80ce52b64d052d71eeb78f881e1::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit4709a80ce52b64d052d71eeb78f881e1::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit4709a80ce52b64d052d71eeb78f881e1::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 4a0b048c9..4414a97fc 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -502,12 +502,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "3c08c4e18f76399a5387f2af807a4049d544284c" + "reference": "e6acc10660ea0185992c2e8c2f73c97ed6d5162c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3c08c4e18f76399a5387f2af807a4049d544284c", - "reference": "3c08c4e18f76399a5387f2af807a4049d544284c", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e6acc10660ea0185992c2e8c2f73c97ed6d5162c", + "reference": "e6acc10660ea0185992c2e8c2f73c97ed6d5162c", "shasum": "", "mirrors": [ { @@ -526,7 +526,7 @@ "qiniu/php-sdk": "^7.2", "topthink/framework": "5.1.*" }, - "time": "2019-07-17T02:59:08+00:00", + "time": "2019-07-17T03:08:08+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/think-library/src/Controller.php b/vendor/zoujingli/think-library/src/Controller.php index 1615dae95..dc38b9fca 100644 --- a/vendor/zoujingli/think-library/src/Controller.php +++ b/vendor/zoujingli/think-library/src/Controller.php @@ -16,6 +16,7 @@ namespace library; use library\logic\Delete; +use library\logic\Form; use library\logic\Input; use library\logic\Page; use library\logic\Query; @@ -208,6 +209,25 @@ class Controller extends \stdClass return (new Page($dbQuery, $isPage, $isDisplay, $total, $limit))->init($this); } + /** + * 快捷表单逻辑器 + * @param string|\think\db\Query $dbQuery + * @param string $tpl 模板名称 + * @param string $pkField 指定数据对象主键 + * @param array $where 额外更新条件 + * @param array $data 表单扩展数据 + * @return array|boolean + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException + */ + protected function _form($dbQuery, $tpl = '', $pkField = '', $where = [], $data = []) + { + return (new Form($dbQuery, $tpl, $pkField, $where, $data))->init($this); + } + /** * 快捷更新逻辑器 * @param string|\think\db\Query $dbQuery