!18 3.0.5

Merge pull request !18 from celaraze/dev

README.md

@@ -78,7 +78,7 @@
 
 `git`，用于管理版本，部署和升级必要工具。
 
-`PHP 7.4 +` ，已经支持 PHP8 ，建议使用 PHP8。
+`PHP 8+` ，仅支持 PHP8。
 
 `MySQL 8 +`，数据库引擎，理论上 `MariaDB 10.2 +` 兼容支持。
 
@@ -113,6 +113,8 @@
 
 OVF 中包含以下组件：Nginx MySQL PHP7.4，网络通过 NAT 实现。
 
+> 此 OVF 中的 chemex 版本为支持 PHP7.4 的版本，但 chemex 从 3.0.4 开始将仅支持 PHP8.0 。
+
 Ubuntu 账密：chemex/chemex
 
 Web 程序主目录：/var/www/html

app/Admin/Actions/Grid/BatchAction/ConsumableRecordBatchDeleteAction.php

+<?php
+
+namespace App\Admin\Actions\Grid\BatchAction;
+
+use App\Services\ConsumableService;
+use Dcat\Admin\Actions\Response;
+use Dcat\Admin\Grid\BatchAction;
+
+class ConsumableRecordBatchDeleteAction extends BatchAction
+{
+    public function __construct($title = null)
+    {
+        parent::__construct($title);
+        $this->title = '<i class="fa fa-fw feather icon-trash-2"></i> ' . admin_trans_label('Batch Delete');
+    }
+
+    /**
+     * 确认弹窗.
+     *
+     * @return string
+     */
+    public function confirm(): string
+    {
+        return admin_trans_label('Batch Delete Confirm');
+    }
+
+    /**
+     * 处理逻辑.
+     *
+     * @return \Dcat\Admin\Actions\Response
+     */
+    public function handle(): Response
+    {
+        $keys = $this->getKey();
+
+        foreach ($keys as $key) {
+            ConsumableService::consumableDelete($key);
+        }
+
+        return $this->response()
+            ->success(trans('main.success'))
+            ->refresh();
+    }
+}

app/Admin/Actions/Grid/BatchAction/ConsumableRecordBatchForceDeleteAction.php

+<?php
+
+namespace App\Admin\Actions\Grid\BatchAction;
+
+use App\Services\ConsumableService;
+use Dcat\Admin\Actions\Response;
+use Dcat\Admin\Grid\BatchAction;
+
+class ConsumableRecordBatchForceDeleteAction extends BatchAction
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->title = '<i class="fa fa-fw feather icon-alert-octagon"></i> ' . admin_trans_label('Batch Force Delete');
+    }
+
+    /**
+     * 确认弹窗.
+     *
+     * @return string
+     */
+    public function confirm(): string
+    {
+        return admin_trans_label('Batch Force Delete Confirm');
+    }
+
+    /**
+     * 处理逻辑.
+     *
+     * @return \Dcat\Admin\Actions\Response
+     */
+    public function handle(): Response
+    {
+        $keys = $this->getKey();
+
+        foreach ($keys as $key) {
+            ConsumableService::consumableForceDelete($key);
+        }
+
+        return $this->response()
+            ->success(trans('main.success'))
+            ->refresh();
+    }
+}

app/Admin/Actions/Grid/BatchAction/DeviceRecordBatchCreateUpdateTrackAction.php

