From edab38cc2566469cf13934aa92c05a8c20b58ece Mon Sep 17 00:00:00 2001 From: panda Date: Thu, 25 Apr 2024 17:51:40 +0800 Subject: [PATCH] ui: fix domain_user select default value (#789) --- packages/ui-default/pages/domain_user.page.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/ui-default/pages/domain_user.page.js b/packages/ui-default/pages/domain_user.page.js index e19aa1291..90a9a18d6 100644 --- a/packages/ui-default/pages/domain_user.page.js +++ b/packages/ui-default/pages/domain_user.page.js @@ -19,7 +19,7 @@ const page = new NamedPage('domain_user', () => { addUserSelector.focus(); return false; } - if ($role.val() === '') { + if (!$role.val()) { $role.focus(); return false; } @@ -27,9 +27,10 @@ const page = new NamedPage('domain_user', () => { return true; }, }); + const firstRoleForAddUser = addUserDialog.$dom.find('[name="role"] option').first().val(); addUserDialog.clear = function () { addUserSelector.clear(); - this.$dom.find('[name="role"]').val(''); + this.$dom.find('[name="role"]').val(firstRoleForAddUser); return this; }; @@ -37,15 +38,16 @@ const page = new NamedPage('domain_user', () => { $body: $('.dialog__body--set-role > div'), onDispatch(action) { const $role = setRolesDialog.$dom.find('[name="role"]'); - if (action === 'ok' && $role.val() === '') { + if (action === 'ok' && !$role.val()) { $role.focus(); return false; } return true; }, }); + const firstRoleForSetRole = setRolesDialog.$dom.find('[name="role"] option').first().val(); setRolesDialog.clear = function () { - this.$dom.find('[name="role"]').val(''); + this.$dom.find('[name="role"]').val(firstRoleForSetRole); return this; };