Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch dev/task-149873 of zentao/zentaopms (#11529)

Browse Source
This commit is contained in:
刘刚
2025-09-18 09:33:10 +08:00
committed by Gitfox
parent 195e4bcf87 f45d5fb2a5
commit 0844e6a02d
12 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/wg/modulemenu/v1.php
+11
View File
@@ -90,6 +90,8 @@ class moduleMenu extends wg
'titleAttrs' => $titleAttrs,
'contentClass' => 'overflow-x-hidden'
);
if(!empty($child->actions)) $item['actions'] = $child->actions;
$items = $this->buildMenuTree($child->id);
if($items) $item['items'] = $items;
if($child->id == $activeKey || $child->id == 'product-' . $activeKey)
@@ -317,6 +319,15 @@ class moduleMenu extends wg
($hasActionDropdown || $hasToggleBtn) ? row
(
setClass('justify-end p-1 flex-none'),
$this->prop('createModuleLink') ? btn
(
set::type('ghost'),
set::icon('plus'),
set::size('sm'),
set::caret(false),
set::url($this->prop('createModuleLink')),
setData(array('toggle' => 'modal', 'size' => 'sm'))
) : null,
$hasActionDropdown ? $actions : div(),
$hasToggleBtn ? btn
(
module/group/lang/resource.php
+6 -4
View File
@@ -1815,6 +1815,7 @@ $lang->user->methodOrder[85] = 'setPublicTemplate';
$lang->resource->tree = new stdclass();
$lang->resource->tree->browse = 'browse';
$lang->resource->tree->browseTask = 'browseTask';
$lang->resource->tree->create = 'create';
$lang->resource->tree->updateOrder = 'updateOrder';
$lang->resource->tree->manageChild = 'manageChild';
$lang->resource->tree->edit = 'edit';
@@ -1823,10 +1824,11 @@ $lang->resource->tree->delete = 'delete';
$lang->tree->methodOrder[5] = 'browse';
$lang->tree->methodOrder[10] = 'browseTask';
$lang->tree->methodOrder[15] = 'updateOrder';
$lang->tree->methodOrder[20] = 'manageChild';
$lang->tree->methodOrder[25] = 'edit';
$lang->tree->methodOrder[30] = 'delete';
$lang->tree->methodOrder[15] = 'create';
$lang->tree->methodOrder[20] = 'updateOrder';
$lang->tree->methodOrder[25] = 'manageChild';
$lang->tree->methodOrder[30] = 'edit';
$lang->tree->methodOrder[35] = 'delete';
/* Screen. */
$lang->resource->screen = new stdclass();
module/group/packagemanager.php
+1
View File
@@ -2963,6 +2963,7 @@ $config->group->package->module->subset = 'tree';
$config->group->package->module->privs = array();
$config->group->package->module->privs['tree-browse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array(), 'recommend' => array('tree-delete', 'tree-manageChild'));
$config->group->package->module->privs['tree-browseTask'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 1, 'depend' => array('tree-edit'), 'recommend' => array('tree-delete', 'tree-manageChild'));
$config->group->package->module->privs['tree-create'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 3, 'depend' => array(), 'recommend' => array());
$config->group->package->module->privs['tree-updateOrder'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 5, 'depend' => array('tree-browse'), 'recommend' => array());
$config->group->package->module->privs['tree-manageChild'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 6, 'depend' => array('tree-edit'), 'recommend' => array('tree-delete'));
$config->group->package->module->privs['tree-edit'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 7, 'depend' => array('tree-browse'), 'recommend' => array());
module/tree/lang/de.php
+1
View File
@@ -11,6 +11,7 @@
*/
$lang->tree = new stdclass();
$lang->tree->common = 'Modul';
$lang->tree->create = 'Create Module';
$lang->tree->edit = 'Bearbeiten';
$lang->tree->delete = 'Löschen';
$lang->tree->browse = 'Allgemeine Module verwalten';
module/tree/lang/en.php
+1
View File
@@ -11,6 +11,7 @@
*/
$lang->tree = new stdclass();
$lang->tree->common = 'Module';
$lang->tree->create = 'Create Module';
$lang->tree->edit = 'Edit Module';
$lang->tree->delete = 'Delete Module';
$lang->tree->browse = 'Manage General Module';
module/tree/lang/fr.php
+1
View File
@@ -11,6 +11,7 @@
*/
$lang->tree = new stdclass();
$lang->tree->common = 'Module';
$lang->tree->create = 'Create Module';
$lang->tree->edit = 'Editer Module';
$lang->tree->delete = 'Supprimer Module';
$lang->tree->browse = 'Gérer les Modules Généraux';
module/tree/lang/zh-cn.php
+1
View File
@@ -11,6 +11,7 @@
*/
$lang->tree = new stdclass();
$lang->tree->common = '模块维护';
$lang->tree->create = '添加模块';
$lang->tree->edit = '编辑模块';
$lang->tree->delete = '删除模块';
$lang->tree->browse = '通用模块维护';
module/weekly/lang/de.php
+5
View File
@@ -48,6 +48,11 @@ $lang->weekly->builtInScopes = array();
$lang->weekly->builtInScopes['rnd'] = array();
$lang->weekly->builtInScopes['rnd']['project'] = 'Project';
$lang->weekly->builtInCategoryList['month'] = 'Monthly Report';
$lang->weekly->builtInCategoryList['week'] = 'Weekly Report';
$lang->weekly->builtInCategoryList['day'] = 'Daily Report';
$lang->weekly->builtInCategoryList['milestone'] = 'Milestone';
$lang->weekly->reportHelpNotice = <<<EOD
<h2>PV Planned Value</h2>
Calculation method:
module/weekly/lang/en.php
+5
View File
@@ -48,6 +48,11 @@ $lang->weekly->builtInScopes = array();
$lang->weekly->builtInScopes['rnd'] = array();
$lang->weekly->builtInScopes['rnd']['project'] = 'Project';
$lang->weekly->builtInCategoryList['month'] = 'Monthly Report';
$lang->weekly->builtInCategoryList['week'] = 'Weekly Report';
$lang->weekly->builtInCategoryList['day'] = 'Daily Report';
$lang->weekly->builtInCategoryList['milestone'] = 'Milestone';
$lang->weekly->reportHelpNotice = <<<EOD
<h2>PV Planned Value</h2>
Calculation method:
module/weekly/lang/fr.php
+5
View File
@@ -48,6 +48,11 @@ $lang->weekly->builtInScopes = array();
$lang->weekly->builtInScopes['rnd'] = array();
$lang->weekly->builtInScopes['rnd']['project'] = 'Project';
$lang->weekly->builtInCategoryList['month'] = 'Monthly Report';
$lang->weekly->builtInCategoryList['week'] = 'Weekly Report';
$lang->weekly->builtInCategoryList['day'] = 'Daily Report';
$lang->weekly->builtInCategoryList['milestone'] = 'Milestone';
$lang->weekly->reportHelpNotice = <<<EOD
<h2>PV Planned Value</h2>
Calculation method:
module/weekly/lang/zh-cn.php
+5
View File
@@ -48,6 +48,11 @@ $lang->weekly->builtInScopes = array();
$lang->weekly->builtInScopes['rnd'] = array();
$lang->weekly->builtInScopes['rnd']['project'] = '项目';
$lang->weekly->builtInCategoryList['month'] = '月报';
$lang->weekly->builtInCategoryList['week'] = '周报';
$lang->weekly->builtInCategoryList['day'] = '日报';
$lang->weekly->builtInCategoryList['milestone'] = '里程碑';
$lang->weekly->reportHelpNotice = <<<EOD
<h2>PV 计划完成的工作</h2>
计算方式：
module/weekly/model.php
+11
View File
@@ -675,6 +675,17 @@ class weeklyModel extends model
public function addBuiltinCategory(int $scopeID): int
{
/* Set category data. */
foreach($this->lang->weekly->builtInCategoryList as $key => $value)
{
$langData = new stdClass();
$langData->lang = 'all';
$langData->module = 'weekly';
$langData->section = 'categoryList';
$langData->key = $key;
$langData->value = $value;
$this->dao->replace(TABLE_LANG)->data($langData)->get();
}
$category = new stdClass();
$category->root = $scopeID;
$category->name = $this->lang->projectCommon;