diff --git a/lib/zin/wg/picker/v1.php b/lib/zin/wg/picker/v1.php index 6d3b9338b1..fa71816aaf 100644 --- a/lib/zin/wg/picker/v1.php +++ b/lib/zin/wg/picker/v1.php @@ -61,6 +61,7 @@ class picker extends wg 'searchDelay?: number', // 搜索延迟时间,单位:毫秒。 'searchHint?: string', // 搜索提示文本。 'searchEmptyHint?: string', // 搜索不到匹配项的提示。 + 'shareSelections?: string', // 共享选中状态。 'onDeselect?: function', // 当取消选择值时的回调函数。 'onSelect?: function', // 当选择值时的回调函数。 'onClear?: function', // 当清空值时的回调函数。 diff --git a/module/testtask/config/table.php b/module/testtask/config/table.php index 2b57dcf84e..6144f6771d 100644 --- a/module/testtask/config/table.php +++ b/module/testtask/config/table.php @@ -21,6 +21,12 @@ $config->testtask->dtable->fieldList['pri']['title'] = $lang->priAB; $config->testtask->dtable->fieldList['pri']['type'] = 'pri'; $config->testtask->dtable->fieldList['pri']['show'] = true; +$config->testtask->dtable->fieldList['productName']['name'] = 'productName'; +$config->testtask->dtable->fieldList['productName']['title'] = $lang->testtask->product; +$config->testtask->dtable->fieldList['productName']['type'] = 'text'; +$config->testtask->dtable->fieldList['productName']['group'] = 'text'; +$config->testtask->dtable->fieldList['productName']['show'] = true; + $config->testtask->dtable->fieldList['buildName']['name'] = 'buildName'; $config->testtask->dtable->fieldList['buildName']['title'] = $lang->testtask->build; $config->testtask->dtable->fieldList['buildName']['type'] = 'text'; @@ -29,12 +35,6 @@ $config->testtask->dtable->fieldList['buildName']['data-app'] = 'execution'; $config->testtask->dtable->fieldList['buildName']['group'] = 'text'; $config->testtask->dtable->fieldList['buildName']['show'] = true; -$config->testtask->dtable->fieldList['productName']['name'] = 'productName'; -$config->testtask->dtable->fieldList['productName']['title'] = $lang->testtask->product; -$config->testtask->dtable->fieldList['productName']['type'] = 'text'; -$config->testtask->dtable->fieldList['productName']['group'] = 'text'; -$config->testtask->dtable->fieldList['productName']['show'] = true; - $config->testtask->dtable->fieldList['executionName']['name'] = 'executionName'; $config->testtask->dtable->fieldList['executionName']['title'] = $lang->testtask->execution; $config->testtask->dtable->fieldList['executionName']['type'] = 'text'; diff --git a/module/testtask/tao.php b/module/testtask/tao.php index e60fc09033..34e2d334d5 100644 --- a/module/testtask/tao.php +++ b/module/testtask/tao.php @@ -19,7 +19,7 @@ class testtaskTao extends testtaskModel * @access protected * @return array */ - protected function fetchTesttaskList(int $productID, string $branch = '', int $projectID = 0, string $unit = 'no', string $scope = '', string $status = '', string $begin = '', string $end = '', string $orderBy = '', ?object $pager = null): array + public function fetchTesttaskList(int $productID, string $branch = '', int $projectID = 0, string $unit = 'no', string $scope = '', string $status = '', string $begin = '', string $end = '', string $orderBy = '', ?object $pager = null): array { return $this->dao->select("t1.*, t5.multiple, IF(t2.shadow = 1, t5.name, t2.name) AS productName, t3.name AS executionName, t4.name AS buildName, t4.branch AS branch, t5.name AS projectName") ->from(TABLE_TESTTASK)->alias('t1') diff --git a/module/testtask/ui/edit.html.php b/module/testtask/ui/edit.html.php index 0845f6b574..b94ab5ffdb 100644 --- a/module/testtask/ui/edit.html.php +++ b/module/testtask/ui/edit.html.php @@ -45,6 +45,7 @@ formPanel ), formGroup ( + setID('typeBox'), set::width('1/2'), set::label($lang->testtask->type), set::name('type[]'), diff --git a/module/testtask/zen.php b/module/testtask/zen.php index ce91265f2d..f844ac10be 100644 --- a/module/testtask/zen.php +++ b/module/testtask/zen.php @@ -433,7 +433,7 @@ class testtaskZen extends testtask $productID = $productID; $projectID = $this->lang->navGroup->testtask == 'qa' ? 0 : $this->session->project; $executionID = $task->execution; - $executions = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, '0', $projectID, 'stagefilter'); + $executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, '0', $projectID, 'stagefilter'); if($executionID && !isset($executions[$executionID])) { $execution = $this->loadModel('execution')->getById($executionID);