From d74abb453cb45ea5d2eb69f0ed7250caf0ab0088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Sun, 19 Nov 2023 16:38:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20`util.on()`=20=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=8F=90=E5=8D=87=E5=8F=82=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E7=81=B5=E6=B4=BB=E6=80=A7=E5=92=8C=E4=BB=A3=E7=A0=81=E7=9A=84?=
 =?UTF-8?q?=E5=8F=AF=E8=AF=BB=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/util.js | 72 +++++++++++++++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 22 deletions(-)

diff --git a/src/modules/util.js b/src/modules/util.js
index ae0bd577..2632ef7d 100644
--- a/src/modules/util.js
+++ b/src/modules/util.js
@@ -383,33 +383,61 @@ layui.define('jquery', function(exports){
       }
     },
 
-    // 批量事件
-    event: function(attr, obj, eventType){
-      var _body = $('body');
-      eventType = eventType || 'click';
-
-      // 记录事件回调集合
-      obj = util.event[attr] = $.extend(true, util.event[attr], obj) || {};
-
-      // 清除委托事件
-      util.event.UTIL_EVENT_CALLBACK = util.event.UTIL_EVENT_CALLBACK || {};
-      _body.off(eventType, '*['+ attr +']', util.event.UTIL_EVENT_CALLBACK[attr])
-
-      // 绑定委托事件
-      util.event.UTIL_EVENT_CALLBACK[attr] = function(){
-        var othis = $(this);
-        var key = othis.attr(attr);
-        (typeof obj[key] === 'function') && obj[key].call(this, othis);
-      };
+    /**
+     * 批量事件
+     * @param {string} [attr="lay-on"] - 触发事件的元素属性名
+     * @param {Object.<string, Function} events - 事件集合
+     * @param {Object} [options] - 参数的更多选项
+     * @param {(string|HTMLElement|jQuery)} [options.elem="body"] - 触发事件的委托元素
+     * @param {string} [options.trigger="click"] - 事件触发的方式
+     * @returns {Object} 返回当前 events 参数设置的事件集合
+     */
+    on: function(attr, events, options) {
+      // 若参数一为 object 类型，则为事件集，且省略 attr
+      if (typeof attr === 'object') {
+        options = events || {};
+        events = attr;
+        attr = options.attr || 'lay-on'; // 默认属性名
+      }
+
+      // 更多选项
+      options = $.extend({
+        elem: 'body',
+        trigger: 'click'
+      }, typeof options === 'object' ? options : {
+        trigger: options // 兼容旧版
+      });
 
-      // 清除旧事件，绑定新事件
-      _body.on(eventType, '*['+ attr +']', util.event.UTIL_EVENT_CALLBACK[attr]);
+      var elem = options.elem = $(options.elem);
+      var attrSelector = '['+ attr +']';
+      var CALLBACK = 'UTIL_ON_CALLBACK';
+
+      if (!elem[0]) return; // 若委托元素不存在
+
+      // 根据 attr 记录事件集合
+      events = util.on[attr] = $.extend(true, util.on[attr], events) || {};
+
+      // 清除事件委托
+      util.on[CALLBACK] = util.on[CALLBACK] || {};
+      elem.off(options.trigger, attrSelector, util.on[CALLBACK][attr]);
+
+      // 绑定事件委托
+      elem.on(
+        options.trigger,
+        attrSelector,
+        util.on[CALLBACK][attr] = function() {
+          var othis = $(this);
+          var key = othis.attr(attr);
+          typeof events[key] === 'function' && events[key].call(this, othis);
+        }
+      );
 
-      return obj;
+      return events;
     }
   };
 
-  util.on = util.event;
+  // 兼容旧版
+  util.event = util.on;
 
   // 输出接口
   exports('util', util);