From 35675167083dc2b6186d4ca0877a14283f3e5a58 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Sat, 15 Jul 2023 02:27:18 +0000
Subject: [PATCH]  * Adjust the picker.

---
 module/build/control.php        |  2 +-
 module/testtask/js/common.ui.js | 15 +++++++++------
 module/testtask/js/create.ui.js | 15 +++++----------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/module/build/control.php b/module/build/control.php
index f3411df5e2..13857ea7f9 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -512,7 +512,7 @@ class build extends control
      * @access public
      * @return string
      */
-    public function ajaxGetExecutionBuilds(int $executionID, int $productID, string $varName, string $build = '', string|int $branch = 'all', int $index = 0, bool $needCreate = false, string $type = 'normal', string $number = '')
+    public function ajaxGetExecutionBuilds(int $executionID, int $productID, string $varName, string $build = '', string $branch = 'all', int $index = 0, bool $needCreate = false, string $type = 'normal', string $number = '')
     {
         $isJsonView = $this->app->getViewType() == 'json';
         if($varName == 'openedBuild')
diff --git a/module/testtask/js/common.ui.js b/module/testtask/js/common.ui.js
index c851369981..97d0d47f51 100644
--- a/module/testtask/js/common.ui.js
+++ b/module/testtask/js/common.ui.js
@@ -14,7 +14,7 @@ $(function()
  */
 function loadExecutionRelated()
 {
-    loadExecutionBuilds($('#execution').val());
+    loadExecutionBuilds();
 }
 
 /**
@@ -24,9 +24,10 @@ function loadExecutionRelated()
  * @access public
  * @return void
  */
-function loadExecutionBuilds(executionID)
+function loadExecutionBuilds()
 {
     const productID   = $('[name=product]').val();
+    const executionID = $('[name=execution]').val();
     var selectedBuild = $('[name=build]').val();
     if(!selectedBuild) selectedBuild = 0;
 
@@ -35,11 +36,12 @@ function loadExecutionBuilds(executionID)
 
     $.get(link, function(data)
     {
+        let $buildPicker = $('[name="build"]').zui('picker');
         if(data)
         {
             data = JSON.parse(data);
-            $('#build').picker({items: data});
-            $('#build').picker('setValue', '0');
+            $buildPicker.render({items: data});
+            $buildPicker.$.changeState({value: '0'});
         }
     });
 }
@@ -55,11 +57,12 @@ function loadTestReports(productID)
 {
     $.get($.createLink('testtask', 'ajaxGetTestReports', 'productID=' + productID), function(data)
     {
+        let $testreportPicker = $('[name="testreport"]').zui('picker');
         if(data)
         {
             data = JSON.parse(data);
-            $('#testreport').picker({items: data});
-            $('#testreport').picker('setValue', '0');
+            $testreportPicker.render({items: data});
+            $testreportPicker.$.changeState({value: '0'});
         }
     });
 }
diff --git a/module/testtask/js/create.ui.js b/module/testtask/js/create.ui.js
index 98ceb76cfa..cf3a62cc5a 100644
--- a/module/testtask/js/create.ui.js
+++ b/module/testtask/js/create.ui.js
@@ -6,12 +6,11 @@
  */
 function loadProductRelated()
 {
-    const productID   = $('[name=product]').val();
-    const executionID = $('[name=execution]').val();
+    const productID = $('[name=product]').val();
 
     loadExecutions(productID);
     loadTestReports(productID);
-    loadExecutionBuilds(executionID)
+    loadExecutionBuilds()
 }
 
 /**
@@ -25,16 +24,12 @@ function loadExecutions(productID)
 {
     $.get($.createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&projectID=' + projectID + '&branch='), function(data)
     {
+        let $executionPicker = $('[name="execution"]').zui('picker');
         if(data)
         {
             data = JSON.parse(data);
-            $('#execution').picker({items: data});
-            $('#execution').picker('setValue', $('[name=execution]').val());
+            $executionPicker.render({items: data});
+            $executionPicker.$.changeState({value: '0'});
         }
     });
 }
-
-$(function()
-{
-    loadProductRelated();
-});