From 8e25786e06a078158c89b86f596a2fc5d1c559d0 Mon Sep 17 00:00:00 2001 From: Anyon Date: Mon, 30 Dec 2019 18:33:25 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 8 +- public/static/theme/css/console.form.css | 231 ++++++++---------- vendor/composer/installed.json | 8 +- vendor/services.php | 2 +- .../zoujingli/think-library/src/Storage.php | 3 +- 5 files changed, 116 insertions(+), 136 deletions(-) diff --git a/composer.lock b/composer.lock index a03c1fdbf..874005828 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "8d9a76ebfaf1ddd430a997f3bef892b7a5800f4c" + "reference": "fa56d64793a05550c1ae45ea5420f0b2bd93fc94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8d9a76ebfaf1ddd430a997f3bef892b7a5800f4c", - "reference": "8d9a76ebfaf1ddd430a997f3bef892b7a5800f4c", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/fa56d64793a05550c1ae45ea5420f0b2bd93fc94", + "reference": "fa56d64793a05550c1ae45ea5420f0b2bd93fc94", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-12-30T07:20:40+00:00" + "time": "2019-12-30T10:26:31+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/public/static/theme/css/console.form.css b/public/static/theme/css/console.form.css index 3d5e8582c..691ac9d91 100644 --- a/public/static/theme/css/console.form.css +++ b/public/static/theme/css/console.form.css @@ -1,178 +1,157 @@ /* 弹框层表单 */ fieldset { - margin: 0; - border: 1px solid #e6e6e6; - padding: 10px 20px 5px 20px; + margin: 0; + border: 1px solid #e6e6e6; + padding: 10px 20px 5px 20px; } - fieldset legend { - color: #666; - padding: 0 10px; - font-size: 14px; + color: #666; + padding: 0 10px; + font-size: 14px; } - .form-search .layui-btn { - height: 32px; - line-height: 28px; - font-size: 12px; - padding: 0 10px; + height: 32px; + line-height: 28px; + font-size: 12px; + padding: 0 10px; } - .form-search .layui-form-label { - width: auto !important; - padding: 0 8px; - height: 32px; - line-height: 30px; + width: auto !important; + padding: 0 8px; + height: 32px; + line-height: 30px; } - .form-search .layui-input-inline { - width: 170px; + width: 170px; } - .form-search .layui-input-inline input, .form-search .layui-input-inline select { - width: 100%; - height: 32px; - padding: 2px 8px; - line-height: 1em; + width: 100%; + height: 32px; + padding: 2px 8px; + line-height: 1em; } - .form-search .layui-form-select dl { - top: 31px; - padding: 0; + top: 31px; + padding: 0; } - .layui-form input.layui-input, .layui-form select.layui-select { - line-height: 1em; + line-height: 1em; } - /* 表单验证异常提示 */ .label-required-prev:before { - width: 1em; - color: red; - content: '*'; - display: inline-block; - position: absolute; - text-align: left; - font-weight: 700; - line-height: 1.6em; - margin-left: -0.8em; + width: 1em; + color: red; + content: '*'; + display: inline-block; + position: absolute; + text-align: left; + font-weight: 700; + line-height: 1.6em; + margin-left: -0.8em; } - .label-required:after, .label-required-next:after { - top: 6px; - right: 5px; - color: red; - content: '*'; - position: absolute; - margin-left: 4px; - font-weight: 700; - line-height: 1.8em; + top: 6px; + right: 5px; + color: red; + content: '*'; + position: absolute; + margin-left: 4px; + font-weight: 700; + line-height: 1.8em; } - .label-required-null:before { - content: none !important; + content: none !important; } - /** 自定义表单样式 */ .think-form-label { - padding: 9px 15px; - font-weight: 400; - line-height: 20px; - text-align: right; + padding: 9px 15px; + font-weight: 400; + line-height: 20px; + text-align: right; } - .think-form-group-right { - border-left: none; - border-top-left-radius: 0; - border-bottom-left-radius: 0; + border-left: none; + border-top-left-radius: 0; + border-bottom-left-radius: 0; } - .think-form-group-left input { - border-right: none; - border-top-right-radius: 0; - border-bottom-right-radius: 0; + border-right: none; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } - .think-box-shadow { - background: #fff; - padding: 20px 20px !important; - box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.1); + background: #fff; + padding: 20px 20px !important; + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.1); } - /** checkbox & radio */ label.think-checkbox, label.think-radio { - margin-right: 10px; - display: inline-block; + margin-right: 10px; + display: inline-block; } - .think-checkbox, .think-radio { - cursor: pointer; - margin-top: 10px; - font-weight: 400; - line-height: 17px; + cursor: pointer; + margin-top: 10px; + font-weight: 400; + line-height: 17px; } - .think-checkbox input[type=checkbox] { - width: 18px; - height: 18px; - border: 1px solid #dcdcdc; - cursor: pointer; - margin: 0 5px 0 0; - position: relative; - display: inline-block !important; - background: #fff; - appearance: none; - box-sizing: border-box !important; - border-radius: 1px; - vertical-align: bottom; - -webkit-appearance: none; + width: 18px; + height: 18px; + border: 1px solid #dcdcdc; + cursor: pointer; + margin: 0 5px 0 0; + position: relative; + display: inline-block !important; + background: #fff; + appearance: none; + box-sizing: border-box !important; + border-radius: 1px; + vertical-align: bottom; + -webkit-appearance: none; } - .think-checkbox input[type=checkbox]:checked:after { - color: #666; - padding: 2px; - display: block; - content: "\e605"; - font-size: 12px; - font-style: normal; - font-weight: 700; - position: absolute; - font-family: layui-icon !important; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + color: #666; + padding: 2px; + display: block; + content: "\e605"; + font-size: 12px; + font-style: normal; + font-weight: 700; + position: absolute; + font-family: layui-icon !important; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } - .think-radio input[type=radio] { - width: 18px; - height: 18px; - cursor: pointer; - margin: 0 5px 0 0; - position: relative; - border: 1px solid #dcdcdc; - display: inline-block !important; - box-sizing: border-box !important; - appearance: none; - background: #fff; - border-radius: 1em; - vertical-align: bottom; - -webkit-appearance: none; + width: 18px; + height: 18px; + cursor: pointer; + margin: 0 5px 0 0; + position: relative; + border: 1px solid #dcdcdc; + display: inline-block !important; + box-sizing: border-box !important; + appearance: none; + background: #fff; + border-radius: 1em; + vertical-align: bottom; + -webkit-appearance: none; } - .think-radio input[type=radio]:checked:after { - top: 4px; - left: 4px; - width: 8px; - height: 8px; - content: ''; - display: block; - position: relative; - background: #666; - border-radius: 1em; + top: 4px; + left: 4px; + width: 8px; + height: 8px; + content: ''; + display: block; + position: relative; + background: #666; + border-radius: 1em; } - /*# sourceMappingURL=console.form.css.map */ \ No newline at end of file diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 12c28915e..9f61cc52e 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -935,12 +935,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "8d9a76ebfaf1ddd430a997f3bef892b7a5800f4c" + "reference": "fa56d64793a05550c1ae45ea5420f0b2bd93fc94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8d9a76ebfaf1ddd430a997f3bef892b7a5800f4c", - "reference": "8d9a76ebfaf1ddd430a997f3bef892b7a5800f4c", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/fa56d64793a05550c1ae45ea5420f0b2bd93fc94", + "reference": "fa56d64793a05550c1ae45ea5420f0b2bd93fc94", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-12-30T07:20:40+00:00", + "time": "2019-12-30T10:26:31+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 2fc4e9b87..4ee8f752a 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/Storage.php b/vendor/zoujingli/think-library/src/Storage.php index f38d98c0a..5313778bc 100644 --- a/vendor/zoujingli/think-library/src/Storage.php +++ b/vendor/zoujingli/think-library/src/Storage.php @@ -15,6 +15,7 @@ namespace think\admin; +use think\admin\storage\LocalStorage; use think\App; use think\Container; @@ -128,7 +129,7 @@ abstract class Storage public static function down($url, $force = false, $expire = 0) { try { - $file = self::instance(); + $file = LocalStorage::instance(); $name = self::name($url, '', 'down/'); if (empty($force) && $file->has($name)) { if ($expire < 1 || filemtime($file->path($name)) + $expire > time()) {