From aa129c189a314c79292e96e2170646a17bbebbc9 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Tue, 11 Jul 2023 11:25:12 +0800
Subject: [PATCH] * Change select to picker.

---
 module/custom/ui/set.html.php     | 14 +++++++-------
 module/project/ui/create.html.php | 17 +++++++++--------
 module/project/ui/edit.html.php   | 17 ++++++++++-------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/module/custom/ui/set.html.php b/module/custom/ui/set.html.php
index 5bd080fda5..eb23f0f525 100644
--- a/module/custom/ui/set.html.php
+++ b/module/custom/ui/set.html.php
@@ -302,13 +302,13 @@ elseif($module == 'user' && $field == 'contactField')
     (
         set::width('1/2'),
         set::label($lang->custom->user->fields['contactField']),
-        set::name('contactField'),
-        set::value($config->user->contactField),
-        set::control(array(
-            'type'     => 'select',
-            'multiple' => true,
-        )),
-        set::items($lang->user->contactFieldList)
+        picker
+        (
+            set::name('contactField'),
+            set::value($config->user->contactField),
+            set::multiple(true),
+            set::items($lang->user->contactFieldList)
+        )
     );
 
     if(common::hasPriv('custom', 'restore'))
diff --git a/module/project/ui/create.html.php b/module/project/ui/create.html.php
index ccb4e0f383..c41e0b2fc1 100644
--- a/module/project/ui/create.html.php
+++ b/module/project/ui/create.html.php
@@ -355,11 +355,10 @@ formPanel
                 div
                 (
                     setClass('grow'),
-                    select
+                    picker
                     (
                         set::name('products[0]'),
                         set::items($allProducts),
-                        set::multiple(false),
                         on::change('productChange')
                     )
                 ),
@@ -382,7 +381,7 @@ formPanel
             inputGroup
             (
                 $lang->product->branchName['branch'],
-                select
+                picker
                 (
                     set::name("branch[0][]"),
                     on::change('branchChange')
@@ -396,11 +395,10 @@ formPanel
             (
                 set::id("plan0"),
                 $lang->project->associatePlan,
-                select
+                picker
                 (
                     set::name('plans[0][]'),
                     set::items(null),
-                    set::multiple(false)
                 )
             ),
             div
@@ -503,10 +501,13 @@ formPanel
     formGroup
     (
         set::width('1/2'),
-        set::name('whitelist[]'),
         set::label($lang->whitelist),
-        set::items($users),
-        set::control(['type' => 'select', 'multiple' => false])
+        picker
+        (
+            set::name('whitelist[]'),
+            set::items($users),
+            set::multiple(true)
+        )
     ),
     formGroup
     (
diff --git a/module/project/ui/edit.html.php b/module/project/ui/edit.html.php
index 96ec35b14d..95c15b0131 100644
--- a/module/project/ui/edit.html.php
+++ b/module/project/ui/edit.html.php
@@ -68,7 +68,7 @@ if($linkedProducts)
                     div
                     (
                         setClass('grow'),
-                        select
+                        picker
                         (
                             set::name("products[$i]"),
                             set::value($product->id),
@@ -87,7 +87,7 @@ if($linkedProducts)
                 inputGroup
                 (
                     $lang->product->branchName['branch'],
-                    select
+                    picker
                     (
                         set::name("branch[$i][]"),
                         set::items($branches),
@@ -103,7 +103,7 @@ if($linkedProducts)
                 (
                     set::id("plan{$i}"),
                     $lang->project->associatePlan,
-                    select
+                    picker
                     (
                         set::name("plans[$product->id][]"),
                         set::items($plans),
@@ -400,11 +400,14 @@ formPanel
     formGroup
     (
         set::width('1/2'),
-        set::name('whitelist[]'),
         set::label($lang->whitelist),
-        set::value($project->whitelist),
-        set::items($users),
-        set::control(['type' => 'select', 'multiple' => false])
+        picker
+        (
+            set::name('whitelist[]'),
+            set::value($project->whitelist),
+            set::items($users),
+            set::multiple(true)
+        )
     ),
     formGroup
     (