diff --git a/module/tree/test/zen/updateworkflowlang.php b/module/tree/test/zen/updateworkflowlang.php index 66797fa70d..a5f8627737 100755 --- a/module/tree/test/zen/updateworkflowlang.php +++ b/module/tree/test/zen/updateworkflowlang.php @@ -20,10 +20,17 @@ include dirname(__FILE__, 2) . '/lib/treezen.unittest.class.php'; su('admin'); +$data = zenData('workflowdatasource'); +$data->id->range('1-5'); +$data->name->prefix('数据源')->range('1-5'); +$data->createdDate->range("20260109 130000")->type('timestamp')->format('YYYY-MM-DD'); +$data->editedDate->range("20260109 130000")->type('timestamp')->format('YYYY-MM-DD'); +$data->gen(5); + $treeTest = new treeTest(); -r($treeTest->updateWorkflowLangTest('datasource_1')) && p('manageDatasource_1Child') && e('模块维护'); -r($treeTest->updateWorkflowLangTest('workflow_1')) && p('manageWorkflow_1Child') && e('模块维护'); r($treeTest->updateWorkflowLangTest('single')) && p('manage') && e('维护模块'); r($treeTest->updateWorkflowLangTest('')) && p('manage') && e('维护模块'); -r($treeTest->updateWorkflowLangTest('datasource_999')) && p('manageDatasource_999Child') && e('模块维护'); \ No newline at end of file +r($treeTest->updateWorkflowLangTest('datasource_1')) && p('manageDatasource_1Child') && e('数据源1'); +r($treeTest->updateWorkflowLangTest('workflow_1')) && p('manageWorkflow_1Child') && e('维护分类'); +r($treeTest->updateWorkflowLangTest('datasource_999')) && p('manageDatasource_999Child') && e('维护分类'); diff --git a/module/tree/zen.php b/module/tree/zen.php index 918797a09a..1849964fda 100644 --- a/module/tree/zen.php +++ b/module/tree/zen.php @@ -159,7 +159,12 @@ class treeZen extends tree if(count($params) == 2) { $manageChild = 'manage' . ucfirst($viewType) . 'Child'; - if($viewType == 'datasource') + + $this->lang->tree->common = $this->lang->workflowdatasource->category; + $this->lang->tree->name = $this->lang->tree->cate; + $this->lang->tree->$manageChild = $this->lang->tree->common; + + if(strpos($viewType, 'datasource') !== false) { $datasourceID = $params[1]; $datasource = $this->loadModel('workflowdatasource', 'flow')->getByID($datasourceID); @@ -167,12 +172,10 @@ class treeZen extends tree { $this->lang->tree->$manageChild = $datasource->name; $this->lang->tree->manage = $datasource->name; + $this->lang->tree->common = $this->lang->workflowdatasource->category; + $this->lang->tree->name = $this->lang->tree->cate; } } - else - { - $this->lang->tree->$manageChild = $this->lang->tree->common; - } } } @@ -213,7 +216,7 @@ class treeZen extends tree if(strpos($viewType, '_') !== false) { $params = explode('_', $viewType); - if(count($params) == 2) $this->app->rawModule = $params[0]; + if(count($params) == 2) $this->app->rawModule = $params[0] == 'datasource' ? 'workflowdatasource' : $params[0]; } } }