From c636e3fe11cf3781370973be8ee85b2e326e7ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Sat, 3 Jun 2023 23:56:47 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20fixbar=20=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=97=A0=E6=95=88=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/modules/util.js b/src/modules/util.js
index 72a55577..d645b25e 100644
--- a/src/modules/util.js
+++ b/src/modules/util.js
@@ -64,7 +64,7 @@ layui.define('jquery', function(exports){
         // 设置 bar 相关属性
         elemBar.addClass(item.icon).attr({
           'lay-type': item.type,
-          'style': item.style || ('background-color: '+ options.bgcolor || '')
+          'style': item.style || (options.bgcolor ? 'background-color: '+ options.bgcolor : '')
         }).html(item.content);
 
         // bar 点击事件

From 0a08d449f6868f68341c6ff89369bbcb1bbe7e7b Mon Sep 17 00:00:00 2001
From: sight <1453017105@qq.com>
Date: Sun, 4 Jun 2023 13:36:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20table=20hideCol=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=AC=AC=E4=BA=8C=E4=B8=AA=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=BA=E5=AF=B9=E8=B1=A1=E6=97=B6=E6=97=A0=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/modules/table.js b/src/modules/table.js
index 4a2be031..7be79f77 100644
--- a/src/modules/table.js
+++ b/src/modules/table.js
@@ -2817,6 +2817,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
         }
       })
     } else {
+      cols = layui.isArray(cols) ? cols : [cols];
       layui.each(cols, function (i1, item1) {
         that.eachCols(function (i2, item2) {
           if (item1.field === item2.field) {

From 43e30022b4c552824887b6f5e0d57529a2bc0d0f 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 Jun 2023 23:53:38 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20tab=20=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/element.tab.html | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/examples/element.tab.html b/examples/element.tab.html
index c1af1927..7e66f9be 100644
--- a/examples/element.tab.html
+++ b/examples/element.tab.html
@@ -32,7 +32,7 @@ body{padding:20px;}
 </div>
 
 <button class="layui-btn" onclick="layui.element.tabChange('tabDemo', 3)">手工切换到“标题3”</button>
-<button class="layui-btn" onclick="layui.element.tabAdd('tabDemo', {title:'新标题', content:'新内容', id: +new Date})">添加Tab</button>
+<button class="layui-btn" onclick="layui.element.tabAdd('tabDemo', {title:'新标题', content:'新内容', id: +new Date, change: true})">添加Tab</button>
 <button class="layui-btn" onclick="layui.element.tabDelete('tabDemo', 4)">删除“标题4”</button>
 
 <div class="layui-tab layui-tab-brief">
@@ -78,16 +78,18 @@ body{padding:20px;}
   </div>
 </div>
 
-<ul class="layui-tab-title">
-  <li class="layui-this"><a href="#1">标题题题题题题1</a></li>
-  <li><a href="#2">标题题题2</a></li>
-  <li><a href="#3">标题3</a></li>
-  <li><a href="#4">标题题题题题题题4</a></li>
-  <li><a href="#5">标题5</a></li>
-  <li><a href="#6">标题6</a></li>
-  <li><a href="#7">标题7</a></li>
-  <li><a href="#8">标题题题题题题题8</a></li>
-</ul>
+<div class="layui-tab">
+  <ul class="layui-tab-title">
+    <li class="layui-this"><a href="#1">标题题题题题题1</a></li>
+    <li><a href="#2">标题题题2</a></li>
+    <li><a href="#3">标题3</a></li>
+    <li><a href="#4">标题题题题题题题4</a></li>
+    <li><a href="#5">标题5</a></li>
+    <li><a href="#6">标题6</a></li>
+    <li><a href="#7">标题7</a></li>
+    <li><a href="#8">标题题题题题题题8</a></li>
+  </ul>
+</div>
 
 <div class="layui-tab" lay-filter="test" lay-allowClose="true">
   <ul class="layui-tab-title">

From 48e58c9cb192b4ac2905d23e6b9775cce71ebc19 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, 5 Jun 2023 00:12:42 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=20tab=20=E5=9C=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=92=8C=E5=88=87=E6=8D=A2=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=8A=98=E5=8F=A0=E5=92=8C=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/element.js | 45 +++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/modules/element.js b/src/modules/element.js
index 17f0d67c..ef265212 100644
--- a/src/modules/element.js
+++ b/src/modules/element.js
@@ -49,8 +49,10 @@ layui.define('jquery', function(exports){
     
     barElem[0] ? barElem.before(li) : titElem.append(li);
     contElem.append('<div class="layui-tab-item">'+ (options.content || '') +'</div>');
-    call.hideTabMore(true);
-    call.tabAuto();
+    // call.hideTabMore(true);
+    // 是否添加即切换
+    options.change && this.tabChange(filter, options.id);
+    call.tabAuto(options.change);
     return this;
   };
   
@@ -180,19 +182,22 @@ layui.define('jquery', function(exports){
     }
     
     // Tab 自适应
-    ,tabAuto: function(){
-      var SCROLL = 'layui-tab-scroll', MORE = 'layui-tab-more', BAR = 'layui-tab-bar'
-      ,CLOSE = 'layui-tab-close', that = this;
+    ,tabAuto: function(spread){
+      var SCROLL = 'layui-tab-scroll';
+      var MORE = 'layui-tab-more';
+      var BAR = 'layui-tab-bar';
+      var CLOSE = 'layui-tab-close';
+      var that = this;
       
       $('.layui-tab').each(function(){
-        var othis = $(this)
-        ,title = othis.children('.layui-tab-title')
-        ,item = othis.children('.layui-tab-content').children('.layui-tab-item')
-        ,STOPE = 'lay-stope="tabmore"'
-        ,span = $('<span class="layui-unselect layui-tab-bar" '+ STOPE +'><i '+ STOPE +' class="layui-icon">&#xe61a;</i></span>');
+        var othis = $(this);
+        var title = othis.children('.layui-tab-title');
+        var item = othis.children('.layui-tab-content').children('.layui-tab-item');
+        var STOPE = 'lay-stope="tabmore"';
+        var span = $('<span class="layui-unselect layui-tab-bar" '+ STOPE +'><i '+ STOPE +' class="layui-icon">&#xe61a;</i></span>');
 
         if(that === window && device.ie != 8){
-          call.hideTabMore(true)
+          // call.hideTabMore(true)
         }
         
         // 开启关闭图标
@@ -210,16 +215,24 @@ layui.define('jquery', function(exports){
         if(typeof othis.attr('lay-unauto') === 'string') return;
         
         // 响应式
-        if(title.prop('scrollWidth') > title.outerWidth()+1){
+        if(
+          title.prop('scrollWidth') > title.outerWidth() + 1 || 
+          title.height() > title.find('li').eq(0).height()
+        ){
+          // 若执行是来自于切换，则自动展开
+          spread && title.addClass(MORE);
+          
           if(title.find('.'+BAR)[0]) return;
           title.append(span);
           othis.attr('overflow', '');
+
+          // 展开图标事件
           span.on('click', function(e){
-            title[this.title ? 'removeClass' : 'addClass'](MORE);
-            this.title = this.title ? '' : '收缩';
+            var isSpread = title.hasClass(MORE);
+            title[isSpread ? 'removeClass' : 'addClass'](MORE);
           });
         } else {
-          title.find('.'+BAR).remove();
+          title.find('.'+ BAR).remove();
           othis.removeAttr('overflow');
         }
       });
@@ -530,7 +543,7 @@ layui.define('jquery', function(exports){
   });
 
   dom.on('click', '.layui-tab-title li', call.tabClick); // Tab 切换
-  dom.on('click', call.hideTabMore); // 隐藏展开的 Tab
+  // dom.on('click', call.hideTabMore); // 隐藏展开的 Tab
   $(window).on('resize', call.tabAuto); // 自适应
   
   exports(MOD_NAME, element);