From 4e94a792fd260372e17a32f7a8daade534de91fa Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 31 May 2023 17:15:37 +0800 Subject: [PATCH] * Change version 18.4 to 18.4.beta1. --- VERSION | 2 +- config/config.php | 4 ++-- doc/CHANGELOG | 2 +- module/misc/lang/de.php | 4 ++-- module/misc/lang/en.php | 4 ++-- module/misc/lang/fr.php | 4 ++-- module/misc/lang/zh-cn.php | 4 ++-- module/upgrade/config.php | 4 ++-- module/upgrade/lang/version.php | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/VERSION b/VERSION index 87d8cad632..f3d64c1ecd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.4 \ No newline at end of file +18.4.beta1 diff --git a/config/config.php b/config/config.php index 6b0c3e2a1f..3fd4fb0e96 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 = '18.4'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '18.4.beta1'; // 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. @@ -24,7 +24,7 @@ $config->timezone = 'Asia/Shanghai'; // 时区设置。 The tim $config->webRoot = ''; // URL根目录。 The root path of the url. $config->customSession = false; // 是否开启自定义session的存储路径。Whether custom the session save path. $config->edition = 'open'; // 设置系统的edition，可选值：open|biz|max。Set edition, optional: open|biz|max. -$config->tabSession = false; // 是否开启浏览器新标签独立session. +$config->tabSession = false; // 是否开启浏览器新标签独立session. /* 框架路由相关设置。Routing settings. */ $config->requestType = 'PATH_INFO'; // 请求类型：PATH_INFO|PATHINFO2|GET。 The request type: PATH_INFO|PATH_INFO2|GET. diff --git a/doc/CHANGELOG b/doc/CHANGELOG index d4aedfd3ed..da61e7cbaf 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,4 +1,4 @@ -2023-05-31 18.4 +2023-05-31 18.4.beta1 完成的需求 开源版： 45157 解决首页我的地盘页面请求2次的问题 diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php index df8d51852e..089f6b56d6 100644 --- a/module/misc/lang/de.php +++ b/module/misc/lang/de.php @@ -104,7 +104,7 @@ $lang->misc->feature->visionsDesc = "

The concept of interface has been add $lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png'; /* Release Date. */ -$lang->misc->releaseDate['18.4'] = '2023-05-31'; +$lang->misc->releaseDate['18.4.beta1'] = '2023-05-31'; $lang->misc->releaseDate['18.4.alpha1'] = '2023-04-21'; $lang->misc->releaseDate['18.3'] = '2023-03-15'; $lang->misc->releaseDate['18.2'] = '2023-02-27'; @@ -203,7 +203,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.4'][] = array('title' => 'Fix bugs.', 'desc' => ''); +$lang->misc->feature->all['18.4.beta1'][] = array('title' => 'Fix bugs.', 'desc' => ''); $lang->misc->feature->all['18.4.alpha1'][] = array('title' => 'We have enhanced the interaction experience of permissions and documents, while introducing the concept of test scenarios. Moreover, we now provide support for importing use cases with XMIND. Additionally, we have fully revamped the BI module by incorporating large screens, pivot tables, charts, and data capabilities.', 'desc' => ''); $lang->misc->feature->all['18.3'][] = array('title' => 'Language item customization is added in secondary development, which supports the definition of language items for menus and search tags; Editor functionality is added in the secondary development, which allows users to turn it on and off on demand; The forms could be saved temporarily when users exits unexpectedly, and the unsaved information will be filled automatically the next time you enter.', 'desc' => ''); $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. Fix bugs.', 'desc' => ''); diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 2dbaf53828..61cd0e910e 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -104,7 +104,7 @@ $lang->misc->feature->visionsDesc = "

The concept of interface has been add $lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png'; /* Release Date. */ -$lang->misc->releaseDate['18.4'] = '2023-05-31'; +$lang->misc->releaseDate['18.4.beta1'] = '2023-05-31'; $lang->misc->releaseDate['18.4.alpha1'] = '2023-04-21'; $lang->misc->releaseDate['18.3'] = '2023-03-15'; $lang->misc->releaseDate['18.2'] = '2023-02-27'; @@ -203,7 +203,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.4'][] = array('title' => 'Fix bugs.', 'desc' => ''); +$lang->misc->feature->all['18.4.beta1'][] = array('title' => 'Fix bugs.', 'desc' => ''); $lang->misc->feature->all['18.4.alpha1'][] = array('title' => 'We have enhanced the interaction experience of permissions and documents, while introducing the concept of test scenarios. Moreover, we now provide support for importing use cases with XMIND. Additionally, we have fully revamped the BI module by incorporating large screens, pivot tables, charts, and data capabilities.', 'desc' => ''); $lang->misc->feature->all['18.3'][] = array('title' => 'Language item customization is added in secondary development, which supports the definition of language items for menus and search tags; Editor functionality is added in the secondary development, which allows users to turn it on and off on demand; The forms could be saved temporarily when users exits unexpectedly, and the unsaved information will be filled automatically the next time you enter.', 'desc' => ''); $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. Fix bugs.', 'desc' => ''); diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php index 56510a5f7d..940deab153 100644 --- a/module/misc/lang/fr.php +++ b/module/misc/lang/fr.php @@ -104,7 +104,7 @@ $lang->misc->feature->visionsDesc = "

