diff --git a/module/doc/js/selectlibtype.ui.js b/module/doc/js/selectlibtype.ui.js index 8131e3c3b3..41418018aa 100644 --- a/module/doc/js/selectlibtype.ui.js +++ b/module/doc/js/selectlibtype.ui.js @@ -36,6 +36,40 @@ window.reloadProject = function() loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}`)); } +window.reloadApiByApiType = function() +{ + const objectType = getSpaceType(); + const apiType = $('.modal-body input[name=apiType]').val(); + const params = window.btoa('apiType=' + apiType); + loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}`)); +} + +window.reloadApi = function() +{ + const objectType = getSpaceType(); + const apiType = $('.modal-body input[name=apiType]').val(); + const libID = $('.modal-body input[name=lib]').val(); + + let params = ''; + if(apiType == 'product') + { + const objectID = $('.modal-body input[name=product]').val(); + params = window.btoa('apiType=' + apiType + '&objectID=' + objectID + '&libID=' + libID); + } + else if(apiType == 'project') + { + const objectID = $('.modal-body input[name=project]').val(); + const executionID = $('.modal-body input[name=execution]').val(); + params = window.btoa('apiType=' + apiType + '&objectID=' + objectID + '&executionID=' + executionID + '&libID=' + libID); + } + else if(apiType == 'nolink') + { + params = window.btoa('apiType=' + apiType + '&libID=' + libID); + } + + loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}`)); +} + /** * Change space. * @@ -48,141 +82,6 @@ window.changeSpace = function() if(objectType) loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}`)); } -/** - * Change doc type. - * - * @access public - * @return void - */ -window.changeDocType = function() -{ - let docType = $('.modal-body .radio-primary [name=type]:not(.hidden):checked').val(); - $('.executionTH').removeClass('hidden'); - $('.executionHelp').removeClass('hidden'); - $('#executionBox').removeClass('hidden'); - if(docType == 'api') - { - $('.executionTH').addClass('hidden'); - $('.executionHelp').addClass('hidden'); - $('#executionBox').addClass('hidden'); - } - - if($('[name=rootSpace]:checked').val()) changeSpace(); - $('#submit').removeAttr('disabled'); -} - -/** - * Change api type. - * - * @access public - * @return void - */ -window.changeApiType = function() -{ - let apiType = $('input[name=apiType]').val(); - $('.projectTR').toggleClass('hidden', apiType != 'project'); - $('.productTR').toggleClass('hidden', apiType != 'product'); - if(apiType == 'project') loadExecutions(); - if(apiType == 'product') loadObjectModulesForSelect('product');; - if(apiType == 'nolink') loadDocLibs('api', 'api'); -} - -/** - * Load doc libs by type. - * - * @param string type - * @return void - */ -window.loadDocLibs = function(space, type, extra = '') -{ - const link = $.createLink('doc', 'ajaxGetLibsByType', `space=${space}&type=${type}&extra=${extra}`); - $.getJSON(link, function(data) - { - const $libPicker = $('#selectLibTypeForm [name=lib]').zui('picker'); - $libPicker.render({items: data.libs}); - $libPicker.$.setValue(''); - - const $modulePicker = $('#selectLibTypeForm [name="module"]').zui('picker'); - $modulePicker.render({items: data.modules}); - $modulePicker.$.setValue(''); - }); -} - -/** - * Load executions. - * - * @param int $projectID - * @access public - * @return void - */ -window.loadExecutions = function() -{ - const projectID = $('.modal-body input[name=project]').val(); - const docType = $('.modal-body .radio-primary [name=type]:not(.hidden):checked').val(); - if(docType == 'doc') - { - const projectID = $('.modal-body input[name=project]').val(); - const executionID = $('.modal-body input[name=execution]').val(); - const link = $.createLink('project', 'ajaxGetExecutions', "projectID=" + projectID + "&mode=multiple,leaf,noprefix"); - $.getJSON(link, function(data) - { - const $executionPicker = $('.modal-body input[name=execution]').zui('picker'); - $executionPicker.render({items: data.items, disabled: !data.multiple}); - $executionPicker.$.setValue(executionID); - }); - } - - loadObjectModulesForSelect('project', projectID); -} - -window.loadObjectModulesForSelect = function(objectType, objectID) -{ - if(typeof objectID == 'undefined') objectID = $(`.modal-body input[name=${objectType}]`).val(); - if(!objectID && objectType == 'execution') - { - objectType = 'project'; - objectID = $(`.modal-body input[name=project]`).val(); - } - - let $libPicker = $('#selectLibTypeForm [name=lib]').zui('picker'); - $libPicker.render({items: []}); - $libPicker.$.setValue(''); - - let $modulePicker = $('#selectLibTypeForm [name="module"]').zui('picker'); - $modulePicker.render({items: []}); - $modulePicker.$.setValue(''); - - if(!objectID || !objectType) return false; - - let docType = $('.modal-body .radio-primary [name=type]:not(.hidden):checked').val(); - if(typeof docType == 'undefined') docType = 'doc'; - - const link = $.createLink('doc', 'ajaxGetModules', 'objectType=' + objectType + '&objectID=' + objectID + '&type=' + docType); - $.getJSON(link, function(data) - { - $libPicker.render({items: data.libs}); - $modulePicker.render({items: data.modules}); - }); -} - -window.loadLibModulesForSelect = function(e) -{ - const objectID = e.target.value; - - let docType = $('.radio-primary [name=type]:not(.hidden):checked').val(); - if(typeof docType == 'undefined') docType = 'doc'; - - const link = $.createLink('tree', 'ajaxGetOptionMenu', 'rootID=' + objectID + '&viewType=' + docType + '&branch=all&rootModuleID=0&returnType=items'); - $.get(link, function(data) - { - data = JSON.parse(data); - - const $modulePicker = $('#selectLibTypeForm [name="module"]').zui('picker'); - $modulePicker.render({items: data}); - $modulePicker.$.setValue(''); - }); -} - /** * Redirect the parent window. * diff --git a/module/doc/ui/selectapi.html.php b/module/doc/ui/selectapi.html.php index b873ed3338..0e3906f5d5 100644 --- a/module/doc/ui/selectapi.html.php +++ b/module/doc/ui/selectapi.html.php @@ -4,64 +4,85 @@ declare(strict_types=1); * The selectlibtype view file of doc module of ZenTaoPMS. * @copyright Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net) * @license ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) - * @author Shujie Tian + * @author Chenxuan Song * @package doc * @link https://www.zentao.net */ namespace zin; +// In this page, $objectType = api +// $params may have four key: apiType|objectID|executionID|libID + +$apiType = isset($params['apiType']) ? $params['apiType'] : 'product'; +$products = $this->loadModel('product')->getPairs(); +$projects = $this->loadModel('project')->getPairsByProgram(0, 'all', false, 'order_asc'); + +if($apiType == 'product') +{ + $useType = $apiType; + $objectID = isset($params['objectID']) ? (int)$params['objectID'] : key($products); + $libPairs = $this->doc->getLibs($useType, '', '', (int)$objectID); +} +elseif($apiType == 'project') +{ + $objectID = isset($params['objectID']) ? (int)$params['objectID'] : key($projects); + $executions = $this->loadModel('execution')->getPairs($objectID, 'all', 'multiple,leaf,noprefix'); + $executionID = (isset($params['executionID']) && isset($executions[$params['executionID']])) ? $params['executionID'] : ''; + + $useType = $executionID ? 'execution' : 'project'; + $useID = $executionID ? $executionID : $objectID; + $libPairs = $this->doc->getLibs($useType, '', '', (int)$useID); +} +elseif($apiType == 'nolink') +{ + $libs = $this->doc->getApiLibs(0, 'nolink'); + $libPairs = array(); + foreach($libs as $libID => $lib) $libPairs[$libID] = $lib->name; +} + +$libID = isset($params['libID']) && isset($libPairs[$params['libID']]) ? $params['libID'] : key($libPairs); + +$modules = $this->loadModel('tree')->getOptionMenu((int)$libID, 'doc', 0); +$moduleID = key($modules); + form ( setID('selectLibTypeForm'), set::submitBtnText($lang->doc->nextStep), on::change('[name=rootSpace]', "changeSpace"), - on::change('[name=type]', "changeDocType"), - on::change('[name=apiType]', "changeApiType"), - on::change('[name=project]', "loadExecutions"), - on::change('[name=execution]', "loadObjectModulesForSelect('execution')"), - on::change('[name=product]', "loadObjectModulesForSelect('product')"), - on::change('[name=custom]', "loadObjectModulesForSelect('custom')"), - on::change('[name=lib]', "loadLibModulesForSelect"), + on::change('[name=apiType]', "reloadApiByApiType"), + on::change('[name=project]', "reloadApi"), + on::change('[name=execution]', "reloadApi"), + on::change('[name=product]', "reloadApi"), + on::change('[name=lib]', "reloadApi"), formGroup ( set::label($lang->doc->selectSpace), - radioList(set::name('rootSpace'), set::items($spaceList), set::value(key($spaceList)), set::inline(true)) + radioList(set::name('rootSpace'), set::items($spaceList), set::value($objectType), set::inline(true)) ), formRow ( - setID('docType'), - formGroup - ( - set::label($lang->doc->type), - radioList(set::name('type'), set::items($typeList), set::value('doc'), set::inline(true)) - ) - ), - formRow - ( - setClass('apiTypeTR hidden'), formGroup ( set::width('2/5'), set::label($lang->doc->apiType), - set::control(array('control' => 'picker', 'name' => 'apiType', 'items' => $lang->doc->apiTypeList, 'value' => '', 'required' => true)) + set::control(array('control' => 'picker', 'name' => 'apiType', 'items' => $lang->doc->apiTypeList, 'value' => $apiType, 'required' => true)) ) ), - formRow + $apiType == 'project' ? formRow ( - setClass('projectTR hidden'), formGroup ( set::label($lang->doc->project), set::width('2/5'), - set::control(array('control' => 'picker', 'name' => 'project', 'items' => $projects, 'value' => key($projects), 'required' => true)) + set::control(array('control' => 'picker', 'name' => 'project', 'items' => $projects, 'value' => $objectID, 'required' => true)) ), formGroup ( - setID('executionBox'), set::width('2/5'), set::label($lang->doc->execution), set::labelClass('executionTH'), - set::control(array('control' => 'picker', 'name' => 'execution', 'items' => array(), 'value' => '')) + set::control(array('control' => 'picker', 'name' => 'execution', 'items' => $executions, 'value' => $executionID)) ), formGroup ( @@ -77,35 +98,23 @@ form setClass('ml-2 mt-2 text-gray') ) ) - ), - formRow + ) : null, + $apiType == 'product' ? formRow ( - setClass('productTR hidden'), formGroup ( set::width('4/5'), set::label($lang->doc->product), set::required(true), - set::control(array('control' => 'picker', 'name' => 'product', 'items' => $products, 'value' => key($products), 'required' => true)) + set::control(array('control' => 'picker', 'name' => 'product', 'items' => $products, 'value' => $objectID, 'required' => true)) ) - ), - formRow - ( - setClass('customTR hidden'), - formGroup - ( - set::width('4/5'), - set::label($lang->doc->space), - set::required(true), - set::control(array('control' => 'picker', 'name' => 'custom', 'items' => $spaces, 'value' => key($spaces), 'required' => true)) - ) - ), + ) : null, formGroup ( set::width('4/5'), set::label($lang->doc->lib), set::required(true), - set::control(array('control' => 'picker', 'name' => 'lib', 'items' => array(), 'value' => '', 'required' => true)) + set::control(array('control' => 'picker', 'name' => 'lib', 'items' => $libPairs, 'value' => $libID, 'required' => true)) ), formGroup ( @@ -113,9 +122,6 @@ form set::width('4/5'), set::label($lang->doc->module), set::required(true), - set::control(array('control' => 'picker', 'name' => 'module', 'items' => array(), 'value' => '', 'required' => true)) + set::control(array('control' => 'picker', 'name' => 'module', 'items' => $modules, 'value' => $moduleID, 'required' => true)) ) ); - -/* ====== Render page ====== */ -render(); diff --git a/module/doc/ui/selectlibtype.html.php b/module/doc/ui/selectlibtype.html.php index ccd8dae904..39a17fb23e 100644 --- a/module/doc/ui/selectlibtype.html.php +++ b/module/doc/ui/selectlibtype.html.php @@ -22,6 +22,7 @@ to::header if(in_array($objectType, array('mine', 'custom'))) include './selectmineandcustom.html.php'; if($objectType == 'product') include './selectproduct.html.php'; if($objectType == 'project') include './selectproject.html.php'; +if($objectType == 'api') include './selectapi.html.php'; /* ====== Render page ====== */ render(); diff --git a/module/doc/ui/selectproduct.html.php b/module/doc/ui/selectproduct.html.php index 8c6f9caf1a..c586b5e9fc 100644 --- a/module/doc/ui/selectproduct.html.php +++ b/module/doc/ui/selectproduct.html.php @@ -4,7 +4,7 @@ declare(strict_types=1); * The selectlibtype view file of doc module of ZenTaoPMS. * @copyright Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net) * @license ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) - * @author Shujie Tian + * @author Chenxuan Song * @package doc * @link https://www.zentao.net */ diff --git a/module/doc/ui/selectproject.html.php b/module/doc/ui/selectproject.html.php index dba4c842f9..e5e235d790 100644 --- a/module/doc/ui/selectproject.html.php +++ b/module/doc/ui/selectproject.html.php @@ -4,14 +4,14 @@ declare(strict_types=1); * The selectlibtype view file of doc module of ZenTaoPMS. * @copyright Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net) * @license ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) - * @author Shujie Tian + * @author Chenxuan Song * @package doc * @link https://www.zentao.net */ namespace zin; // In this page, $objectType = project -// $params may have three key: objectID|executionID|docType|libID +// $params may have four key: objectID|executionID|docType|libID $projects = $this->loadModel('project')->getPairsByProgram(0, 'all', false, 'order_asc'); $objectID = isset($params['objectID']) ? (int)$params['objectID'] : key($projects);