@@ -11,7 +11,7 @@ class DeviceRecordBatchCreateUpdateTrackAction extends BatchAction
     public function __construct()
     {
         parent::__construct();
-        $this->title = '👨‍💼 ' . admin_trans_label('Batch Track Create Update');
+        $this->title = '<i class="fa fa-fw feather icon-user-plus"></i> ' . admin_trans_label('Batch Track Create Update');
     }
 
     /**

app/Admin/Actions/Grid/BatchAction/DeviceRecordBatchDeleteAction.php

@@ -11,7 +11,7 @@ class DeviceRecordBatchDeleteAction extends BatchAction
     public function __construct()
     {
         parent::__construct();
-        $this->title = '🔨 ' . admin_trans_label('Batch Delete');
+        $this->title = '<i class="fa fa-fw feather icon-trash"></i> ' . admin_trans_label('Batch Delete');
     }
 
     /**

app/Admin/Actions/Grid/BatchAction/DeviceRecordBatchForceDeleteAction.php

+<?php
+
+namespace App\Admin\Actions\Grid\BatchAction;
+
+use App\Services\DeviceService;
+use Dcat\Admin\Actions\Response;
+use Dcat\Admin\Grid\BatchAction;
+
+class DeviceRecordBatchForceDeleteAction extends BatchAction
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->title = '<i class="fa fa-fw feather icon-alert-octagon"></i> ' . admin_trans_label('Batch Force Delete');
+    }
+
+    /**
+     * 确认弹窗.
+     *
+     * @return string
+     */
+    public function confirm(): string
+    {
+        return admin_trans_label('Batch Force Delete Confirm');
+    }
+
+    /**
+     * 处理逻辑.
+     *
+     * @return \Dcat\Admin\Actions\Response
+     */
+    public function handle(): Response
+    {
+        $keys = $this->getKey();
+
+        foreach ($keys as $key) {
+            DeviceService::deviceForceDelete($key);
+        }
+
+        return $this->response()
+            ->success(trans('main.success'))
+            ->refresh();
+    }
+}

app/Admin/Actions/Grid/BatchAction/PartRecordBatchDeleteAction.php

@@ -11,7 +11,7 @@ class PartRecordBatchDeleteAction extends BatchAction
     public function __construct($title = null)
     {
         parent::__construct($title);
-        $this->title = '🔨 ' . admin_trans_label('Batch Delete');
+        $this->title = '<i class="fa fa-fw feather icon-trash-2"></i> ' . admin_trans_label('Batch Delete');
     }
 
     /**

app/Admin/Actions/Grid/BatchAction/PartRecordBatchForceDeleteAction.php

+<?php
+
+namespace App\Admin\Actions\Grid\BatchAction;
+
+use App\Services\PartService;
+use Dcat\Admin\Actions\Response;
+use Dcat\Admin\Grid\BatchAction;
+
+class PartRecordBatchForceDeleteAction extends BatchAction
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->title = '<i class="fa fa-fw feather icon-alert-octagon"></i> ' . admin_trans_label('Batch Force Delete');
+    }
+
+    /**
+     * 确认弹窗.
+     *
+     * @return string
+     */
+    public function confirm(): string
+    {
+        return admin_trans_label('Batch Force Delete Confirm');
+    }
+
+    /**
+     * 处理逻辑.
+     *
+     * @return \Dcat\Admin\Actions\Response
+     */
+    public function handle(): Response
+    {
+        $keys = $this->getKey();
+
+        foreach ($keys as $key) {
+            PartService::partForceDelete($key);
+        }
+
+        return $this->response()
+            ->success(trans('main.success'))
+            ->refresh();
+    }
+}

app/Admin/Actions/Grid/BatchAction/ServiceRecordBatchDeleteAction.php

+<?php
+
+namespace App\Admin\Actions\Grid\BatchAction;
+
+use App\Services\ServiceService;
+use Dcat\Admin\Actions\Response;
+use Dcat\Admin\Grid\BatchAction;
+
+class ServiceRecordBatchDeleteAction extends BatchAction
+{
+    public function __construct($title = null)
+    {
+        parent::__construct($title);
+        $this->title = '<i class="fa fa-fw feather icon-trash-2"></i> ' . admin_trans_label('Batch Delete');
+    }
+
+    /**
+     * 确认弹窗.
+     *
+     * @return string
+     */
+    public function confirm(): string
+    {
+        return admin_trans_label('Batch Delete Confirm');
+    }
+
+    /**
+     * 处理逻辑.
+     *
+     * @return \Dcat\Admin\Actions\Response
+     */
+    public function handle(): Response
+    {
+        $keys = $this->getKey();
+
+        foreach ($keys as $key) {
+            ServiceService::serviceDelete($key);
+        }
+
+        return $this->response()
+            ->success(trans('main.success'))
+            ->refresh();
+    }
+}

