Merge pull request #55 from jyiL/patch-5

Update AbstractController.php

composer.json

@@ -14,27 +14,27 @@
         "ext-swoole": ">=4.4",
         "aliyuncs/oss-sdk-php": "^2.3",
         "box/spout": "^3.1",
-        "hyperf/amqp": "~2.1.0",
-        "hyperf/async-queue": "~2.1.0",
-        "hyperf/cache": "~2.1.0",
-        "hyperf/command": "~2.1.0",
-        "hyperf/config": "~2.1.0",
-        "hyperf/constants": "~2.1.0",
-        "hyperf/crontab": "~2.1.0",
-        "hyperf/database": "~2.1.0",
-        "hyperf/db-connection": "~2.1.0",
+        "hyperf/amqp": "~2.2.0",
+        "hyperf/async-queue": "~2.2.0",
+        "hyperf/cache": "~2.2.0",
+        "hyperf/command": "~2.2.0",
+        "hyperf/config": "~2.2.0",
+        "hyperf/constants": "~2.2.0",
+        "hyperf/crontab": "~2.2.0",
+        "hyperf/database": "~2.2.0",
+        "hyperf/db-connection": "~2.2.0",
         "hyperf/filesystem": "^2.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/validation": "~2.1.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",
+        "hyperf/validation": "~2.2.0",
         "nette/php-generator": "^3.4",
         "xxtime/flysystem-aliyun-oss": "^1.5",
         "yadakhov/insert-on-duplicate-key": "^1.2",

src/base-utils/src/Scaffold/Controller/AbstractController.php

@@ -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'], [

src/base-utils/src/classmap/ProviderConfig.php

@@ -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);