4 Commits

Author SHA1 Message Date
daodao97
4b9cea60ff perf: 更新分包中的 hyperf 版本指 2.2 2021-08-30 19:35:13 +08:00
刀刀
c881a36788 Merge pull request #55 from jyiL/patch-5
Update AbstractController.php
2021-08-14 16:09:59 +08:00
daodao97
a1c0372828 perf: upcode 2021-08-14 16:08:56 +08:00
jyiL
572c8a1065 Update AbstractController.php
设置filter的select默认值不生效问题
2021-08-07 10:51:13 +08:00
8 changed files with 34 additions and 35 deletions

View File

@@ -9,8 +9,8 @@
}
],
"require": {
"hyperf/async-queue": "~2.1.0",
"hyperf/process": "~2.1.0",
"hyperf/async-queue": "~2.2.0",
"hyperf/process": "~2.2.0",
"hyperf-admin/rule-engine": "dev-master"
},
"autoload": {

View File

@@ -16,31 +16,31 @@
"ext-yaml": "*",
"aliyuncs/oss-sdk-php": "^2.3",
"box/spout": "^3.1",
"hyperf/amqp": "~2.1.0",
"hyperf/cache": "~2.1.0",
"hyperf/command": "~2.1.0",
"hyperf/config": "~2.1.0",
"hyperf/constants": "~2.1.0",
"hyperf/database": "~2.1.0",
"hyperf/db-connection": "~2.1.0",
"hyperf/filesystem": "~2.1.0",
"hyperf/framework": "~2.1.0",
"hyperf/guzzle": "~2.1.0",
"hyperf/http-server": "~2.1.0",
"hyperf/logger": "~2.1.0",
"hyperf/memory": "~2.1.0",
"hyperf/metric": "~2.1.0",
"hyperf/nsq": "~2.1.0",
"hyperf/process": "~2.1.0",
"hyperf/redis": "~2.1.0",
"hyperf/snowflake": "~2.1.0",
"hyperf/amqp": "~2.2.0",
"hyperf/cache": "~2.2.0",
"hyperf/command": "~2.2.0",
"hyperf/config": "~2.2.0",
"hyperf/constants": "~2.2.0",
"hyperf/database": "~2.2.0",
"hyperf/db-connection": "~2.2.0",
"hyperf/filesystem": "~2.2.0",
"hyperf/framework": "~2.2.0",
"hyperf/guzzle": "~2.2.0",
"hyperf/http-server": "~2.2.0",
"hyperf/logger": "~2.2.0",
"hyperf/memory": "~2.2.0",
"hyperf/metric": "~2.2.0",
"hyperf/nsq": "~2.2.0",
"hyperf/process": "~2.2.0",
"hyperf/redis": "~2.2.0",
"hyperf/snowflake": "~2.2.0",
"yadakhov/insert-on-duplicate-key": "^1.2"
},
"require-dev": {
"swoft/swoole-ide-helper": "^4.2",
"phpstan/phpstan": "^0.11.2",
"hyperf/devtool": "~2.1.0",
"hyperf/testing": "~2.1.0",
"hyperf/devtool": "~2.2.0",
"hyperf/testing": "~2.2.0",
"daodao97/hyperf-watch": "dev-master",
"symfony/var-dumper": "^5.0"
},

View File

@@ -915,7 +915,6 @@ abstract class AbstractController extends Controller
])
&& isset($_form['options'])) {
$_form['type'] = 'select';
unset($_form['value']);
$options_labels = array_column($_form['options'], 'label');
if (!isset($_form['props']['selectApi']) && !in_array('全部', $options_labels)) {
array_unshift($_form['options'], [

View File

@@ -44,7 +44,7 @@ class ProviderConfig
$providers = array_values($package);
usort($providers, function ($a, $b) {
return $a['weight'] > $b['weight'];
return intval($a['weight'] > $b['weight']);
});
$providers = array_column($providers, 'provider');
static::$providerConfigs = static::loadProviders($providers);

View File

@@ -10,10 +10,10 @@
}
],
"require": {
"hyperf/crontab": "~2.1.0",
"hyperf/process": "~2.1.0",
"hyperf/command": "~2.1.0",
"hyperf/event": "~2.1.0",
"hyperf/crontab": "~2.2.0",
"hyperf/process": "~2.2.0",
"hyperf/command": "~2.2.0",
"hyperf/event": "~2.2.0",
"hyperf-admin/base-utils": "dev-master"
},
"autoload": {

View File

@@ -9,8 +9,8 @@
}
],
"require": {
"hyperf/process": "~2.1.0",
"hyperf/amqp": "~2.1.0"
"hyperf/process": "~2.2.0",
"hyperf/amqp": "~2.2.0"
},
"autoload": {
"psr-4": {

View File

@@ -10,10 +10,10 @@
],
"require": {
"php": ">=7.3",
"hyperf/amqp": "~2.1.0",
"hyperf/crontab": "~2.1.0",
"hyperf/nsq": "~2.1.0",
"hyperf/process": "~2.1.0"
"hyperf/amqp": "~2.2.0",
"hyperf/crontab": "~2.2.0",
"hyperf/nsq": "~2.2.0",
"hyperf/process": "~2.2.0"
},
"autoload": {
"psr-4": {

View File

@@ -9,7 +9,7 @@
}
],
"require": {
"hyperf/validation": "~2.1.0",
"hyperf/validation": "~2.2.0",
"hyperf-admin/base-utils": "dev-master"
},
"autoload": {