From a46fec901654933b664831b11eb2b734bda1a817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Tue, 4 Jul 2023 02:09:35 +0800
Subject: [PATCH] feat: optimize views

---
 app/http/controllers/info_controller.go   | 16 +++++++++++++++-
 public/panel/adminui/src/modules/admin.js |  6 ++++++
 public/panel/adminui/src/modules/view.js  |  7 +++++--
 public/panel/views/index.html             |  8 ++------
 public/panel/views/login.html             | 13 +++----------
 public/panel/views/logout.html            |  9 +--------
 public/panel/views/plugin.html            |  2 +-
 7 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/app/http/controllers/info_controller.go b/app/http/controllers/info_controller.go
index da29e285..1b80a777 100644
--- a/app/http/controllers/info_controller.go
+++ b/app/http/controllers/info_controller.go
@@ -7,6 +7,7 @@ import (
 	"github.com/goravel/framework/facades"
 
 	"panel/app/models"
+	"panel/app/services"
 	"panel/packages/helpers"
 )
 
@@ -63,7 +64,20 @@ func (r *InfoController) HomePlugins(ctx http.Context) {
 		return
 	}
 
-	Success(ctx, plugins)
+	type pluginsData struct {
+		models.Plugin
+		Name string `json:"name"`
+	}
+
+	var pluginsJson []pluginsData
+	for _, plugin := range plugins {
+		pluginsJson = append(pluginsJson, pluginsData{
+			Plugin: plugin,
+			Name:   services.NewPluginImpl().GetBySlug(plugin.Slug).Name,
+		})
+	}
+
+	Success(ctx, pluginsJson)
 }
 
 func (r *InfoController) NowMonitor(ctx http.Context) {
diff --git a/public/panel/adminui/src/modules/admin.js b/public/panel/adminui/src/modules/admin.js
index c8bfe29c..5dec0834 100644
--- a/public/panel/adminui/src/modules/admin.js
+++ b/public/panel/adminui/src/modules/admin.js
@@ -796,6 +796,12 @@ layui.define('view', function (exports) {
         admin.events.refresh()
       }
     }
+
+    // 清理所有定时器
+    var highestTimeoutId = setTimeout('')
+    for (var i = 0; i < highestTimeoutId; i++) {
+      clearTimeout(i)
+    }
   })
 
   //点击事件
