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

Pre Merge pull request !429 from Bran/develop

pull/429/MERGE
Bran 2023-06-09 07:10:36 +00:00 committed by Gitee
parent c1236b17da 9f1c1db03c
commit be5d28a048
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -397,7 +397,8 @@ class Backend extends Controller
$arr = $arr[0]; $arr = $arr[0];
} }
$tableArr = explode('.', $k); $tableArr = explode('.', $k);
if (count($tableArr) > 1 && $tableArr[0] != $name && !in_array($tableArr[0], $alias) && !empty($this->model)) { if (count($tableArr) > 1 && $tableArr[0] != $name && !in_array($tableArr[0], $alias)
&& !empty($this->model) && $this->relationSearch) {
//修复关联模型下时间无法搜索的BUG //修复关联模型下时间无法搜索的BUG
$relation = Loader::parseName($tableArr[0], 1, false); $relation = Loader::parseName($tableArr[0], 1, false);
$alias[$this->model->$relation()->getTable()] = $tableArr[0]; $alias[$this->model->$relation()->getTable()] = $tableArr[0];

3
public/assets/js/require-table.js
View File

@ -910,7 +910,8 @@ define(['jquery', 'bootstrap'], function ($, undefined) {
row.ids = ids ? ids : (typeof row.ids !== 'undefined' ? row.ids : 0); row.ids = ids ? ids : (typeof row.ids !== 'undefined' ? row.ids : 0);
url = url == null || url.length === 0 ? '' : url.toString(); url = url == null || url.length === 0 ? '' : url.toString();
//自动添加ids参数 //自动添加ids参数
url = !url.match(/\{ids\}/i) ? url + (url.match(/(\?|&)+/) ? "&ids=" : "/ids/") + '{ids}' : url; url = !url.match(/(?=([?&]ids=)|(\/ids\/)|(\{ids}))/i) ?
url + (url.match(/(\?|&)+/) ? "&ids=" : "/ids/") + '{ids}' : url;
url = url.replace(/\{(.*?)\}/gi, function (matched) { url = url.replace(/\{(.*?)\}/gi, function (matched) {
matched = matched.substring(1, matched.length - 1); matched = matched.substring(1, matched.length - 1);
if (matched.indexOf(".") !== -1) { if (matched.indexOf(".") !== -1) {