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

优化关联查询时模型表名读取 

优化插件配置数据过滤
pull/146/MERGE
Karson 2019-10-10 17:52:32 +08:00
parent 5cb74b5e36
commit 3157f3a574
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controller/Addon.php
View File

@ -61,7 +61,7 @@ class Addon extends Backend
$this->error(__('No Results were found')); $this->error(__('No Results were found'));
} }
if ($this->request->isPost()) { if ($this->request->isPost()) {
$params = $this->request->post("row/a"); $params = $this->request->post("row/a", [], 'trim');
if ($params) { if ($params) {
foreach ($config as $k => &$v) { foreach ($config as $k => &$v) {
if (isset($params[$v['name']])) { if (isset($params[$v['name']])) {

4
application/admin/controller/general/Config.php
View File

@ -74,7 +74,7 @@ class Config extends Backend
{ {
if ($this->request->isPost()) { if ($this->request->isPost()) {
$this->token(); $this->token();
$params = $this->request->post("row/a"); $params = $this->request->post("row/a", [], 'trim');
if ($params) { if ($params) {
foreach ($params as $k => &$v) { foreach ($params as $k => &$v) {
$v = is_array($v) ? implode(',', $v) : $v; $v = is_array($v) ? implode(',', $v) : $v;
@ -113,7 +113,7 @@ class Config extends Backend
{ {
if ($this->request->isPost()) { if ($this->request->isPost()) {
$this->token(); $this->token();
$row = $this->request->post("row/a"); $row = $this->request->post("row/a", [], 'trim');
if ($row) { if ($row) {
$configList = []; $configList = [];
foreach ($this->model->all() as $v) { foreach ($this->model->all() as $v) {

1
application/common/controller/Backend.php
View File

@ -267,6 +267,7 @@ class Backend extends Controller
if ($relationSearch) { if ($relationSearch) {
if (!empty($this->model)) { if (!empty($this->model)) {
$name = \think\Loader::parseName(basename(str_replace('\\', '/', get_class($this->model)))); $name = \think\Loader::parseName(basename(str_replace('\\', '/', get_class($this->model))));
$name = $this->model->getTable();
$tableName = $name . '.'; $tableName = $name . '.';
} }
$sortArr = explode(',', $sort); $sortArr = explode(',', $sort);