Главная Обзор Помощь
Регистрация Вход
dcatadmin2
/
dcat-admin2
2
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

Merge pull request #822 from Celaraze/2.0

优化：卡片中图表显示溢出的问题
Jiang Qinghua 5 лет назад
Родитель
cf40c533a8 a83dc43963
Сommit
68283c24f4
2 измененных файлов с 22 добавлено и 11 удалено
Единый вид Показать статистику Diff
  1. 21 10
      src/Widgets/Metrics/Card.php
  2. 1 1
      src/Widgets/Metrics/Line.php

+ 21 - 10
src/Widgets/Metrics/Card.php
Просмотреть файл 

@@ -97,6 +97,13 @@ class Card extends Widget
 
      */
 
      */
 
     protected $chartMarginBottom;
 
     protected $chartMarginBottom;
 
 
 
+    /**
 
+     * 图表右间距.
 
+     *
 
+     * @var int
 
+     */
 
+    protected $chartMarginRight = 1;
 
+
 
     /**
 
     /**
 
      * 图表配置.
 
      * 图表配置.
 
      *
 
      *
 
@@ -131,7 +138,7 @@ class Card extends Widget
 
      */
 
      */
 
     protected function init()
 
     protected function init()
 
     {
 
     {
 
-        $this->id('metric-card-'.Str::random(8));
 
+        $this->id('metric-card-' . Str::random(8));
 
         $this->class('card');
 
         $this->class('card');
 
     }
 
     }
 
 
 
@@ -341,7 +348,7 @@ class Card extends Widget
 
      */
 
      */
 
     public function chartLabels($label)
 
     public function chartLabels($label)
 
     {
 
     {
 
-        $this->chartOptions['labels'] = (array) $label;
 
+        $this->chartOptions['labels'] = (array)$label;
 
 
 
         $this->useChart();
 
         $this->useChart();
 
 
 
@@ -357,7 +364,7 @@ class Card extends Widget
 
      */
 
      */
 
     public function chartColors($colors)
 
     public function chartColors($colors)
 
     {
 
     {
 
-        $this->chartOptions['colors'] = (array) $colors;
 
+        $this->chartOptions['colors'] = (array)$colors;
 
 
 
         $this->useChart();
 
         $this->useChart();
 
 
 
@@ -392,7 +399,7 @@ class Card extends Widget
 
      */
 
      */
 
     protected function setUpChart()
 
     protected function setUpChart()
 
     {
 
     {
 
-        if (! $chart = $this->chart) {
 
+        if (!$chart = $this->chart) {
 
             return;
 
             return;
 
         }
 
         }
 
 
 
@@ -403,7 +410,7 @@ class Card extends Widget
 
 
 
         // 颜色
 
         // 颜色
 
         if (empty($this->chartOptions['colors'])) {
 
         if (empty($this->chartOptions['colors'])) {
 
-            $this->chartOptions['colors'] = (array) Admin::color()->get($this->style);
 
+            $this->chartOptions['colors'] = (array)Admin::color()->get($this->style);
 
         }
 
         }
 
 
 
         // 图表配置选项
 
         // 图表配置选项
 
@@ -428,6 +435,10 @@ class Card extends Widget
 
         if ($this->chartMarginBottom !== null) {
 
         if ($this->chartMarginBottom !== null) {
 
             $this->chart->style("margin-bottom: {$this->chartMarginBottom}px;");
 
             $this->chart->style("margin-bottom: {$this->chartMarginBottom}px;");
 
         }
 
         }
 
+
 
+        if ($this->chartMarginRight !== null) {
 
+            $this->chart->style("margin-right: {$this->chartMarginRight}px;");
 
+        }
 
     }
 
     }
 
 
 
     /**
 
     /**
 
@@ -435,7 +446,7 @@ class Card extends Widget
 
      */
 
      */
 
     public function addScript()
 
     public function addScript()
 
     {
 
     {
 
-        if (! $this->allowBuildRequest()) {
 
+        if (!$this->allowBuildRequest()) {
 
             return;
 
             return;
 
         }
 
         }
 
 
 
@@ -514,7 +525,7 @@ JS;
 
      */
 
      */
 
     protected function setUpCardHeight()
 
     protected function setUpCardHeight()
 
     {
 
     {
 
-        if (! $height = $this->height) {
 
+        if (!$height = $this->height) {
 
             return;
 
             return;
 
         }
 
         }
 
 
 
@@ -557,11 +568,11 @@ JS;
 
 
 
         return array_merge(
 
         return array_merge(
 
             [
 
             [
 
-                'status'  => 1,
 
-                'header'  => $this->renderHeader(),
 
+                'status' => 1,
 
+                'header' => $this->renderHeader(),
 
                 'content' => $this->renderContent(),
 
                 'content' => $this->renderContent(),
 
             ],
 
             ],
 
-            (array) optional($this->chart)->valueResult()
 
+            (array)optional($this->chart)->valueResult()
 
         );
 
         );
 
     }
 
     }
 
 }
 
 }

+ 1 - 1
src/Widgets/Metrics/Line.php
Просмотреть файл 

@@ -115,7 +115,7 @@ class Line extends Card
 
 
 
         return <<<HTML
 
         return <<<HTML
 
 {$content}
 
 {$content}
 
-<div class="card-content" style="overflow-x:hidden;overflow-y:hidden">
 
+<div class="card-content">
 
     {$this->renderChart()}
 
     {$this->renderChart()}
 
 </div>
 
 </div>
 
 HTML;
 
 HTML;