Merge branch 'develop' of gitee.com:karson/fastadmin into develop

application/admin/command/Addon/stubs/config.stub

@@ -3,7 +3,7 @@
 return [
     [
         //配置唯一标识
-        'name'    => 'usernmae',
+        'name'    => 'username',
         //显示的标题
         'title'   => '用户名',
         //类型

application/common/controller/Backend.php

@@ -397,7 +397,8 @@ class Backend extends Controller
                         $arr = $arr[0];
                     }
                     $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
                         $relation = Loader::parseName($tableArr[0], 1, false);
                         $alias[$this->model->$relation()->getTable()] = $tableArr[0];

public/assets/js/require-table.js

@@ -914,7 +914,8 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                 row.ids = ids ? ids : (typeof row.ids !== 'undefined' ? row.ids : 0);
                 url = url == null || url.length === 0 ? '' : url.toString();
                 //自动添加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) {
                     matched = matched.substring(1, matched.length - 1);
                     if (matched.indexOf(".") !== -1) {