From 80188cdcd88e043d7c450f48254a6530239afb47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Fri, 26 Jul 2024 10:34:52 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix(carousel):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=88=A0=E9=99=A4=E6=9D=A1=E7=9B=AE=E8=87=B3?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E6=97=B6=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=20inst.reload=20=E7=9A=84=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#2107)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(carousel): 修复外部动态增删条目时调用 inst.reload 的异常问题

* chore: 更正命名，避免歧义

* fix: 修复 slide 方法在条目数为 1 的滑动异常问题
---
 examples/carousel.html  | 66 +++++++++++++++++++++--------------------
 src/modules/carousel.js | 29 +++++++++++-------
 2 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/examples/carousel.html b/examples/carousel.html
index b74fb72e..347e737c 100644
--- a/examples/carousel.html
+++ b/examples/carousel.html
@@ -68,54 +68,56 @@ div[carousel-item]>*:nth-child(2n+1){background-color: #5FB878;}
 layui.use('carousel', function(){
   var carousel = layui.carousel;
   
-  //建造实例
-  carousel.render({
-    elem: '#test1'
-    ,index: 2
-    //,full: true
-    ,arrow: 'always'
-    ,autoplay: 'always'
-    ,change: function(obj){
+  // 实例
+  var carInst = carousel.render({
+    elem: '#test1',
+    index: 2,
+    // full: true,
+    arrow: 'always',
+    autoplay: 'always',
+    change: function(obj) {
       console.log(obj)
-    }
-    //,interval: 5000
-    //,autoplay: false
-    //,indicator: 'outside'
-    //,trigger: 'hover'
+    },
+    // interval: 5000,
+    // autoplay: false,
+    // indicator: 'outside',
+    // trigger: 'hover'
   });
+
+  // carInst.goto(1);
   
-  //事件
+  // 事件
   /*
-  carousel.on('change(test1)', function(obj){
+  carousel.on('change(test1)', function(obj) {
     console.log(obj)
   });
   */
 
   carousel.render({
-    elem: '#test2'
-    ,interval: 1800
-    //,full: true
-    ,anim: 'fade'
-    ,height: '120px'
+    elem: '#test2',
+    interval: 1800,
+    // full: true,
+    anim: 'fade',
+    height: '120px'
   });
   
   carousel.render({
-    elem: '#test3'
-    //,full: true
-    ,arrow: 'always'
-    //,autoplay: false
-    //,indicator: 'outside'
-    //,trigger: 'hover'
-    ,anim: 'updown'
-    //,full: true
+    elem: '#test3',
+    // full: true,
+    arrow: 'always',
+    // autoplay: false,
+    // indicator: 'outside',
+    // trigger: 'hover',
+    anim: 'updown',
+    // full: true
   });
   
   // 图片轮播
   carousel.render({
-    elem: '#test4'
-    ,width: '720px'
-    ,height: '360px'
-    ,interval: 5000
+    elem: '#test4',
+    width: '720px',
+    height: '360px',
+    interval: 5000
   });
 });
 </script>
diff --git a/src/modules/carousel.js b/src/modules/carousel.js
index e55abdb6..ee24b779 100644
--- a/src/modules/carousel.js
+++ b/src/modules/carousel.js
@@ -113,13 +113,14 @@ layui.define(['jquery', 'lay'], function(exports){
     // 初始焦点状态
     that.elemItem.eq(options.index).addClass(THIS);
 
-    // 指示器等动作
-    if(that.elemItem.length <= 1) return;
-
+    // 指示器、箭头等动作
     that.indicator();
     that.arrow();
     that.autoplay();
-    that.events();
+
+    if (that.elemItem.length > 1) {
+      that.events();
+    }
   };
   
   // 重置轮播
@@ -188,19 +189,23 @@ layui.define(['jquery', 'lay'], function(exports){
   Class.prototype.autoplay = function(){
     var that = this;
     var options = that.config;
+    var itemsCount = that.elemItem.length;
     
     if(!options.autoplay) return;
     clearInterval(that.timer);
     
-    that.timer = setInterval(function(){
-      that.slide();
-    }, options.interval);
+    if (itemsCount > 1) {
+      that.timer = setInterval(function(){
+        that.slide();
+      }, options.interval);
+    }
   };
   
   // 箭头
   Class.prototype.arrow = function(){
     var that = this;
     var options = that.config;
+    var itemsCount = that.elemItem.length;
     
     // 模板
     var tplArrow = $([
@@ -215,7 +220,7 @@ layui.define(['jquery', 'lay'], function(exports){
     if(options.elem.find('.'+ELEM_ARROW)[0]){
       options.elem.find('.'+ELEM_ARROW).remove();
     }
-    options.elem.append(tplArrow);
+    itemsCount > 1 ? options.elem.append(tplArrow) : tplArrow.remove();
     
     // 事件
     tplArrow.on('click', function(){
@@ -241,6 +246,7 @@ layui.define(['jquery', 'lay'], function(exports){
   Class.prototype.indicator = function(){
     var that = this;
     var options = that.config;
+    var itemsCount = that.elemItem.length;
     
     // 模板
     var tplInd = that.elemInd = $(['<div class="'+ ELEM_IND +'"><ul>',
@@ -260,7 +266,8 @@ layui.define(['jquery', 'lay'], function(exports){
     if(options.elem.find('.'+ELEM_IND)[0]){
       options.elem.find('.'+ELEM_IND).remove();
     }
-    options.elem.append(tplInd);
+
+    itemsCount > 1 ? options.elem.append(tplInd) : tplInd.remove();
     
     if(options.anim === 'updown'){
       tplInd.css('margin-top', -(tplInd.height()/2));
@@ -276,11 +283,12 @@ layui.define(['jquery', 'lay'], function(exports){
   Class.prototype.slide = function(type, num){
     var that = this;
     var elemItem = that.elemItem;
+    var itemsCount = elemItem.length;
     var options = that.config;
     var thisIndex = options.index;
     var filter = options.elem.attr('lay-filter');
     
-    if(that.haveSlide) return;
+    if (that.haveSlide || itemsCount <= 1) return;
     
     // 滑动方向
     if(type === 'sub'){
@@ -329,6 +337,7 @@ layui.define(['jquery', 'lay'], function(exports){
     var options = that.config;
     
     if(options.elem.data('haveEvents')) return;
+
     
     // 移入移出容器
     options.elem.on('mouseenter touchstart', function(){
-- 
Gitee


From 829bedc7064da1a16e443536d2915a95d953f29a Mon Sep 17 00:00:00 2001
From: sunxiaobin89 <285584806@qq.com>
Date: Fri, 26 Jul 2024 22:34:46 +0800
Subject: [PATCH 2/8] =?UTF-8?q?feat(element-tab):=20=E6=96=B0=E5=A2=9E=20t?=
 =?UTF-8?q?ab=20=E5=88=87=E6=8D=A2=E5=89=8D=E7=9A=84=E4=BA=8B=E4=BB=B6=20(?=
 =?UTF-8?q?#2111)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(element-tab): 新增 tab 切换前的事件

* feat(element-tab): 优化 tabChange 添加 skipBeforeChange 参数

* docs(element-tab): 更新 tabChange 和 tabBeforeChange 相关文档

* Update docs/tab/index.md

* Update docs/tab/index.md

* Update docs/tab/index.md

* Update docs/tab/index.md

* chore: 修改名称一致及优化注释

---------

Co-authored-by: 贤心 <3277200+sentsim@users.noreply.github.com>
---
 docs/tab/index.md      | 32 +++++++++++++++++++++++++++++---
 src/modules/element.js | 30 +++++++++++++++++++++++++++---
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/docs/tab/index.md b/docs/tab/index.md
index e97e7850..22d41e10 100644
--- a/docs/tab/index.md
+++ b/docs/tab/index.md
@@ -111,7 +111,7 @@ tab 组件提供了三种 UI 风格，分别为：
 | [element.render(\'tab\', filter)](#element.render) | 渲染 tab 组件 |
 | [element.tabAdd(filter, options)](#element.tabAdd) | 添加 tab 选项 |
 | [element.tabDelete(filter, layid)](#element.tabDelete) | 删除 tab 选项 |
-| [element.tabChange(filter, layid)](#element.tabChange) | 切换 tab 选项 |
+| [element.tabChange(filter, layid, force)](#element.tabChange) | 切换 tab 选项 |
 | [element.tab(options)](#element.tab) | 绑定自定义 tab 元素 |
 
 <h3 id="options" lay-toc="{level: 2}" class="ws-bold">元素属性</h3>
@@ -207,10 +207,11 @@ layui.use(function(){
 
 <h3 id="element.tabChange" lay-toc="{level: 2}" class="ws-bold">切换 tab</h3>
 
-`element.tabChange(filter, layid);`
+`element.tabChange(filter, layid, force);`
 
 - 参数 `filter` : tab 容器（`class="layui-tab"`）的 `lay-filter` 属性值
 - 参数 `layid` : 选项卡标题元素的 `lay-id` 属性值
+- 参数 `force` : 是否强制执行 tab 切换。设置 `true` 后，将忽略 `tabBeforeChange` 事件行为。默认 `false` <sup>2.9.15+</sup>
 
 该方法用于切换到对应的 tab 选项。用法详见 : [#示例](#examples)
 
@@ -290,6 +291,31 @@ element.on('tab(filter)', function(data){
 });
 ```
 
+<h3 id="on-tabBeforeChange" lay-toc="{level: 2}" class="ws-bold">tab 切换前的事件 <sup>2.9.15+</sup></h3>
+
+`element.on('tabBeforeChange(filter)', callback);`
+
+- 参数 `tabBeforeChange(filter)` 是一个特定结构。
+  - `tabBeforeChange` 为 tab 切换前事件固定值；
+  - `filter` 为 tab 容器属性 `lay-filter` 对应的值。
+- 参数 `callback` 为事件执行时的回调函数，并返回一个 `object` 类型的参数。
+
+点击 tab 选项切换前触发。
+
+```
+var element = layui.element;
+ 
+// tab 切换前的事件
+element.on('tabBeforeChange(filter)', function(data){
+  console.log(data.elem); // 得到当前的 tab 容器
+  console.log(data.from.index); // 得到切换前的 tab 项所在下标
+  console.log(data.from.id); // 得到切换前的 tab 项所在ID
+  console.log(data.to.index); // 得到切换后的 tab 项所在下标
+  console.log(data.to.id); // 得到切换后的 tab 项所在ID
+
+  if(data.to.id === 'home') return false; // 返回 false 时阻止切换到对应的选项卡
+});
+```
 
 <h3 id="on-tabDelete" lay-toc="{level: 2}" class="ws-bold">tab 删除事件</h3>
 
@@ -318,7 +344,7 @@ element.on('tabDelete(filter)', function(data){
 `element.on('tabBeforeDelete(filter)', callback);`
 
 - 参数 `tabBeforeDelete(filter)` 是一个特定结构。
-  - `tabBeforeDelete` 为 tab 删除事件固定值；
+  - `tabBeforeDelete` 为 tab 删除前事件固定值；
   - `filter` 为 tab 容器属性 `lay-filter` 对应的值。
 - 参数 `callback` 为事件执行时的回调函数，并返回一个 `object` 类型的参数。
 
diff --git a/src/modules/element.js b/src/modules/element.js
index d083c360..ddc9eddc 100644
--- a/src/modules/element.js
+++ b/src/modules/element.js
@@ -66,14 +66,21 @@ layui.define('jquery', function(exports){
     return this;
   };
   
-  // 外部 Tab 切换
-  Element.prototype.tabChange = function(filter, layid){
+  /**
+   * 外部 Tab 切换
+   * @param {string} filter - 标签主容器 lay-filter 值
+   * @param {string} layid - 标签头 lay-id 值
+   * @param {boolean} force - 是否强制切换
+   * @returns {this}
+   */
+  Element.prototype.tabChange = function(filter, layid, force){
     var tabElem = $('.layui-tab[lay-filter='+ filter +']');
     var titElem = tabElem.children(TITLE);
     var liElem = titElem.find('>li[lay-id="'+ layid +'"]');
 
     call.tabClick.call(liElem[0], {
-      liElem: liElem
+      liElem: liElem,
+      force: force
     });
     return this;
   };
@@ -140,6 +147,23 @@ layui.define('jquery', function(exports){
       var index = 'index' in obj 
         ? obj.index 
       : othis.parent().children('li').index(othis);
+
+      // 若非强制切换，则根据 tabBeforeChange 事件的返回结果决定是否切换
+      if (!obj.force) {
+        var liThis = othis.siblings('.' + THIS);
+        var shouldChange = layui.event.call(this, MOD_NAME, 'tabBeforeChange('+ filter +')', {
+          elem: parents,
+          from: {
+            index: othis.parent().children('li').index(liThis),
+            id: liThis.attr('lay-id')
+          },
+          to: {
+            index: index,
+            id: hasId
+          },
+        });
+        if(shouldChange === false) return;
+      }
       
       // 执行切换
       if(!(isJump || unselect)){
-- 
Gitee


From 6a23ada7d3c0250332833b041cceb6a3cc654de1 Mon Sep 17 00:00:00 2001
From: morning-star <26325820+Sight-wcg@users.noreply.github.com>
Date: Fri, 26 Jul 2024 23:29:25 +0800
Subject: [PATCH 3/8] =?UTF-8?q?feat(form-select):=20=E6=94=B9=E8=BF=9B=20l?=
 =?UTF-8?q?ay-search=20=E5=B1=9E=E6=80=A7=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E3=80=8C=E6=98=AF=E5=90=A6=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99=E6=95=8F=E6=84=9F=E3=80=8D=E5=92=8C=E3=80=8C=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=90=9C=E7=B4=A2=E3=80=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat(form-select): 弃用 `lay-search="cs"`，新增 `lay-search="{caseSensitive:false, fuzzy: false}"` 方式 (#2121)
---
 docs/form/index.md  |  2 +-
 src/modules/form.js | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/docs/form/index.md b/docs/form/index.md
index cac7d0d1..a364710a 100644
--- a/docs/form/index.md
+++ b/docs/form/index.md
@@ -116,7 +116,7 @@ form 还可以借助*栅格*实现更灵活的响应式布局。
 | lay-reqtext | 自定义 | 设置*必填项*（`lay-verify="required"`）的默认提示文本 |
 | lay-affix | [#详见](input.html#affix) | 输入框动态点缀，`<input type="text">`元素 **私有属性** |
 | lay-skin | [#详见](checkbox.html#default) | 设置 UI 风格。 `<input type="checkbox">`，`<input type="radio">` 元素 **私有属性** |
-| lay-search | 默认不区分大小写;<br>设置`cs`区分大小写 | 给 `select` 组件开启搜索功能。`<select>` 元素 **私有属性** |
+| lay-search |<sup>2.9.15+</sup> `lay-search="{caseSensitive:false, fuzzy: false}"` <br>`caseSensitive` 是否区分大小写，默认值为 `false` <br>`fuzzy`是否开启模糊匹配，开启后将会忽略匹配字符出现在字符串中的位置，默认值为 `false` <br>设置`cs`区分大小写(2.9.15+ 已弃用) | 给 `select` 组件开启搜索功能。`<select>` 元素 **私有属性** |
 | lay-creatable <sup>2.9.7+</sup> | 无需值 | 是否允许创建新条目，需要配合 `lay-search` 使用。`<select>` 元素 **私有属性** |
 | lay-append-to <sup>2.9.12+</sup> <sup>实验性</sup> | `body` | 是否将 select 面板追加到 body 元素中。`<select>` 元素 **私有属性** |
 | lay-append-position <sup>2.9.12+</sup> <sup>实验性</sup> | `absolute` 绝对定位 (默认)<br>`fixed` 固定定位 | 用于设置 select 面板开启 `lay-append-to` 属性后的定位方式。`<select>` 元素 **私有属性** |
diff --git a/src/modules/form.js b/src/modules/form.js
index 48eaee8b..75ec033a 100644
--- a/src/modules/form.js
+++ b/src/modules/form.js
@@ -400,8 +400,14 @@ layui.define(['lay', 'layer', 'util'], function(exports){
           
           if(disabled) return;
 
-          // 搜索项
-          var laySearch = select.attr('lay-search');
+          /**
+           * 搜索项 
+           * @typedef searchOption
+           * @prop {boolean} [caseSensitive=false] 是否区分大小写
+           * @prop {boolean} [fuzzy=false] 是否开启模糊匹配，开启后将会忽略模式出现在字符串中的位置。
+           */
+          /** @type {searchOption} */
+          var laySearch = select.attr('lay-search') === 'cs' ? {caseSensitive:true} : lay.options(select, {attr:'lay-search'});
           // 目前只支持 body
           var appendTarget = select.attr('lay-append-to') || 'body';
           var appendPosition = select.attr('lay-append-position');
@@ -593,11 +599,13 @@ layui.define(['lay', 'layer', 'util'], function(exports){
             var dds = dl.children('dd');
             var hasEquals = false;
             var rawValue = value;
-            var caseInsensitive = laySearch !== 'cs';
-            if(caseInsensitive){
+            var fuzzyMatchRE;
+            if(!laySearch.caseSensitive){
               value = value.toLowerCase();
             }
-            var fuzzyMatch = fuzzyMatchRegExp(value, caseInsensitive);
+            if(laySearch.fuzzy){
+              fuzzyMatchRE = fuzzyMatchRegExp(value, laySearch.caseSensitive);
+            }
             layui.each(dds, function(){
               var othis = $(this);
               var text = othis.text();
@@ -609,12 +617,12 @@ layui.define(['lay', 'layer', 'util'], function(exports){
               }
 
               // 是否区分大小写
-              if(caseInsensitive){
+              if(!laySearch.caseSensitive){
                 text = text.toLowerCase();
               }
               
               // 匹配
-              var not = !fuzzyMatch.test(text);
+              var not = laySearch.fuzzy ? !fuzzyMatchRE.test(text) : text.indexOf(value) === -1;
               
               if(value === '' || (origin === 'blur') ? value !== text : not) num++;
               origin === 'keyup' && othis[(isCreatable ? (not && !isCreateOption) : not) ? 'addClass' : 'removeClass'](HIDE);
@@ -1237,14 +1245,14 @@ layui.define(['lay', 'layer', 'util'], function(exports){
     return layui.event.call(this, MOD_NAME, 'submit('+ layFilter +')', params);
   };
 
-  function fuzzyMatchRegExp(keyword, caseInsensitive) {
+  function fuzzyMatchRegExp(keyword, caseSensitive) {
     var wordMap = {};
     var regexPattern = ['^'];
     var escapeRegExp = function(str){
       return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
     }
 
-    if(caseInsensitive)keyword = keyword.toLowerCase();
+    if(!caseSensitive)keyword = keyword.toLowerCase();
 
     // 统计关键字中各字符出现次数
     var wordArr = keyword.trim().split('');
@@ -1266,7 +1274,7 @@ layui.define(['lay', 'layer', 'util'], function(exports){
     }
     regexPattern.push('.*');
 
-    return new RegExp(regexPattern.join(''), caseInsensitive ? 'i' : undefined);
+    return new RegExp(regexPattern.join(''), !caseSensitive ? 'i' : undefined);
   }
   
   var form = new Form();
-- 
Gitee


From 130533e967f12255bc8688e393bb2c7853bf99b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Fri, 2 Aug 2024 14:26:25 +0800
Subject: [PATCH 4/8] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=20layui-text=20?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=EF=BC=8C=E4=BB=A5=E6=9B=B4=E5=A5=BD=E5=9C=B0?=
 =?UTF-8?q?=E9=80=82=E5=BA=94=20Markdown=20(#2126)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* style: 剔除 .layui-text 子元素中非必要标题样式

* style: 优化 .layui-text 引用元素边距
---
 src/css/layui.css | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/css/layui.css b/src/css/layui.css
index 202c082a..0db18e12 100644
--- a/src/css/layui.css
+++ b/src/css/layui.css
@@ -650,12 +650,6 @@ hr.layui-border-black{border-width: 0 0 1px;}
 
 /* 文本区域 */
 .layui-text{line-height: 1.8; font-size: 14px;}
-.layui-text h1,
-.layui-text h2,
-.layui-text h3,
-.layui-text h4,
-.layui-text h5,
-.layui-text h6{color: #3A3A3A;}
 .layui-text h1{font-size: 32px;}
 .layui-text h2{font-size: 24px;}
 .layui-text h3{font-size: 18px;}
@@ -673,7 +667,7 @@ hr.layui-border-black{border-width: 0 0 1px;}
 .layui-text p:last-child{margin-bottom: 0;}
 .layui-text a:not(.layui-btn){color: #01AAED;}
 .layui-text a:not(.layui-btn):hover{text-decoration: underline;}
-.layui-text blockquote:not(.layui-elem-quote){padding: 5px 15px; border-left: 5px solid #eee;}
+.layui-text blockquote:not(.layui-elem-quote){margin: 15px 0; padding: 5px 15px; border-left: 5px solid #eee;}
 .layui-text pre > code:not(.layui-code){padding: 15px; font-family: "Courier New",Consolas,"Lucida Console";}
 
 /* 字体大小 */
-- 
Gitee


From af792a8452df4e3b0be40ad2760177ce6bbc8369 Mon Sep 17 00:00:00 2001
From: morning-star <26325820+Sight-wcg@users.noreply.github.com>
Date: Fri, 2 Aug 2024 14:31:28 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix(form-select):=20=E4=BF=AE=E5=A4=8D=20`l?=
 =?UTF-8?q?ay-append-to`=20=E5=B1=9E=E6=80=A7=E5=BC=80=E5=90=AF=E6=97=B6?=
 =?UTF-8?q?=E5=9C=A8=20dropdown=20=E4=B8=AD=E7=82=B9=E5=87=BB=20select=20?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=AF=BC=E8=87=B4=20dropdown=20=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E8=A2=AB=E5=85=B3=E9=97=AD=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#2138)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(form-select): 开启 `lay-append-to` 时，在 dropdown 中点击 select 面板，会导致 dropdown 面板意外关闭

* update
---
 src/modules/form.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/modules/form.js b/src/modules/form.js
index 75ec033a..aa1403fd 100644
--- a/src/modules/form.js
+++ b/src/modules/form.js
@@ -745,6 +745,11 @@ layui.define(['lay', 'layer', 'util'], function(exports){
             hideDown(true);
             return false;
           });
+
+          // 用于开启 lay-append-to 时兼容 dropdown
+          dl.on('mousedown pointerdown touchstart', function(e){
+            return false;
+          })
           
           reElem.find('dl>dt').on('click', function(e){
             return false;
-- 
Gitee


From f147aae538a85b13f36a1ed072970e90169505d3 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, 4 Aug 2024 22:39:15 +0800
Subject: [PATCH 6/8] =?UTF-8?q?refactor(table):=20=E9=87=8D=E6=9E=84=20tab?=
 =?UTF-8?q?le.setRowChecked()=20=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/table.js | 66 +++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 40 deletions(-)

diff --git a/src/modules/table.js b/src/modules/table.js
index 6ba70f64..fb033aa2 100644
--- a/src/modules/table.js
+++ b/src/modules/table.js
@@ -1722,9 +1722,10 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
     var options = that.config;
     var isCheckAll = opts.index === 'all'; // 是否操作全部
     var isCheckMult = layui.type(opts.index) === 'array'; // 是否操作多个
-    var needDisableTransition= isCheckAll || isCheckMult; // 减少回流
+    var isCheckAllOrMult = isCheckAll || isCheckMult; // 是否全选或多选
 
-    if(needDisableTransition){
+    // 全选或多选时减少回流
+    if(isCheckAllOrMult){
       that.layBox.addClass(DISABLED_TRANSITION);
     }
 
@@ -1737,13 +1738,14 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
     }
 
     // 匹配行元素
-    var selector = (isCheckAll || isCheckMult) ? 'tr' : 'tr[data-index="'+ opts.index +'"]';
+    var tbody = that.layBody.children('.layui-table').children('tbody');
+    var selector = isCheckAllOrMult ? 'tr' : 'tr[data-index="'+ opts.index +'"]';
     var tr = function(tr) {
       return isCheckAll ? tr : tr.filter(isCheckMult ? function() {
         var dataIndex = $(this).data('index');
         return opts.index[dataIndex];
       } : '[data-index="'+ opts.index +'"]');
-    }(that.layBody.find(selector));
+    }(tbody.children(selector));
 
     // 默认属性
     opts = $.extend({
@@ -1759,61 +1761,44 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
       return opts.type === 'radio' ? true : (existChecked ? opts.checked : !value)
     };
 
-    var ignoreTrIndex = {};
     // 设置选中状态
-    layui.each(thisData, function(i, item){
+    tr.each(function() {
+      var el = $(this);
+      var i = el.attr('data-index');
+      var item = thisData[i];
+
+      if (!i) return; // 此时 el 通常为静态表格嵌套时的原始模板
+
       // 绕过空项和禁用项
-      if(layui.type(item) === 'array' || item[options.disabledName]){
-        ignoreTrIndex[i] = true;
+      if (layui.type(item) === 'array' || item[options.disabledName]) {
         return;
       }
 
       // 匹配条件
       var matched = isCheckAll || (
-        isCheckMult ? opts.index[i] : Number(opts.index) === i
+        isCheckMult ? opts.index[i] : Number(opts.index) === Number(i)
       );
 
       // 设置匹配项的选中值
-      if(matched){
+      if (matched) {
         // 标记数据选中状态
         var checked = item[options.checkName] = getChecked(item[options.checkName]);
 
         // 标记当前行背景色
-        // 此处只更新 radio 和 单个 checkbox
-        if(!isCheckAll && !isCheckMult){
-          var currTr = tr.filter('[data-index="'+ i +'"]');
-          currTr[checked ? 'addClass' : 'removeClass'](ELEM_CHECKED);
-  
-          // 若为 radio 类型，则取消其他行选中背景色
-          if(opts.type === 'radio'){
-            currTr.siblings().removeClass(ELEM_CHECKED);
-          }
+        el.toggleClass(ELEM_CHECKED, !!checked);
+
+        // 若为 radio 类型，则取消其他行选中背景色
+        if (opts.type === 'radio') {
+          el.siblings().removeClass(ELEM_CHECKED);
         }
       } else if(opts.type === 'radio') {
         delete item[options.checkName];
       }
     });
 
-    if(isCheckAll){
-      tr.each(function(i){
-        var index = this.getAttribute('data-index');
-        if(!ignoreTrIndex[index]){
-          var el = $(this);
-          el.toggleClass(ELEM_CHECKED, !!getChecked(thisData[index][options.checkName]))
-        }
-      });
-    }else if(isCheckMult){
-      tr.each(function(i){
-        var index = this.getAttribute('data-index');
-        if(opts.index[index] && !ignoreTrIndex[index]){
-          var el = $(this);
-          el.toggleClass(ELEM_CHECKED, !!getChecked(thisData[index][options.checkName]))
-        }
-      });
-    }
-
     // 若存在复选框或单选框，则标注选中状态样式
-    var checkedElem = tr.find('input[lay-type="'+ ({
+    var td = tr.children('td').children('.layui-table-cell');
+    var checkedElem = td.children('input[lay-type="'+ ({
       radio: 'layTableRadio',
       checkbox: 'layTableCheckbox'
     }[opts.type] || 'checkbox') +'"]:not(:disabled)');
@@ -1826,7 +1811,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
 
     that.syncCheckAll();
 
-    if(needDisableTransition){
+    if(isCheckAllOrMult){
       setTimeout(function(){
         that.layBox.removeClass(DISABLED_TRANSITION);
       },100)
@@ -2438,9 +2423,10 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
           index: index,
           checked: checked
         });
-        layui.stope(e);
       }
 
+      layui.stope(e);
+
       // 事件
       layui.event.call(
         checkbox[0],
-- 
Gitee


From 7a5dae4290bfecbc7ae76a350b7dad160cc1ebec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Fri, 9 Aug 2024 18:17:47 +0800
Subject: [PATCH 7/8] =?UTF-8?q?feat:=20=E8=BF=9B=E4=B8=80=E6=AD=A5?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20`table.setRowChecked()`=20fix:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=8D=95=E9=80=89=E6=97=B6=E6=9C=AA=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=A1=8C=E6=95=B0=E6=8D=AE=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/table-test.html |  2 +-
 src/modules/table.js     | 45 +++++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/examples/table-test.html b/examples/table-test.html
index 96fa6766..0cc56f07 100644
--- a/examples/table-test.html
+++ b/examples/table-test.html
@@ -84,7 +84,7 @@
 (function(off){
   if(!off) return;
   layui.disuse('table').extend({
-    table: '{/}https://cdn.staticfile.net/layui/2.7.6/layui.js'
+    table: '{/}https://cdn.jsdelivr.net/gh/layui/layui@2.7.6/src/modules/table'
   });
 })();
 
diff --git a/src/modules/table.js b/src/modules/table.js
index fb033aa2..42b13afe 100644
--- a/src/modules/table.js
+++ b/src/modules/table.js
@@ -1724,9 +1724,10 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
     var isCheckMult = layui.type(opts.index) === 'array'; // 是否操作多个
     var isCheckAllOrMult = isCheckAll || isCheckMult; // 是否全选或多选
 
-    // 全选或多选时减少回流
-    if(isCheckAllOrMult){
-      that.layBox.addClass(DISABLED_TRANSITION);
+    // 全选或多选时
+    if (isCheckAllOrMult) {
+      that.layBox.addClass(DISABLED_TRANSITION); // 减少回流
+      if (opts.type === 'radio') return; // radio 不允许全选或多选
     }
 
     if(isCheckMult){
@@ -1761,7 +1762,9 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
       return opts.type === 'radio' ? true : (existChecked ? opts.checked : !value)
     };
 
-    // 设置选中状态
+    var radioCheckedIndex;
+
+    // 给匹配行设置选中状态
     tr.each(function() {
       var el = $(this);
       var i = el.attr('data-index');
@@ -1774,28 +1777,28 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
         return;
       }
 
-      // 匹配条件
-      var matched = isCheckAll || (
-        isCheckMult ? opts.index[i] : Number(opts.index) === Number(i)
-      );
+      // 标记数据选中状态
+      var checked = item[options.checkName] = getChecked(el.hasClass(ELEM_CHECKED));
 
-      // 设置匹配项的选中值
-      if (matched) {
-        // 标记数据选中状态
-        var checked = item[options.checkName] = getChecked(item[options.checkName]);
+      // 标记当前行背景色
+      el.toggleClass(ELEM_CHECKED, !!checked);
 
-        // 标记当前行背景色
-        el.toggleClass(ELEM_CHECKED, !!checked);
-
-        // 若为 radio 类型，则取消其他行选中背景色
-        if (opts.type === 'radio') {
-          el.siblings().removeClass(ELEM_CHECKED);
-        }
-      } else if(opts.type === 'radio') {
-        delete item[options.checkName];
+      // 若为 radio 类型，则取消其他行选中背景色
+      if (opts.type === 'radio') {
+        radioCheckedIndex = i;
+        el.siblings().removeClass(ELEM_CHECKED);
       }
     });
 
+    // 若为 radio 类型，移除其他行数据选中状态
+    if (opts.type === 'radio' && radioCheckedIndex) {
+      layui.each(thisData, function(i, item) {
+        if (Number(radioCheckedIndex) !== Number(i)) {
+          delete item[options.checkName];
+        }
+      });
+    }
+
     // 若存在复选框或单选框，则标注选中状态样式
     var td = tr.children('td').children('.layui-table-cell');
     var checkedElem = td.children('input[lay-type="'+ ({
-- 
Gitee


From 3328dbc8b1736a0898c4b36d0936433352c8c38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Mon, 12 Aug 2024 13:05:41 +0800
Subject: [PATCH 8/8] =?UTF-8?q?refactor:=20=E5=89=94=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/table.js b/src/modules/table.js
index 42b13afe..505e5889 100644
--- a/src/modules/table.js
+++ b/src/modules/table.js
@@ -1791,7 +1791,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
     });
 
     // 若为 radio 类型，移除其他行数据选中状态
-    if (opts.type === 'radio' && radioCheckedIndex) {
+    if (radioCheckedIndex) {
       layui.each(thisData, function(i, item) {
         if (Number(radioCheckedIndex) !== Number(i)) {
           delete item[options.checkName];
-- 
Gitee