diff --git a/app/controller/admin/system/dev/ComposerController.php b/app/controller/admin/system/dev/ComposerController.php index 8542f25..65eeebe 100644 --- a/app/controller/admin/system/dev/ComposerController.php +++ b/app/controller/admin/system/dev/ComposerController.php @@ -7,7 +7,7 @@ use think\response\Json; class ComposerController extends BaseController { - public function list(): Json + public function info(): Json { $composerLockFile = $this->app->getRootPath() . 'composer.lock'; $composerLockData = json_decode(file_get_contents($composerLockFile), true); diff --git a/route/api.php b/route/api.php index 9607d3e..fce0fe4 100644 --- a/route/api.php +++ b/route/api.php @@ -71,7 +71,7 @@ Route::group("adminapi", function () { Route::group("system", function () { - Route::get('composer/package', [ComposerController::class, "list"])->name("system.composerPackageList"); + Route::get('composer', [ComposerController::class, "info"])->name("system.composerInfo"); Route::get('command', [CommandController::class, "list"])->name("system.commandList"); diff --git a/z_ele/src/api/system/composer/index.ts b/z_ele/src/api/system/composer/index.ts index 9abb810..30a4250 100644 --- a/z_ele/src/api/system/composer/index.ts +++ b/z_ele/src/api/system/composer/index.ts @@ -1,17 +1,14 @@ import request from '@/utils/request'; import type { ApiResult } from '@/api'; -import type { Package, PackageParam } from './model'; +import type { Composer, ComposerParam } from './model'; /** - * 查询引入的包列表 + * 查询composer信息 */ -export async function listPackage(params?: PackageParam) { - const res = await request.get>( - '/system/composer/package', - { - params - } - ); +export async function composerInfo(params?: ComposerParam) { + const res = await request.get>('/system/composer', { + params + }); if (res.data.code === 0 && res.data.data) { return res.data.data; } diff --git a/z_ele/src/api/system/composer/model/index.ts b/z_ele/src/api/system/composer/model/index.ts index bcdc8b6..902ae70 100644 --- a/z_ele/src/api/system/composer/model/index.ts +++ b/z_ele/src/api/system/composer/model/index.ts @@ -1,5 +1,7 @@ import type { PageParam } from '@/api'; -export interface Package {} +export interface Composer { + packages: any; +} -export interface PackageParam extends PageParam {} +export interface ComposerParam extends PageParam {} diff --git a/z_ele/src/views/system/composer/package/index.vue b/z_ele/src/views/system/composer/package/index.vue index 7bb0639..9fb4e3d 100644 --- a/z_ele/src/views/system/composer/package/index.vue +++ b/z_ele/src/views/system/composer/package/index.vue @@ -22,7 +22,7 @@ DatasourceFunction, Columns } from 'ele-admin-plus/es/ele-pro-table/types'; - import { listPackage } from '@/api/system/composer'; + import { composerInfo } from '@/api/system/composer'; defineOptions({ name: 'SystemComposerPackage' }); @@ -79,9 +79,12 @@ hideInExport: true } ]); - + const info = ref(false); /** 表格数据源 */ const datasource: DatasourceFunction = ({ pages, where, orders }) => { - return listPackage({ ...where, ...orders, ...pages }); + return composerInfo({ ...where, ...orders, ...pages }).then((data: any) => { + info.value = data; + return data.packages; + }); };