fix height + add disable date

LonnyX · Jul 18, 2022 · 328114f · 328114f
1 parent 306a048
commit 328114f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/dist/js/nova-apex-chart.js b/dist/js/nova-apex-chart.js
diff --git a/resources/js/components/BaseNovaApexChart.vue b/resources/js/components/BaseNovaApexChart.vue
@@ -5,7 +5,7 @@
 
             <HelpTextTooltip v-if="helpText" :text="helpText" :width="helpWidth" />
 
-            <div class="ml-auto w-[16rem] flex-shrink-0">
+            <div v-if="!disableDate" class="ml-auto w-[16rem] flex-shrink-0">
                 <litepie-datepicker :placeholder="datePlaceHolder || '-'" :formatter="dateFormatter" separator=" - " v-model="dateValue">
                 </litepie-datepicker>
             </div>
@@ -66,6 +66,7 @@ export default {
         helpText: {},
         helpWidth: {},
         maxWidth: {},
+        disableDate: false,
     },
 
     methods: {
@@ -100,6 +101,7 @@ export default {
             if (!this.options) {
                 return;
             }
+            console.log(this.chartHeight + '/' + this.chartWidth + '/' + this.series);
             const options = this.options
             this.handleFormatter(options)
             return options

diff --git a/resources/js/components/NovaApexChart.vue b/resources/js/components/NovaApexChart.vue
@@ -1,15 +1,18 @@
 <template>
     <BaseNovaApexChart
         @selected="handleSelected"
-        :width="chartWidth"
-        :height="chartHeight"
+        :chartWidth="chartWidth"
+        :chartHeight="chartHeight"
+        :height="height"
+        :width="width"
         :chartType="chartType"
         :series="series"
         :options="options"
         :title="name"
         :help-text="helpText"
         :help-width="helpWidth"
         :datePlaceHolder="datePlaceHolder"
+        :disableDate="disableDate"
         :loading="loading" />
 </template>
 
@@ -64,7 +67,6 @@ export default {
     methods: {
         handleSelected(dateValue) {
             this.selectedDateValue = {...dateValue};
-            console.log('handleSelected', this.selectedDateValue);
             this.fetch();
         },
         fetch() {
@@ -81,6 +83,7 @@ export default {
                             width,
                             height,
                             datePlaceHolder,
+                            disableDate,
                         },
                     },
                 }) => {
@@ -92,6 +95,7 @@ export default {
                     this.width = width;
                     this.height = height;
                     this.datePlaceHolder = datePlaceHolder;
+                    this.disableDate = disableDate || false;
                     this.loading = false;
                 }
             )

diff --git a/src/ApexMetric.php b/src/ApexMetric.php
@@ -55,6 +55,11 @@ public function chartHeight(string $type): self
         return $this->withMeta([ 'chartHeight' => $type ]);
     }
 
+    public function disableDate(bool $disabled = true): self
+    {
+        return $this->withMeta([ 'disableDate' => $disabled ]);
+    }
+
     public function options(array $options): self
     {
         return $this->withMeta([ 'options' => (object) $options ]);