diff --git a/public/panel/adminui/src/modules/view.js b/public/panel/adminui/src/modules/view.js
index b6a74b5e..def1b26c 100644
--- a/public/panel/adminui/src/modules/view.js
+++ b/public/panel/adminui/src/modules/view.js
@@ -63,10 +63,13 @@ layui.define(['laytpl', 'layer'], function (exports) {
     delete options.success
     delete options.error
 
-    options.data = JSON.stringify(options.data)
+    if (options.type === 'post' || options.type === 'put' || options.type === 'delete' || options.type === 'patch' || options.type === 'POST' || options.type === 'PUT' || options.type === 'DELETE' || options.type === 'PATCH') {
+      options.contentType = 'application/json'
+      options.data = JSON.stringify(options.data)
+    }
 
     return $.ajax($.extend({
-      type: 'get', dataType: 'json', contentType: 'application/json', success: function (res) {
+      type: 'get', dataType: 'json', success: function (res) {
         var statusCode = response.statusCode
 
         //只有 response 的 code 一切正常才执行 done
diff --git a/public/panel/views/index.html b/public/panel/views/index.html
index 34f66557..2f6d76dd 100644
--- a/public/panel/views/index.html
+++ b/public/panel/views/index.html
@@ -81,7 +81,7 @@ Date: 2023-06-22
                                 <script type="text/html" template lay-url="/api/panel/info/homePlugins">
                                     {{#  layui.each(d.data, function(index, item){ }}
                                     <li class="layui-col-xs4 layui-col-md2 layui-col-sm4">
-                                        <a lay-href="/plugin/{{ item.slug }}">
+                                        <a lay-href="/plugins/{{ item.slug }}">
                                             <i class="layui-icon layui-icon-engine"></i>
                                             <cite>{{ item.name }}</cite>
                                         </a>
@@ -178,7 +178,6 @@ Date: 2023-06-22
 </div>
 
 <script>
-  var home_timer
   var uptime_1 = '获取中', uptime_5 = '获取中', uptime_15 = '获取中'
   var net_send = 0, net_recv = 0, net_send_last = 0, net_recv_last = 0
 
@@ -260,11 +259,8 @@ Date: 2023-06-22
     })
   }
 
-  // 先执行一次
   refresh_home_info(true)
-  // 然后设置个定时器3s一次刷新
-  clearInterval(home_timer)
-  home_timer = setInterval(refresh_home_info, 3000)
+  setInterval(refresh_home_info, 3000)
   // 获取系统信息，这部分信息无需更新。
   layui.use(['index', 'jquery', 'admin', 'carousel'], function () {
     let $ = layui.jquery
diff --git a/public/panel/views/login.html b/public/panel/views/login.html
index 534cf332..23bc8cc1 100644
--- a/public/panel/views/login.html
+++ b/public/panel/views/login.html
@@ -1,5 +1,5 @@
 <script type="text/html" template>
-    <link rel="stylesheet" href="/res/adminui/src/css/login.css?v={{ layui.admin.v }}" media="all">
+    <link rel="stylesheet" href="/panel/adminui/src/css/login.css?v={{ layui.admin.v }}" media="all">
 </script>
 
 
@@ -52,14 +52,6 @@
     // 设置面板名称
     $('#panel-login-name').text(setter.name);
 
-    // 判断并清除定时器
-    if (typeof home_timer !== 'undefined') {
-      clearInterval(home_timer);
-    }
-    if (typeof install_plugin_timer !== 'undefined') {
-      clearInterval(install_plugin_timer);
-    }
-
     form.render();
 
     //提交
@@ -93,7 +85,8 @@
              * 所以这里强制刷新到主页
              * location.hash = search.redirect ? decodeURIComponent(search.redirect) : '/';
              */
-            location.href = '/';
+            //location.href = '/';
+            location.hash = search.redirect ? decodeURIComponent(search.redirect) : '/';
           });
         }
       });
diff --git a/public/panel/views/logout.html b/public/panel/views/logout.html
index d9619de8..5823380f 100644
--- a/public/panel/views/logout.html
+++ b/public/panel/views/logout.html
@@ -1,5 +1,5 @@
 <script type="text/html" template>
-    <link rel="stylesheet" href="/res/adminui/src/css/login.css?v={{ layui.admin.v }}" media="all">
+    <link rel="stylesheet" href="/panel/adminui/src/css/login.css?v={{ layui.admin.v }}" media="all">
 </script>
 
 
@@ -21,13 +21,6 @@
 <script>
   layui.use(['admin'], function () {
     let admin = layui.admin
-    // 判断并清除定时器
-    if (typeof home_timer !== 'undefined') {
-      clearInterval(home_timer)
-    }
-    if (typeof install_plugin_timer !== 'undefined') {
-      clearInterval(install_plugin_timer)
-    }
     setTimeout(function () {
       admin.exit()
       window.location = '/'
diff --git a/public/panel/views/plugin.html b/public/panel/views/plugin.html
index 8aab854d..8201b0a5 100644
--- a/public/panel/views/plugin.html
+++ b/public/panel/views/plugin.html
@@ -72,7 +72,7 @@
     table.on('tool(panel-plugin)', function (obj) {
       let data = obj.data
       if (obj.event === 'open') {
-        location.hash = '/plugin/' + data.slug
+        location.hash = '/plugins/' + data.slug
       } else if (obj.event === 'install') {
         layer.confirm('确定安装该插件吗？', function (index) {
           layer.close(index)