修复Filter ignore无效问题；增加暗黑模式颜色

jqhph · Oct 21, 2020 · f29205f · f29205f
1 parent 4953682
commit f29205f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git 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 = [
         // 往 <head> 标签内输入内容

diff --git 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
@@ -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) {