feat: Enhance screen management with conditional layer and zone handling
- Updated the ScreenManagementService to allow general companies to query both their own zones and common zones. - Improved the ScreenViewPage to include detailed logging for loaded conditional layers and zones. - Added functionality to ignore empty targetComponentId in condition evaluations. - Enhanced the EditModal and LayerManagerPanel to support loading conditional layers and dynamic options based on selected zones. - Implemented additional tab configurations to manage entity join columns effectively in the SplitPanelLayout components.
This commit is contained in:
@@ -5379,9 +5379,11 @@ export class ScreenManagementService {
|
||||
[screenId],
|
||||
);
|
||||
} else {
|
||||
// 일반 회사: 자사 Zone만 조회 (company_code = '*' 제외)
|
||||
// 일반 회사: 자사 Zone + 공통(*) Zone 조회
|
||||
zones = await query<any>(
|
||||
`SELECT * FROM screen_conditional_zones WHERE screen_id = $1 AND company_code = $2 ORDER BY zone_id`,
|
||||
`SELECT * FROM screen_conditional_zones
|
||||
WHERE screen_id = $1 AND (company_code = $2 OR company_code = '*')
|
||||
ORDER BY zone_id`,
|
||||
[screenId, companyCode],
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user