app/Admin/Actions/Grid/BatchAction/ServiceRecordBatchForceDeleteAction.php

+<?php
+
+namespace App\Admin\Actions\Grid\BatchAction;
+
+use App\Services\ServiceService;
+use Dcat\Admin\Actions\Response;
+use Dcat\Admin\Grid\BatchAction;
+
+class ServiceRecordBatchForceDeleteAction extends BatchAction
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->title = '<i class="fa fa-fw feather icon-alert-octagon"></i> ' . admin_trans_label('Batch Force Delete');
+    }
+
+    /**
+     * 确认弹窗.
+     *
+     * @return string
+     */
+    public function confirm(): string
+    {
+        return admin_trans_label('Batch Force Delete Confirm');
+    }
+
+    /**
+     * 处理逻辑.
+     *
+     * @return \Dcat\Admin\Actions\Response
+     */
+    public function handle(): Response
+    {
+        $keys = $this->getKey();
+
+        foreach ($keys as $key) {
+            ServiceService::serviceForceDelete($key);
+        }
+
+        return $this->response()
+            ->success(trans('main.success'))
+            ->refresh();
+    }
+}

app/Admin/Actions/Grid/BatchAction/SoftwareRecordBatchDeleteAction.php

@@ -11,7 +11,7 @@ class SoftwareRecordBatchDeleteAction extends BatchAction
     public function __construct($title = null)
     {
         parent::__construct($title);
-        $this->title = '🔨 ' . admin_trans_label('Batch Delete');
+        $this->title = '<i class="fa fa-fw feather icon-trash-2"></i> ' . admin_trans_label('Batch Delete');
     }
 
     /**

app/Admin/Actions/Grid/BatchAction/SoftwareRecordBatchForceDeleteAction.php

+<?php
+
+namespace App\Admin\Actions\Grid\BatchAction;
+
+use App\Services\SoftwareService;
+use Dcat\Admin\Actions\Response;
+use Dcat\Admin\Grid\BatchAction;
+
+class SoftwareRecordBatchForceDeleteAction extends BatchAction
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->title = '<i class="fa fa-fw feather icon-alert-octagon"></i> ' . admin_trans_label('Batch Force Delete');
+    }
+
+    /**
+     * 确认弹窗.
+     *
+     * @return string
+     */
+    public function confirm(): string
+    {
+        return admin_trans_label('Batch Force Delete Confirm');
+    }
+
+    /**
+     * 处理逻辑.
+     *
+     * @return \Dcat\Admin\Actions\Response
+     */
+    public function handle(): Response
+    {
+        $keys = $this->getKey();
+
+        foreach ($keys as $key) {
+            SoftwareService::softwareForceDelete($key);
+        }
+
+        return $this->response()
+            ->success(trans('main.success'))
+            ->refresh();
+    }
+}

app/Admin/Actions/Grid/BatchAction/UserBatchDeleteAction.php

@@ -11,7 +11,7 @@ class UserBatchDeleteAction extends BatchAction
     public function __construct($title = null)
     {
         parent::__construct($title);
-        $this->title = '🔨 ' . admin_trans_label('Batch Delete');
+        $this->title = '<i class="fa fa-fw feather icon-trash-2"></i> ' . admin_trans_label('Batch Delete');
     }
 
     /**

app/Admin/Actions/Grid/BatchAction/UserBatchForceDeleteAction.php

+<?php
+
+namespace App\Admin\Actions\Grid\BatchAction;
+
+use App\Services\UserService;
+use Dcat\Admin\Actions\Response;
+use Dcat\Admin\Grid\BatchAction;
+
+class UserBatchForceDeleteAction extends BatchAction
+{
+    public function __construct($title = null)
+    {
+        parent::__construct($title);
+        $this->title = '<i class="fa fa-fw feather icon-trash-2"></i> ' . admin_trans_label('Batch Force Delete');
+    }
+
+    /**
+     * 确认弹窗.
+     *
+     * @return string
+     */
+    public function confirm(): string
+    {
+        return admin_trans_label('Batch Force Delete Confirm');
+    }
+
+    /**
+     * 处理逻辑.
+     *
+     * @return \Dcat\Admin\Actions\Response
+     */
+    public function handle(): Response
+    {
+        $keys = $this->getKey();
+
+        foreach ($keys as $key) {
+            UserService::userForceDelete($key);
+        }
+
+        return $this->response()->success(trans('main.success'))->refresh();
+    }
+}

