广告管理-调整配置

packages/banner/resources/assets/css/index.css

@@ -1,4 +0,0 @@
-.extension-demo {
-    font-size: 1.3rem;
-    cursor: pointer;
-}

packages/banner/resources/assets/js/index.js

@@ -1,26 +0,0 @@
-(function (w, $) {
-    function ExtensionDemo(options) {
-        this.options = $.extend({
-            $el: $('.demo'),
-        }, options);
-
-        this.init(this.options);
-    }
-
-    ExtensionDemo.prototype = {
-        init: function (options) {
-            options.$el.on('click', function () {
-                Dcat.success($(this).text());
-            });
-
-            console.log('Done.');
-        },
-    };
-
-    $.fn.extensionDemo = function (options) {
-        options = options || {};
-        options.$el = $(this);
-
-        return new ExtensionDemo(options);
-    };
-})(window, jQuery);

packages/banner/resources/views/index.blade.php

@@ -1,13 +0,0 @@
-<div class="extension-demo">
-	Welcome to dcat-admin !
-</div>
-
-<style>
-	.extension-demo {
-		color: @primary;
-	}
-</style>
-
-<script require="@Peidikeji.Banner">
-	$('.extension-demo').extensionDemo();
-</script>

packages/banner/src/Http/Controllers/BannerController.php

@@ -5,6 +5,7 @@ namespace Peidikeji\Banner\Http\Controllers;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Admin;
+use Dcat\Admin\Widgets\Card;
 use Illuminate\Http\Request;
 use Peidikeji\Banner\Models\Banner;
 use Peidikeji\Banner\Models\BannerAd;
@@ -62,6 +63,18 @@ class BannerController extends AdminController
             })->else(function (GridColumn $column) {
                 $column->bool();
             });
+            $grid->column('ext')
+            ->if(function(){
+                return $this->ext;
+            })->then(function (GridColumn $column) {
+                $column->display('展开')->expand(function () {
+                    // 返回显示的详情
+                    $card = new Card(null, sprintf('<pre class="dump">%s</pre>', json_encode($this->ext, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)));
+
+                    return "<div style='padding:10px 10px 0'>$card</div>";
+                });
+            });
+
             $grid->column('remarks');
 
             $grid->setDialogFormDimensions('50%', '70%');

packages/setting/resources/lang/zh_CN/setting.php

@@ -3,11 +3,12 @@
 return [
     'labels' => [
         'Setting' => '配置管理',
-        'setting' => '配置管理',
+        'settings' => '配置管理',
     ],
     'fields' => [
+        'name' => '名称',
         'slug' => 'key',
-        'value' => 'value',
+        'value' => '值',
     ],
     'options' => [
     ],

packages/setting/src/Http/Controllers/SettingController.php

@@ -4,14 +4,15 @@ namespace Peidikeji\Setting\Http\Controllers;
 
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Http\Controllers\AdminController;
-use Peidikeji\Setting\Models\Setting;
 use Dcat\Admin\Show;
+use Dcat\Admin\Admin;
 use Illuminate\Validation\Rule;
+use Peidikeji\Setting\Models\Setting;
+use Dcat\Admin\Http\Controllers\AdminController;
 
 class SettingController extends AdminController
 {
-    protected $translation = 'peidikeji.dcat-admin-extension-setting::setting';
+    protected $translation = 'peidikeji.setting::setting';
 
     protected function grid()
     {
@@ -20,10 +21,14 @@ class SettingController extends AdminController
             $grid->column('name');
             $grid->column('value');
 
-            $grid->showCreateButton();
-            $grid->showQuickEditButton();
-            $grid->showDeleteButton();
-            $grid->showViewButton();
+            $grid->disableCreateButton(!(!config('admin.permission.enable') || Admin::user()->can('dcat.admin.settings.create')));
+            $grid->enableDialogCreate();
+
+            $grid->actions(function (Grid\Displayers\Actions $actions) {
+                $actions->disableView();
+                $actions->disableEdit();
+                $actions->quickEdit(!config('admin.permission.enable') || Admin::user()->can('dcat.admin.settings.edit'));
+            });
 
             $grid->quickSearch(['slug', 'name', 'value'])->placeholder('输入 key/名称/value 搜索');
         });

packages/setting/src/Models/Setting.php

@@ -6,6 +6,9 @@ use Illuminate\Database\Eloquent\Model;
 
 class Setting extends Model
 {
+
+    protected $table = 'admin_settings';
+
     protected $primaryKey = 'slug';
 
     public $incrementing = false;