添加flat扩展

GridRoute组件支持{xxx.xx}深度对象值替换

Author: SmallRuralDog

package-lock.json

@@ -37,6 +37,7 @@
         "wangeditor": "^3.1.1"
     },
     "dependencies": {
+        "flat": "^5.0.0",
         "js-cookie": "^2.2.1",
         "mavon-editor": "^2.9.0",
         "vue-progressbar": "^0.7.5",

package.json

@@ -1,3 +1,10 @@
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
 /*!
  * JavaScript Cookie v2.2.1
  * https://github.com/js-cookie/js-cookie

public/0.js

@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=52747b333ef4846d11ef",
+    "/app.js": "/app.js?id=77438fd426d416cb6e8f",
     "/manifest.js": "/manifest.js?id=8991394a854ee5cdffc3",
     "/vendor.js": "/vendor.js?id=df0be4950fcb717193ba"
 }

public/5.js

@@ -10,6 +10,7 @@
   ></el-link>
 </template>
 <script>
+var flatten = require('flat')
 import { GridColumnComponent } from "@/mixins.js";
 export default {
   mixins: [GridColumnComponent],
@@ -22,7 +23,10 @@ export default {
     uri() {
       //替换变量
       let uri = this.attrs.uri;
-      this._.forEach(this.row, (value, key) => {
+
+      let flattenRow = flatten(this.row)
+
+      this._.forEach(flattenRow, (value, key) => {
         uri = this._.replace(uri, "{" + key + "}", value);
       });
       return uri;

public/app.js

@@ -8,8 +8,10 @@
 use SmallRuralDog\Admin\Auth\Database\OperationLog;
 
 use SmallRuralDog\Admin\Components\Attrs\SelectOption;
+use SmallRuralDog\Admin\Components\Form\Input;
 use SmallRuralDog\Admin\Components\Form\Select;
 use SmallRuralDog\Admin\Components\Grid\Avatar;
+use SmallRuralDog\Admin\Components\Grid\Route;
 use SmallRuralDog\Admin\Components\Grid\Tag;
 use SmallRuralDog\Admin\Form;
 use SmallRuralDog\Admin\Grid;
@@ -26,15 +28,16 @@ protected function grid()
             ->defaultSort('id', 'desc')
             ->stripe()
             ->emptyText("暂无日志")
-            ->height('auto');
+            ->height('auto')
+            ->appendFields(["user.id"]);
 
 
         $grid->column('id', "ID")->width("100");
         $grid->column('user.avatar', '头像', 'user_id')->component(Avatar::make()->size('small'))->width(80);
-        $grid->column('user.name', '用户', 'user_id')->help("操作用户")->sortable();
+        $grid->column('user.name', '用户', 'user_id')->help("操作用户")->sortable()->component(Route::make("/auth/logs?user_id={user.id}")->type("primary"));
         $grid->column('method', '请求方式')->width(100)->align('center')->component(Tag::make()->type(['GET' => 'info', 'POST' => 'success']));
         $grid->column('path', '路径')->help('操作URL')->sortable();
-        $grid->column('ip', 'IP');
+        $grid->column('ip', 'IP')->component(Route::make("/auth/logs?ip={ip}")->type("primary"));
         $grid->column('created_at', "创建时间")->sortable();
 
         $grid->actions(function (Grid\Actions $actions) {
@@ -45,14 +48,16 @@ protected function grid()
         });
 
         $grid->filter(function (Grid\Filter $filter) {
-            $filter->equal('user_id')->component(Select::make()->placeholder("请选择用户")->options(function () {
+            $user_id = (int)request('user_id');
+            $filter->equal('user_id')->component(Select::make($user_id)->placeholder("请选择用户")->options(function () {
                 $user_ids = OperationLog::query()->groupBy("user_id")->get(["user_id"])->pluck("user_id")->toArray();
                 /**@var Model $userModel */
                 $userModel = config('admin.database.users_model');
                 return $userModel::query()->whereIn("id", $user_ids)->get()->map(function ($user) {
                     return SelectOption::make($user->id, $user->name);
                 })->all();
             }));
+            $filter->equal('ip')->component(Input::make(request('ip'))->placeholder("IP"));
         });
 
         return $grid;