Merge pull request #15 from osindex/develop

🎨 1.card header 支持组件写法；2.content->body() 兼容html写法

Author: SmallRuralDog

docs/components.md

@@ -31,7 +31,17 @@ $baseForm->item("express_no", "物流单号")->required();
 将信息聚合在卡片容器中展示。
 
 ```php
-Card::make()->content();
+$header = '标题 <a style="float:right;">测试</a>'; //html文本
+$content = new Content; // 对象
+$header = $content->row(function (Row $row) {
+    $row->column(12, Widgets\Text::make('标题'));
+    $row->column(12, Form\CSwitch::make()->style(['float' => 'right']));
+});
+Card::make()->header(function (Content $content)
+{
+    $content->className('mt-10')->body('测试内容'); // 闭包
+})->content();
+// content同理
 ```
 
 ### Steps 步骤条

resources/js/components/widgets/Card.vue

@@ -2,10 +2,16 @@
   <el-card
     :style="attrs.style"
     :class="attrs.className"
-    :header="attrs.header"
     :body-style="attrs.bodyStyle"
     :shadow="attrs.shadow"
   >
+    <div slot="header" class="clearfix">
+      <component
+        v-if="attrs.header"
+        :is="attrs.header.componentName"
+        :attrs="attrs.header"
+      />
+    </div>
     <component
       v-if="attrs.content"
       :is="attrs.content.componentName"

src/Components/Widgets/Card.php

@@ -1,9 +1,7 @@
 <?php
 
-
 namespace SmallRuralDog\Admin\Components\Widgets;
 
-
 use SmallRuralDog\Admin\Components\Component;
 use SmallRuralDog\Admin\Layout\Content;
 
@@ -22,13 +20,13 @@ public static function make()
     }
 
     /**
-     * 设置 header 目前只支持String
+     * 设置 header
      * @param string $header
      * @return $this
      */
-    public function header(string $header)
+    public function header($header)
     {
-        $this->header = $header;
+        $this->header = instance_content($header);
         return $this;
     }
 
@@ -62,17 +60,8 @@ public function shadow(string $shadow)
      */
     public function content($content)
     {
-        if ($content instanceof \Closure) {
-            $c_content = new Content();
-            call_user_func($content, $c_content);
-            $this->content = $c_content;
-        } else {
-            $this->content = $content;
-        }
-
-
+        $this->content = instance_content($content);
         return $this;
     }
 
-
 }

src/Layout/Content.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace SmallRuralDog\Admin\Layout;
 
 use Closure;
@@ -21,13 +20,11 @@ public static function make()
         return new Content();
     }
 
-
     public function body($content)
     {
         return $this->row($content);
     }
 
-
     public function row($content)
     {
 
@@ -47,7 +44,6 @@ protected function addRow(Row $row)
         $this->rows[] = $row;
     }
 
-
     /**
      * @param bool $showHeader
      * @return $this
@@ -78,5 +74,4 @@ public function description($description)
         return $this;
     }
 
-
 }

src/Layout/Row.php

@@ -1,9 +1,9 @@
 <?php
 
-
 namespace SmallRuralDog\Admin\Layout;
 
 use SmallRuralDog\Admin\Components\Component;
+use SmallRuralDog\Admin\Components\Widgets\Html;
 
 class Row extends Component
 {
@@ -17,10 +17,12 @@ class Row extends Component
 
     protected $gutter = 0;
 
-
     public function __construct($content = '')
     {
         if (!empty($content)) {
+            if (is_string($content)) {
+                $this->column(24, Html::make()->html($content));
+            }
             $this->column(24, $content);
         }
     }
@@ -33,7 +35,6 @@ public function column($width, $content)
         return $column;
     }
 
-
     /**
      * @param Column $column
      */

src/helpers.php

@@ -1,6 +1,8 @@
 <?php
 
 use Illuminate\Support\MessageBag;
+use SmallRuralDog\Admin\Components\Widgets\Html;
+use SmallRuralDog\Admin\Layout\Content;
 
 if (!function_exists('admin_path')) {
 
@@ -17,7 +19,6 @@ function admin_path($path = '')
     }
 }
 
-
 if (!function_exists('admin_base_path')) {
     /**
      * Get admin url.
@@ -65,13 +66,14 @@ function admin_url($path = '', $parameters = [], $secure = null)
 if (!function_exists('admin_file_url')) {
     function admin_file_url($path)
     {
-        if (\Illuminate\Support\Str::contains($path,"//")){
+        if (\Illuminate\Support\Str::contains($path, "//")) {
             return $path;
         }
 
         return \Storage::disk(config('admin.upload.disk'))->url($path);
     }
-};
+}
+;
 
 if (!function_exists('admin_toastr')) {
 
@@ -102,3 +104,18 @@ function admin_asset($path)
         return (config('admin.https') || config('admin.secure')) ? secure_asset($path) : asset($path);
     }
 }
+if (!function_exists('instance_content')) {
+
+    function instance_content($content = '')
+    {
+        if (is_string($content)) {
+            return Html::make()->html($content);
+        } elseif ($content instanceof \Closure) {
+            $c_content = new Content();
+            call_user_func($content, $c_content);
+            return $c_content;
+        } else {
+            return $content;
+        }
+    }
+}