兼容问题

Author: hikki

src/CascadeDot.php

@@ -2,9 +2,8 @@
 
 namespace DLP;
 
-use Encore\Admin\Form\Field;
 
-class CascadeDot extends Field
+class CascadeDot extends DLPField
 {
     protected $view = 'dlp::component';
 
@@ -14,10 +13,7 @@ public function render()
         $height = isset($this->attributes['height']) ?  $this->attributes['height'] : '200px';
         $this->addVariables(['height'=>$height]);
         $select = json_encode($this->options, JSON_UNESCAPED_UNICODE | JSON_HEX_QUOT | JSON_HEX_APOS);
-        $selected = array_map(function ($v) {
-            return (int)$v;
-        }, array_values($this->checked));
-        $selected = json_encode($selected);
+        $selected = json_encode($this->checked);
         $this->script = <<<EOT
 new ComponentCascadeDot("{$id}",JSON.parse('{$selected}'),JSON.parse('{$select}'));
 EOT;

src/DLPField.php

@@ -0,0 +1,63 @@
+<?php
+namespace DLP;
+
+use Encore\Admin\Form\Field;
+use Illuminate\Contracts\Support\Arrayable;
+
+class DLPField extends Field
+{
+    protected $view = 'dlp::component';
+
+    /**
+     * Set the field options.
+     *
+     * @param array $options
+     *
+     * @return $this
+     */
+    public function options($options = [])
+    {
+        if ($options instanceof Arrayable) {
+            $options = $options->toArray();
+        }
+
+        $this->options = $options;
+        return $this;
+    }
+
+    /**
+     * Set the field option checked.
+     *
+     * @param array $checked
+     *
+     * @return $this
+     */
+    public function checked($checked = [])
+    {
+        if ($checked instanceof Arrayable) {
+            $checked = $checked->toArray();
+        }
+
+        $this->checked = array_map(function ($v) {
+            return (int)$v;
+        }, array_values($checked));;
+        return $this;
+    }
+
+    /**
+     * Set the field option checked.
+     *
+     * @param array $columns
+     *
+     * @return $this
+     */
+    public function columns($columns)
+    {
+        if ($columns instanceof Arrayable) {
+            $columns = $columns->toArray();
+        }
+
+        $this->columns = $columns;;
+        return $this;
+    }
+}

src/Dot.php

@@ -2,9 +2,8 @@
 
 namespace DLP;
 
-use Encore\Admin\Form\Field;
 
-class Dot extends Field
+class Dot extends DLPField
 {
     protected $view = 'dlp::component';
 
@@ -14,10 +13,7 @@ public function render()
         $height = isset($this->attributes['height']) ?  $this->attributes['height'] : '200px';
         $this->addVariables(['height'=>$height]);
         $select = json_encode($this->options, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE | JSON_HEX_QUOT | JSON_HEX_APOS);
-        $selected = array_map(function ($v) {
-            return (int)$v;
-        }, array_values($this->checked));
-        $selected = json_encode($selected);
+        $selected = json_encode($this->checked);
         $this->script = <<<EOT
 new ComponentDot("{$id}",JSON.parse('{$selected}'),JSON.parse('{$select}'));
 EOT;

src/Linear.php

@@ -2,25 +2,23 @@
 
 namespace DLP;
 
-use Encore\Admin\Form\Field;
 
-class Linear extends Field
+class Linear extends DLPField
 {
     protected $view = 'dlp::component';
 
     public function render()
     {
         $id = $this->formatName($this->id);
-        if(isset($this->attributes['columns'])){
-            $columns = json_encode($this->attributes['columns']);
+        if(isset($this->columns)){
+            $columns = json_encode($this->columns);
         }else{
             $columns = [];
             foreach (array_keys(current($this->options)) as $key){
                 $columns[$key] = ['name'=>$key,'type' => 'text'];
             }
             $columns = json_encode($columns);
         }
-        $this->attributes['columns'] = null;
         $options = isset($this->attributes['options']) ?  json_encode($this->attributes['options']) : json_encode(['sortable'=>true,'delete'=>true]);
         $height = isset($this->attributes['height']) ?  $this->attributes['height'] : '360px';
         $this->addVariables(['height'=>$height]);

test/example.php

@@ -132,8 +132,7 @@ protected function form($id)
          * attribute.height 设置高度 默认200px
          */
         $form->Dot('dot','标签选择器')
-            ->options([1=>'松下紗栄子',2=>'上原亜衣',3=>'白石茉莉奈',4=>'美谷朱里',5=>'沖田杏梨',
-            6=>'由愛可奈',7=>'七瀬あいり',8=>'五十嵐星蘭',9=>'仲里紗羽',10=>'波多野結衣'])
+            ->options([1=>'松下紗栄子',2=>'上原亜衣',3=>'白石茉莉奈',4=>'美谷朱里',5=>'沖田杏梨',6=>'由愛可奈',7=>'七瀬あいり',8=>'五十嵐星蘭',9=>'仲里紗羽',10=>'波多野結衣'])
             ->checked([1,2,3])
             ->attribute(['height'=>'200px']);
 
@@ -150,7 +149,7 @@ protected function form($id)
          */
         $form->CascadeDot('cascadeDot','级联标签选择器')
             ->options($this->cascadeData())
-            ->checked([614,377,550,543,544])
+            ->checked([614,550,543])
             ->attribute(['height'=>'200px']);
 
 
@@ -166,16 +165,14 @@ protected function form($id)
             ['name'=>'01','meta'=>'test info1','url'=>'1','time'=>'2021-05-15 00:00:00','is-small'=>1,'is-warning'=>1],
             ['name'=>'02','meta'=>'test info2','url'=>'2','time'=>'2021-05-15 00:00:00','is-small'=>1,'is-warning'=>1],
             ['name'=>'03','meta'=>'test info3','url'=>'3','time'=>'2021-05-15 00:00:00','is-small'=>1,'is-warning'=>1]])
-            ->attribute([
-            'columns' => [
+            ->columns([
                 'name' => ['name' => '名称', 'type' => 'input'],
                 'meta' => ['name' => '信息', 'type' => 'input'],
                 'url' => ['name' => '链接', 'type' => 'input'],
                 'time' => ['name' => '更新时间', 'type' => 'text'],
                 'is-small' => ['name' => '高清[1是 2否]', 'type' => 'input', 'style' => 'width:60px'],
-                'is-warning' => ['name' => '含字幕[1是 2否]', 'type' => 'input', 'style' => 'width:60px'],
-                'tooltip' => ['name' => '可下载[1是 2否]', 'type' => 'input', 'style' => 'width:60px']]
-        ]);
+                'is-warning' => ['name' => '含字幕[1是 2否]', 'type' => 'input', 'style' => 'width:60px']
+            ]);
         return $form;
     }