From 89635eaab6af2195c71a250c1af56543ee0d392b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
 <2449271624@qq.com>
Date: Tue, 10 Oct 2023 14:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BE=A7=E8=BE=B9=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/inc/inc_menu_func.php   |  4 +--
 src/admin/index.php               |  3 ++
 src/admin/index_menu.php          | 16 -----------
 src/admin/templets/index.htm      |  7 ++++-
 src/admin/templets/index_menu.htm | 22 ---------------
 src/static/web/css/admin.css      | 47 +++++++++++++++----------------
 src/static/web/js/admin.main.js   |  6 ++--
 7 files changed, 37 insertions(+), 68 deletions(-)
 delete mode 100644 src/admin/index_menu.php
 delete mode 100644 src/admin/templets/index_menu.htm

diff --git a/src/admin/inc/inc_menu_func.php b/src/admin/inc/inc_menu_func.php
index 507fa2fb..a9e28336 100644
--- a/src/admin/inc/inc_menu_func.php
+++ b/src/admin/inc/inc_menu_func.php
@@ -10,7 +10,7 @@
  */
 require_once(dirname(__FILE__)."/../config.php");
 require_once(DEDEINC."/dedetag.class.php");
-$headTemplet = '<li><div class="link"><i class="~icon~"></i><span>~channelname~</span><i class="fa fa-angle-down"></i></div><ul class="sidemenu">';
+$headTemplet = '<li><div class="link"><i class="~icon~"></i><span>~channelname~</span><i class="fa fa-angle-down"></i></div><ul class="submenu">';
 $footTemplet = "</ul></li>";
 $itemTemplet = "<li>~link~</li>";
 function GetMenus($userrank, $topos = 'main')
@@ -49,7 +49,7 @@ function GetMenus($userrank, $topos = 'main')
                         } else {
                             $addico = 'fa fa-plus-circle';
                         }
-                        $link = "$link<a href='".$ctag2->GetAtt('linkadd')."' class='sidemenu-right' target='".$ctag2->GetAtt('target')."'><span class='$addico'></span></a>";
+                        $link = "$link<a href='".$ctag2->GetAtt('linkadd')."' class='submenu-right' target='".$ctag2->GetAtt('target')."'><span class='$addico'></span></a>";
                     } else {
                         $link .= "";
                     }
diff --git a/src/admin/index.php b/src/admin/index.php
index e668d235..ce7bf2c8 100644
--- a/src/admin/index.php
+++ b/src/admin/index.php
@@ -16,6 +16,9 @@ if (preg_match("#PHP (.*) Development Server#", $_SERVER['SERVER_SOFTWARE'])) {
 }
 require_once(dirname(__FILE__)."/config.php");
 require_once(DEDEINC.'/dedetag.class.php');
+require(DEDEADMIN.'/inc/inc_menu.php');
+require(DEDEADMIN.'/inc/inc_menu_func.php');
+$openitem = (empty($openitem) ? 1 : $openitem);
 include(DEDEADMIN.'/templets/index.htm');
 exit();
 ?>
