From aedd2862a6cd3fe57fe3129227254a4924fb2444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Tue, 15 Apr 2025 13:23:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20escape=20=E5=92=8C?=
 =?UTF-8?q?=20unescape=20=E5=9C=A8=E8=A7=A3=E6=9E=90=E6=9F=90=E4=BA=9B?=
 =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=BD=9C=E5=9C=A8=E9=97=AE=E9=A2=98=20(#2628)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修复 escape 未转义 unicode 中 & 字符的问题

* chore: update

* fix: 优化 unescape 替换顺序，确保为 escape 替换的反向顺序

* chore: update
---
 docs/laytpl/detail/demo.md | 25 +++++++++++++------------
 src/modules/util.js        | 17 ++++++++---------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docs/laytpl/detail/demo.md b/docs/laytpl/detail/demo.md
index bb77a7a0..7f1434c9 100644
--- a/docs/laytpl/detail/demo.md
+++ b/docs/laytpl/detail/demo.md
@@ -20,19 +20,20 @@
     <span>{{= item.site || '' }}</span>
   </li>
 {{# }); }}
- 
+
 {{# if(d.list.length === 0){ }}
   无数据
-{{# } }} 
+{{# } }}
 </ul>
     &lt;/textarea>
   </div>
-  
+
   <div class="layui-col-xs6 laytpl-demo">
     <div>数据</div>
     &lt;textarea id="ID-tpl-data"&gt;
 {
-  "title": "Layui 常用模块",
+  "title": "Layui 常用组件",
+  "desc": "<a style=\"color:blue;\">一段带 HTML 的内容</a>",
   "list": [
     {
       "modname": "弹层",
@@ -71,7 +72,7 @@
 </div>
 <div class="layui-clear"></div>
 
-<!-- import layui --> 
+<!-- import layui -->
 <script>
 layui.use(function(){
   var laytpl = layui.laytpl;
@@ -91,9 +92,9 @@ layui.use(function(){
       }()
     };
   };
-  
+
   var data = get();
-  
+
   // 耗时计算
   var startTime = new Date().getTime(), timer = function(startTime, title){
     var endTime = new Date().getTime();
@@ -108,20 +109,20 @@ layui.use(function(){
     timer(startTime);
     $('#ID-tpl-view').html(view);
   });
-  
+
   // 编辑
   $('.laytpl-demo textarea').on('input propertychange', function(){
     var data = get();
     if(!data.data) return;
-    
+
     // 计算模板渲染耗时
     var startTime = new Date().getTime();
-    
+
     // 若模板有变化，则重新解析模板；若模板没变，数据有变化，则从模板缓存中直接渲染（效率大增）
-    if(this.id === 'ID-tpl-src'){ 
+    if(this.id === 'ID-tpl-src'){
       thisTpl.parse(data.template, data.data); // 解析模板
     }
-    
+
     // 执行渲染
     thisTpl.render(data.data, function(view){
       timer(startTime);
diff --git a/src/modules/util.js b/src/modules/util.js
index 7fb37649..a5da1874 100644
--- a/src/modules/util.js
+++ b/src/modules/util.js
@@ -323,25 +323,24 @@ layui.define('jquery', function(exports){
 
     // 转义 html
     escape: function(html){
-      var exp = /[<"'>]|&(?=#[a-zA-Z0-9]+)/g;
-      if(html === undefined || html === null) return '';
+      var exp = /[<"'>]|&(?=#?[a-zA-Z0-9]+)/g;
+      if (html === undefined || html === null) return '';
 
       html += '';
-      if(!exp.test(html)) return html;
+      if (!exp.test(html)) return html;
 
-      return html.replace(/&(?!#?[a-zA-Z0-9]+;)/g, '&amp;')
+      return html.replace(/&(?=#?[a-zA-Z0-9]+;?)/g, '&amp;')
       .replace(/</g, '&lt;').replace(/>/g, '&gt;')
       .replace(/'/g, '&#39;').replace(/"/g, '&quot;');
     },
 
     // 还原转义的 html
     unescape: function(html){
-      if(html === undefined || html === null) html = '';
-      html += '';
+      if (html === undefined || html === null) return '';
 
-      return html.replace(/\&amp;/g, '&')
-      .replace(/\&lt;/g, '<').replace(/\&gt;/g, '>')
-      .replace(/\&#39;/g, '\'').replace(/\&quot;/g, '"');
+      return String(html).replace(/\&quot;/g, '"').replace(/\&#39;/g, '\'')
+      .replace(/\&gt;/g, '>').replace(/\&lt;/g, '<')
+      .replace(/\&amp;/g, '&');
     },
 
     // 打开新窗口