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

Merge branch 'sprint/hufangzhou_package' into 'master'

Browse Source 
Sprint/hufangzhou package

See merge request easycorp/zentaopms!7077
This commit is contained in:
王怡栋
2023-02-27 06:58:39 +00:00
parent c9115f7a21 f41f2cfb9b
commit 8b56c39297
12 changed files with 3811 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
18.1
18.2
config/config.php
+1 -1
View File
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* 基本设置。Basic settings. */
$config->version = '18.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '18.2'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->liteVersion = '1.2'; // 迅捷版版本。 The version of Lite.
$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time.
db/standard/zentao18.2.sql
+3648
View File
File diff suppressed because it is too large Load Diff
doc/CHANGELOG
+133
View File
@@ -1,3 +1,136 @@
2023-02-27 18.2
完成的需求
开源版：
41729 按指派人搜索时，支持搜索多人并行任务
41730 待处理中过滤掉我已经完成的多人并行任务
41731 多人并行任务全部完成后指派给创建人
41732 编辑任务时，父/子任务不能修改为多人任务
41817 创建项目弹窗增加融合敏捷项目
41821 融合敏捷项目的迭代菜单下可以创建看板
41824 创建融合敏捷项目时，能复制融合敏捷项目的信息
41825 创建执行时，能复制融合敏捷项目的执行的信息
41829 融合敏捷项目的创建执行页面，增加方法字段
41830 批量编辑迭代信息页面，增加方法字段
41832 迭代列表导出增加方法字段
41833 后台全局设置增加融合敏捷设置
41834 后台融合敏捷设置下增加QA设置
41835 后台融合敏捷设置下增加过程设置
41940 后台过程设置的分类项设置，不同模型管理自己的分类项
41952 轻量级模式增加融合敏捷项目入口
41826 创建Bug时执行只能选择叶子执行
41831 创建问题、风险、机会时只能选择叶子执行
41839 瀑布项目阶段列表支持无限层级
41865 创建版本时只能选择叶子执行
41867 提交测试单时只能选择叶子执行
41870 瀑布项目的甘特图列表支持无限层级
41872 执行列表支持无限层级
41877 瀑布模型的里程碑报告统计该阶段下所有数据
41878 瀑布项目支持创建无限级阶段
41889 阶段编辑页面支持修改父阶段
41891 阶段类型增加“综合”
41907 瀑布项目创建任务时所属执行只能选择叶子执行
41911 通用看板导入执行时可以选择父执行或子执行
41912 创建执行文档库时支持选择父执行或子执行
41913 执行文档库中2.5级菜单支持选择父执行或子执行
41915 新增日志时只能选择叶子执行
41957 代码模块中维护所属执行时只能选择叶子执行
41961 代码的评审模块中维护所属执行时只能选择叶子执行
41968 回收站内父阶段未删除时才能恢复子阶段
42011 子阶段增加阶段类型字段
42017 父阶段阶段类型修改后，子阶段类型同步变更
42019 无限级阶段的阶段进度计算规则
42212 宿主机重装服务后可正常操作执行节点
42213 初始化中的执行节点只能进行远程操作
42214 快照状态显示优化
42215 创建执行节点的初始快照
42216 加载或刷新宿主机详情页时清空服务状态文本
42217 加载或刷新执行节点详情页时清空服务状态文本
41743 后台首页内容定义
41755 功能配置页的二级导航定义
41756 后台首页设置区块调整
41759 后台首页插件区块内容
41760 后台首页公开课区块的内容
41761 后台首页官方公众号区块的内容
41768 后台配置页增加1.5级导航切换功能
41774 私有部署时后台首页内容调整
41777 后台模型配置页面结构调整
41791 后台通知页面结构调整
41793 后台数据导入页面定义
41794 后台系统设置页面的结构调整
41797 后台二次开发页面的结构调整
41837 非中文版本后台首页内容调整
41745 功能配置下的地盘中新增待办和区块的Tab项
41746 功能配置下的产品中新增Tab项
41747 功能配置下的执行中新增Tab项
41748 功能配置下的测试中新增Tab项
41749 新增功能配置下的看板模块
41750 功能配置下的文档中新增必填项设置的字段及内容
41751 新增功能配置下的反馈模块
41752 将后台的审批移至功能配置下做为审批模块导航
41753 将后台全局设置中的度量移至功能配置中做为度量模块的设置入口
41754 新增功能配置下的会议室模块
41758 后台首页禅道信息区块内容
41766 调整二级页面配置项详情页面的布局和结构
41773 新增功能配置下的用户模块
41775 后台人员配置页面结构调整
41776 后台功能开关页面结构调整
41790 后台模型配置中瀑布模型的配置项定义
41795 后台系统中聊天页面的排版调整
41812 后台文档模板页面内容补充并调整结构
41942 运营界面的后台功能配置中，新增的项目导航内容定义
41955 调整后台基线模块的权限配置
41965 将后台自定义的语言项改为配置
42006 禅道补丁、新闻动态、公开课和禅道升级信息的接口
41869 创建融合瀑布项目时，能复制瀑布项目和融合瀑布项目的信息
41871 创建执行时，能复制融合瀑布项目的执行的信息
41895 后台全局设置增加融合瀑布设置
41896 后台融合瀑布设置下增加阶段设置
41897 后台融合瀑布设置下增加设计设置
41898 后台融合瀑布设置下增加QA设置
41899 后台融合瀑布设置下增加配置设置
41900 后台融合瀑布设置下增加过程设置
41901 后台融合瀑布设置下增加评审设置
41902 更新API接口
41906 后台系统模式下，增加融合敏捷和融合瀑布
41941 后台系统功能设置，增加融合敏捷和融合瀑布
42100 瀑布项目的甘特图列表支持迭代和看板的展示
42194 融合敏捷项目复制时，可以复制敏捷项目信息
42196 融合敏捷项目创建执行时，能复制敏捷项目的执行的信息
42360 阶段的所属计划可以编辑修改
42501 融合敏捷项目创建执行页面增加提示语
42502 融合瀑布项目创建子阶段页面增加提示语
42517 多层级阶段的瀑布项目。在项目看板中，展示了第一层级阶段
42542 融合敏捷项目下，迭代和看板支持互相转入任务
42543 融合瀑布项目下，叶子节点的执行支持互相转入任务
39290 瀑布项目的阶段支持排序
41769 执行统计区块仅展示叶子层级的执行数据
41803 执行总览区块统计父子层级汇总的数据
41804 执行列表区块展示父子层级汇总的数据
41815 项目集看板中的执行只展示叶子节点的执行
41816 产品看板中的执行只展示叶子节点的执行
41828 瀑布项目的项目计划区块仅统计一级阶段的数据
41868 创建项目弹窗增加融合瀑布项目
41875 修改阶段状态时，同步调整父子阶段的状态
41892 融合瀑布项目阶段细分时，可以细分为迭代和看板
41893 批量编辑阶段信息页面，增加方法字段
41894 阶段列表导出增加方法字段
41917 复制瀑布项目时支持复制无限级阶段
42037 组织的日志中的执行只展示叶子节点的执行
42038 组织的动态中的执行展示父执行和子执行
42052 批量编辑无限级阶段信息时需要增加校验信息
42088 融合瀑布项目迭代和看板的编辑页面增加父阶段
42089 融合瀑布项目迭代和看板的的产品不允许编辑
42182 剩余类型的迭代/看板的功能与阶段保持一致
42193 执行1.5级菜单根据层级展示
42195 设计类型的阶段增加研发需求菜单及功能
42197 测试类型的阶段增加代码的菜单及功能
42231 阶段进行操作时，同步调整父子阶段的状态
42176 设计类型的迭代/看板的功能与阶段保持一致
42175 需求/总结评审类型的迭代/看板的功能与阶段保持一致
修复的Bug
开源版：
32397 地盘待处理任务搜索界面报错
2023-02-08 18.1
完成的需求
开源版：
module/admin/lang/en.php
+1
View File
@@ -72,6 +72,7 @@ $lang->admin->registerNotice->click = 'Sign Up';
$lang->admin->registerNotice->lblAccount = '>= 3 letters and numbers';
$lang->admin->registerNotice->lblPasswd = '>= 6 letters and numbers';
$lang->admin->registerNotice->submit = 'Submit';
$lang->admin->registerNotice->submitHere = 'RegistierenHere';
$lang->admin->registerNotice->bind = "Bind Exsiting Account";
$lang->admin->registerNotice->success = "You have signed up!";
module/misc/lang/de.php
+4
View File
@@ -103,6 +103,8 @@ $lang->misc->feature->themeDesc = '<p>ZenTao 15.0+ a new "Youth Blue" theme
$lang->misc->feature->visionsDesc = "<p>The concept of interface has been added since 16.5. Users can deal with R&D affairs in <span style='color: #0c60e1'>[Full Feature Interface]</span> and daily office affairs in <span style='color: #0c60e1'>[Operation Management Interface]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png';
/* Release Date. */
$lang->misc->releaseDate['18.2'] = '2023-02-27';
$lang->misc->releaseDate['18.1'] = '2023-02-08';
$lang->misc->releaseDate['18.0'] = '2023-01-03';
$lang->misc->releaseDate['18.0.beta3'] = '2022-12-26';
@@ -197,6 +199,8 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
$lang->misc->feature->all['18.2'][] = array('title' => 'Agile Plus and Waterfall Plus management models are newly added. Support for unlimited splitting of waterfall project stages. The UI of Admin is completely upgraded and redesigned.', 'desc' => '');
$lang->misc->feature->all['18.1'][] = array('title' => 'The automation testing solution interaction is optimized, while a new snapshot management function is newly added. ZenTao IM implemented online collaboration of PPT documents.Fix bugs.', 'desc' => '');
$lang->misc->feature->all['18.0'][] = array('title' => "Automated test solutions are proposed. Work order related functions are added to the Operation Management Interface. Approval workflow support for adding all types of notifications. And at the same time, we have further improved the earned value calculation rules.", 'desc' => '');
$lang->misc->feature->all['18.0.beta3'][] = array('title' => "The module Statistic is upgraded to BI, with 5 built-in large screens of macro management dimensions.", 'desc' => '');
module/misc/lang/en.php
+4
View File
@@ -103,6 +103,8 @@ $lang->misc->feature->themeDesc = '<p>ZenTao 15.0+ a new "Youth Blue" theme
$lang->misc->feature->visionsDesc = "<p>The concept of interface has been added since 16.5. Users can deal with R&D affairs in <span style='color: #0c60e1'>[Full Feature Interface]</span> and daily office affairs in <span style='color: #0c60e1'>[Operation Management Interface]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png';
/* Release Date. */
$lang->misc->releaseDate['18.2'] = '2023-02-27';
$lang->misc->releaseDate['18.1'] = '2023-02-08';
$lang->misc->releaseDate['18.0'] = '2023-01-03';
$lang->misc->releaseDate['18.0.beta3'] = '2022-12-26';
@@ -197,6 +199,8 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
$lang->misc->feature->all['18.2'][] = array('title' => 'Agile Plus and Waterfall Plus management models are newly added. Support for unlimited splitting of waterfall project stages. The UI of Admin is completely upgraded and redesigned.', 'desc' => '');
$lang->misc->feature->all['18.1'][] = array('title' => 'The automation testing solution interaction is optimized, while a new snapshot management function is newly added. ZenTao IM implemented online collaboration of PPT documents.Fix bugs.', 'desc' => '');
$lang->misc->feature->all['18.0'][] = array('title' => "Automated test solutions are proposed. Work order related functions are added to the Operation Management Interface. Approval workflow support for adding all types of notifications. And at the same time, we have further improved the earned value calculation rules.", 'desc' => '');
$lang->misc->feature->all['18.0.beta3'][] = array('title' => "The module Statistic is upgraded to BI, with 5 built-in large screens of macro management dimensions.", 'desc' => '');
module/misc/lang/fr.php
+4
View File
@@ -103,6 +103,8 @@ $lang->misc->feature->themeDesc = '<p>ZenTao 15.0+ a new "Youth Blue" theme
$lang->misc->feature->visionsDesc = "<p>The concept of interface has been added since 16.5. Users can deal with R&D affairs in <span style='color: #0c60e1'>[Full Feature Interface]</span> and daily office affairs in <span style='color: #0c60e1'>[Operation Management Interface]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png';
/* Release Date. */
$lang->misc->releaseDate['18.2'] = '2023-02-27';
$lang->misc->releaseDate['18.1'] = '2023-02-08';
$lang->misc->releaseDate['18.0'] = '2023-01-03';
$lang->misc->releaseDate['18.0.beta3'] = '2022-12-26';
@@ -197,6 +199,8 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
$lang->misc->feature->all['18.2'][] = array('title' => 'Agile Plus and Waterfall Plus management models are newly added. Support for unlimited splitting of waterfall project stages. The UI of Admin is completely upgraded and redesigned.', 'desc' => '');
$lang->misc->feature->all['18.1'][] = array('title' => 'The automation testing solution interaction is optimized, while a new snapshot management function is newly added. ZenTao IM implemented online collaboration of PPT documents.Fix bugs.', 'desc' => '');
$lang->misc->feature->all['18.0'][] = array('title' => "Automated test solutions are proposed. Work order related functions are added to the Operation Management Interface. Approval workflow support for adding all types of notifications. And at the same time, we have further improved the earned value calculation rules.", 'desc' => '');
$lang->misc->feature->all['18.0.beta3'][] = array('title' => "The module Statistic is upgraded to BI, with 5 built-in large screens of macro management dimensions.", 'desc' => '');
module/misc/lang/zh-cn.php
+2
View File
@@ -104,6 +104,7 @@ $lang->misc->feature->visionsDesc = "<p>从16.5开始增加了界面概念，
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions.png';
/* Release Date. */
$lang->misc->releaseDate['18.2'] = '2023-02-27';
$lang->misc->releaseDate['18.1'] = '2023-02-08';
$lang->misc->releaseDate['18.0'] = '2023-01-03';
$lang->misc->releaseDate['18.0.beta3'] = '2022-12-26';
@@ -199,6 +200,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
$lang->misc->feature->all['18.2'][] = array('title' => '新增融合敏捷、融合瀑布管理模型，瀑布项目阶段支持无限级拆分，后台进行全新UI改版。', 'desc' => '');
$lang->misc->feature->all['18.1'][] = array('title' => '自动化测试解决方案交互优化、新增快照管理功能。禅道客户端实现了 PPT文档在线协作。修复Bug。', 'desc' => '');
$lang->misc->feature->all['18.0'][] = array('title' => '推出自动化测试解决方案；运营管理界面增加工单功能；审批流支持增加所有类型的通知以及挣值计算规则完善。', 'desc' => '');
$lang->misc->feature->all['18.0.beta3'][] = array('title' => '统计模块升级为BI，内置5张宏观管理维度大屏。', 'desc' => '');
module/upgrade/config.php
+4 -2
View File
@@ -32,7 +32,8 @@ $config->upgrade->maxVersion['max4_0_beta1'] = '18_0_beta1';
$config->upgrade->maxVersion['max4_0_beta2'] = '18_0_beta2';
$config->upgrade->maxVersion['max4_0_beta3'] = '18_0_beta3';
$config->upgrade->maxVersion['max4_0'] = '18_0';
$config->upgrade->maxVersion['max4_1'] = '18_1'; // max insert position.
$config->upgrade->maxVersion['max4_1'] = '18_1';
$config->upgrade->maxVersion['max4_2'] = '18_2'; // max insert position.
$config->upgrade->bizVersion = array();
$config->upgrade->bizVersion['biz1_0'] = '9_5_1';
@@ -103,7 +104,8 @@ $config->upgrade->bizVersion['biz8_0_beta1'] = '18_0_beta1';
$config->upgrade->bizVersion['biz8_0_beta2'] = '18_0_beta2';
$config->upgrade->bizVersion['biz8_0_beta3'] = '18_0_beta3';
$config->upgrade->bizVersion['biz8_0'] = '18_0';
$config->upgrade->bizVersion['biz8_1'] = '18_1'; // biz insert position.
$config->upgrade->bizVersion['biz8_1'] = '18_1';
$config->upgrade->bizVersion['biz8_2'] = '18_2'; // biz insert position.
$config->upgrade->proVersion = array();
$config->upgrade->proVersion['pro1_0'] = '3_1';
module/upgrade/lang/version.php
+6 -3
View File
@@ -173,7 +173,8 @@ $lang->upgrade->fromVersions['18_0_beta1'] = '18.0.beta1';
$lang->upgrade->fromVersions['18_0_beta2'] = '18.0.beta2';
$lang->upgrade->fromVersions['18_0_beta3'] = '18.0.beta3';
$lang->upgrade->fromVersions['18_0'] = '18.0';
$lang->upgrade->fromVersions['18_1'] = '18.1'; // pms insert position.
$lang->upgrade->fromVersions['18_1'] = '18.1';
$lang->upgrade->fromVersions['18_2'] = '18.2'; // pms insert position.
global $config;
/* Lite. */
@@ -351,7 +352,8 @@ $lang->upgrade->fromVersions['biz8_0_beta1'] = 'Biz8.0.beta1';
$lang->upgrade->fromVersions['biz8_0_beta2'] = 'Biz8.0.beta2';
$lang->upgrade->fromVersions['biz8_0_beta3'] = 'Biz8.0.beta3';
$lang->upgrade->fromVersions['biz8_0'] = 'Biz8.0';
$lang->upgrade->fromVersions['biz8_1'] = 'Biz8.1'; // biz insert position.
$lang->upgrade->fromVersions['biz8_1'] = 'Biz8.1';
$lang->upgrade->fromVersions['biz8_2'] = 'Biz8.2'; // biz insert position.
/* Max. */
$lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -385,4 +387,5 @@ $lang->upgrade->fromVersions['max3_8'] = 'Max3.8';
$lang->upgrade->fromVersions['max4_0_beta1'] = 'Max4.0.beta1';
$lang->upgrade->fromVersions['max4_0_beta2'] = 'Max4.0.beta2';
$lang->upgrade->fromVersions['max4_0_beta3'] = 'Max4.0.beta3';
$lang->upgrade->fromVersions['max4_0'] = 'Max4.0'; // max insert position.
$lang->upgrade->fromVersions['max4_0'] = 'Max4.0';
$lang->upgrade->fromVersions['max4_1'] = 'Max4.1'; // max insert position.
module/upgrade/model.php
+3 -1
View File
@@ -1085,7 +1085,9 @@ class upgradeModel extends model
case '18_0_beta3':
$confirmContent .= file_get_contents($this->getUpgradeFile('18.0.beta3'));
case '18_0':
$confirmContent .= file_get_contents($this->getUpgradeFile('18.0')); // confirm insert position.
$confirmContent .= file_get_contents($this->getUpgradeFile('18.0'));
case '18_1':
$confirmContent .= file_get_contents($this->getUpgradeFile('18.1')); // confirm insert position.
}
return $confirmContent;