From d910dbb01c9f1a1f2d238e0f157867d22c9c3ba8 Mon Sep 17 00:00:00 2001
From: makotocc0107 <1424018999@qq.com>
Date: Wed, 28 Aug 2024 16:13:59 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=88=A0=E9=99=A4=E4=BA=86?=
 =?UTF-8?q?updatetoetcd=E7=9A=84page=E9=A1=B5=E9=9D=A2=E3=80=81widget?=
 =?UTF-8?q?=E6=8E=92=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 23 ++++++++++++++-----
 .../app/Filament/Widgets/PrometheusMemory.php |  6 +++--
 .../Filament/Widgets/UpdateConfigWidget.php   |  2 ++
 .../Providers/Filament/AdminPanelProvider.php |  5 ++--
 .../filament/pages/update-to-etcd.blade.php   | 10 --------
 5 files changed, 25 insertions(+), 21 deletions(-)
 delete mode 100644 management-panel/resources/views/filament/pages/update-to-etcd.blade.php

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a936d84..075570f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="596fb1a0-d6fb-4db8-a922-13b01593ce79" name="更改" comment="[增添]添加了Prometheus服务、对应的widget展示（待美化）">
+    <list default="true" id="596fb1a0-d6fb-4db8-a922-13b01593ce79" name="更改" comment="[修改]修改美化了了widget样式，折线图展示">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/management-panel/app/Filament/Widgets/PrometheusMetrics.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/management-panel/app/Filament/Pages/UpdateToEtcd.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/management-panel/app/Filament/Widgets/PrometheusMemory.php" beforeDir="false" afterPath="$PROJECT_DIR$/management-panel/app/Filament/Widgets/PrometheusMemory.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/management-panel/app/Filament/Widgets/UpdateConfigWidget.php" beforeDir="false" afterPath="$PROJECT_DIR$/management-panel/app/Filament/Widgets/UpdateConfigWidget.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/management-panel/app/Providers/Filament/AdminPanelProvider.php" beforeDir="false" afterPath="$PROJECT_DIR$/management-panel/app/Providers/Filament/AdminPanelProvider.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/management-panel/resources/views/filament/widgets/prometheus-metrics.blade.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/management-panel/resources/views/filament/pages/update-to-etcd.blade.php" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -259,7 +261,7 @@
       <workItem from="1724743649380" duration="22000" />
       <workItem from="1724743707590" duration="5840000" />
       <workItem from="1724806979170" duration="149000" />
-      <workItem from="1724808563307" duration="14085000" />
+      <workItem from="1724808563307" duration="14880000" />
     </task>
     <task id="LOCAL-00001" summary="[增添]添加注册">
       <option name="closed" value="true" />
@@ -373,7 +375,15 @@
       <option name="project" value="LOCAL" />
       <updated>1724829229997</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="[修改]修改美化了了widget样式，折线图展示">
+      <option name="closed" value="true" />
+      <created>1724831975781</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1724831975781</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -433,6 +443,7 @@
     <MESSAGE value="[增添]增添了datasource中的配置参数及对应页面" />
     <MESSAGE value="[修改]修改文本 调整了布局" />
     <MESSAGE value="[增添]添加了Prometheus服务、对应的widget展示（待美化）" />
-    <option name="LAST_COMMIT_MESSAGE" value="[增添]添加了Prometheus服务、对应的widget展示（待美化）" />
+    <MESSAGE value="[修改]修改美化了了widget样式，折线图展示" />
+    <option name="LAST_COMMIT_MESSAGE" value="[修改]修改美化了了widget样式，折线图展示" />
   </component>
 </project>
\ No newline at end of file
diff --git a/management-panel/app/Filament/Widgets/PrometheusMemory.php b/management-panel/app/Filament/Widgets/PrometheusMemory.php
index b5022ab..4cb08b8 100644
--- a/management-panel/app/Filament/Widgets/PrometheusMemory.php
+++ b/management-panel/app/Filament/Widgets/PrometheusMemory.php
@@ -7,7 +7,9 @@ use Filament\Widgets\ChartWidget;
 
 class PrometheusMemory extends ChartWidget
 {
-    protected static ?string $heading = 'Chart';
+    protected static ?int $sort = 3;
+
+    protected static ?string $heading = '内存占用率';
 
     protected function getData(): array
     {
@@ -34,7 +36,7 @@ class PrometheusMemory extends ChartWidget
             'labels' => $labels,
             'datasets' => [
                 [
-                    'label' => 'Memory Usage (%)',
+                    'label' => '内存占用率 (%)',
                     'data' => $data,
                     'borderColor' => '#4CAF50',
                     'backgroundColor' => 'rgba(76, 175, 80, 0.2)',
diff --git a/management-panel/app/Filament/Widgets/UpdateConfigWidget.php b/management-panel/app/Filament/Widgets/UpdateConfigWidget.php
index decef0d..12caaee 100644
--- a/management-panel/app/Filament/Widgets/UpdateConfigWidget.php
+++ b/management-panel/app/Filament/Widgets/UpdateConfigWidget.php
@@ -11,6 +11,8 @@ use Spatie\Activitylog\ActivityLogStatus;
 
 class UpdateConfigWidget extends Widget
 {
+    protected static ?int $sort = 2;
+
     protected static string $view = 'filament.widgets.update-config-widget';
 
     public function updateSettingsToEtcd()
diff --git a/management-panel/app/Providers/Filament/AdminPanelProvider.php b/management-panel/app/Providers/Filament/AdminPanelProvider.php
index 5ab36d6..141fec9 100644
--- a/management-panel/app/Providers/Filament/AdminPanelProvider.php
+++ b/management-panel/app/Providers/Filament/AdminPanelProvider.php
@@ -43,8 +43,9 @@ class AdminPanelProvider extends PanelProvider
             ->widgets([
                 Widgets\AccountWidget::class,
 //                Widgets\FilamentInfoWidget::class,
-                UpdateConfigWidget::class,
                 PrometheusMemory::class,
+                UpdateConfigWidget::class,
+
             ])
             ->middleware([
                 EncryptCookies::class,
@@ -59,8 +60,6 @@ class AdminPanelProvider extends PanelProvider
             ])
             ->authMiddleware([
                 Authenticate::class,
-            ])->resources([
-                config('filament-logger.activity_resource')
             ]);
     }
 }
diff --git a/management-panel/resources/views/filament/pages/update-to-etcd.blade.php b/management-panel/resources/views/filament/pages/update-to-etcd.blade.php
deleted file mode 100644
index b8b2dc9..0000000
--- a/management-panel/resources/views/filament/pages/update-to-etcd.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<x-filament::page>
-    <form wire:submit.prevent="updateSettingsToEtcd" class="space-y-6">
-        {{$this->form }}
-        <div class="flex flex-wrap items-center gap-4 justify-start">
-            <x-filament::button type="submit">
-                导出配置到ETCD
-            </x-filament::button>
-        </div>
-    </form>
-</x-filament::page>