diff --git a/src/Admin.php b/src/Admin.php index c5f8562ca..fc22ab763 100755 --- a/src/Admin.php +++ b/src/Admin.php @@ -28,7 +28,7 @@ class Admin use HasAssets; use HasHtml; - const VERSION = '2.0.0-beta'; + const VERSION = '2.0.2-beta'; const SECTION = [ // 往 标签内输入内容 diff --git a/src/Color.php b/src/Color.php index 65f64dc35..e1116e8de 100644 --- a/src/Color.php +++ b/src/Color.php @@ -56,6 +56,10 @@ * @method string border(int $amt = 0) * @method string inputBorder(int $amt = 0) * @method string background(int $amt = 0) + * @method string darkModeBg(int $amt = 0) + * @method string darkModeFont(int $amt = 0) + * @method string darkModeColor(int $amt = 0) + * @method string darkModeColor2(int $amt = 0) */ class Color { @@ -173,6 +177,14 @@ class Color // 背景色 'background' => '#eff3f8', + + // 深色模式 + // 背景色 + 'dark-mode-bg' => '#2c2c43', + // 深色 + 'dark-mode-color' => '#222233', + 'dark-mode-color2' => '#1e1e2d', + 'dark-mode-font' => '##a8a9bb', ]; /** diff --git a/src/Grid/Filter/AbstractFilter.php b/src/Grid/Filter/AbstractFilter.php index 54965f3e0..49a4ea398 100755 --- a/src/Grid/Filter/AbstractFilter.php +++ b/src/Grid/Filter/AbstractFilter.php @@ -271,10 +271,6 @@ public function next($step = 1) */ public function condition($inputs) { - if ($this->ignore) { - return; - } - $value = Arr::get($inputs, $this->column); if ($value === null) { @@ -554,6 +550,10 @@ public function setValue($value) */ protected function buildCondition(...$params) { + if ($this->ignore) { + return; + } + $column = explode('.', $this->column); if (count($column) == 1) {