From b75daa5e4b7a06677898da0fef43a80408dc6668 Mon Sep 17 00:00:00 2001 From: panliang <1163816051@qq.com> Date: Wed, 27 Jul 2022 12:22:26 +0800 Subject: [PATCH] packages --- .github/stale.yml | 21 -- .github/workflows/dusk.yml | 238 ------------------- src/Extend/Manager.php | 2 +- src/Http/Controllers/ExtensionController.php | 1 + src/Traits/JsonResponse.php | 41 ++++ 5 files changed, 43 insertions(+), 260 deletions(-) delete mode 100644 .github/stale.yml delete mode 100644 .github/workflows/dusk.yml create mode 100644 src/Traits/JsonResponse.php diff --git a/.github/stale.yml b/.github/stale.yml deleted file mode 100644 index dc7a696..0000000 --- a/.github/stale.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Number of days of inactivity before an issue becomes stale -daysUntilStale: 180 -# Number of days of inactivity before a stale issue is closed -daysUntilClose: 7 -# Issues with these labels will never be considered stale -exemptLabels: - - pinned - - security - - bug - - unconfirmed - - enhancement - - feature -# Label to use when marking an issue as stale -staleLabel: wontfix -# Comment to post when marking an issue as stale. Set to `false` to disable -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -# Comment to post when closing a stale issue. Set to `false` to disable -closeComment: false diff --git a/.github/workflows/dusk.yml b/.github/workflows/dusk.yml deleted file mode 100644 index 561d4a6..0000000 --- a/.github/workflows/dusk.yml +++ /dev/null @@ -1,238 +0,0 @@ -name: Laravel Dusk - -on: - push: - branches: [ 2.0 ] - pull_request: - branches: [ 2.0 ] - -jobs: - laravel5: - runs-on: ubuntu-latest - - steps: - - uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8 - with: - php-version: '7.2' - - - uses: actions/checkout@v2 - - - name: Composer Update - run: composer self-update --2 - - - name: Setup MySQL - # You may pin to the exact commit or the version. - # uses: mirromutth/mysql-action@de1fba8b3f90ce8db80f663a7043be3cf3231248 - uses: mirromutth/mysql-action@v1.1 - with: - # Version of MySQL to use - mysql version: 5.7 - # MYSQL_ROOT_PASSWORD - root superuser password - mysql root password: 123456 - # MYSQL_DATABASE - name for the default database that is created - mysql database: laravel - # MYSQL_USER - create the specified user with superuser power for created database - mysql user: root - # MYSQL_PASSWORD - specified superuser password which user is power for created database - mysql password: 123456 - - - name: Install Dependencies - run: | - composer create-project --prefer-dist laravel/laravel laravel-tests 5.* - sh ./tests/bin/install-dep.sh - - - name: Install Admin - run: sh ./tests/bin/install-admin.sh - -# - name: Install Xvfb -# run: sudo apt-get install xvfb - - - name: Start Server - run: sh ./tests/bin/start.sh - - - name: Run test suite - run: cd ./laravel-tests && php artisan dusk - - laravel6: - runs-on: ubuntu-latest - - steps: - - uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8 - with: - php-version: '7.3' - - - uses: actions/checkout@v2 - - - name: Composer Update - run: composer self-update --2 - - - name: Setup MySQL - # You may pin to the exact commit or the version. - # uses: mirromutth/mysql-action@de1fba8b3f90ce8db80f663a7043be3cf3231248 - uses: mirromutth/mysql-action@v1.1 - with: - # Version of MySQL to use - mysql version: 5.7 - # MYSQL_ROOT_PASSWORD - root superuser password - mysql root password: 123456 - # MYSQL_DATABASE - name for the default database that is created - mysql database: laravel - # MYSQL_USER - create the specified user with superuser power for created database - mysql user: root - # MYSQL_PASSWORD - specified superuser password which user is power for created database - mysql password: 123456 - - - name: Install Dependencies - run: | - composer create-project --prefer-dist laravel/laravel laravel-tests 6.* - sh ./tests/bin/install-dep.sh - - - name: Install Admin - run: sh ./tests/bin/install-admin.sh - -# - name: Install Xvfb -# run: sudo apt-get install xvfb - - - name: Start Server - run: sh ./tests/bin/start.sh - - - name: Run test suite - run: cd ./laravel-tests && php artisan dusk - - laravel7: - runs-on: ubuntu-latest - - steps: - - uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8 - with: - php-version: '7.3' - - - uses: actions/checkout@v2 - - - name: Composer Update - run: composer self-update --2 - - - name: Setup MySQL - # You may pin to the exact commit or the version. - # uses: mirromutth/mysql-action@de1fba8b3f90ce8db80f663a7043be3cf3231248 - uses: mirromutth/mysql-action@v1.1 - with: - # Version of MySQL to use - mysql version: 5.7 - # MYSQL_ROOT_PASSWORD - root superuser password - mysql root password: 123456 - # MYSQL_DATABASE - name for the default database that is created - mysql database: laravel - # MYSQL_USER - create the specified user with superuser power for created database - mysql user: root - # MYSQL_PASSWORD - specified superuser password which user is power for created database - mysql password: 123456 - - - name: Install Dependencies - run: | - composer create-project --prefer-dist laravel/laravel laravel-tests 7.* - sh ./tests/bin/install-dep.sh - - - name: Install Admin - run: sh ./tests/bin/install-admin.sh - -# - name: Install Xvfb -# run: sudo apt-get install xvfb - - - name: Start Server - run: sh ./tests/bin/start.sh - - - name: Run test suite - run: cd ./laravel-tests && php artisan dusk - - laravel8: - runs-on: ubuntu-latest - - steps: - - uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8 - with: - php-version: '8.0' - - - uses: actions/checkout@v2 - - - name: Composer Update - run: composer self-update --2 - - - name: Setup MySQL - # You may pin to the exact commit or the version. - # uses: mirromutth/mysql-action@de1fba8b3f90ce8db80f663a7043be3cf3231248 - uses: mirromutth/mysql-action@v1.1 - with: - # Version of MySQL to use - mysql version: 5.7 - # MYSQL_ROOT_PASSWORD - root superuser password - mysql root password: 123456 - # MYSQL_DATABASE - name for the default database that is created - mysql database: laravel - # MYSQL_USER - create the specified user with superuser power for created database - mysql user: root - # MYSQL_PASSWORD - specified superuser password which user is power for created database - mysql password: 123456 - - - name: Install Dependencies - run: | - composer create-project --prefer-dist laravel/laravel laravel-tests 8.* - sh ./tests/bin/install-dep.sh - - - name: Install Admin - run: sh ./tests/bin/install-admin.sh - - - name: Install Xvfb - run: sudo apt-get install xvfb - - - name: Start Server - run: sh ./tests/bin/start.sh - - - name: Run test suite - run: cd ./laravel-tests && php artisan dusk - - laravel9: - runs-on: ubuntu-latest - - steps: - - uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8 - with: - php-version: '8.0' - - - uses: actions/checkout@v2 - - - name: Composer Update - run: composer self-update --2 - - - name: Setup MySQL - # You may pin to the exact commit or the version. - # uses: mirromutth/mysql-action@de1fba8b3f90ce8db80f663a7043be3cf3231248 - uses: mirromutth/mysql-action@v1.1 - with: - # Version of MySQL to use - mysql version: 5.7 - # MYSQL_ROOT_PASSWORD - root superuser password - mysql root password: 123456 - # MYSQL_DATABASE - name for the default database that is created - mysql database: laravel - # MYSQL_USER - create the specified user with superuser power for created database - mysql user: root - # MYSQL_PASSWORD - specified superuser password which user is power for created database - mysql password: 123456 - - - name: Install Dependencies - run: | - composer create-project --prefer-dist laravel/laravel laravel-tests 9.* - sh ./tests/bin/install-dep.sh - - - name: Install Admin - run: sh ./tests/bin/install-admin.sh - - - name: Install Xvfb - run: sudo apt-get install xvfb - - - name: Start Server - run: sh ./tests/bin/start.sh - - - name: Run test suite - run: cd ./laravel-tests && php artisan dusk diff --git a/src/Extend/Manager.php b/src/Extend/Manager.php index e887c56..6d7e986 100644 --- a/src/Extend/Manager.php +++ b/src/Extend/Manager.php @@ -274,7 +274,7 @@ class Manager $it->rewind(); while ($it->valid()) { - if ($it->getDepth() > 1 && $it->getFilename() === 'composer.json') { + if ($it->getDepth() >= 1 && $it->getFilename() === 'composer.json') { $extensions[] = dirname($it->getPathname()); } diff --git a/src/Http/Controllers/ExtensionController.php b/src/Http/Controllers/ExtensionController.php index 63eea61..6f251c2 100644 --- a/src/Http/Controllers/ExtensionController.php +++ b/src/Http/Controllers/ExtensionController.php @@ -61,6 +61,7 @@ class ExtensionController extends Controller $grid->disableDeleteButton(); $grid->disableViewButton(); $grid->disableActions(); + $grid->disableRowSelector(); // $grid->tools([ // new Marketplace(), diff --git a/src/Traits/JsonResponse.php b/src/Traits/JsonResponse.php new file mode 100644 index 0000000..6ed6c11 --- /dev/null +++ b/src/Traits/JsonResponse.php @@ -0,0 +1,41 @@ + $data, 'code' => $code, 'message' => $message]; + return response()->json($result); + } + + public function success($data = null, $message = '') + { + return $this->json($data, Response::HTTP_OK, $message); + } + + public function error($message = '', $code = Response::HTTP_BAD_REQUEST, $data = null) + { + return $this->json($data, $code, $message); + } + + public function include($include = [], $key = 'include') + { + $request = request(); + if ($request->filled($key)) { + $include1 = $request->input($key); + $include1 = is_array($include1) ? $include1 : explode(',', $include1); + $include = array_merge($include, $include1); + } + return $include; + } + + protected function user($guard = null) + { + return Auth::guard($guard)->user(); + } +}