diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php index 8eed578..1664f55 100755 --- a/application/admin/command/Crud.php +++ b/application/admin/command/Crud.php @@ -807,7 +807,7 @@ class Crud extends Command } } unset($line); - $langList = implode(",\n", array_filter($langList)) . ","; + $langList = implode(",\n", array_filter($langList)); //表注释 $tableComment = $modelTableInfo['Comment']; @@ -934,9 +934,7 @@ class Crud extends Command // 生成JS文件 $this->writeToFile('javascript', $data, $javascriptFile); // 生成语言文件 - if ($langList) { - $this->writeToFile('lang', $data, $langFile); - } + $this->writeToFile('lang', $data, $langFile); } catch (ErrorException $e) { throw new Exception("Code: " . $e->getCode() . "\nLine: " . $e->getLine() . "\nMessage: " . $e->getMessage() . "\nFile: " . $e->getFile()); } diff --git a/public/assets/js/fast.js b/public/assets/js/fast.js index 722f2a5..e5ae383 100644 --- a/public/assets/js/fast.js +++ b/public/assets/js/fast.js @@ -117,7 +117,7 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine title = options && options.title ? options.title : (title ? title : ""); url = Fast.api.fixurl(url); url = url + (url.indexOf("?") > -1 ? "&" : "?") + "dialog=1"; - var area = [$(window).width() > 800 ? '800px' : '95%', $(window).height() > 600 ? '600px' : '95%']; + var area = Fast.config.openArea != undefined ? Fast.config.openArea : [$(window).width() > 800 ? '800px' : '95%', $(window).height() > 600 ? '600px' : '95%']; options = $.extend({ type: 2, title: title,