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

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2020-06-23 10:13:54 +08:00
parent c59ca0b3ca
commit a6f0eeb0ed
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.lock generated
View File

@ -929,12 +929,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "2fe569700bd8d7e2a24054f3592c5b06171c617c" "reference": "c72947dcdfe84b488dd5721f65266a7c00e082c6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2fe569700bd8d7e2a24054f3592c5b06171c617c", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c72947dcdfe84b488dd5721f65266a7c00e082c6",
"reference": "2fe569700bd8d7e2a24054f3592c5b06171c617c", "reference": "c72947dcdfe84b488dd5721f65266a7c00e082c6",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -978,7 +978,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "homepage": "http://framework.thinkadmin.top",
"time": "2020-06-22T09:29:56+00:00" "time": "2020-06-22T10:03:12+00:00"
}, },
{ {
"name": "zoujingli/wechat-developer", "name": "zoujingli/wechat-developer",

8
vendor/composer/installed.json vendored
View File

@ -955,12 +955,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "2fe569700bd8d7e2a24054f3592c5b06171c617c" "reference": "c72947dcdfe84b488dd5721f65266a7c00e082c6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2fe569700bd8d7e2a24054f3592c5b06171c617c", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c72947dcdfe84b488dd5721f65266a7c00e082c6",
"reference": "2fe569700bd8d7e2a24054f3592c5b06171c617c", "reference": "c72947dcdfe84b488dd5721f65266a7c00e082c6",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -976,7 +976,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-06-22T09:29:56+00:00", "time": "2020-06-22T10:03:12+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2020-06-22 17:43:32 // This file is automatically generated at:2020-06-23 10:13:28
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

9
vendor/zoujingli/think-library/src/helper/DeleteHelper.php vendored
View File

@ -65,14 +65,19 @@ class DeleteHelper extends Helper
if (false === $this->controller->callback('_delete_filter', $this->query, $this->where)) { if (false === $this->controller->callback('_delete_filter', $this->query, $this->where)) {
return null; return null;
} }
// 执行删除操作 // 组装执行数据
$data = []; $data = [];
if (method_exists($this->query, 'getTableFields')) { if (method_exists($this->query, 'getTableFields')) {
$fields = $this->query->getTableFields(); $fields = $this->query->getTableFields();
if (in_array('deleted', $fields)) $data['deleted'] = 1; if (in_array('deleted', $fields)) $data['deleted'] = 1;
if (in_array('is_deleted', $fields)) $data['is_deleted'] = 1; if (in_array('is_deleted', $fields)) $data['is_deleted'] = 1;
} }
empty($this->where) or $this->query->where($this->where); if (!empty($this->where)) $this->query->where($this->where);
// 阻止危险操作
if (!$this->query->getOptions('where')) {
$this->controller->error(lang('think_library_delete_error'));
}
// 执行删除操作
$result = empty($data) ? $this->query->delete() : $this->query->update($data); $result = empty($data) ? $this->query->delete() : $this->query->update($data);
// 结果回调处理 // 结果回调处理
if (false === $this->controller->callback('_delete_result', $result)) { if (false === $this->controller->callback('_delete_result', $result)) {