浏览代码

fix cascader 组件

xaboy 5 年之前
父节点
当前提交
d6bccb71ef
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 3 2
      src/UI/Elm/Components/Cascader.php
  2. 3 2
      src/UI/Iview/Components/Cascader.php

+ 3 - 2
src/UI/Elm/Components/Cascader.php

@@ -96,12 +96,13 @@ class Cascader extends FormComponent
      *    }]
      *    }]
      *  }
      *  }
      *
      *
-     * @param array $data
+     * @param array|callable $data
      * @return $this
      * @return $this
      */
      */
     public function options($data)
     public function options($data)
     {
     {
-        if (!is_array($data) || !$is_callable = is_callable($data)) return $this;
+        $is_callable = is_callable($data);
+        if (!is_array($data) && !$is_callable) return $this;
 
 
         $this->props['options'] = $is_callable ? $data($this) : $data;
         $this->props['options'] = $is_callable ? $data($this) : $data;
         return $this;
         return $this;

+ 3 - 2
src/UI/Iview/Components/Cascader.php

@@ -92,12 +92,13 @@ class Cascader extends FormComponent
      *    }]
      *    }]
      *  }
      *  }
      *
      *
-     * @param array $data
+     * @param array|callable $data
      * @return $this
      * @return $this
      */
      */
     public function data($data)
     public function data($data)
     {
     {
-        if (!is_array($data) || !$is_callable = is_callable($data)) return $this;
+        $is_callable = is_callable($data);
+        if (!is_array($data) && !$is_callable) return $this;
 
 
         $this->props['data'] = $is_callable ? $data($this) : $data;
         $this->props['data'] = $is_callable ? $data($this) : $data;
         return $this;
         return $this;