From 324d9cb5ed365709c5a422ae8da2c5af1c2bf1d2 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 1 Feb 2024 15:17:29 +0800
Subject: [PATCH] * Write the change function in a new way, and optimize code
 for entry::edit.

---
 module/entry/js/common.ui.js    | 19 -----------------
 module/entry/ui/create.html.php |  3 ++-
 module/entry/ui/edit.html.php   | 36 ++++++++++++++++++++++-----------
 3 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/module/entry/js/common.ui.js b/module/entry/js/common.ui.js
index 959ce76cef..b28b28453e 100644
--- a/module/entry/js/common.ui.js
+++ b/module/entry/js/common.ui.js
@@ -35,22 +35,3 @@ function toggleAllIP(event)
         $('input.hidden#ip').remove();
     }
 }
-
-/**
- * Hide account row when enabling password-free login.
- *
- * @param  event  $event
- * @access public
- * @return void
- */
-function toggleFreePasswd(event)
-{
-    if($(event.target).val() == '1')
-    {
-      $('#account').closest('.form-row').addClass('hidden');
-    }
-    else
-    {
-      $('#account').closest('.form-row').removeClass('hidden');
-    }
-}
diff --git a/module/entry/ui/create.html.php b/module/entry/ui/create.html.php
index d26fa6f73f..a9d0b72301 100644
--- a/module/entry/ui/create.html.php
+++ b/module/entry/ui/create.html.php
@@ -70,7 +70,7 @@ formPanel
             set::label($lang->entry->freePasswd),
             radioList
             (
-                on::change('toggleFreePasswd'),
+                on::change()->toggleClass('.accountRow', 'hidden','$(target).val() == 1'),
                 set::name('freePasswd'),
                 set::items($lang->entry->freePasswdList),
                 set::value(0),
@@ -80,6 +80,7 @@ formPanel
     ),
     formRow
     (
+        setClass('accountRow'),
         formGroup
         (
             set::width('1/2'),
diff --git a/module/entry/ui/edit.html.php b/module/entry/ui/edit.html.php
index 52b33597af..fa19cf5dff 100644
--- a/module/entry/ui/edit.html.php
+++ b/module/entry/ui/edit.html.php
@@ -35,7 +35,10 @@ formPanel
                 set('target', '_blank'),
                 $lang->entry->help
             ),
-            item(set::type('divider')),
+            div
+            (
+                setClass('w-px h-3 bg-gray mx-2'),
+            ),
             a
             (
                 setClass('text-darken'),
@@ -77,7 +80,7 @@ formPanel
             set::label($lang->entry->freePasswd),
             radioList
             (
-                on::change('toggleFreePasswd'),
+                on::change()->toggleClass('.accountRow', 'hidden','$(target).val() == 1'),
                 set::name('freePasswd'),
                 set::items($lang->entry->freePasswdList),
                 set::value($entry->freePasswd),
@@ -88,14 +91,20 @@ formPanel
     formRow
     (
         setClass($entry->freePasswd ? 'hidden' : ''),
+        setClass('accountRow'),
         formGroup
         (
             set::width('1/2'),
             set::label($lang->entry->account),
-            set::placeholder($lang->entry->note->account),
-            set::name('account'),
-            set::items($users),
-            set::value($entry->account)
+            set::requried(true),
+            picker
+            (
+                set::placeholder($lang->entry->note->account),
+                set::name('account'),
+                set::items($users),
+                set::requried(false),
+                set::value($entry->account)
+            )
         )
     ),
     formRow
@@ -132,13 +141,16 @@ formPanel
         ),
         formGroup
         (
-            setClass('items-center ml-2'),
-            checkbox
+            div
             (
-                set::name('allIP'),
-                on::change('toggleAllIP'),
-                set::checked($entry->ip == '*'),
-                $lang->entry->note->allIP
+                setClass('items-center ml-2 my-auto'),
+                checkbox
+                (
+                    set::name('allIP'),
+                    on::change('toggleAllIP'),
+                    set::checked($entry->ip == '*'),
+                    $lang->entry->note->allIP
+                )
             )
         )
     ),