hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://gitee.com/karson/fastadmin

pull/117/MERGE
Karson 2019-03-30 00:12:38 +08:00
parent b23d7f9b72 d775f062b5
commit a3a742cebe
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/admin/command/Crud.php
View File

@ -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());
}

2
public/assets/js/fast.js
View File

@ -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,