From eb94f54cbaa6f855ce726f5d25f93313d94d378b Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Fri, 29 Jul 2022 11:24:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E7=AE=A1=E7=90=86-=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../banner/resources/assets/css/index.css | 4 --- packages/banner/resources/assets/js/index.js | 26 ------------------- .../banner/resources/views/index.blade.php | 13 ---------- .../src/Http/Controllers/BannerController.php | 13 ++++++++++ .../setting/resources/lang/zh_CN/setting.php | 5 ++-- .../Http/Controllers/SettingController.php | 19 +++++++++----- packages/setting/src/Models/Setting.php | 3 +++ 7 files changed, 31 insertions(+), 52 deletions(-) delete mode 100644 packages/banner/resources/assets/css/index.css delete mode 100644 packages/banner/resources/assets/js/index.js delete mode 100644 packages/banner/resources/views/index.blade.php diff --git a/packages/banner/resources/assets/css/index.css b/packages/banner/resources/assets/css/index.css deleted file mode 100644 index d69dd2d..0000000 --- a/packages/banner/resources/assets/css/index.css +++ /dev/null @@ -1,4 +0,0 @@ -.extension-demo { - font-size: 1.3rem; - cursor: pointer; -} \ No newline at end of file diff --git a/packages/banner/resources/assets/js/index.js b/packages/banner/resources/assets/js/index.js deleted file mode 100644 index cdc4a7e..0000000 --- a/packages/banner/resources/assets/js/index.js +++ /dev/null @@ -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); \ No newline at end of file diff --git a/packages/banner/resources/views/index.blade.php b/packages/banner/resources/views/index.blade.php deleted file mode 100644 index 5acad67..0000000 --- a/packages/banner/resources/views/index.blade.php +++ /dev/null @@ -1,13 +0,0 @@ -
- Welcome to dcat-admin ! -
- - - - diff --git a/packages/banner/src/Http/Controllers/BannerController.php b/packages/banner/src/Http/Controllers/BannerController.php index fdf5e0d..2ee00be 100644 --- a/packages/banner/src/Http/Controllers/BannerController.php +++ b/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('
%s
', json_encode($this->ext, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE))); + + return "
$card
"; + }); + }); + $grid->column('remarks'); $grid->setDialogFormDimensions('50%', '70%'); diff --git a/packages/setting/resources/lang/zh_CN/setting.php b/packages/setting/resources/lang/zh_CN/setting.php index 7d06d31..a81affa 100755 --- a/packages/setting/resources/lang/zh_CN/setting.php +++ b/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' => [ ], diff --git a/packages/setting/src/Http/Controllers/SettingController.php b/packages/setting/src/Http/Controllers/SettingController.php index 3513636..df161ab 100644 --- a/packages/setting/src/Http/Controllers/SettingController.php +++ b/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 搜索'); }); diff --git a/packages/setting/src/Models/Setting.php b/packages/setting/src/Models/Setting.php index 5cf4663..67c4f90 100644 --- a/packages/setting/src/Models/Setting.php +++ b/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;