From bed97cb9d3bd418e737e088aaed49ba6b7a16db0 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: Fri, 8 Sep 2023 18:36:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/js/main.js              | 75 ++++++++++++++++++++-----------
 src/admin/templets/index_menu.htm | 26 +----------
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/src/admin/js/main.js b/src/admin/js/main.js
index f5fc9e49..b7cf610f 100644
--- a/src/admin/js/main.js
+++ b/src/admin/js/main.js
@@ -299,35 +299,35 @@ function guid() {
 var _DedeConfirmFuncs = {};
 var _DedeConfirmFuncsClose = {};
 function __DedeConfirmRun(modalID) {
-    _DedeConfirmFuncs[modalID]();
+	_DedeConfirmFuncs[modalID]();
 }
 function __DedeConfirmRunClose(modalID) {
-    _DedeConfirmFuncsClose[modalID]();
+	_DedeConfirmFuncsClose[modalID]();
 }
 function DedeConfirm(content = "", title = "确认提示") {
-    let modalID = guid();
-    return new Promise((resolve, reject) => {
-        _DedeConfirmFuncs[modalID] = ()=>{
-            resolve("success");
-            CloseModal(`DedeModal${modalID}`);
-        }
-        _DedeConfirmFuncsClose[modalID] = ()=>{
-            reject("cancel");
-            CloseModal(`DedeModal${modalID}`);
-        }
-        let footer = `<button type="button" class="btn btn-outline-success btn-sm" onclick="__DedeConfirmRunClose(\'${modalID}\')">取消</button><button type="button" class="btn btn-success btn-sm" onclick="__DedeConfirmRun(\'${modalID}\')">确定</button>`;
-        let modal = `<div id="DedeModal${modalID}" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="DedeModalLabel${modalID}"><div class="modal-dialog modal-dialog-centered" role="document"><div class="modal-content"><div class="modal-header"><h6 class="modal-title" id="DedeModalLabel${modalID}">${title}</h6>`;
-        modal += `<button type="button" class="update-close" data-dismiss="modal" aria-label="Close"><i class="fa fa-times"></i></button>`;
-        modal += `</div><div class="modal-body">${content}</div><div class="modal-footer">${footer}</div></div></div></div>`;
-        $("body").append(modal)
-        $("#DedeModal" + modalID).modal({
-            backdrop: 'static',
-            show: true
-        });
-        $("#DedeModal" + modalID).on('hidden.bs.modal', function(e) {
-            $("#DedeModal" + modalID).remove();
-        })
-    })
+	let modalID = guid();
+	return new Promise((resolve, reject) => {
+		_DedeConfirmFuncs[modalID] = ()=>{
+			resolve("success");
+			CloseModal(`DedeModal${modalID}`);
+		}
+		_DedeConfirmFuncsClose[modalID] = ()=>{
+			reject("cancel");
+			CloseModal(`DedeModal${modalID}`);
+		}
+		let footer = `<button type="button" class="btn btn-outline-success btn-sm" onclick="__DedeConfirmRunClose(\'${modalID}\')">取消</button><button type="button" class="btn btn-success btn-sm" onclick="__DedeConfirmRun(\'${modalID}\')">确定</button>`;
+		let modal = `<div id="DedeModal${modalID}" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="DedeModalLabel${modalID}"><div class="modal-dialog modal-dialog-centered" role="document"><div class="modal-content"><div class="modal-header"><h6 class="modal-title" id="DedeModalLabel${modalID}">${title}</h6>`;
+		modal += `<button type="button" class="update-close" data-dismiss="modal" aria-label="Close"><i class="fa fa-times"></i></button>`;
+		modal += `</div><div class="modal-body">${content}</div><div class="modal-footer">${footer}</div></div></div></div>`;
+		$("body").append(modal)
+		$("#DedeModal" + modalID).modal({
+			backdrop: 'static',
+			show: true
+		});
+		$("#DedeModal" + modalID).on('hidden.bs.modal', function(e) {
+			$("#DedeModal" + modalID).remove();
+		})
+	})
 }
 //函数会返回一个modalID，通过这个id可自已定义一些方法，这里用到了一个展开语法：https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax
 function ShowMsg(content, ...args) {
@@ -466,6 +466,29 @@ $(document).ready(function() {
 			$(this).html('<i class="fa fa-dedent"></i>');
 		}
 	});
+	$(function() {
+		var menu = function(el, multiple) {
+			this.el = el || {};
+			this.multiple = multiple || false;
+			var links = this.el.find('.link');
+			links.on('click', {el: this.el, multiple: this.multiple}, this.dropdown)
+		}
+		menu.prototype.dropdown = function(e) {
+			var $el = e.data.el;
+				$this = $(this),
+				$next = $this.next();
+				$next.slideToggle();
+				$this.parent().toggleClass('open');
+			if (!e.data.multiple) {
+				$el.find('.submenu').not($next).slideUp().parent().removeClass('open');
+			};
+		}	
+		var menu = new menu($('#menu'), false);
+		$(".submenu li a").click(function(e) {
+			$(".submenu li").removeClass('active');
+			$(this).parent().addClass('active');
+		})
+	});
 	$("#btnClearAll").click(function(event) {
 		litpicImgSrc = "";
 		litpicImg = "";
@@ -529,6 +552,6 @@ $(document).ready(function() {
 				picker.drops = 'down';
 			}
 			picker.move();
-		})
+		});
 	}
 });
\ No newline at end of file
diff --git a/src/admin/templets/index_menu.htm b/src/admin/templets/index_menu.htm
index 03c88d78..e34495e5 100644
--- a/src/admin/templets/index_menu.htm
+++ b/src/admin/templets/index_menu.htm
@@ -7,6 +7,7 @@
 		<link rel="stylesheet" href="../static/web/font/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="js/main.js"></script>
 	</head>
 	<body class="menu-box">
 		<div class="menu-body">
@@ -17,30 +18,5 @@
 				?>
 			</ul>
 		</div>
-		<script>
-			$(function() {
-				var menu = function(el, multiple) {
-					this.el = el || {};
-					this.multiple = multiple || false;
-					var links = this.el.find('.link');
-					links.on('click', {el: this.el, multiple: this.multiple}, this.dropdown)
-				}
-				menu.prototype.dropdown = function(e) {
-					var $el = e.data.el;
-						$this = $(this),
-						$next = $this.next();
-						$next.slideToggle();
-						$this.parent().toggleClass('open');
-					if (!e.data.multiple) {
-						$el.find('.submenu').not($next).slideUp().parent().removeClass('open');
-					};
-				}	
-				var menu = new menu($('#menu'), false);
-				$(".submenu li a").click(function(e) {
-					$(".submenu li").removeClass('active');
-					$(this).parent().addClass('active');
-				})
-			});
-		</script>
 	</body>
 </html>
\ No newline at end of file