dev
popup: optimize code (#14413)
PopupManager: fix z-index cannot be rewritten at first using (#15738)