" + desc.number + "、
";
+ stepDesc += "
" + desc.number + "、
";
})
}
else
{
- stepDesc += "
1、
";
+ stepDesc += "
1、
";
}
diff --git a/module/testcase/js/showxmindimport.ui.js b/module/testcase/js/showxmindimport.ui.js
index 9ef3eda558..7ff6d5870b 100644
--- a/module/testcase/js/showxmindimport.ui.js
+++ b/module/testcase/js/showxmindimport.ui.js
@@ -37,7 +37,7 @@ $(document).ready(function()
var data = mindmapMgr.toJson();
if(data.testcaseList.length == 0)
{
- alert(jsLng.caseNotExist);
+ zui.Modal.alert(jsLng.caseNotExist);
return;
}
@@ -48,7 +48,7 @@ $(document).ready(function()
form.append("sceneList", sceneList);
form.append("testcaseList", testcaseList);
- postAndLoadPage($.createLink('testcase', 'saveXmindImport'), form);
+ $.ajaxSubmit({url: $.createLink('testcase', 'saveXmindImport'), data: form});
})
});
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 702f2e2794..27bdef1761 100755
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -597,7 +597,7 @@ class testcaseModel extends model
$this->testcaseTao->updateCase2Project($oldCase, $case);
- if($case->stepChanged) $this->testcaseTao->updateStep($case, $oldCase);
+ if(!empty($case->stepChanged)) $this->testcaseTao->updateStep($case, $oldCase);
if($oldCase->lib && empty($oldCase->product))
{
@@ -613,7 +613,7 @@ class testcaseModel extends model
$this->loadModel('file')->processFile4Object('testcase', $oldCase, $case);
/* Join the steps to diff. */
- if($case->stepChanged && $case->steps)
+ if(!empty($case->stepChanged) && $case->steps)
{
$oldCase->steps = $this->joinStep($oldCase->steps);
$case->steps = $this->joinStep($this->getByID($oldCase->id, $case->version)->steps);
diff --git a/module/testcase/tao.php b/module/testcase/tao.php
index ff7c59ef33..44112e4e1a 100644
--- a/module/testcase/tao.php
+++ b/module/testcase/tao.php
@@ -321,7 +321,12 @@ class testcaseTao extends testcaseModel
*/
protected function getRelatedSteps(array $caseIdList): array
{
- return $this->dao->select('id, parent, `case`, version, type, `desc`, expect')->from(TABLE_CASESTEP)->where('`case`')->in($caseIdList)->orderBy('version desc,id')->fetchGroup('case', 'id');
+ return $this->dao->select('DISTINCT t2.id, t2.parent, t2.`case`, t2.version, t2.type, t2.`desc`, t2.expect')
+ ->from(TABLE_CASE)->alias('t1')
+ ->leftJoin(TABLE_CASESTEP)->alias('t2')->on('t1.version = t2.version')
+ ->where('t1.id')->in($caseIdList)
+ ->orderBy('t2.id')
+ ->fetchGroup('case', 'id');
}
/**
@@ -393,7 +398,7 @@ class testcaseTao extends testcaseModel
protected function updateCase2Project(object $oldCase, object $case): bool
{
$productChanged = $oldCase->product != $case->product;
- $storyChanged = $oldCase->story != $case->story;
+ $storyChanged = $oldCase->story != zget($case, 'story', $oldCase->story);
if(!$productChanged && !$storyChanged) return true;
@@ -620,7 +625,7 @@ class testcaseTao extends testcaseModel
$this->dao->insert(TABLE_SCENE)->data($scene)->autoCheck()->exec();
$sceneID = $this->dao->lastInsertID();
- $this->dao->update(TABLE_SCENE)->set('`order`')->eq($sceneID)->where('id')->eq($sceneID)->exec();
+ $this->dao->update(TABLE_SCENE)->set('sort')->eq($sceneID)->where('id')->eq($sceneID)->exec();
}
else
{
diff --git a/module/testcase/ui/browse.html.php b/module/testcase/ui/browse.html.php
index 4f1ba56a77..c0c655ad55 100644
--- a/module/testcase/ui/browse.html.php
+++ b/module/testcase/ui/browse.html.php
@@ -91,7 +91,7 @@ $footToolbar = $canBatchAction ? array('items' => array
$canImportToLib ? array('text' => $lang->testcase->importToLib, 'data-toggle' => 'modal', 'data-target' => '#importToLib', 'data-size' => 'sm') : null,
), 'btnProps' => array('size' => 'sm', 'btnType' => 'secondary')) : null;
-$footToolbar['items'] = array_values(array_filter($footToolbar['items']));
+$footToolbar['items'] = $canBatchAction ? array_values(array_filter($footToolbar['items'])) : array();
$cols = $isOnlyScene ? $this->config->scene->dtable->fieldList : $this->loadModel('datatable')->getSetting('testcase');
if(!empty($cols['actions']['list']))
diff --git a/module/testcase/zen.php b/module/testcase/zen.php
index 1171013c8c..109bd785b0 100755
--- a/module/testcase/zen.php
+++ b/module/testcase/zen.php
@@ -1417,10 +1417,11 @@ class testcaseZen extends testcase
* 构建导入用例的数据。
* Build cases for showing imported.
*
+ * @param int $productID
* @access protected
* @return array
*/
- protected function buildCasesForShowImport(): array
+ protected function buildCasesForShowImport(int $productID): array
{
/* 初始化变量。 */
/* Initialize variables. */
@@ -1444,6 +1445,7 @@ class testcaseZen extends testcase
$stepChanged = $this->buildUpdateCaseForShowImport($case, $oldCase, zget($oldSteps, $case->rawID, array()), $forceNotReview);
$case->id = $case->rawID;
+ $case->product = $productID;
$case->lastEditedBy = $account;
$case->lastEditedDate = $now;
if($case->story != $oldCase->story) $case->storyVersion = zget($storyVersionPairs, $case->story, 1);
@@ -1455,6 +1457,7 @@ class testcaseZen extends testcase
/* Build inserted case. */
else
{
+ $case->product = $productID;
$case->version = 1;
$case->openedBy = $this->app->user->account;
$case->openedDate = $now;
@@ -1983,6 +1986,7 @@ class testcaseZen extends testcase
protected function importCases(array $cases): void
{
$this->loadModel('action');
+ $daoErrors = array();
foreach($cases as $case)
{
if(isset($case->id))
@@ -2001,9 +2005,10 @@ class testcaseZen extends testcase
else
{
$caseID = $this->testcase->create($case);
- $this->testcase->syncCase2Project($case, $caseID);
+ dao::isError() ? $daoErrors = array_merge($daoErrors, dao::getError()) : $this->testcase->syncCase2Project($case, $caseID);
}
}
+ if(!empty($daoErrors)) dao::$errors = $daoErrors;
}
/**
@@ -2773,28 +2778,39 @@ class testcaseZen extends testcase
if(isset($relatedSteps[$case->id]))
{
- $i = $childID = 0;
+ $preGrade = 1;
+ $parentSteps = array();
+ $key = array(0, 0, 0);
foreach($relatedSteps[$case->id] as $step)
{
- $stepID = 0;
- if($step->type == 'group' || $step->type == 'step')
+ $grade = 1;
+ $parentSteps[$step->id] = $step->parent;
+ if(isset($parentSteps[$step->parent])) $grade = isset($parentSteps[$parentSteps[$step->parent]]) ? 3 : 2;
+
+ if($grade > $preGrade)
{
- $i ++;
- $childID = 0;
- $stepID = $i;
+ $key[$grade - 1] = 1;
}
else
{
- $stepID = $i . '.' . $childID;
+ if($grade < $preGrade)
+ {
+ if($grade < 2) $key[1] = 0;
+ if($grade < 3) $key[2] = 0;
+ }
+ $key[$grade - 1] ++;
}
- if($step->version != $case->version) continue;
+ $stepID = implode('.', $key);
+ $stepID = str_replace('.0', '', $stepID);
+ $stepID = str_replace('.0', '', $stepID);
$sign = (in_array($this->post->fileType, array('html', 'xml'))) ? '
' : "\n"; $case->stepDesc .= $stepID . ". " . htmlspecialchars_decode($step->desc) . $sign; $case->stepExpect .= $stepID . ". " . htmlspecialchars_decode($step->expect) . $sign; $case->real .= $stepID . ". " . (isset($result[$step->id]) ? $result[$step->id]['real'] : '') . $sign; - $childID ++; + + $preGrade = $grade; } } $case->stepDesc = trim($case->stepDesc); @@ -3113,7 +3129,11 @@ class testcaseZen extends testcase /* Get the content list from the zip file. */ $files = $zip->listContent(); $removePath = $files[0]['filename']; - if($zip->extract(PCLZIP_OPT_PATH, $filePath, PCLZIP_OPT_REMOVE_PATH, $removePath) === 0) return array('result' => 'fail', 'message' => $this->lang->testcase->errorXmindUpload); + + /* 限制解压的文件内容以阻止 ZIP 解压缩的目录穿越漏洞。*/ + /* Limit the file content to prevent the directory traversal vulnerability of ZIP decompression. */ + $extractFiles = array('content.xml', 'content.json'); + if($zip->extract(PCLZIP_OPT_PATH, $filePath, PCLZIP_OPT_BY_NAME, $extractFiles, PCLZIP_OPT_REMOVE_PATH, $removePath) == 0) return array('result' => 'fail', 'message' => $this->lang->testcase->errorXmindUpload); $this->classFile->removeFile($tmpFile); diff --git a/module/testreport/test/testreport.class.php b/module/testreport/test/testreport.class.php index 68dd4c48ad..20cdb62847 100644 --- a/module/testreport/test/testreport.class.php +++ b/module/testreport/test/testreport.class.php @@ -186,6 +186,7 @@ class testreportTest if(dao::isError()) return dao::getError(); + krsort($objects); $return = ''; foreach($objects as $object) $return .= "{$object->name}:{$object->value},"; return trim($return, ','); @@ -209,6 +210,7 @@ class testreportTest if(dao::isError()) return dao::getError(); $return = ''; + ksort($objects); foreach($objects as $object) $return .= "{$object->name}:{$object->value},"; return trim($return, ','); } diff --git a/module/testsuite/css/linkcase.ui.css b/module/testsuite/css/linkcase.ui.css deleted file mode 100644 index 95245bf46e..0000000000 --- a/module/testsuite/css/linkcase.ui.css +++ /dev/null @@ -1 +0,0 @@ -#featureBar .nav .btn > .icon.icon-back{color: var(--color-white);} diff --git a/module/testtask/js/common.ui.js b/module/testtask/js/common.ui.js index eb12c70add..4b72fb6b0f 100644 --- a/module/testtask/js/common.ui.js +++ b/module/testtask/js/common.ui.js @@ -46,9 +46,9 @@ window.loadExecutionBuilds = function() let oldBuild = $('[name="build"]').val(); $buildPicker.render({items: data}); executionID == 0 ? $buildPicker.$.setValue('') : $buildPicker.$.setValue(oldBuild); - if(data.length == 0) + if(data.length == 0 && executionID != 0) { - $('[name="build"]').closest('.input-group').find('.input-group-addon').removeClass('hidden'); + $('[name="build"]').closest('.input-group').find('.input-group-addon').removeClass('hidden').find('a').attr('href', $.createLink('build', 'create', "executionID=" + executionID + "&productID=" + productID + "&projectID=" + projectID)); } else { diff --git a/module/testtask/model.php b/module/testtask/model.php index bfe29270bc..71f9b5afa6 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1089,7 +1089,7 @@ class testtaskModel extends model $caseQuery = str_replace(array('t2.`assignedTo`', 't2.`lastRunner`', 't2.`lastRunDate`', 't2.`lastRunResult`'), array('t1.`assignedTo`', 't1.`lastRunner`', 't1.`lastRunDate`', 't1.`lastRunResult`'), $caseQuery); $orderBy = $this->addPrefixToOrderBy($sort); - return $this->dao->select('t2.*, t1.*, t3.title AS storyTitle, t2.status AS caseStatus')->from(TABLE_TESTRUN)->alias('t1') + return $this->dao->select('t2.*, t1.*, t3.title AS storyTitle, t2.status AS caseStatus, t2.version AS caseVersion')->from(TABLE_TESTRUN)->alias('t1') ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id') ->leftJoin(TABLE_STORY)->alias('t3')->on('t2.story = t3.id') ->where($caseQuery) diff --git a/module/todo/js/batchcreate.ui.js b/module/todo/js/batchcreate.ui.js index 1beea3dc75..b5b9da176e 100644 --- a/module/todo/js/batchcreate.ui.js +++ b/module/todo/js/batchcreate.ui.js @@ -71,15 +71,22 @@ window.initTime = function(e) if(isBegin) { let endValue = ''; - items.forEach(function(item, timeIndex) + if(!value) { - if(item.value == value) + endValue = items[0].value; + } + else + { + items.forEach(function(item, timeIndex) { - endIndex = timeIndex + 3; - endValue = items.length <= endIndex ? value : items[endIndex].value; - return; - } - }); + if(item.value == value) + { + endIndex = timeIndex + 3; + endValue = items.length <= endIndex ? '' : items[endIndex].value; + return; + } + }); + } $end.zui('picker').$.setValue(endValue); if(typeof endIndex != 'undefined') value = endIndex; } diff --git a/module/tree/model.php b/module/tree/model.php index 18966b62e8..244e379a0f 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -1401,6 +1401,19 @@ class treeModel extends model return html::a(helper::createLink('traincourse', 'practicebrowse', "moduleID={$module->id}"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'"); } + /** + * Create link of practice. + * + * @param string $type + * @param object $module + * @access public + * @return string + */ + public function createPracticeLink(string $type, object $module): string + { + return html::a(helper::createLink('traincourse', 'practicebrowse', "moduleID={$module->id}"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'"); + } + /** * 生成培训技能的链接。 * Create link of trainskill. @@ -1610,16 +1623,21 @@ class treeModel extends model * Get parents of a module. * * @param int $moduleID + * @param bool $queryAll * @access public * @return array */ - public function getParents(int $moduleID): array + public function getParents(int $moduleID, bool $queryAll = false): array { if($moduleID == 0) return array(); $path = $this->dao->select('path')->from(TABLE_MODULE)->where('id')->eq((int)$moduleID)->fetch('path'); $path = trim($path, ','); if(!$path) return array(); - return $this->dao->select('*')->from(TABLE_MODULE)->where('id')->in($path)->andWhere('deleted')->eq(0)->orderBy('grade')->fetchAll(); + return $this->dao->select('*')->from(TABLE_MODULE) + ->where('id')->in($path) + ->beginIF(!$queryAll)->andWhere('deleted')->eq(0)->fi() + ->orderBy('grade') + ->fetchAll(); } /** diff --git a/module/tree/test/model/getparents.php b/module/tree/test/model/getparents.php index ab02c41d58..b65f39a882 100755 --- a/module/tree/test/model/getparents.php +++ b/module/tree/test/model/getparents.php @@ -1,23 +1,33 @@ #!/usr/bin/env php getParents(); -timeout=0 cid=1 -- 获取 module 1 的父module @,1 +- 获取 module 1 的未删除父module @,1 -- 获取 module 2 的父module @,2 +- 获取 module 2 的未删除父module @,2 -- 获取 module 3 的父module @,3 +- 获取 module 3 的未删除父module @,3 -- 获取 module 6 的父module @,1,6 +- 获取 module 6 的未删除父module @,1,6 -- 获取 module 7 的父module @,2,7 +- 获取 module 7 的未删除父module @,2,7 -- 获取 module 8 的父module @,3,8 +- 获取 module 8 的未删除父module @,3,8 + +- 获取 module 1 的全部父module @,1 + +- 获取 module 2 的全部父module @,2 + +- 获取 module 3 的全部父module @,3 + +- 获取 module 6 的全部父module @,1,6 + +- 获取 module 7 的全部父module @,2,7 + +- 获取 module 8 的全部父module @,3,8 */ include dirname(__FILE__, 5) . '/test/lib/init.php'; @@ -28,9 +38,16 @@ zdTable('module')->config('module')->gen(100); $tree = new treeTest(); -r($tree->getParentsTest(1)) && p() && e(',1'); // 获取 module 1 的父module -r($tree->getParentsTest(2)) && p() && e(',2'); // 获取 module 2 的父module -r($tree->getParentsTest(3)) && p() && e(',3'); // 获取 module 3 的父module -r($tree->getParentsTest(6)) && p() && e(',1,6'); // 获取 module 6 的父module -r($tree->getParentsTest(7)) && p() && e(',2,7'); // 获取 module 7 的父module -r($tree->getParentsTest(8)) && p() && e(',3,8'); // 获取 module 8 的父module \ No newline at end of file +r($tree->getParentsTest(1)) && p() && e(',1'); // 获取 module 1 的未删除父module +r($tree->getParentsTest(2)) && p() && e(',2'); // 获取 module 2 的未删除父module +r($tree->getParentsTest(3)) && p() && e(',3'); // 获取 module 3 的未删除父module +r($tree->getParentsTest(6)) && p() && e(',1,6'); // 获取 module 6 的未删除父module +r($tree->getParentsTest(7)) && p() && e(',2,7'); // 获取 module 7 的未删除父module +r($tree->getParentsTest(8)) && p() && e(',3,8'); // 获取 module 8 的未删除父module + +r($tree->getParentsTest(1, true)) && p() && e(',1'); // 获取 module 1 的全部父module +r($tree->getParentsTest(2, true)) && p() && e(',2'); // 获取 module 2 的全部父module +r($tree->getParentsTest(3, true)) && p() && e(',3'); // 获取 module 3 的全部父module +r($tree->getParentsTest(6, true)) && p() && e(',1,6'); // 获取 module 6 的全部父module +r($tree->getParentsTest(7, true)) && p() && e(',2,7'); // 获取 module 7 的全部父module +r($tree->getParentsTest(8, true)) && p() && e(',3,8'); // 获取 module 8 的全部父module diff --git a/module/tree/test/tree.class.php b/module/tree/test/tree.class.php index 419d3d8d3a..18a7aef48f 100644 --- a/module/tree/test/tree.class.php +++ b/module/tree/test/tree.class.php @@ -551,12 +551,13 @@ class treeTest * Test get parents of a module. * * @param int $moduleID + * @param bool $queryAll * @access public * @return string */ - public function getParentsTest($moduleID) + public function getParentsTest($moduleID, $queryAll = false) { - $objects = $this->objectModel->getParents($moduleID); + $objects = $this->objectModel->getParents($moduleID, $queryAll); if(dao::isError()) return dao::getError(); diff --git a/module/upgrade/config/upgradeflow.php b/module/upgrade/config/upgradeflow.php index 2e90d1c6b3..a65ffbbb83 100644 --- a/module/upgrade/config/upgradeflow.php +++ b/module/upgrade/config/upgradeflow.php @@ -93,7 +93,8 @@ $config->upgrade->execFlow['18_7'] = array('functions' => 'processHistory $config->upgrade->execFlow['18_8'] = array('functions' => 'upgradeTesttaskMembers,deleteGeneralReportBlock,stopOldCron'); $config->upgrade->execFlow['18_9'] = array('functions' => 'addDefaultTraincoursePriv,renameBIModule,migrateXuanClientSettings'); $config->upgrade->execFlow['18_10_1'] = array('functions' => 'migrateAIModelConfig'); -$config->upgrade->execFlow['20_0_alpha1'] = array('functions' => 'revertStoryCustomFields,hideOA,updateMetricDateType,update1810,update18101,migrateAIModelConfig'); +$config->upgrade->execFlow['20_0_alpha1'] = array('functions' => 'revertStoryCustomFields'); +$config->upgrade->execFlow['20_0_beta1'] = array('functions' => 'hideOA,updateMetricDateType,update18101,migrateAIModelConfig'); if(!empty($config->isINT)) { diff --git a/module/upgrade/js/mergeprogram.ui.js b/module/upgrade/js/mergeprogram.ui.js index 1eb2d1bc23..3527ff6808 100644 --- a/module/upgrade/js/mergeprogram.ui.js +++ b/module/upgrade/js/mergeprogram.ui.js @@ -85,8 +85,8 @@ window.changeProjectType = function() const projectType = $('input[name=projectType]:checked').val(); $('.programForm, .formTitle').toggleClass('hidden', projectType == 'project' && mode == 'light'); - $('.createProjectTip').toggleClass('hidden', projectType == 'project'); - $('.createExecutionTip').toggleClass('hidden', projectType == 'execution'); + $('.createProjectTip').toggleClass('hidden', projectType != 'project'); + $('.createExecutionTip').toggleClass('hidden', projectType != 'execution'); $('[name=projectAcl]').closest('.check-list').toggleClass('hidden', projectType == 'project'); $('[name=programAcl]').closest('.check-list').toggleClass('hidden', projectType == 'execution'); $('.projectName').toggleClass('hidden', projectType == 'project'); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 9e99d63705..73fbe74f0f 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -8554,14 +8554,16 @@ class upgradeModel extends model } /** - * 检查是否添加了18.10版本的需求池字段，如果没有就添加。 - * Check if the demand pool field of version 18.10 is added, if not, add it. + * 检查是否添加了18.10.1版本的 AI 表，如果没有就添加。 + * Check if the AI table of version 18.10.1 is added, if not, add it. * * @access public * @return void */ public function update1810(): void { + if(!defined('TABLE_DEMANDPOOL')) return; + $fields = $this->dao->query('DESC ' . TABLE_DEMANDPOOL)->fetchAll(); foreach($fields as $field) { @@ -8576,17 +8578,15 @@ class upgradeModel extends model /** * 检查是否添加了18.10.1版本的需求反馈字段，如果没有就添加。 * Check if the demand feedback field of version 18.10.1 is added, if not, add it. +>>>>>>> * Fix bug for upgrade. * * @access public * @return void */ public function update18101(): void { - $fields = $this->dao->query('DESC ' . TABLE_DEMAND)->fetchAll(); - foreach($fields as $field) - { - if($field->Field == 'feedback') return; - } + $count = $this->dao->select('COUNT(*) AS count')->from('information_schema.TABLES')->where('TABLE_SCHEMA')->eq($this->config->db->name)->andWhere('TABLE_NAME')->eq(str_replace('`', '', TABLE_AI_MODEL))->fetch('count'); + if($count) return; /* Execute open edition. */ $this->saveLogs('Execute 18_10_1'); diff --git a/module/upgrade/test/model/computeproductacl.php b/module/upgrade/test/model/computeproductacl.php index 7bdb8281c2..380186ea7b 100644 --- a/module/upgrade/test/model/computeproductacl.php +++ b/module/upgrade/test/model/computeproductacl.php @@ -66,7 +66,7 @@ zdTable('user')->gen(5); $product = zdTable('product'); $product->program->range('0{2},1'); -$product->acl->range('custom,public,private'); +$product->acl->range('custom,open,private'); $product->gen(9); su('admin'); @@ -77,31 +77,31 @@ $productIdList = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9), array(10, $programID = array(0, 1, 2); $lineID = array(0, 1, null); -r($upgrade->computeProductAclTest($productIdList[0], $programID[0], $lineID[0])) && p() && e('1:0,private,0; 2:0,,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 0 lineID改为 0 -r($upgrade->computeProductAclTest($productIdList[0], $programID[0], $lineID[1])) && p() && e('1:0,private,1; 2:0,,1; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 0 lineID改为 1 -r($upgrade->computeProductAclTest($productIdList[0], $programID[0], $lineID[2])) && p() && e('1:0,private,1; 2:0,,1; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 0 lineID改为 null -r($upgrade->computeProductAclTest($productIdList[0], $programID[1], $lineID[0])) && p() && e('1:1,private,0; 2:1,,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 1 lineID改为 0 -r($upgrade->computeProductAclTest($productIdList[0], $programID[1], $lineID[1])) && p() && e('1:1,private,0; 2:1,,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 1 lineID改为 1 -r($upgrade->computeProductAclTest($productIdList[0], $programID[1], $lineID[2])) && p() && e('1:1,private,0; 2:1,,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 1 lineID改为 null -r($upgrade->computeProductAclTest($productIdList[0], $programID[2], $lineID[0])) && p() && e('1:1,private,0; 2:1,,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 2 lineID改为 0 -r($upgrade->computeProductAclTest($productIdList[0], $programID[2], $lineID[1])) && p() && e('1:1,private,0; 2:1,,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 2 lineID改为 1 -r($upgrade->computeProductAclTest($productIdList[0], $programID[2], $lineID[2])) && p() && e('1:1,private,0; 2:1,,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 2 lineID改为 null +r($upgrade->computeProductAclTest($productIdList[0], $programID[0], $lineID[0])) && p() && e('1:0,private,0; 2:0,open,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 0 lineID改为 0 +r($upgrade->computeProductAclTest($productIdList[0], $programID[0], $lineID[1])) && p() && e('1:0,private,1; 2:0,open,1; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 0 lineID改为 1 +r($upgrade->computeProductAclTest($productIdList[0], $programID[0], $lineID[2])) && p() && e('1:0,private,1; 2:0,open,1; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 0 lineID改为 null +r($upgrade->computeProductAclTest($productIdList[0], $programID[1], $lineID[0])) && p() && e('1:1,private,0; 2:1,open,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 1 lineID改为 0 +r($upgrade->computeProductAclTest($productIdList[0], $programID[1], $lineID[1])) && p() && e('1:1,private,0; 2:1,open,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 1 lineID改为 1 +r($upgrade->computeProductAclTest($productIdList[0], $programID[1], $lineID[2])) && p() && e('1:1,private,0; 2:1,open,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 1 lineID改为 null +r($upgrade->computeProductAclTest($productIdList[0], $programID[2], $lineID[0])) && p() && e('1:1,private,0; 2:1,open,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 2 lineID改为 0 +r($upgrade->computeProductAclTest($productIdList[0], $programID[2], $lineID[1])) && p() && e('1:1,private,0; 2:1,open,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 2 lineID改为 1 +r($upgrade->computeProductAclTest($productIdList[0], $programID[2], $lineID[2])) && p() && e('1:1,private,0; 2:1,open,0; 3:1,private,2;'); // 测试更新产品 1 2 3 的项目集ID改为 2 lineID改为 null -r($upgrade->computeProductAclTest($productIdList[1], $programID[0], $lineID[0])) && p() && e('4:0,private,0; 5:0,,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 0 lineID改为 0 -r($upgrade->computeProductAclTest($productIdList[1], $programID[0], $lineID[1])) && p() && e('4:0,private,1; 5:0,,1; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 0 lineID改为 1 -r($upgrade->computeProductAclTest($productIdList[1], $programID[0], $lineID[2])) && p() && e('4:0,private,1; 5:0,,1; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 0 lineID改为 null -r($upgrade->computeProductAclTest($productIdList[1], $programID[1], $lineID[0])) && p() && e('4:1,private,0; 5:1,,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 1 lineID改为 0 -r($upgrade->computeProductAclTest($productIdList[1], $programID[1], $lineID[1])) && p() && e('4:1,private,0; 5:1,,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 1 lineID改为 1 -r($upgrade->computeProductAclTest($productIdList[1], $programID[1], $lineID[2])) && p() && e('4:1,private,0; 5:1,,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 1 lineID改为 null -r($upgrade->computeProductAclTest($productIdList[1], $programID[2], $lineID[0])) && p() && e('4:1,private,0; 5:1,,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 2 lineID改为 0 -r($upgrade->computeProductAclTest($productIdList[1], $programID[2], $lineID[1])) && p() && e('4:1,private,0; 5:1,,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 2 lineID改为 1 -r($upgrade->computeProductAclTest($productIdList[1], $programID[2], $lineID[2])) && p() && e('4:1,private,0; 5:1,,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 2 lineID改为 null +r($upgrade->computeProductAclTest($productIdList[1], $programID[0], $lineID[0])) && p() && e('4:0,private,0; 5:0,open,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 0 lineID改为 0 +r($upgrade->computeProductAclTest($productIdList[1], $programID[0], $lineID[1])) && p() && e('4:0,private,1; 5:0,open,1; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 0 lineID改为 1 +r($upgrade->computeProductAclTest($productIdList[1], $programID[0], $lineID[2])) && p() && e('4:0,private,1; 5:0,open,1; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 0 lineID改为 null +r($upgrade->computeProductAclTest($productIdList[1], $programID[1], $lineID[0])) && p() && e('4:1,private,0; 5:1,open,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 1 lineID改为 0 +r($upgrade->computeProductAclTest($productIdList[1], $programID[1], $lineID[1])) && p() && e('4:1,private,0; 5:1,open,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 1 lineID改为 1 +r($upgrade->computeProductAclTest($productIdList[1], $programID[1], $lineID[2])) && p() && e('4:1,private,0; 5:1,open,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 1 lineID改为 null +r($upgrade->computeProductAclTest($productIdList[1], $programID[2], $lineID[0])) && p() && e('4:1,private,0; 5:1,open,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 2 lineID改为 0 +r($upgrade->computeProductAclTest($productIdList[1], $programID[2], $lineID[1])) && p() && e('4:1,private,0; 5:1,open,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 2 lineID改为 1 +r($upgrade->computeProductAclTest($productIdList[1], $programID[2], $lineID[2])) && p() && e('4:1,private,0; 5:1,open,0; 6:1,private,5;'); // 测试更新产品 4 5 6 的项目集ID改为 2 lineID改为 null -r($upgrade->computeProductAclTest($productIdList[2], $programID[0], $lineID[2])) && p() && e('7:0,private,6; 8:0,,7; 9:1,private,8;'); // 测试更新产品 7 8 9 的项目集ID改为 0 lineID改为 null -r($upgrade->computeProductAclTest($productIdList[2], $programID[0], $lineID[1])) && p() && e('7:0,private,1; 8:0,,1; 9:1,private,8;'); // 测试更新产品 7 8 9 的项目集ID改为 0 lineID改为 1 -r($upgrade->computeProductAclTest($productIdList[2], $programID[1], $lineID[2])) && p() && e('7:1,private,1; 8:1,,1; 9:1,private,8;'); // 测试更新产品 7 8 9 的项目集ID改为 1 lineID改为 null -r($upgrade->computeProductAclTest($productIdList[2], $programID[1], $lineID[1])) && p() && e('7:1,private,1; 8:1,,1; 9:1,private,8;'); // 测试更新产品 7 8 9 的项目集ID改为 1 lineID改为 1 -r($upgrade->computeProductAclTest($productIdList[2], $programID[2], $lineID[2])) && p() && e('7:1,private,1; 8:1,,1; 9:1,private,8;'); // 测试更新产品 7 8 9 的项目集ID改为 2 lineID改为 null -r($upgrade->computeProductAclTest($productIdList[2], $programID[2], $lineID[1])) && p() && e('7:1,private,1; 8:1,,1; 9:1,private,8;'); // 测试更新产品 7 8 9 的项目集ID改为 2 lineID改为 1 +r($upgrade->computeProductAclTest($productIdList[2], $programID[0], $lineID[2])) && p() && e('7:0,private,6; 8:0,open,7; 9:1,private,8;'); // 测试更新产品 7 8 9 的项目集ID改为 0 lineID改为 null +r($upgrade->computeProductAclTest($productIdList[2], $programID[0], $lineID[1])) && p() && e('7:0,private,1; 8:0,open,1; 9:1,private,8;'); // 测试更新产品 7 8 9 的项目集ID改为 0 lineID改为 1 +r($upgrade->computeProductAclTest($productIdList[2], $programID[1], $lineID[2])) && p() && e('7:1,private,1; 8:1,open,1; 9:1,private,8;'); // 测试更新产品 7 8 9 的项目集ID改为 1 lineID改为 null +r($upgrade->computeProductAclTest($productIdList[2], $programID[1], $lineID[1])) && p() && e('7:1,private,1; 8:1,open,1; 9:1,private,8;'); // 测试更新产品 7 8 9 的项目集ID改为 1 lineID改为 1 +r($upgrade->computeProductAclTest($productIdList[2], $programID[2], $lineID[2])) && p() && e('7:1,private,1; 8:1,open,1; 9:1,private,8;'); // 测试更新产品 7 8 9 的项目集ID改为 2 lineID改为 null +r($upgrade->computeProductAclTest($productIdList[2], $programID[2], $lineID[1])) && p() && e('7:1,private,1; 8:1,open,1; 9:1,private,8;'); // 测试更新产品 7 8 9 的项目集ID改为 2 lineID改为 1 r($upgrade->computeProductAclTest($productIdList[3], $programID[0], $lineID[0])) && p() && e('0'); // 测试更新不存在的产品 10 11 12 的项目集ID改为 0 lineID改为 0 diff --git a/module/upgrade/test/model/createproject.php b/module/upgrade/test/model/createproject.php index 6521369a68..2247475569 100644 --- a/module/upgrade/test/model/createproject.php +++ b/module/upgrade/test/model/createproject.php @@ -27,8 +27,8 @@ zdTable('user')->gen(5); zdTable('action')->gen(0); $project = zdTable('project'); -$project->begin->range('2023-11-01'); -$project->end->range('2023-12-31'); +$project->begin->range('2023-11-01')->type('timestamp')->format('YYYY-MM-DD'); +$project->end->range('2023-12-31')->type('timestamp')->format('YYYY-MM-DD'); $project->gen(2); su('admin'); @@ -62,9 +62,9 @@ $emptyName->PM = 'user1'; $programID = array(1, 2); -r($upgrade->createProjectTest($programID[0], $project1)) && p() && e('project:3,项目1,2059-12-31,open; program:0000-00-00,0000-00-00; actionCount:2'); // 测试创建 project1 到项目集 1 -r($upgrade->createProjectTest($programID[0], $project2)) && p() && e('project:4,项目2,2024-12-31,open; program:0000-00-00,2024-12-31; actionCount:1'); // 测试创建 project2 到项目集 1 -r($upgrade->createProjectTest($programID[1], $project1)) && p() && e('project:5,项目1,2059-12-31,open; program:0000-00-00,0000-00-00; actionCount:2'); // 测试创建 project1 到项目集 2 -r($upgrade->createProjectTest($programID[1], $project2)) && p() && e('project:6,项目2,2024-12-31,open; program:0000-00-00,2024-12-31; actionCount:1'); // 测试创建 project2 到项目集 2 +r($upgrade->createProjectTest($programID[0], $project1)) && p() && e('project:3,项目1,2059-12-31,open; program:2023-12-01,2024-03-12; actionCount:2'); // 测试创建 project1 到项目集 1 +r($upgrade->createProjectTest($programID[0], $project2)) && p() && e('project:4,项目2,2024-12-31,open; program:2021-12-01,2024-12-31; actionCount:1'); // 测试创建 project2 到项目集 1 +r($upgrade->createProjectTest($programID[1], $project1)) && p() && e('project:5,项目1,2059-12-31,open; program:2023-12-01,2024-03-12; actionCount:2'); // 测试创建 project1 到项目集 2 +r($upgrade->createProjectTest($programID[1], $project2)) && p() && e('project:6,项目2,2024-12-31,open; program:2021-12-01,2024-12-31; actionCount:1'); // 测试创建 project2 到项目集 2 r($upgrade->createProjectTest($programID[0], $emptyName)) && p('name:0') && e('『项目名称』不能为空。'); // 测试创建 项目名称空 的项目到项目集 1 r($upgrade->createProjectTest($programID[1], $project1)) && p('name:0') && e('『项目名称』已经有『项目1』这条记录了。如果您确定该记录已删除，请到后台-系统设置-回收站还原。'); // 测试重复创建 project1 到项目集 2 diff --git a/module/upgrade/ui/createprogram.html.php b/module/upgrade/ui/createprogram.html.php index 4685fe4e7b..3e17c3d144 100644 --- a/module/upgrade/ui/createprogram.html.php +++ b/module/upgrade/ui/createprogram.html.php @@ -25,7 +25,7 @@ $createProgram = function($data) div(setClass('createProjectTip text-gray ' . ($data->projectType == 'project' ? '' : 'hidden')), html($lang->upgrade->createProjectTip)), div(setClass('createExecutionTip text-gray ' . ($data->projectType == 'execution' ? '' : 'hidden')), html($lang->upgrade->createExecutionTip)) ), - formRowGroup(set::class('formTitle'), set::title($data->systemMode == 'light' ? $lang->upgrade->setProject : $lang->upgrade->setProgram), set::items(array())), + formRowGroup(setClass('formTitle'), set::title($data->systemMode == 'light' ? $lang->upgrade->setProject : $lang->upgrade->setProgram), set::items(array())), div ( setClass('programForm mt-4 form-horz'), diff --git a/module/user/ui/bug.html.php b/module/user/ui/bug.html.php index b800c17b50..11c82c9c9f 100644 --- a/module/user/ui/bug.html.php +++ b/module/user/ui/bug.html.php @@ -47,6 +47,8 @@ div set::bordered(true), set::cols($cols), set::data(array_values($bugs)), + set::priList($lang->bug->priList), + set::severityList($lang->bug->severityList), set::orderBy($orderBy), set::sortLink(inlink('bug', "userID={$user->id}&type={$type}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::footPager(usePager()) diff --git a/module/zanode/js/create.ui.js b/module/zanode/js/create.ui.js index 636f1cd848..4aa73041c2 100644 --- a/module/zanode/js/create.ui.js +++ b/module/zanode/js/create.ui.js @@ -24,10 +24,10 @@ function onChangeType() } } -function onHostChange(event) +function onHostChange(host) { - var hostID = $(event.target).val(); - var link = $.createLink('zanode', 'ajaxGetImages', 'hostID=' + hostID); + const hostID = typeof host == 'object' ? $('[name=parent]').val() : host; + var link = $.createLink('zanode', 'ajaxGetImages', 'hostID=' + hostID); $.get(link, function(data) { if(data) @@ -106,3 +106,8 @@ function onChangeSystem(event) $osPicker.render({items: osItems}); $osPicker.$.clear(); } + +$(function() +{ + if(hostID) onHostChange(hostID); +}); diff --git a/module/zanode/ui/create.html.php b/module/zanode/ui/create.html.php index 6a19ee0f0d..ade04318d8 100644 --- a/module/zanode/ui/create.html.php +++ b/module/zanode/ui/create.html.php @@ -12,6 +12,7 @@ namespace zin; jsVar('linuxList', $config->zanode->linuxList); jsVar('windowsList', $config->zanode->windowsList); +jsVar('hostID', $hostID); formPanel ( @@ -26,10 +27,10 @@ formPanel ( array ( - 'toggle' => 'tooltip', - 'placement' => 'right', - 'title' => $lang->zanode->tips, - 'type' => 'white', + 'toggle' => 'tooltip', + 'placement' => 'right', + 'title' => $lang->zanode->tips, + 'type' => 'white', 'class-name' => 'text-gray border border-light' ) ), @@ -181,5 +182,3 @@ formPanel set::control('editor') ) ); - -render(); diff --git a/test/data/cron.yaml b/test/data/cron.yaml index d6e6862eba..b9dee9d29b 100644 --- a/test/data/cron.yaml +++ b/test/data/cron.yaml @@ -81,10 +81,6 @@ fields: loop: 0 format: "" - field: lastTime - note: "最后执行时间" - from: common.date.v1.yaml - use: dateA - prefix: "" - postfix: "" - loop: 0 - format: "" + range: "(-1M)-(+1w):-1D" + type: timestamp + format: "YYYY-MM-DD hh:mm:ss" diff --git a/test/data/project.yaml b/test/data/project.yaml index dfd3661f04..521a2ea0ec 100644 --- a/test/data/project.yaml +++ b/test/data/project.yaml @@ -94,5 +94,7 @@ fields: range: 1 - field: category range: '' + - field: hasProduct + range: 1 - field: deleted range: 0 diff --git a/test/data/searchindex.yaml b/test/data/searchindex.yaml index c53d3f47a6..0ab49b69e7 100644 --- a/test/data/searchindex.yaml +++ b/test/data/searchindex.yaml @@ -40,17 +40,11 @@ fields: format: "" - field: addedDate note: "添加日期" - from: common.date.v1.yaml - use: dateA - prefix: "" - postfix: "" - loop: 0 - format: "" + range: "(-1M)-(+1w):-1D" + type: timestamp + format: "YYYY-MM-DD hh:mm:ss" - field: editedDate note: "编辑日期" - from: common.date.v1.yaml - use: dateA - prefix: "" - postfix: "" - loop: 0 - format: "" + range: "(-1M)-(+1w):-1D" + type: timestamp + format: "YYYY-MM-DD hh:mm:ss" diff --git a/www/js/zui/min.js b/www/js/zui/min.js index 95ad52d9b9..a56f698491 100644 --- a/www/js/zui/min.js +++ b/www/js/zui/min.js @@ -1,7 +1,7 @@ /*! * ZUI: ZUI for Zentao - v1.10.0 - 2024-03-08 * http://openzui.com - * GitHub: https://github.com/easysoft/zui.git + * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2024 cnezsoft.com; Licensed MIT */ function showEditCheckbox(t){if($(".icon-project,.icon-waterfall,.icon-scrum,.icon-kanban,.icon-agileplus,.icon-waterfallplus,.icon-ipd").each(function(){if($this=$(this),$tr=$(this).closest("tr"),projectID=$tr.attr("data-id"),t){var e=$tr.find("td:first").find("span.table-nest-icon").css("margin-left");$tr.find("td:first").prepend(""),$tr.find("td:first").find(".checkbox-primary").css("margin-left",e).css("width","14"),$tr.find("td:first").find("span.table-nest-icon").css("margin-left","0")}else{var e=$tr.find("td:first").find(".checkbox-primary").css("margin-left");$tr.find("td:first").find("span.table-nest-icon").css("margin-left",e),$tr.find("td:first").find('[name^="projectIdList"]').parent().remove()}}),t&&hasProject){var e="
";$("#programForm").attr("action",createLink("project","batchEdit","from=program")),$(".table-footer").prepend(e).show(),$("body").scroll()}else $("#programForm").removeClass("has-row-checked"),$("#projectsSummary").addClass("hidden"),$("#programSummary").removeClass("hidden"),$("#programForm").find(".editCheckbox").remove(),0==$("#programForm .pager").length&&$(".table-footer").hide(),$("#programForm").removeAttr("action")}!function(t,e,i){"use strict";if("undefined"==typeof t)throw new Error("ZUI requires jQuery");Number.isNaN||"function"!=typeof isNaN||(Number.isNaN=isNaN),Number.parseInt||"function"!=typeof parseInt||(Number.parseInt=parseInt),Number.parseFloat||"function"!=typeof parseFloat||(Number.parseFloat=parseFloat),t.zui||(t.zui=function(e){t.isPlainObject(e)&&t.extend(t.zui,e)});var n={all:-1,left:0,middle:1,right:2},o=0;t.zui({uuid:function(t){var e=1e5*(Date.now()-1580890015292)+10*Math.floor(1e4*Math.random())+o++%10;return t?e:e.toString(36)},callEvent:function(t,e,n){if("function"==typeof t){n!==i&&(t=t.bind(n));var o=t(e);return e&&(e.result=o),!(o!==i&&!o)}return 1},strCode:function(t){var e=0;if("string"!=typeof t&&(t=String(t)),t&&t.length)for(var i=0;i
");return n},a.prototype.createSizeMenu=function(){var e=this,i=this.state,n=t(''),o=e.options.pageSizeOptions;"string"==typeof o&&(o=o.split(","));for(var a=0;a
'+s.totalCount+"
").format(n));case"page_text":return t((''+s.pageOf+"
").format(n));case"total_page_text":return t((''+s.totalPage+"
").format(n));case"page_of_total_text":return t((''+s.pageOfTotal+"
").format(n));case"page_size_text":return t((''+s.pageSize+"
").format(n));case"items_range_text":return t((''+s.itemsRange+"
").format(n));case"goto":return o.createGoto();case"size_menu":return o.createSizeMenu();default:return t("").html(e.format(n))}},a.prototype.createLink=function(i,n){i===e&&(i=this.state.page),n===e&&(n=this.state);var o=this.options.linkCreator;return"string"==typeof o?o.format(t.extend({},n,{page:i})):"function"==typeof o?o(i,n):"#page="+i},a.prototype.render=function(e){var i=this,n=i.state,o=i.options.elementCreator||i.createElement,a=t.isPlainObject(o);e=e||i.elements||i.options.elements,"string"==typeof e&&(e=e.split(",")),i.elements=e,i.$.empty();for(var s=0;s');a.allowSingleDeselect&&x.append(''),x.appendTo(y),l.$singleSelection=x}v.toggleClass("picker-input-empty",!w.val().length).append(y),l.$container=v,l.$selections=y,l.$search=w,l.search="";var C=a.placeholder;if(void 0===C&&(C=d.attr("placeholder")),"string"==typeof C&&C.length&&y.append(t('').text(C)),a.placeholder=C,a.fixLabelFor){var k=d.attr("id");k&&t('label[for="'+k+'"]').attr("for",b)}var _=void 0!==a.defaultValue?a.defaultValue:d.val();if(null===_&&(_=""),l.setValue(_,!0),l.setDisabled(),w.on("focus",function(){l.disabled||(l._blurTimer&&(clearTimeout(l._blurTimer),l._blurTimer=0),v.addClass("picker-focus"),l.options.disableEmptySearch&&"string"==typeof l.search&&!l.search.length||l.showDropList())}).on("blur",function(){l.disabled||(l._blurTimer&&clearTimeout(l._blurTimer),l._blurTimer=setTimeout(function(){l._blurTimer=0,w.is(":focus")||v.removeClass("picker-focus")},100))}).on("input change",function(){if(!l.disabled){var t=w.val();if(g&&w.width(14*t.length),v.toggleClass("picker-input-empty",!t.length),l.tryUpdateList(t),a.disableEmptySearch){const e="string"!=typeof t||t.length;!l.dropListShowed&&e?l.showDropList():l.dropListShowed&&!e&&l.hideDropList()}}}),a.hotkey&&w.on("keydown",function(t){if(!l.disabled){var e=t.key||t.which;if(l.dropListShowed){var i=l.activeValue,n="string"==typeof i;if("Enter"===e||13===e)n&&(l.select(i,g),g?(l.$search.val(""),l.tryUpdateList("")):w.blur(),t.preventDefault(),t.stopPropagation());else if("ArrowDown"===e||40===e){var o,s=l.$activeOption;if(s&&(o=s.next(".picker-option"),g))for(;o.length&&o.hasClass("picker-option-selected");)o=o.next(".picker-option");o&&o.length||(o=l.$optionsList.children(g?".picker-option:not(.picker-option-selected)":".picker-option").first()),o.length&&l.activeOption(o),t.preventDefault(),t.stopPropagation()}else if("ArrowUp"===e||30===e){var r,s=l.$activeOption;if(s&&(r=s.prev(".picker-option"),g))for(;r.length&&r.hasClass("picker-option-selected");)r=r.prev(".picker-option");r&&r.length||(r=l.$optionsList.children(g?".picker-option:not(.picker-option-selected)":".picker-option").last()),r.length&&l.activeOption(r),t.preventDefault(),t.stopPropagation()}else"Escape"===e||27===e?l.hideDropList(!0):a.deleteByBackspace&&g&&("Backspace"===e||8===e)&&l.value&&l.value.length&&!w.val().length&&l.deselect(l.value[l.value.length-1])}}}),g){y.on("mousedown",function(t){if(!l.disabled)return l.dropListShowed&&!a.checkable?(t.preventDefault(),void t.stopPropagation()):void 0}).on("mouseup",function(e){l.disabled||y.hasClass("sortable-sorting")||t(e.target).closest(".picker-selection-remove").length||l.dropListShowed&&!a.checkable||l.focus()});var T=a.sortValuesByDnd;if(T&&t.fn.sortable){v.addClass("picker-sortable");var S={selector:".picker-selection",stopPropagation:!0,start:function(){l.hideDropList(!0)},finish:function(e){var i=[];t.each(e.list,function(t,e){i.push(e.item.data("value"))}),l.setValue(i.slice(),!1,!0)}};"object"==typeof T&&t.extend(S,T),y.sortable(S)}}if(y.on("click",".picker-selection-remove",function(e){if(!l.disabled){if(l.multi){var i=t(this).closest(".picker-selection");l.deselect(i.data("value"))}else l.deselect();e.stopPropagation()}}),d.on("chosen:updated",function(){l.updateFromSelect(!1),l.setValue(d.val(),!0),l.setDisabled(),l.updateList()}).on("chosen:activate",l.focus).on("chosen:open",l.showDropList).on("chosen:close",l.hideDropList),v.addClass("picker-ready"),t.zui.asap(function(){l.triggerEvent("ready",{picker:l},"","chosen:ready")}),!a.disableScrollOnShow){var D=a.hideOnScroll;D&&![e,i,!0].includes(D)&&t(D).on("scroll",this.handleParentScroll.bind(this))}};r.prototype.destroy=function(){var e=this,i=e.options;e.hideDropList(!0);var o=e.$search;o.off("focus blur input change"),i.hotkey&&o.off("keydown"),o.remove();var a=e.$selections;a.off("click"),e.multi&&a.off("mousedown mouseup"),a.remove();var s=e.$formItem;e.selectOptionsBackup&&(s.empty(),t.each(e.selectOptionsBackup,function(e,n){var o={value:n[i.valueKey]},a=n[i.keysKey];void 0!==a&&(o["data-"+i.keysKey]=a),s.append(t("").attr(o).text(n[i.textKey]))})),s.off("chosen:updated chosen:activate chosen:open chosen:close").val(e.value).show(),!e.selfFormItem&&e.$.hasClass("picker")||e.$container.remove(),this.destroyDropList(0),e.$.data(n,null)},r.prototype.focus=function(){this.$search.focus()},r.prototype.select=function(t,e){var i=this;if(i.$search.val()&&i.$search.val(""),!i.isSelectedValue(t)){if(i.triggerEvent("select",{value:t,picker:i})===!1)return;if(i.multi){var n=i.value;n=n?n.slice():[],n.push(t),i.setValue(n)}else i.setValue(t)}e||i.hideDropList()},r.prototype.deselect=function(t){var e=this;if(e.multi){if(!e.isSelectedValue(t))return;if(e.triggerEvent("deselect",{value:t,picker:e})===!1)return;var i=e.value;if(i&&i.length)for(var n=0;n
','",'","
"].join("")).appendTo(i),e.$actions.on("click",".picker-action",function(i){var n=t(this).data("type");"select-all"===n?e.selectAll(s):"deselect-all"===n&&e.deselectAll(s)})),e.$message=t('').appendTo(i),e.$dropMenu=i,e.$optionsList=a}e.updateList(e.search,!1,function(){e.triggerEvent("showedDrop",{picker:e},"","chosen:showing_dropdown")}),e.$dropMenu.addClass("picker-drop-show")}},r.prototype.hideDropList=function(e){var i=this;if(i.triggerEvent("hidingDrop",{picker:i})!==!1){i.dropListShowed=!1,i.$activeOption=null,i.activeValue=null,i.$search.val(""),i.search="",delete o[i.id],i.$dropMenu&&i.$dropMenu.removeClass("picker-drop-show"),i.options.disableScrollOnShow&&t.zui.resetBodyScrollbar(),e&&this.$search.blur(),i.triggerEvent("hiddenDrop",{picker:i},"","chosen:hiding_dropdown");var n=i.options.autoClearDrop;n&&i.destroyDropList(n)}},r.prototype.updateFromSelect=function(e){var i=this,n=i.options,o=[];void 0===e&&(e=!0);var a=i.$formItem.children("option");a.length&&(a.each(function(){var e=t(this),a=e.val(),s=e.text();if(n.onUpdateSelectOption){var r=n.onUpdateSelectOption(e,i);r&&o.push(r)}else if(s.length||a.length){var r={};r[n.valueKey]=a,r[n.textKey]=s,r[n.keysKey]=e.data(n.keysKey),r.disabled=e.attr("disabled"),o.push(r)}var l=n.allowSingleDeselect;"auto"!==l&&null!==l&&void 0!==l||a.length||(n.allowSingleDeselect=!0)}),i.selectOptionsBackup=o.slice()),i.setList(o,e)},r.prototype.setList=function(t,e){var i=this,n=i.options,o=e?[]:i.list||[],a=e?{}:i.listMap||{};"string"==typeof t&&(t=t.split(n.multiValueSplitter));for(var s=0;s"+i+"
";e>0?($("#programSummary").addClass("hidden"),$("#projectsSummary").remove(),$(".editCheckbox").after(n)):($("#programSummary").removeClass("hidden"),$("#projectsSummary").addClass("hidden"))}),$(document).on("click",".table-footer #checkAll",function(){if($(this).prop("checked")){$(":checkbox[name^='projectIdList']").prop("checked",!0),$("#programForm").addClass("has-row-checked");var t=$(":checkbox[name^='projectIdList']:checked").length,e=checkedProjects.replace("%s",t);"en"==cilentLang&&t<2&&(e=e.replace("items","item"));var i=""+e+"
";$("#programSummary").addClass("hidden"),$("#projectsSummary").remove(),$(".editCheckbox").after(i),$(this).next("label").addClass("hover")}else $(":checkbox[name^='projectIdList']").prop("checked",!1),$("#programForm").removeClass("has-row-checked"),$("#programSummary").removeClass("hidden"),$("#projectsSummary").addClass("hidden"),$(this).next("label").removeClass("hover")}),setTimeout(function(){$(":checkbox[name^='projectIdList']").each(function(){$(this).prop("checked",!1)}),$(".table-footer #checkAll").prop("checked",!1)},10)}),function(t,e,i){t.fn._ajaxForm=t.fn.ajaxForm;var n={timeout:e.config?e.config.timeout:0,dataType:"json",method:"post"},o="";t.fn.enableForm=function(e,n,o){return e===i&&(e=!0),this.each(function(){var i=t(this);n||i.find('[type="submit"]').attr("disabled",e?null:"disabled"),!o&&i.hasClass("load-indicator")&&i.toggleClass("loading",!e),i.toggleClass("form-disabled",!e)})},t.enableForm=function(e,i,n,o){"string"==typeof e||e instanceof t?e=t(e):(o=n,n=i,i=e,e=t("form")),e.enableForm(i!==!1,n,o)},t.disableForm=function(e,i,n){t.enableForm(e,!1,i,n)};var a=function(e,i,n){i=i||"show",t.zui.messager?(n?n.html=!0:n={html:!0},e=e.toString().replace(/\n/g,""),t.zui.messager[i](e,n)):alert(e)};t.ajaxForm=function(s,r){var l=t(s);if(l.length>1)return l.each(function(){t.ajaxForm(this,r)});"function"==typeof r&&(r={complete:r}),r=t.extend({},n,l.data(),r);var c=r.beforeSubmit,h=r.error,d=r.success,u=r.finish;delete r.finish,delete r.success,delete r.onError,delete r.beforeSubmit,r=t.extend({beforeSubmit:function(n,a,s){if((c&&c(n,a,s))===!1)return!1;l.removeClass("form-watched").enableForm(!1);var r={},h=a.find('[type="file"]');r.fileapi=h.length&&h[0].files!==i,r.formdata=e.FormData!==i;var d=r.fileapi&&a.find('input[type="file"]:enabled').filter(function(){return""!==t(this).val()}),u=d.length,p="multipart/form-data",f=a.attr("enctype")==p||a.attr("encoding")==p,g=r.fileapi&&r.formdata,m=u&&!g||f&&!r.formdata;m&&(""==o&&(o=s.url),s.url!=o&&(s.url=o),s.url=s.url.indexOf("&")>=0?s.url+"&HTTP_X_REQUESTED_WITH=XMLHttpRequest":s.url+"?HTTP_X_REQUESTED_WITH=XMLHttpRequest")},success:function(i,n,o){if(l.trigger("success.form.zui",[i,n,o,l]),(d&&d(i,n,o,l))!==!1){try{"string"==typeof i&&(i=JSON.parse(i))}catch(s){}if(null===i||"object"!=typeof i)return i?alert(i):a("No response.","danger");var c=r.responser?t(r.responser):l.find(".form-responser");c.length||(c=t("#responser"));var h=i.message,p=function(){var n=i.callback;if(n){var o=e;if(t("body").hasClass("body-modal")){var a=e.frameElement,s=e.parent,r=s.$(a).closest(".modal").data("zui.modaltrigger");r&&r.options.context&&(o=r.options.context)}if("object"==typeof n){var c=n.target?o[n.target]:o,h=c[n.name];h.apply(l,Array.isArray(n.params)?n.params:[n.params])}else{var d=n.indexOf("("),u=(d>0?n.substr(0,d):n).split("."),p=u[0];u.length>1&&(p=u[1],"top"===u[0]?o=e.top:"parent"===u[0]&&(o=e.parent));var h=o[p]||e[p];if("function"==typeof h){var f=[];return d>0&&")"==n[n.length-1]&&(f=t.parseJSON("["+n.substring(d+1,n.length-1)+"]")),f.push(i),h.apply(l,f)}}}};if("success"===i.result){var f=r.locate||i.locate,g=r.closeModal||i.closeModal,m=r.ajaxReload||i.ajaxReload;if(l.enableForm(!0,!!(f||g||m)),h){var v=l.find('[type="submit"]').first(),y=!1;v.length&&(v.popover({container:"body",trigger:"manual",content:h,tipClass:"popover-in-modal popover-success popover-form-result",placement:i.placement||v.data("placement")||r.popoverPlacement||"right"}).popover("show"),setTimeout(function(){v.popover("destroy")},r.popoverTime||2e3),y=!0),c.length&&(c.html(''+h+"").show().delay(3e3).fadeOut(100),y=!0),y||a(h,"success")}if(u)return u(i,!0,l);if(g&&setTimeout(t.zui.closeModal,"number"==typeof g?g:r.closeModalTime||2e3),p()===!1)return;if(f)if("loadInModal"==f){var b=t(".modal");setTimeout(function(){b.load(b.attr("ref"),function(){t(this).find(".modal-dialog").css("width",t(this).data("width")),t.zui.ajustModalPosition()})},1e3)}else"parent"===f||"top"===f?e[f]&&setTimeout(function(){e[f].location.reload()},1200):"reload"===f?setTimeout(function(){e.location.href=e.location.href},1200):setTimeout(function(){t.apps?t.apps.open(f,"",!0):e.location.href=f},1200);if(m){var w=t(m);w.length&&w.load(e.location.href+" "+m,function(){w.find('[data-toggle="modal"]').modalTrigger()})}}else{if(l.enableForm(),"string"==typeof h)c.length?c.html(''+h+"").show().delay(3e3).fadeOut(100):a(h,"danger");else if("object"==typeof h){var x=!1,C=[];t.each(h,function(e,i){var n=t.isArray(i)?i.join(""):i,o=t("#"+e);if(!o.length)return void C.push(n);var a=e+"Label",s=t("#"+a);if(!s.length){var r=o.closest(".input-group").length,l=o.closest("td").length;s=t('').appendTo(l?o.closest("td"):r?o.closest(".input-group").parent():o.parent())}s.empty().append(n),o.addClass("has-error");var c=function(){var e=t("#"+a);if(e.length)return e.remove(),o.removeClass("has-error"),!0};o.on("change input mousedown",c);var h=t("#"+e+"_chosen");if(h.length&&h.find(".chosen-single,.chosen-choices").addClass("has-error").on("mousedown",function(){c()===!0&&t(this).removeClass("has-error")}),!x&&!o.data("datetimepicker")){var d=o[0];if(o.hasClass("chosen"))o.trigger("chosen:activate").trigger("chosen:open"),d=o.parent().find(".chosen-container")[0];else if(o.is("textarea")&&o.data("keditor")){var u=o.data("keditor");u.focus(),u.edit.doc.body.focus(),d=o.parent().find(".ke-container")[0]}else o.focus();d.scrollIntoView&&d.scrollIntoView(),x=!0}}),C.length&&a(C.join(""),"danger")}if(u)return u(i,!1,l);if(p()===!1)return}}},error:function(t,i,n){if(l.trigger("error.form.zui",[t,i,n,l]),(h&&h(t,i,n,l))!==!1){l.enableForm();var o="timeout"==i||"error"==i?e.lang?e.lang.timeout:i:t.responseText+i+n;a(o,"danger")}}},r),l._ajaxForm(r).data("zui.ajaxform",!0),l.on("click","[data-form-action]",function(){l.attr("action",t(this).data("formAction")).submit()})},t.setAjaxForm=function(e,i,n){t.ajaxForm(e,t.isPlainObject(i)?i:{finish:i,beforeSubmit:n})},t.fn.ajaxForm=function(e){return this.each(function(){t.ajaxForm(this,e)})},t.fn.setInputRequired=function(){return this.each(function(){var e=t(this),i=e.parent();i.is(".input-control,td")?i.addClass("required"):e.is(".chosen")?e.attr("required",null).next(".chosen-container").addClass("required"):i.addClass("required"),e.attr("required",null);var n=i.closest(".input-group");n.length&&1===n.find(".required,input[required],select[required]").length&&n.addClass("required")})},t(function(){t('.form-ajax,form[data-type="ajax"]').ajaxForm(),setTimeout(function(){var i=e.config.requiredFields,n=t("form");i&&(i=i.split(",")),i&&i.length&&t.each(i,function(t,e){n.find("#"+e).attr("required","required")}),n.find("input[required],select[required],textarea[required]").setInputRequired()},400),t('form[target="hiddenwin"]').on("submit",function(){var e=t(this);e.data("zui.ajaxform")||e.enableForm(!1).data("disabledTime",(new Date).getTime())}).on("click",function(){var e=t(this),i=e.data("disabledTime");i&&(new Date).getTime()-i>1e4&&e.enableForm(!0).data("disabledTime",null)})})}(jQuery,window,void 0),function(t){"use strict";var e="zui.searchList",i=function(t,e){if(t&&t.length)for(var i=0;i
'+(n.errorText||window.lang&&window.lang.timeout)+"
{page}/{totalPage}
',"next_icon","last_icon"],onPageChange:function(e,i){e.recPerPage!==i.recPerPage&&t.cookie(this.options.pageCookie,e.recPerPage,{expires:config.cookieLife,path:config.webRoot}),e.recPerPage!==i.recPerPage&&(window.location.href=this.createLink())}}),
-t.extend(!0,t.zui.Messager.DEFAULTS,{cssClass:"messagger-zt",icons:{success:"check-circle",info:"chat-line",warning:"exclamation-sign",danger:"exclamation-sign"}}),t.fn.reverseOrder=function(){return this.each(function(){var e=t(this);e.prependTo(e.parent())})};var r=function(e,i){var n=t(e);if(!n.data("historiesInited")){n.data("historiesInited",1),i=t.extend({},n.data(),i);var o=n.find(".histories-list"),a=n.find(".btn-reverse .icon").hasClass("icon-arrow-up"),s=!1;n.on("click",".btn-reverse",function(){a=!a,o.children("li").reverseOrder(),o.trigger("historiesReverse",a),t(this).find(".icon").toggleClass("icon-arrow-up",a).toggleClass("icon-arrow-down",!a);var e="#lastComment",i=t(e);i.length&&window.KindEditor&&(window.KindEditor.remove(e),i.kindeditor())}).on("click",".btn-expand-all",function(){var e=t(this).find(".icon");s=!s,e.toggleClass("icon-plus",!s).toggleClass("icon-minus",s),o.children("li").toggleClass("show-changes",s)}).on("click",".btn-expand",function(){t(this).closest("li").toggleClass("show-changes")}).on("click",".btn-strip",function(){var e=t(this),n=e.find(".icon"),o=n.hasClass("icon-code");n.toggleClass("icon-code",!o).toggleClass("icon-text",o),e.attr("title",o?i.original:i.textdiff),e.closest("li").toggleClass("show-original",o)}),o.find(".btn-strip").attr("title",i.original);var r=n.find(".modal-comment").modal({show:!1}).on("shown.zui.modal",function(){var t=r.find("#comment");t.length&&(t.focus(),window.editor&&window.editor.comment&&window.editor.comment.focus())}).on("show.zui.modal",function(){var e=r.find("#comment");e.length&&!e.data("keditor")&&t.fn.kindeditor&&e.kindeditor()});n.on("click",".btn-comment",function(t){r.modal("toggle"),t.preventDefault()}).on("click",".btn-edit-comment,.btn-hide-form",function(){t(this).closest("li").toggleClass("show-form")});var l=n.find(".comment-edit-form");l.ajaxForm({success:function(t,e,i,n){setTimeout(function(){l.closest("li").removeClass("show-form")},2e3)}})}};t.fn.histories=function(t){return this.each(function(){r(this,t)})},t(function(){t(".histories").histories()});var l=0,c=0;t.toggleSidebar=function(e){var i=t("#sidebar");if(i.length){var n=t("main");if(void 0===e)e=n.hasClass("hide-sidebar");else if(e&&!n.hasClass("hide-sidebar"))return;n.toggleClass("hide-sidebar",!e),clearTimeout(l),t.zui.store.set(c,e);var o=i.children(".cell"),a={overflow:"visible",maxHeight:"initial"};e?(i.addClass("showing"),l=setTimeout(function(){i.removeClass("showing"),i.trigger("sidebar.toggle",e)},210)):(i.trigger("sidebar.toggle",e),t(window).width()<1900&&(a={overflow:"hidden",maxHeight:t(window).height()-45})),o.css(a)}};var h=t.initSidebar=function(){var e=t("#sidebar");if(e.length){if(e.data("init"))return!0;c="sidebar:"+(e.data("id")||config.currentModule+"/"+config.currentMethod);var i=t("main");if(i.length){i.on("click",".sidebar-toggle",function(){t.toggleSidebar(i.hasClass("hide-sidebar"))});var n=t.zui.store.get(c,e.data("hide")!==!1);n===!1&&e.addClass("no-animate"),t.toggleSidebar(n),n===!1&&setTimeout(function(){e.removeClass("no-animate")},500);var o=e.find(".sidebar-toggle");if(o.length){var a=function(){var e=o[0].getBoundingClientRect(),i=t(window).height(),n=Math.max(0,Math.floor(Math.min(i-40,e.top+e.height)-Math.max(e.top,0))/2)+(e.top<0?0-e.top:0);o.removeClass("fade").find(".icon").css("top",n+(t.zui.browser.isIE()?(i-80)/2:0))};a(),e.data("init",1).on("sidebar.toggle",a);var s=t.zui.browser.isIE()?1500:0,r=0,l=null,h=function(){var t=Date.now();return l&&(clearTimeout(l),l=null),t-r