调整版本号增加修复2个小bug

darwinwen · May 20, 2019 · b9b5c52 · b9b5c52
1 parent 79ea012
commit b9b5c52
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/common/config/main.php b/common/config/main.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => 'RageFrame',
-    'version' => '2.2.43',
+    'version' => '2.2.46',
     'aliases' => [
         '@bower' => '@vendor/bower-asset',
         '@npm' => '@vendor/npm-asset',

diff --git a/common/helpers/ExcelHelper.php b/common/helpers/ExcelHelper.php
@@ -36,6 +36,10 @@ public static function exportData($list = [], $header = [], $filename = '', $suf
             return false;
         }
 
+        // 清除之前的错误输出
+        ob_end_clean();
+        ob_start();
+
         !$filename && $filename = time();
 
         // 初始化

diff --git a/common/widgets/ueditor/UEditor.php b/common/widgets/ueditor/UEditor.php
@@ -100,6 +100,7 @@ public function run()
 
         //ready部分代码，是为了缩略图管理。UEditor本身就很大，在后台直接加载大文件图片会很卡。
         $script = <<<UEDITOR
+        UE.delEditor('{$id}');
         var ue = UE.getEditor('{$id}',{$config}).ready(function(){
             this.addListener( "beforeInsertImage", function ( type, imgObjs ) {
                 for(var i=0;i < imgObjs.length;i++){

diff --git a/docs/guide-zh-CN/start-update-log.md b/docs/guide-zh-CN/start-update-log.md
@@ -8,7 +8,7 @@
 
 > 各个小版本升级例如 2.1.x 升级到 2.2.x 以上不能完美升级最好重新安装
 
-### v2.2.43
+### v2.2.46
 updated 2019.5.20
 
 - 增加: 省市区三级联动可自由显示级别，例如只需要省市
@@ -18,6 +18,8 @@ updated 2019.5.20
 - 合并: `AuthHelper` 和 `AddonAuthHelper` 做到插件和系统校验无感切换
 - 合并: `HtmlHelper `和 `AddonHtmlHelper` 做到插件和系统无感切换
 - 合并: `UrlHelper `和 `AddonUrlHelper` 做到插件和系统无感切换
+- 修复: 百度编辑器 ajax model 渲染只渲染一次的问题
+- 修复: ExcleHelper辅助类导出报格式错误
 - 移动: 服务层 `services` 到根目录
 - 移除: 默认路由 `.html` 后缀