修复表格规格选择器存在多个0开头选项时选中功能异常问题

jqhph · Mar 8, 2021 · 1f2a7eb · 1f2a7eb
1 parent bc6dbb2
commit 1f2a7eb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/resources/views/grid/selector.blade.php b/resources/views/grid/selector.blade.php
@@ -6,7 +6,7 @@
                 <ul>
                     @foreach($selector['options'] as $value => $option)
                         @php
-                            $active = in_array($value, \Illuminate\Support\Arr::get($selected, $column, []));
+                            $active = in_array((string) $value, \Illuminate\Support\Arr::get($selected, $column, []), true);
                         @endphp
                         <li>
                             <a href="{{ $self->url($column, $value, true) }}"

diff --git a/src/Grid/Tools/Selector.php b/src/Grid/Tools/Selector.php
@@ -147,6 +147,10 @@ public function parseSelected()
 
         foreach ($selected as &$value) {
             $value = explode(',', $value);
+
+            foreach ($value as &$v) {
+                $v = (string) $v;
+            }
         }
 
         return $this->selected = $selected;
@@ -182,8 +186,8 @@ public function url($column, $value = null, $add = false)
             return $this->request->fullUrlWithQuery($query);
         }
 
-        if (in_array($value, $options)) {
-            Helper::deleteByValue($options, $value);
+        if (in_array((string) $value, $options, true)) {
+            Helper::deleteByValue($options, (string) $value, true);
         } else {
             if ($add) {
                 $options = [];

diff --git a/src/Support/Helper.php b/src/Support/Helper.php
@@ -417,13 +417,14 @@ public static function exportArrayPhp(array $array)
      *
      * @param array $array
      * @param mixed $value
+     * @param bool $strict
      */
-    public static function deleteByValue(&$array, $value)
+    public static function deleteByValue(&$array, $value, bool $strict = false)
     {
         $value = (array) $value;
 
         foreach ($array as $index => $item) {
-            if (in_array($item, $value)) {
+            if (in_array($item, $value, $strict)) {
                 unset($array[$index]);
             }
         }