app/Admin/Actions/Grid/RowAction/ApprovalRecordDeleteAction.php

@@ -11,7 +11,7 @@ class ApprovalRecordDeleteAction extends RowAction
     public function __construct()
     {
         parent::__construct();
-        $this->title = '🔨 ' . admin_trans_label('Delete');
+        $this->title = '<i class="fa fa-fw feather icon-trash"></i> ' . admin_trans_label('Delete');
     }
 
     /**

app/Admin/Actions/Grid/RowAction/CheckRecordUpdateNoAction.php

@@ -13,7 +13,7 @@ class CheckRecordUpdateNoAction extends RowAction
     public function __construct()
     {
         parent::__construct();
-        $this->title = '❌ ' . admin_trans_label('Cancel Check');
+        $this->title = '<i class="fa fa-fw feather icon-x"></i> ' . admin_trans_label('Cancel Check');
     }
 
     /**

app/Admin/Actions/Grid/RowAction/CheckRecordUpdateYesAction.php

@@ -13,7 +13,7 @@ class CheckRecordUpdateYesAction extends RowAction
     public function __construct()
     {
         parent::__construct();
-        $this->title = '⚡ ' . admin_trans_label('Finish Record');
+        $this->title = '<i class="fa fa-fw feather icon-check"></i> ' . admin_trans_label('Finish Record');
     }
 
     /**

app/Admin/Actions/Grid/RowAction/CheckTrackUpdateAction.php

@@ -11,7 +11,7 @@ class CheckTrackUpdateAction extends RowAction
     public function __construct()
     {
         parent::__construct();
-        $this->title = '👨‍💼 ' . admin_trans_label('Update Track');
+        $this->title = '<i class="fa fa-fw feather icon-clipboard"></i> ' . admin_trans_label('Update Track');
     }
 
     /**

app/Admin/Actions/Grid/RowAction/ConsumableRecordDeleteAction.php

+<?php
+
+namespace App\Admin\Actions\Grid\RowAction;
+
+use App\Services\ConsumableService;
+use Dcat\Admin\Actions\Response;
+use Dcat\Admin\Grid\RowAction;
+
+class ConsumableRecordDeleteAction extends RowAction
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->title = '<i class="fa fa-fw feather icon-trash"></i> ' . admin_trans_label('Delete');
+    }
+
+    /**
+     * 处理动作逻辑.
+     *
+     * @return Response
+     */
+    public function handle(): Response
+    {
+        ConsumableService::consumableDelete($this->getKey());
+
+        return $this->response()
+            ->success(trans('main.success'))
+            ->refresh();
+    }
+
+    /**
+     * 对话框.
+     *
+     * @return string[]
+     */
+    public function confirm(): array
+    {
+        return [admin_trans_label('Delete Confirm'), admin_trans_label('Delete Confirm Description')];
+    }
+}

app/Admin/Actions/Grid/RowAction/DeviceRecordCreateUpdateTrackAction.php

@@ -13,7 +13,7 @@ class DeviceRecordCreateUpdateTrackAction extends RowAction
     public function __construct($is_lend)
     {
         parent::__construct();
-        $this->title = '👨‍💼 ' . admin_trans_label('Track Create Update');
+        $this->title = '<i class="fa fa-fw feather icon-user-plus"></i> ' . admin_trans_label('Track Create Update');
         $this->is_lend = $is_lend;
     }