From 85e2dc3cfd7bf1222b88f503a34d6c13b10bfed0 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Tue, 10 Sep 2024 10:14:07 +0800 Subject: [PATCH] * [release] adjust release info. --- VERSION | 2 +- config/config.php | 2 +- doc/CHANGELOG | 92 +++++++++++++++++++++++++++++++++ module/misc/lang/de.php | 1 + module/misc/lang/en.php | 1 + module/misc/lang/fr.php | 1 + module/misc/lang/zh-cn.php | 2 + module/upgrade/config.php | 9 ++-- module/upgrade/lang/version.php | 12 +++-- 9 files changed, 113 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index 668f94ca1e..85e0458f69 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -20.6 \ No newline at end of file +20.7 \ No newline at end of file diff --git a/config/config.php b/config/config.php index 881171f525..ae4719e8f6 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '20.6'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '20.7'; // 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. diff --git a/doc/CHANGELOG b/doc/CHANGELOG index ea067468b9..7b7eb5a18b 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,95 @@ +2024-09-13 20.7 +完成的需求 +开源版： +64421 菜单右键操作增加恢复默认功能 +63553 基础教程新增Scrum项目管理教程 +63552 基础教程新增瀑布项目管理教程 +63551 基础教程新增看板项目管理教程 +63548 进阶教程新增看板项目管理教程 +63547 进阶教程新增瀑布项目管理教程 +63546 进阶教程新增Scrum项目管理教程 +63519 菜单右键操作增加移动排序功能 +63518 菜单右键操作增加添加功能 +63517 菜单右键操作增加隐藏功能 +63512 基础教程系列新增测试管理教程 +63511 基础教程系列新增任务管理教程 +63437 进阶教程新增产品管理教程 +63436 进阶教程系列新增文档管理教程 +63435 进阶教程系列新增项目集管理教程 +63434 基础教程系列新增产品管理教程 +63433 基础教程系列新增账号管理教程 +63432 新手引导教程修改为快速上手系列教程 +63431 头像的下拉菜单顺序和分组调整 +企业版： +67251 工作流在不同界面增加不同所属XX字段 +66955 创建工作流时可以选择是否和1.5级导航联动 +66937 系统内置对象在多个菜单下展示时，工作流修改均生效-用例、Bug +66935 内置工作流的列表支持拓展配置 +66934 工作流目前支持的对象的列表采用高级表格渲染 +66867 非内置的工作流配置在一级导航可以选择icon +66179 查询筛选器选择逻辑优化 +65467 查询筛选器下拉菜单优化 +65461 员工登录次数统计表 +65460 日志汇总表 +65459 公司动态汇总表 +65441 任务状态统计表 +65440 任务类型统计表 +65439 项目任务指派统计表 +65438 项目任务完成者统计表 +65437 项目投入统计表 +65421 产品需求阶段分布表 +65420 产品发布数量统计表 +65419 产品Bug类型统计表 +65418 产品质量表 +65414 度量项联表查询的优化 +65413 实现结果筛选器为空时不查数据 +64417 工作流对象列表根据1.5级导航展示 +64416 搜索所属项目集、产品、项目、执行时增加全部 +64414 工作流中内置项目集、项目、产品、执行字段支持在工作流中使用 +64142 非内置工作流中，主表增加所属执行字段 +64141 非内置工作流中，主表增加所属产品字段 +64140 非内置工作流中，主表增加所属项目字段 +64139 非内置工作流中，主表增加所属项目集字段 +64137 创建工作流时可以选择导航、视图和位置 +63956 工作流配置的动作也可以发起通知 +63935 系统内置对象在多个菜单下展示时，工作流修改均生效-发布、版本、计划 +63904 工作流生成的列表使用高级表格 +59804 优化查询筛选器的功能 +57467 维度可以设置访问控制权限 +57466 大屏可以设置访问控制权限 +57465 图表可以设置访问控制权限 +49576 透视表可以设置访问控制权限 +36392 工作流显示在二级导航时，分配权限时可以显示在对应模块下 +修复的Bug +开源版： +54789 复制项目选择项目集后权限控制没有显示项目集内公开选项 +企业版： +37619 新建的工作流发布到二级目录的“项目/瀑布”下后，选择的显示位置不生效 (Feedback#3900) +40320 产品发布工作流设计跨流程设置时代码报错 +40326 产品计划工作流新增字段在列表展示错误 +53579 工作流设置全文检索不生效 +54801 发布到项目集二级菜单的自定义工作流点击后菜单内容错误 (Feedback#4207) +IPD版： +50590 项目关联需求，搜索表单加载不出来 +50660 IPD项目基线评审上传多个文件后保存报错 +51961 路标下移除需求后，点击二级导航无效 +52988 地盘使用帮助区块中界面切换样式混乱 +53127 需求池需求导入确认页面1.5级需求池显示为空 +53455 旧页面退出登录后出现报错 +53630 关闭OR需求评审流程后批量创建OR需求不应为草稿状态 +54518 需求池需求分发按钮提示文案没有判断是否开启业务需求 +54524 市场描述不显示编辑后的内容 +54579 旧页面的旧编辑器贴图不成功显示 +54701 有父子需求时，评审立项报错 +54738 编辑市场保存报错 +54748 OR界面没有批量修改路标权限 +54762 php8.1的源码包安装报错 +54765 IPD界面复制项目报错 +54769 甘特图中点评审点后返回有报错 +54771 发起评审不填写必填信息时有报错 +54796 路标下移除需求弹窗中出现报错 +54797 需求池需求撤回分发弹窗中有报错 + 2024-08-30 20.6 完成的需求 企业版： diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php index 751cfaaa16..8dac9c1f65 100644 --- a/module/misc/lang/de.php +++ b/module/misc/lang/de.php @@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +$lang->misc->releaseDate['20.7'] = '2024-09-13'; $lang->misc->releaseDate['20.6'] = '2024-08-30'; $lang->misc->releaseDate['20.5'] = '2024-08-16'; $lang->misc->releaseDate['18.13'] = '2024-08-09'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 615aa7f21e..5e3f0c22cc 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +$lang->misc->releaseDate['20.7'] = '2024-09-13'; $lang->misc->releaseDate['20.6'] = '2024-08-30'; $lang->misc->releaseDate['20.5'] = '2024-08-16'; $lang->misc->releaseDate['18.13'] = '2024-08-09'; diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php index 3a45c32117..5a01eaacbc 100644 --- a/module/misc/lang/fr.php +++ b/module/misc/lang/fr.php @@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +$lang->misc->releaseDate['20.7'] = '2024-09-13'; $lang->misc->releaseDate['20.6'] = '2024-08-30'; $lang->misc->releaseDate['20.5'] = '2024-08-16'; $lang->misc->releaseDate['18.13'] = '2024-08-09'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 10b84e8ebd..6396cd2919 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +$lang->misc->releaseDate['20.7'] = '2024-09-13'; $lang->misc->releaseDate['20.6'] = '2024-08-30'; $lang->misc->releaseDate['20.5'] = '2024-08-16'; $lang->misc->releaseDate['18.13'] = '2024-08-09'; @@ -235,6 +236,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['20.7'][] = array('title' => '新手引导优化；菜单自定义。工作流优化兼容企业版解Bug。', 'desc' => ''); $lang->misc->feature->all['20.6'][] = array('title' => '工作流支持配置多界面；审批流支持使用工作流中字段配置条件；修复Bug。', 'desc' => ''); $lang->misc->feature->all['20.5'][] = array('title' => '文档优化；新增23个内置度量项。', 'desc' => ''); $lang->misc->feature->all['18.13'][] = array('title' => '性能优化：我的待办和需求、任务、Bug列表页面、项目、产品的详情页面。禅道兼容达梦数据库；复制需求、任务、Bug、用例时，可以复制工作流中添加的字段和值；修复Bug。', 'desc' => ''); diff --git a/module/upgrade/config.php b/module/upgrade/config.php index 824fa9f011..cb752eedb4 100644 --- a/module/upgrade/config.php +++ b/module/upgrade/config.php @@ -54,7 +54,8 @@ $config->upgrade->maxVersion['max5_2_0'] = '20_3_0'; $config->upgrade->maxVersion['max5_3'] = '20_4'; $config->upgrade->maxVersion['max4_13'] = '18_13'; $config->upgrade->maxVersion['max5_4'] = '20_5'; -$config->upgrade->maxVersion['max5_5'] = '20_6'; // max insert position. +$config->upgrade->maxVersion['max5_5'] = '20_6'; +$config->upgrade->maxVersion['max5_6'] = '20_7'; // max insert position. $config->upgrade->bizVersion = array(); $config->upgrade->bizVersion['biz1_0'] = '9_5_1'; @@ -147,7 +148,8 @@ $config->upgrade->bizVersion['biz10_2_0'] = '20_3_0'; $config->upgrade->bizVersion['biz10_3'] = '20_4'; $config->upgrade->maxVersion['biz8_13'] = '18_13'; $config->upgrade->bizVersion['biz10_4'] = '20_5'; -$config->upgrade->bizVersion['biz10_5'] = '20_6'; // biz insert position. +$config->upgrade->bizVersion['biz10_5'] = '20_6'; +$config->upgrade->bizVersion['biz10_6'] = '20_7'; // biz insert position. $config->upgrade->proVersion = array(); $config->upgrade->proVersion['pro1_0'] = '3_1'; @@ -277,7 +279,8 @@ $config->upgrade->ipdVersion['ipd2_2_0'] = '20_3_0'; $config->upgrade->ipdVersion['ipd2_3'] = '20_4'; $config->upgrade->maxVersion['ipd1_5'] = '18_13'; $config->upgrade->ipdVersion['ipd2_4'] = '20_5'; -$config->upgrade->ipdVersion['ipd2_5'] = '20_6'; // ipd insert position. +$config->upgrade->ipdVersion['ipd2_5'] = '20_6'; +$config->upgrade->ipdVersion['ipd2_6'] = '20_7'; // ipd insert position. $config->upgrade->lowerTables = array(); $config->upgrade->lowerTables[$config->db->prefix . 'caseStep'] = $config->db->prefix . 'casestep'; diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index 7da69e630d..059f202280 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -199,7 +199,8 @@ $lang->upgrade->fromVersions['20_2_0'] = '20.2.0'; $lang->upgrade->fromVersions['20_3_0'] = '20.3.0'; $lang->upgrade->fromVersions['20_4'] = '20.4'; $lang->upgrade->fromVersions['20_5'] = '20.5'; -$lang->upgrade->fromVersions['20_6'] = '20.6'; // pms insert position. +$lang->upgrade->fromVersions['20_6'] = '20.6'; +$lang->upgrade->fromVersions['20_7'] = '20.7'; // pms insert position. global $config; /* Lite. */ @@ -399,7 +400,8 @@ $lang->upgrade->fromVersions['biz10_1_0'] = 'Biz10.1.0'; $lang->upgrade->fromVersions['biz10_2_0'] = 'Biz10.2.0'; $lang->upgrade->fromVersions['biz10_3'] = 'Biz10.3'; $lang->upgrade->fromVersions['biz10_4'] = 'Biz10.4'; -$lang->upgrade->fromVersions['biz10_5'] = 'Biz10.5'; // biz insert position. +$lang->upgrade->fromVersions['biz10_5'] = 'Biz10.5'; +$lang->upgrade->fromVersions['biz10_6'] = 'Biz10.6'; // biz insert position. /* Max. */ $lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4'; @@ -457,7 +459,8 @@ $lang->upgrade->fromVersions['max5_1_0'] = 'Max5.1.0'; $lang->upgrade->fromVersions['max5_2_0'] = 'Max5.2.0'; $lang->upgrade->fromVersions['max5_3'] = 'Max5.3'; $lang->upgrade->fromVersions['max5_4'] = 'Max5.4'; -$lang->upgrade->fromVersions['max5_5'] = 'Max5.5'; // max insert position. +$lang->upgrade->fromVersions['max5_5'] = 'Max5.5'; +$lang->upgrade->fromVersions['max5_6'] = 'Max5.6'; // max insert position. /* Ipd */ $lang->upgrade->fromVersions['ipd1_0_beta1'] = 'Ipd1.0.beta1'; @@ -476,4 +479,5 @@ $lang->upgrade->fromVersions['ipd2_0_0'] = 'Ipd2.0.0'; $lang->upgrade->fromVersions['ipd2_1_0'] = 'Ipd2.1.0'; $lang->upgrade->fromVersions['ipd2_2_0'] = 'Ipd2.2.0'; $lang->upgrade->fromVersions['ipd2_3'] = 'Ipd2.3'; -$lang->upgrade->fromVersions['ipd2_4'] = 'Ipd2.4'; // ipd insert position. +$lang->upgrade->fromVersions['ipd2_4'] = 'Ipd2.4'; +$lang->upgrade->fromVersions['ipd2_5'] = 'Ipd2.5'; // ipd insert position.