Merge branch '2.0' into gitee2

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) }}"

src/Grid/Displayers/Limit.php

@@ -42,9 +42,7 @@ JS;
 
         $value = Helper::strLimit($this->value, $limit, $end);
 
-        $original = $this->column->getOriginal();
-
-        if ($value == $original) {
+        if ($value == $this->value) {
             return $value;
         }
 
@@ -54,7 +52,7 @@ JS;
     &nbsp;<a href="javascript:void(0);" class="limit-more">&nbsp;<i class="fa fa-angle-double-down"></i></a>
 </div>
 <div class="limit-text d-none">
-    <span class="text">{$original}</span>
+    <span class="text">{$this->value}</span>
     &nbsp;<a href="javascript:void(0);" class="limit-more">&nbsp;<i class="fa fa-angle-double-up"></i></a>
 </div>
 HTML;

src/Grid/Tools/Selector.php

@@ -147,6 +147,10 @@ class Selector
 
         foreach ($selected as &$value) {
             $value = explode(',', $value);
+
+            foreach ($value as &$v) {
+                $v = (string) $v;
+            }
         }
 
         return $this->selected = $selected;
@@ -182,8 +186,8 @@ class Selector
             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 = [];

src/Support/Helper.php

@@ -417,13 +417,14 @@ class Helper
      *
      * @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]);
             }
         }