Merge pull request #1 from huiyonghkw/master

array_get is not support in laravel 6.x
cyd622 · Jan 13, 2022 · e59a445 · e59a445
2 parents 444cb84 + 6c2b46f
commit e59a445
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/.php_cs.cache b/.php_cs.cache
@@ -0,0 +1 @@
+{"php":"7.2.24","version":"2.16.0","indent":"    ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true},"hashes":{"config\/config.php":1868915280,"resources\/views\/index.blade.php":4162280623,"routes\/web.php":2271466094,"src\/Echarts.php":2774331493,"src\/Http\/Controllers\/EchartsController.php":530074248,"src\/EchartsServiceProvider.php":4210772860}}
diff --git a/config/config.php b/config/config.php
@@ -4,4 +4,4 @@
     'view' => 'echarts::index',
     'water_mark_text' => 'Cyd622@Laravel-Admin',
     'theme' => 'shine',
-];
+];
diff --git a/routes/web.php b/routes/web.php
@@ -2,4 +2,4 @@
 
 use Encore\Admin\Widgets\Echarts\Http\Controllers\EchartsController;
 
-Route::get('echarts', EchartsController::class.'@index');
+Route::get('echarts', EchartsController::class.'@index');
diff --git a/src/Echarts.php b/src/Echarts.php
@@ -161,7 +161,7 @@ private function buildOption()
         }
 
         if (!$this->showToolbox) {
-            array_set($this->toolbox, 'show', false);
+            data_set($this->toolbox, 'show', false);
         }
 
         $this->dataSource = $this->dataSource ?: $this->data;
@@ -196,7 +196,6 @@ private function buildOption()
      */
     public function bindLegend(array $data)
     {
-
         $this->dataSource = collect($this->data)->map(function ($item) use ($data) {
             $tmp = [];
             foreach ($data as $k => $v) {
@@ -369,4 +368,4 @@ public function setShowShadow(bool $showShadow)
         $this->showShadow = $showShadow;
         return $this;
     }
-}
+}
diff --git a/src/EchartsServiceProvider.php b/src/EchartsServiceProvider.php
@@ -22,7 +22,6 @@ public function boot(Echarts $extension)
         }
 
         if ($this->app->runningInConsole() && $assets = $extension->assets()) {
-
             $this->publishes(
                 [$assets => public_path('vendor/laravel-admin-ext/echarts')],
                 'echarts'
@@ -46,4 +45,4 @@ public function boot(Echarts $extension)
             Admin::headerJs('vendor/laravel-admin-ext/echarts/draw.js');
         });
     }
-}
+}
diff --git a/src/Http/Controllers/EchartsController.php b/src/Http/Controllers/EchartsController.php
@@ -89,7 +89,6 @@ public function index(Content $content)
             ->header('Echarts demo')
             ->description('百度echarts图表展示')
             ->row(function (Row $row) use ($box, $box2, $box3, $box4) {
-
                 $row->column(6, function (Column $column) use ($box) {
                     $column->append($box);
                 });
@@ -105,7 +104,6 @@ public function index(Content $content)
                 $row->column(6, function (Column $column) use ($box4) {
                     $column->append($box4);
                 });
-
             });
     }
-}
+}