浏览代码

Merge branch 'master' into 2.0

jqh 4 年之前
父节点
当前提交
af8a5339ac
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      src/Form/Builder.php
  2. 1 1
      src/Grid/LazyRenderable.php
  3. 1 1
      src/Widgets/Form.php

+ 1 - 1
src/Form/Builder.php

@@ -506,7 +506,7 @@ class Builder
     {
         $field = $this->fields->first(function (Field $field) use ($name) {
             if (is_array($field->column())) {
-                return in_array($name, $field->column(), true);
+                return in_array($name, $field->column(), true) ? $field : null;
             }
 
             return $field === $name || $field->column() === $name;

+ 1 - 1
src/Grid/LazyRenderable.php

@@ -38,7 +38,7 @@ HTML;
 
     protected function addStyle()
     {
-        Admin::style('.select2-container{z-index:29891015}');
+        Admin::style('.select2-container--open{z-index:29891015}');
     }
 
     /**

+ 1 - 1
src/Widgets/Form.php

@@ -362,7 +362,7 @@ class Form implements Renderable
     {
         foreach ($this->fields as $field) {
             if (is_array($field->column())) {
-                return in_array($name, $field->column(), true);
+                return in_array($name, $field->column(), true) ? $field : null;
             }
 
             if ($field === $name || $field->column() === $name) {