From 6facfcf8942432902177598c6ea490cb73cf921e Mon Sep 17 00:00:00 2001
From: Chrisleung <showerlzy@gmail.com>
Date: Sun, 24 Mar 2019 09:52:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E8=A1=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B3=A8=E9=87=8A=E4=B8=BA=E7=A9=BA=E6=97=B6?=
 =?UTF-8?q?,=E7=94=9F=E6=88=90=E7=9A=84=E8=AF=AD=E8=A8=80=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/command/Crud.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index 8eed5788..1664f55c 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());
         }

From 5ec2a9893af9f4a98fd6617616217df3b722c9bf Mon Sep 17 00:00:00 2001
From: CoolAbc <13836962@qq.com>
Date: Fri, 29 Mar 2019 06:29:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0-=E7=AA=97=E5=8F=A3=E5=A4=A7=E5=B0=8F,?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=E7=BB=9F=E4=B8=80=E8=AE=BE=E7=BD=AE=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E6=88=96=E5=8D=95=E4=B8=AA=E6=A8=A1=E5=9D=97=E7=9A=84?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/js/fast.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/assets/js/fast.js b/public/assets/js/fast.js
index 722f2a50..e5ae383c 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,