perf: 更新分包中的 hyperf 版本指 2.2

Merge pull request #55 from jyiL/patch-5
Update AbstractController.php
2026-01-15 07:15:06 +08:00 · 2021-08-30 19:35:13 +08:00 · 2021-08-14 16:09:59 +08:00 · 2021-08-14 16:08:56 +08:00 · 2021-08-07 10:51:13 +08:00 · 2021-07-19 16:03:03 +08:00
27 changed files with 192 additions and 83 deletions
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@

 > 演示站点部署在`亚马逊免费主机`, 国内访问可能会慢

-![HyperfAdmin架构](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/sJaJti.png)
+![HyperfAdmin架构](https://gitee.com/daodao97/asset/raw/master/uPic/sJaJti.png)

 前端为`vue multiple page`多页模式, 可以按模块打包, 默认包含两个模块`default` 默认模块,  `system`系统管理模块,  绝大部分业务组件在`src/components`目录

--- a/bin/release.sh
+++ b/bin/release.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+set -e
+
+if (( "$#" != 1 ))
+then
+    echo "Tag has to be provided"
+
+    exit 1
+fi
+
+NOW=$(date +%s)
+CURRENT_BRANCH="master"
+VERSION=$1
+BASEPATH=$(cd `dirname $0`; cd ../src/; pwd)
+
+# Always prepend with "v"
+if [[ $VERSION != v*  ]]
+then
+    VERSION="v$VERSION"
+fi
+
+git tag $VERSION
+git push origin --tags
+
+repos=$(ls $BASEPATH)
+
+for REMOTE in $repos
+do
+    echo ""
+    echo ""
+    echo "Cloning $REMOTE";
+    TMP_DIR="/tmp/hyperf-split"
+    REMOTE_URL="git@github.com:hyperf-admin/$REMOTE.git"
+
+    rm -rf $TMP_DIR;
+    mkdir $TMP_DIR;
+
+    (
+        cd $TMP_DIR;
+
+        git clone $REMOTE_URL .
+        git checkout "$CURRENT_BRANCH";
+
+        if [[ $(git log --pretty="%d" -n 1 | grep tag --count) -eq 0 ]]; then
+            echo "Releasing $REMOTE"
+            git tag $VERSION
+            git push origin --tags
+        fi
+    )
+done
+
+TIME=$(echo "$(date +%s) - $NOW" | bc)
+
+printf "Execution time: %f seconds" $TIME
--- a/bin/split.sh
+++ b/bin/split.sh
@@ -9,7 +9,7 @@ REPOS=$@

 function split()
 {
-    SHA1=`splitsh-lite --prefix=$1`
+    SHA1=`./bin/splitsh-lite --prefix=$1`
    git push $2 "$SHA1:refs/heads/$CURRENT_BRANCH" -f
 }

--- a/bin/splitsh-lite
+++ b/bin/splitsh-lite
--- a/composer.json
+++ b/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",
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 `hyperf-admin`是前后端分离的后台管理系统, 前端基于`vue`的 `vue-admin-template`, 针对后台业务`列表`, `表单`等场景封装了大量业务组件, 后端基于`hyperf`实现, 整体思路是后端定义页面渲染规则, 前端页面渲染时首先拉取配置, 然后组件根据具体配置完成页面渲染, 方便开发者仅做少量的配置工作就能完成常见的`CRUD`工作, 同时支持自定义组件和自定义页面, 以开发更为复杂的页面.

-![hyperf-admin架构](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/sJaJti.png)
+![hyperf-admin架构](https://gitee.com/daodao97/asset/raw/master/uPic/sJaJti.png)

 前端为`vue multiple page`多页模式, 可以按模块打包, 默认包含两个模块`default` 默认模块,  `system`系统管理模块,  绝大部分业务组件在`src/components`目录, 前端文档详见 [这里](/frontend/form)

@@ -22,7 +22,7 @@
 后端的详细文档见[这里](/backend/scaffold)

 ### UI预览
-![样式预览](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/FW2cCN.png)
+![样式预览](https://gitee.com/daodao97/asset/raw/master/uPic/FW2cCN.png)

 ## 依赖 & 参考

--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@@ -4,6 +4,7 @@
  * [安装](guide/install.md)
  * [开发样例](guide/dev_example.md)
  * [线上交流](guide/communication.md)
+  * [常见问题](guide/qa.md)
 * 后端
  * [脚手架](backend/scaffold.md)
  * [表单详解](backend/form.md)
--- a/docs/backend/components/business/desc.md
+++ b/docs/backend/components/business/desc.md
@@ -60,7 +60,7 @@ php bin/hyperf.php

 可以查看到相关安装命令

-![qIKtC8](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/qIKtC8.png)
+![qIKtC8](https://gitee.com/daodao97/asset/raw/master/uPic/qIKtC8.png)

 开发环境执行相应命令, 安装依赖的`db`结构即可, 在此之前请先确认`.env` 中已配置好相应连接信息.

--- a/docs/backend/components/business/dev-tools.md
+++ b/docs/backend/components/business/dev-tools.md
@@ -2,7 +2,7 @@

 针对 数据库, `Model`, `Controller` 通用模型, 可以使用后台提供的`代码生成工具`来初始化大部分代码. 

-![9fnAUL(1)](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/9fnAUL%20%281%29.png)
+![9fnAUL(1)](https://gitee.com/daodao97/asset/raw/master/uPic/9fnAUL%20%281%29.png)

 连接池对应`config.autoload.databases` 中配置的可用链接, 选择好`连接池`, `数据库`, `表` 后下方表单会根据表结构字段渲染, 完成具体字段的配置, 点击提交.

--- a/docs/backend/components/business/make_component.md
+++ b/docs/backend/components/business/make_component.md
@@ -36,7 +36,7 @@ CREATE TABLE `config_center` (

 #### 2. 创建 `Controller`, `Model`

-![wlXctg](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/wlXctg.png)
+![wlXctg](https://gitee.com/daodao97/asset/raw/master/uPic/wlXctg.png)

 此时基础文件已经生成在`lib/` 下, 作为一个`composer`包模式开发, 我们将其转移至 `/opt/hyperf-admin/config-center`目录

@@ -73,7 +73,7 @@ CREATE TABLE `config_center` (

 #### 3. 添加菜单 注册路由

-![uAR5lj](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/uAR5lj.png)
+![uAR5lj](https://gitee.com/daodao97/asset/raw/master/uPic/uAR5lj.png)

 ```php
 <?php
@@ -87,7 +87,7 @@ register_route('/config_center', ConfigCenterController::class);

 ?> 若配置有不生效的情况, 执行 `rm vendor/hyperf-admin/config-center && composer require hyperf-admin/config-center` 重新安装即可

-![EFvajy](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/EFvajy.png)
+![EFvajy](https://gitee.com/daodao97/asset/raw/master/uPic/EFvajy.png)

 至此已经完成了, 配置的`CRUD`.

--- a/docs/backend/form.md
+++ b/docs/backend/form.md
@@ -112,7 +112,7 @@ type：表单项类型，以下是支持的组件列表，以下所有组件 pro
  "field_name|字段名" => [
    "type" => "textarea",
    "props" => [
-      "row" => 6, // 行数, 默认6
+      "rows" => 6, // 行数, 默认6
    ]
  ]
 ]
--- a/docs/backend/remote_module.md
+++ b/docs/backend/remote_module.md
@@ -8,16 +8,16 @@

 所以我们的服务一步步的变得膨胀, 变得不稳定, 是时候做出改变了

-![Biv9dV](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/Biv9dV.png)
+![Biv9dV](https://gitee.com/daodao97/asset/raw/master/uPic/Biv9dV.png)

 我们将一些业务边界比较明显, 比较独立的功能, 以微服务的方式拆分出去, 然后注册到主项目上去, 这样我们就可以达到, 既使用一套ui, 又进行服务拆分的目的啦.

 `remote_module`的注册也十分简单, `http://localhost:9528/system/#/cconf/cconf_website_config` 在站点管理中增加相应模块的配置即可

-![1DIbj0](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/1DIbj0.png)
+![1DIbj0](https://gitee.com/daodao97/asset/raw/master/uPic/1DIbj0.png)

 然后在`菜单管理`中, 增加相应的模块菜单即可使用啦.

 ?> 注意 `remote_module` 必须基于`hyperf-admin/admin` 组件构建哦

-?> 另外, 主的`HyperfAdmin`项目, 默认包含两个本地模块, `default`, `system`
+?> 另外, 主的`HyperfAdmin`项目, 默认包含两个本地模块, `default`, `system`
--- a/docs/backend/remote_scaffold.md
+++ b/docs/backend/remote_scaffold.md
@@ -3,9 +3,9 @@
 我们以 `用户管理` 这个页面功能为例, 讲解如何使用此功能.

 先上效果图
-![MXURtd](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/MXURtd.png)
+![MXURtd](https://gitee.com/daodao97/asset/raw/master/uPic/MXURtd.png)

-![rs0BhV](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/rs0BhV.png)
+![rs0BhV](https://gitee.com/daodao97/asset/raw/master/uPic/rs0BhV.png)

 此时我们只用配置好脚手架配置,即可为第三方服务提供后台页面的管理功能
 ```json
--- a/docs/guide/communication.md
+++ b/docs/guide/communication.md
@@ -1,4 +1,4 @@
 我们使用微信群进行交流, 由于群二维码经常过期, 请添加下方个人微信, 拉你进群.

-![WechatIMG7](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/WechatIMG7.jpeg ':size=50%')
+![WechatIMG7](https://gitee.com/daodao97/asset/raw/master/uPic/WechatIMG7.jpeg ':size=50%')

--- a/docs/guide/desc.md
+++ b/docs/guide/desc.md
@@ -2,7 +2,7 @@

 ### 架构

-![hyperf-admin架构](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/sJaJti.png)
+![hyperf-admin架构](https://gitee.com/daodao97/asset/raw/master/uPic/sJaJti.png)

 前端为`vue multiple page`多页模式, 可以按模块打包, 默认包含两个模块`default` 默认模块,  `system`系统管理模块,  绝大部分业务组件在`src/components`目录, 前端文档详见 [这里](/frontend/form)

@@ -24,7 +24,7 @@
 后端的详细文档见[这里](/backend/scaffold)

 ### UI预览
-![样式预览](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/FW2cCN.png)
+![样式预览](https://gitee.com/daodao97/asset/raw/master/uPic/FW2cCN.png)

 ### 依赖 & 参考

--- a/docs/guide/dev_example.md
+++ b/docs/guide/dev_example.md
@@ -48,13 +48,13 @@ CREATE TABLE `student_score` (

 2.  通过`DevTools`开发者工具创建 `student_score` 相关的 `Model`, `Controller`

-    ![YPdEli](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/YPdEli.png)
+    ![YPdEli](https://gitee.com/daodao97/asset/raw/master/uPic/YPdEli.png)

    选择好相应的表后, 点击提交, 此时工具已经帮我们创建好相应的`app/Controller/StudentScoreController.php`和`app/Model/Test/StudentScore.php`

 3.  添加目录和菜单

-    ![cs0SYX](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/cs0SYX.png)
+    ![cs0SYX](https://gitee.com/daodao97/asset/raw/master/uPic/cs0SYX.png)

    注册路由

@@ -65,7 +65,7 @@ CREATE TABLE `student_score` (

    此时我们也已经完成了基础的`CRUD`开发

-    ![MEoM4p](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/MEoM4p.png)
+    ![MEoM4p](https://gitee.com/daodao97/asset/raw/master/uPic/MEoM4p.png)

    哦对了, 还有各种筛选条件呢? 也很简单, 在 `scaffoldOptions` 中增加 `filter`配置即可

@@ -84,7 +84,7 @@ CREATE TABLE `student_score` (
    }
    ```

-    ![u68v1D](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/u68v1D.png)
+    ![u68v1D](https://gitee.com/daodao97/asset/raw/master/uPic/u68v1D.png)

    还有, 大家别忘了, 需求中还要去可以按页签显示, 改怎么办呢, 这个ui可有点复杂啊, 不过在`hyperf-admin`里也同样简单

@@ -112,7 +112,7 @@ CREATE TABLE `student_score` (
    }
    ```

-    ![Ax0WWD](https://cdn.jsdelivr.net/gh/daodao97/FigureBed@master/uPic/Ax0WWD.png)
+    ![Ax0WWD](https://gitee.com/daodao97/asset/raw/master/uPic/Ax0WWD.png)

 至此我们已经完成了绝大部分的功能开发, 如果使用熟练, 我们应该能在十分钟内完成整个功能的前后端开发, 而且还支持复杂的前端效果.

--- a/docs/guide/install.md
+++ b/docs/guide/install.md
@@ -30,6 +30,8 @@ cd hyperf-admin
 ``` 

 #### 2. 移除`hyperf-skeleton`中的日志配置, 因为 `admin` 底层已配置
+
+底层的日志配置见 [base-utils/ConfigProvider](https://github.com/hyperf-admin/hyperf-admin/blob/master/src/base-utils/src/ConfigProvider.php#L22)
 ```shell
 rm config/autoload/logger.php
 ```
@@ -65,6 +67,12 @@ LOCAL_DB_HOST=localhost
 ```shell 
 composer require hyperf-admin/hyperf-admin
 ```
+
+如果存在依赖包的版本号问题, 注意, 请使用 composer2
+```shell
+composer require hyperf-admin/hyperf-admin -W
+```
+
 !> hyperf-admin 为分包模式, 实际应用中请根据情况安装

 #### 6. 初始化`validation`的依赖文档
--- a/docs/guide/qa.md
+++ b/docs/guide/qa.md
@@ -0,0 +1,22 @@
+#### 1. 导出服务的进度一直是0
+
+导出任务没有默认启动，有两种方式可以启用他
+1. 使用croncenter 的话，在 定时任务的管理后台 增加 export-task 任务即可, 参见[cron-center](http://daodao97.gitee.io/hyperf-admin/#/backend/components/business/cron-center)
+2. 未使用croncenter 自己起个进程或定时任务 启动 `HyperfAdmin/Admin/Service/ExportService` 即可
+  
+#### 2. 前端页面点击菜单, 不能正常跳转
+打开控制台可见如下错
+
+![X6ijLg](https://gitee.com/daodao97/asset/raw/master/imgs/X6ijLg.png)
+
+此时, 保证本地的 `node`, `npm` 为最新版本, 安装依赖时, 不要使用 `cnpm`
+
+然后 `npm i` 或 `yarn` 重新安装并启动
+
+#### 3. 点击下载中心的文件链接跳转地址提示需要登录
+
+这里的逻辑是先跳转到 http://hyperf-admin.daodao.run/api/upload/ossprivateurl?key=oss/1/export_task/xxxxx.csv, 由接口 `api/upload/ossprivateurl` 生成临时的下载地址, 也就是我们需要此接口的权限, 如下操作即可 
+![KwtN0f](https://gitee.com/daodao97/asset/raw/master/imgs/KwtN0f.png)
+勾选接口后, 点击提交, 并清理权限缓存
+![EsMcs5](https://gitee.com/daodao97/asset/raw/master/imgs/EsMcs5.png)
+同理, 其他接口的权限问题也可在此管理
--- a/src/alert-manager/composer.json
+++ b/src/alert-manager/composer.json
@@ -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": {
--- a/src/base-utils/composer.json
+++ b/src/base-utils/composer.json
@@ -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"
    },
--- a/src/base-utils/src/Helper/system.php
+++ b/src/base-utils/src/Helper/system.php
@@ -85,6 +85,9 @@ if (!function_exists('move_local_file_to_filesystem')) {
            if ($private) {
                $filesystem->setVisibility($save_file_path, AdapterInterface::VISIBILITY_PRIVATE);
            }
+            if (method_exists($filesystem, 'chmod')) {
+                $filesystem->chmod($save_file_path, 0644);
+            }
            $meta = $filesystem->getMetadata($save_file_path);
            switch (config("file.storage.{$bucket}.driver")) {
                case \Hyperf\Filesystem\Adapter\LocalAdapterFactory::class:
--- a/src/base-utils/src/Scaffold/Controller/AbstractController.php
+++ b/src/base-utils/src/Scaffold/Controller/AbstractController.php
@@ -148,7 +148,10 @@ abstract class AbstractController extends Controller
            if (isset($item[0])) {
                $buttons[$key] = $this->buttonConfigConvert($item);
            }
-        }
+            if (isset($item['method'])) {
+                $buttons[$key]['method'] = $item['method'];
+            }
+         }
        return $buttons;
    }

@@ -200,8 +203,12 @@ abstract class AbstractController extends Controller
            }
        }
        $order_by = $this->options['order_by'] ?? '';
+        $group_by = $this->options['group_by'] ?? '';
+        if ($sortColumn = $this->request->input('_sort_column') && $sortType = $this->request->input('_sort_type')) {
+            $order_by = $sortColumn . ' ' . $sortType;
+        }
        if (empty($conditions) && !($this->options['defaultList'] ?? true)) {
-            return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options');
+            return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options', 'group_by');
        }
        if (method_exists($this, 'beforeListQuery')) {
            $hook_params = get_class_method_params_name($this, 'beforeListQuery');
@@ -209,9 +216,11 @@ abstract class AbstractController extends Controller
                $this->beforeListQuery($conditions, $order_by);
            } elseif (count($hook_params) === 1) {
                $this->beforeListQuery($conditions);
+            } elseif (count($hook_params) === 4) {
+                $this->beforeListQuery($conditions, $order_by, $group_by, $columns);
            }
        }
-        return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options');
+        return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options', 'group_by');
    }

    /**
@@ -226,13 +235,25 @@ abstract class AbstractController extends Controller
            $order_by,
            $columns,
            $tableOptions,
+            $group_by
        ] = array_values($this->makeWhere());
        $entity = $this->getEntity();
-        $count = $entity->count($conditions);
+        if ($group_by) {
+            $entity->getModel()->groupBy($group_by);
+            $count_query = clone $entity;
+            $count = $count_query->getModel()->select(
+                gettype($group_by) == 'array' ? $group_by[0] : $group_by,
+                DB::raw('count(*) as total')
+            )->get()->count();
+        } else {
+            $count = $entity->count($conditions);
+        }
+        
        $list = [];
        if ($count) {
            $attr['select'] = $columns;
            $order_by && $attr['order_by'] = $order_by;
+            $group_by && $attr['group_by'] = $group_by;
            $list = $entity->list($conditions, $attr, $page, $size);
        }
        $list = $this->listFilter($list, $tableOptions);
@@ -384,7 +405,8 @@ abstract class AbstractController extends Controller
        $order_by = $this->options['order_by'] ?? '';
        $attr['select'] = $columns;
        $order_by && $attr['order_by'] = $order_by;
-        $childs = $this->getEntity()->list(['pid' => $id], $attr);
+        $parent_key = $this->options['table']['tree']['pid'] ?? 'pid';
+        $childs = $this->getEntity()->list([$parent_key => $id], $attr);
        foreach ($tableOptions as $item) {
            if (!isset($item['render'])) {
                continue;
@@ -893,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'], [
--- a/src/base-utils/src/classmap/ProviderConfig.php
+++ b/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);
--- a/src/cron-center/composer.json
+++ b/src/cron-center/composer.json
@@ -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": {
--- a/src/event-bus/composer.json
+++ b/src/event-bus/composer.json
@@ -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": {
--- a/src/process-manager/composer.json
+++ b/src/process-manager/composer.json
@@ -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": {
--- a/src/validation/composer.json
+++ b/src/validation/composer.json
@@ -9,7 +9,7 @@
        }
    ],
    "require": {
-        "hyperf/validation": "~2.1.0",
+        "hyperf/validation": "~2.2.0",
        "hyperf-admin/base-utils": "dev-master"
    },
    "autoload": {
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
daodao97	c8a049faeb	perf: upgrade to hyperf/* 2.2.0	2021-07-19 16:03:03 +08:00
daodao97	cb2b2b5428	Merge branch 'master' of github.com:hyperf-admin/hyperf-admin	2021-06-26 11:28:27 +08:00
daodao97	8b44c279c1	docs: website	2021-06-26 11:28:11 +08:00
刀刀	8f1df241a4	Merge pull request #53 from AKMCC-hub/master feat: 脚手架增加group_by语法支持	2021-06-16 09:57:28 +08:00
刀刀	9abd51cc6b	Update AbstractController.php	2021-06-16 09:56:41 +08:00
七戒	f4c429ea28	feat: 脚手架增加group_by语法支持	2021-06-15 15:52:14 +08:00
daodao97	839bd1e0b9	fix: tree child api	2021-05-18 17:49:55 +08:00
daodao97	4ccb7200eb	Merge branch 'master' of github.com:hyperf-admin/hyperf-admin	2021-05-18 11:47:14 +08:00
daodao97	d79fdca30b	fix: move_local_file_to_filesystem chmod	2021-05-18 11:46:30 +08:00
刀刀	11f249669e	Update form.md	2021-04-26 09:46:10 +08:00
刀刀	a707dae623	Update README.md	2021-04-22 19:56:56 +08:00
刀刀	d5a7a584df	Update install.md	2021-04-22 19:54:31 +08:00
刀刀	c0379e5137	Update README.md	2021-04-22 10:51:12 +08:00
刀刀	bde50ad7e2	Update README.md	2021-04-22 10:31:40 +08:00
daodao97	e4dd791a66	perf: tools	2021-04-21 16:54:21 +08:00
daodao97	5f1bdc834e	fix: support custom sort cloumn	2021-04-21 16:25:24 +08:00
daodao97	0798685e90	feat: set readable by all user	2021-04-21 16:22:34 +08:00
三刀	1891c2053b	docs: update images	2021-04-12 10:05:55 +08:00
刀刀	89505d63c3	Update AbstractController.php	2021-03-05 22:02:37 +08:00
刀刀	165bfe1a2a	Update AbstractController.php	2021-03-05 22:00:29 +08:00
刀刀	5e2314292b	Update install.md	2021-02-05 18:04:28 +08:00
daodoa97	c5ee5692f9	docs: add qa	2021-02-05 15:20:57 +08:00
daodoa97	de939c1c42	docs: add qa	2021-02-04 11:43:16 +08:00
daodoa97	5dedcff854	merge: branch 'master' of https://github.com/hyperf-admin/hyperf-admin	2021-02-04 11:23:59 +08:00
刀刀	1d9e2401fa	Update install.md	2021-01-28 14:52:02 +08:00