\ No newline at end of file
diff --git a/src/admin/index_menu.php b/src/admin/index_menu.php
deleted file mode 100644
index d1c5da8b..00000000
--- a/src/admin/index_menu.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * 侧边菜单
- *
- * @version        $id:index_menu.php 11:06 2010年7月13日 tianya $
- * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2022 DedeBIZ.COM
- * @license        GNU GPL v2 (https://www.dedebiz.com/license)
- * @link           https://www.dedebiz.com
- */
-require(dirname(__FILE__).'/config.php');
-require(DEDEADMIN.'/inc/inc_menu.php');
-require(DEDEADMIN.'/inc/inc_menu_func.php');
-$openitem = (empty($openitem) ? 1 : $openitem);
-include DedeInclude('templets/index_menu.htm');
-?>
\ No newline at end of file
diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm
index 61bab997..3f19f902 100644
--- a/src/admin/templets/index.htm
+++ b/src/admin/templets/index.htm
@@ -58,7 +58,12 @@
 			</div>
 		</div>
 		<div class="menu-left">
-			<div class="menu"><iframe name="menu" src="index_menu.php"></iframe></div>
+			<ul id="menu" class="item-menu shadow-sm">
+				<?php 
+				$openitem=100;
+				GetMenus($cuserLogin->getUserRank(),'main'); 
+				?>
+			</ul>
 		</div>
 		<div class="body-right">
 			<div class="main"><iframe name="main" src="index_body.php"></iframe></div>
diff --git a/src/admin/templets/index_menu.htm b/src/admin/templets/index_menu.htm
deleted file mode 100644
index 667301a4..00000000
--- a/src/admin/templets/index_menu.htm
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-		<title>侧边菜单</title>
-		<link rel="stylesheet" href="/static/web/css/font-awesome.min.css">
-		<link rel="stylesheet" href="/static/web/css/admin.css">
-		<script src="/static/web/js/jquery.min.js"></script>
-		<script src="/static/web/js/admin.main.js"></script>
-	</head>
-	<body class="menu-box">
-		<div class="menu-body">
-			<ul id="menu" class="item-menu">
-				<?php 
-				$openitem=100;
-				GetMenus($cuserLogin->getUserRank(),'main'); 
-				?>
-			</ul>
-		</div>
-	</body>
-</html>
\ No newline at end of file
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index 2a3e4679..15469cfc 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -35,22 +35,6 @@ input:focus,select:focus,textarea:focus{color:#6c757d;background:#fff;border-col
 .login-from{margin:5rem auto;width:500px}
 .login-box{padding:1.25rem;background:#fff}
 .login-box h2{margin:0;line-height:1.2;font-size:24px;font-weight:600;color:#343a40}
-body.menu-show .menu-left{display:block}
-body.menu-hide,body.menu-hide .menu-left{background:none}
-body.menu-show .body-right{left:220px;transition:all 0.5s}
-body.menu-hide .body-right{left:0;transition:all 0.5s}
-.menu-left{position:absolute;top:60px;left:0;bottom:0;width:220px}
-.body-right{position:absolute;top:60px;right:0;bottom:0}
-.main,.menu{width:100%;height:99%}
-.main iframe,.menu iframe{width:100%;height:99%;border:0}
-.menu-box{margin:0;padding:1rem 5px}
-.menu-body{width:100%;background:#fff;box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075)}
-.item-menu .link{position:relative;padding-left:50px;display:block;height:42px;line-height:42px;cursor:pointer}
-.item-menu li:last-child .link{border-bottom:0}
-.item-menu li i{position:absolute;top:14px;left:20px;color:#6c757d}
-.item-menu li i.fa-angle-down{right:20px;left:auto}
-.item-menu li.open .link,.item-menu li.open i{color:#1eb867}
-.item-menu li.open i.fa-angle-down{transform:rotate(180deg)}
 .admin-head{width:100%;height:60px;background:linear-gradient(45deg,#1eb867,#009688 80%)}
 .admin-head .logo{float:left;padding-left:30px;width:220px}
 .admin-head .logo .name a{float:left;height:60px;line-height:60px;font-size:18px;font-weight:600;color:#fff}
@@ -66,12 +50,27 @@ body.menu-hide .body-right{left:0;transition:all 0.5s}
 .admin-head .admin img{width:30px;height:30px;border-radius:50%}
 .admin-head .admin ul li{float:left;padding-left:30px;height:60px;line-height:60px}
 .admin-head .admin ul li:first-child{padding-left:0}
-.sidemenu{display:none;padding:5px 0;background:#adb5bd}
-.sidemenu li{height:40px;line-height:40px}
-.sidemenu li:hover{background:#009688;transition:all 0.5s}
-.sidemenu a{float:left;display:block;padding:0 10px 0 50px;color:#fff}
-.sidemenu .active{background:#1eb867}
-.sidemenu-right{float:right!important;padding:0 20px 0 10px!important}
+body.menu-hide .menu-left{background:none}
+body.menu-hide .body-right{left:0;transition:all 0.5s}
+body.menu-show .menu-left{display:block}
+body.menu-show .body-right{left:220px;transition:all 0.5s}
+.menu-left{padding:1rem 5px;position:absolute;top:60px;left:0;width:220px}
+.item-menu{background:#fff;border-radius:0.5rem}
+.item-menu .link{position:relative;padding-left:50px;display:block;height:42px;line-height:42px;cursor:pointer}
+.item-menu li:last-child .link{border-bottom:0}
+.item-menu li i{position:absolute;top:14px;left:20px;color:#6c757d}
+.item-menu li i.fa-angle-down{right:20px;left:auto}
+.item-menu li.open .link,.item-menu li.open i{color:#1eb867}
+.item-menu li.open i.fa-angle-down{transform:rotate(180deg)}
+.item-menu .submenu{display:none;padding:5px 0;background:#adb5bd}
+.item-menu .submenu li{height:40px;line-height:40px}
+.item-menu .submenu li:hover{background:#009688;transition:all 0.5s}
+.item-menu .submenu a{float:left;display:block;padding:0 10px 0 50px;color:#fff}
+.item-menu .submenu .active{background:#1eb867}
+.item-menu .submenu-right{float:right!important;padding:0 20px 0 10px!important}
+.body-right{position:absolute;top:60px;right:0;bottom:0}
+.body-right .main{width:100%;height:99%}
+.body-right .main iframe{width:100%;height:99%;border:0}
 .web-info{padding:10px;background:#f5f5f5}
 #_fileList,#_verList{height:360px;overflow-y:auto}
 #_msgInfo{display:none}
@@ -139,9 +138,9 @@ body.menu-hide .body-right{left:0;transition:all 0.5s}
 .admin-input-sm{width:160px}
 .admin-input-xs{width:60px}
 span.page-link{color:#fff;background:#1eb867}
-table,input,select,textarea,.login-box,.menu-body,.coolbg,.mysource,.mywriter,.pubdlg,.colordlg,.quickselitem .topcat,.web-info,.upload-bg,.cke_chrome,.cke_inner,.pagination,.card,.form-control,.btn,.alert,.rounded,#edsta{border-radius:0.5rem!important}
+table,input,select,textarea,.login-box,.coolbg,.mysource,.mywriter,.pubdlg,.colordlg,.quickselitem .topcat,.web-info,.upload-bg,.cke_chrome,.cke_inner,.pagination,.card,.form-control,.btn,.alert,.rounded,#edsta{border-radius:0.5rem!important}
 .coolbg2,.pubdlg .title,.cke_top{border-radius:0.5rem 0.5rem 0 0!important}
-.sidemenu,.wsselect,.cke_bottom{border-radius:0 0 0.5rem 0.5rem!important}
+.submenu,.wsselect,.cke_bottom{border-radius:0 0 0.5rem 0.5rem!important}
 .page-item:first-child .page-link{border-top-left-radius:0.5rem!important;border-bottom-left-radius:0.5rem!important}
 .page-item:last-child .page-link{border-top-right-radius:0.5rem!important;border-bottom-right-radius:0.5rem!important}
 .input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}
diff --git a/src/static/web/js/admin.main.js b/src/static/web/js/admin.main.js
index 3c1c922c..ce998ba7 100644
--- a/src/static/web/js/admin.main.js
+++ b/src/static/web/js/admin.main.js
@@ -425,12 +425,12 @@ $(document).ready(function() {
 			$next.slideToggle();
 			$this.parent().toggleClass("open");
 			if (!e.data.multiple) {
-				$el.find(".sidemenu").not($next).slideUp().parent().removeClass("open");
+				$el.find(".submenu").not($next).slideUp().parent().removeClass("open");
 			}
 		}
 		var menu = new menu($('#menu'), false);
-		$(".sidemenu li a").click(function(e) {
-			$(".sidemenu li").removeClass("active");
+		$(".submenu li a").click(function(e) {
+			$(".submenu li").removeClass("active");
 			$(this).parent().addClass("active");
 		});
 	});