fix: 流程明细精确路由避免空数据

This commit is contained in:
yueyang 2026-10-26 18:24:46 +08:00
parent fa53dadab1
commit 8b4c698b15
3 changed files with 36 additions and 18 deletions

View File

@ -1,25 +1,7 @@
<?php
use Illuminate\Support\Facades\Route;
use Modules\EcommerceFinance\Http\Controllers\ProcessDetails;
Route::admin('ecommerce-finance', function () {
Route::view('/', 'ecommerce-finance::index')->name('index');
});
// 通用 workspace/{section}/{page} 路由在 App\Providers\Route::boot() 中注册;
// 模块路由在 register 阶段先注册,因此这里的精确路由会优先命中。沿用
// business.pages.show 名称,侧边栏仍能生成与通用页面一致的可访问 URL。
Route::admin('ecommerce-finance', function (): void {
Route::get('workspace/financial-operations/process-details', [ProcessDetails::class, 'show'])
->middleware('business.page.viewer')
->defaults('section', 'financial-operations')
->defaults('page', 'process-details')
->name('business.pages.show');
Route::get('workspace/financial-operations/process-details/export', [ProcessDetails::class, 'export'])
->middleware('business.page.viewer')
->defaults('section', 'financial-operations')
->defaults('page', 'process-details')
->name('business.process-details.export');
}, ['prefix' => '', 'as' => '']);

View File

@ -22,6 +22,7 @@ use Modules\EcommerceFinance\Http\Controllers\AccountBills;
use Modules\EcommerceFinance\Http\Controllers\AlipayBills;
use Modules\EcommerceFinance\Http\Controllers\DewuAccountBills;
use Modules\EcommerceFinance\Http\Controllers\PinduoduoAccountBills;
use Modules\EcommerceFinance\Http\Controllers\ProcessDetails;
use Modules\EcommerceFinance\Http\Controllers\TaobaoWechatAccountBills;
use Modules\EcommerceFinance\Http\Controllers\Api\GoodsReconciliations;
use Modules\EcommerceFinance\Http\Controllers\Api\SupplierPayables;
@ -819,7 +820,19 @@ Route::get('workspace/financial-ledger/{page?}/{tab?}', function (Request $reque
})->name('business.financial-ledger.legacy');
Route::middleware('business.page.viewer')->group(function (): void {
Route::get('workspace/financial-operations/process-details', [ProcessDetails::class, 'show'])
->defaults('section', 'financial-operations')
->defaults('page', 'process-details')
->name('business.pages.show');
Route::get('workspace/financial-operations/process-details/export', [ProcessDetails::class, 'export'])
->defaults('section', 'financial-operations')
->defaults('page', 'process-details')
->name('business.process-details.export');
Route::get('workspace/{section}/{page?}/{tab?}', 'Business\Pages@show')
// 流程明细使用上面的精确 GET 路由;通用路由不能再次抢占并渲染空表。
->where('page', '^(?!process-details$).*')
->name('business.pages.show');
Route::post('workspace/{section}/{page}/import/{tab?}', 'Business\Pages@import')

View File

@ -3,13 +3,36 @@
namespace Tests\Feature\Business;
use App\Models\Auth\Permission;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Route;
use Mockery;
use Modules\EcommerceFinance\Http\Controllers\ProcessDetails;
use Modules\EcommerceFinance\Repositories\DingProcessDetailMirrorRepository;
use RuntimeException;
use Tests\Feature\FeatureTestCase;
class ProcessDetailsPageTest extends FeatureTestCase
{
public function test_process_details_route_is_not_shadowed_by_generic_workspace_page(): void
{
$genericRoute = collect(Route::getRoutes()->getRoutes())->first(
static fn ($route): bool => $route->uri() === '{company_id}/workspace/{section}/{page?}/{tab?}',
);
$this->assertNotNull($genericRoute);
$this->assertArrayHasKey('page', $genericRoute->wheres);
$this->assertSame(
0,
preg_match('#' . $genericRoute->wheres['page'] . '#', 'process-details'),
);
$matched = Route::getRoutes()->match(Request::create(
'/1/workspace/financial-operations/process-details',
));
$this->assertSame(ProcessDetails::class . '@show', $matched->getActionName());
}
public function test_page_renders_process_detail_rows_and_filters(): void
{
$this->user->attachPermission(Permission::where('name', 'read-admin-panel')->firstOrFail());