The concept of interface has been add $lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png'; /* Release Date. */ -$lang->misc->releaseDate['18.4'] = '2023-05-31'; +$lang->misc->releaseDate['18.4.beta1'] = '2023-05-31'; $lang->misc->releaseDate['18.4.alpha1'] = '2023-04-21'; $lang->misc->releaseDate['18.3'] = '2023-03-15'; $lang->misc->releaseDate['18.2'] = '2023-02-27'; @@ -203,7 +203,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.4'][] = array('title' => 'Fix bugs.', 'desc' => ''); +$lang->misc->feature->all['18.4.beta1'][] = array('title' => 'Fix bugs.', 'desc' => ''); $lang->misc->feature->all['18.4.alpha1'][] = array('title' => 'We have enhanced the interaction experience of permissions and documents, while introducing the concept of test scenarios. Moreover, we now provide support for importing use cases with XMIND. Additionally, we have fully revamped the BI module by incorporating large screens, pivot tables, charts, and data capabilities.', 'desc' => ''); $lang->misc->feature->all['18.3'][] = array('title' => 'Language item customization is added in secondary development, which supports the definition of language items for menus and search tags; Editor functionality is added in the secondary development, which allows users to turn it on and off on demand; The forms could be saved temporarily when users exits unexpectedly, and the unsaved information will be filled automatically the next time you enter.', 'desc' => ''); $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. Fix bugs.', 'desc' => ''); diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 6683c8b2c4..0326834970 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -104,7 +104,7 @@ $lang->misc->feature->visionsDesc = "

从16.5开始增加了界面概念， $lang->misc->feature->visionsImage = 'theme/default/images/main/visions.png'; /* Release Date. */ -$lang->misc->releaseDate['18.4'] = '2023-05-31'; +$lang->misc->releaseDate['18.4.beta1'] = '2023-05-31'; $lang->misc->releaseDate['18.4.alpha1'] = '2023-04-21'; $lang->misc->releaseDate['18.3'] = '2023-03-15'; $lang->misc->releaseDate['18.2'] = '2023-02-27'; @@ -203,7 +203,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.4'][] = array('title' => '解Bug。', 'desc' => ''); +$lang->misc->feature->all['18.4.beta1'][] = array('title' => '解Bug。', 'desc' => ''); $lang->misc->feature->all['18.4.alpha1'][] = array('title' => '优化权限、文档交互体验，测试新增场景概念，用例支持xmind导入，并对BI模块中的大屏、透视表、图表、数据表进行了全面升级。', 'desc' => ''); $lang->misc->feature->all['18.3'][] = array('title' => '二次开发增加语言项自定义,支持对菜单和检索标签的语言项进行定义；二次开发增加编辑器功能，支持用户按需开启和关闭；表单意外退出支持表单暂存，下次进入自动代入填写的未保存信息。', 'desc' => ''); $lang->misc->feature->all['18.2'][] = array('title' => '新增融合敏捷、融合瀑布管理模型，瀑布项目阶段支持无限级拆分，后台进行全新UI改版。修复Bug。', 'desc' => ''); diff --git a/module/upgrade/config.php b/module/upgrade/config.php index 93fe5eca22..aeb7e69fa8 100644 --- a/module/upgrade/config.php +++ b/module/upgrade/config.php @@ -36,7 +36,7 @@ $config->upgrade->maxVersion['max4_1'] = '18_1'; $config->upgrade->maxVersion['max4_2'] = '18_2'; $config->upgrade->maxVersion['max4_3'] = '18_3'; $config->upgrade->maxVersion['max4_4_alpha1'] = '18_4_alpha1'; -$config->upgrade->maxVersion['max4_4'] = '18_4'; // max insert position. +$config->upgrade->maxVersion['max4_4'] = '18_4_beta1'; // max insert position. $config->upgrade->bizVersion = array(); $config->upgrade->bizVersion['biz1_0'] = '9_5_1'; @@ -111,7 +111,7 @@ $config->upgrade->bizVersion['biz8_1'] = '18_1'; $config->upgrade->bizVersion['biz8_2'] = '18_2'; $config->upgrade->bizVersion['biz8_3'] = '18_3'; $config->upgrade->bizVersion['biz8_4_alpha1'] = '18_4_alpha1'; -$config->upgrade->bizVersion['biz8_4'] = '18_4'; // biz insert position. +$config->upgrade->bizVersion['biz8_4'] = '18_4_beta1'; // biz insert position. $config->upgrade->proVersion = array(); $config->upgrade->proVersion['pro1_0'] = '3_1'; diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index 68015db779..29dc22a5f2 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -177,7 +177,7 @@ $lang->upgrade->fromVersions['18_1'] = '18.1'; $lang->upgrade->fromVersions['18_2'] = '18.2'; $lang->upgrade->fromVersions['18_3'] = '18.3'; $lang->upgrade->fromVersions['18_4_alpha1'] = '18.4.alpha1'; -$lang->upgrade->fromVersions['18_4'] = '18.4'; // pms insert position. +$lang->upgrade->fromVersions['18_4_beta1'] = '18.4.beta1'; // pms insert position. global $config; /* Lite. */ @@ -359,7 +359,7 @@ $lang->upgrade->fromVersions['biz8_1'] = 'Biz8.1'; $lang->upgrade->fromVersions['biz8_2'] = 'Biz8.2'; $lang->upgrade->fromVersions['biz8_3'] = 'Biz8.3'; $lang->upgrade->fromVersions['biz8_4_alpha1'] = 'Biz8.4.alpha1'; -$lang->upgrade->fromVersions['biz8_4'] = 'Biz8.4'; // biz insert position. +$lang->upgrade->fromVersions['biz8_4_beta1'] = 'Biz8.4.beta1'; // biz insert position. /* Max. */ $lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';