From cf2531947c5b49ff84f7c61f7526eb040c5213ba 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 Aug 2022 23:26:17 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20dropdown=20=E7=9A=84?=
 =?UTF-8?q?=20clickScope=20=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/dropdown.html  |  5 ++++-
 src/modules/dropdown.js | 12 +++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/examples/dropdown.html b/examples/dropdown.html
index 51bd13b2..18203d6b 100644
--- a/examples/dropdown.html
+++ b/examples/dropdown.html
@@ -155,7 +155,10 @@ layui.use('dropdown', function(){
     
     ,id: 'demo1'
     
-    //菜单被点击的事件
+     // 触发点击事件的元素范围 --- default: 仅子菜单触发点击事件（默认，可不填）; all: 所有父子菜单均触发点击事件
+    ,clickScope: 'all'
+
+    // 菜单被点击的事件
     ,click: function(obj){
       console.log(obj);
     }
diff --git a/src/modules/dropdown.js b/src/modules/dropdown.js
index bfaf1a12..7587f0e1 100644
--- a/src/modules/dropdown.js
+++ b/src/modules/dropdown.js
@@ -261,13 +261,15 @@ layui.define(['jquery', 'laytpl', 'lay'], function(exports){
 
     //触发菜单列表事件
     that.elemView.find('.layui-menu li').on('click', function(e){
-      var othis = $(this)
-      ,data = othis.data('item') || {}
-      ,isChild = data.child && data.child.length > 0;
+      var othis = $(this);
+      var data = othis.data('item') || {};
+      var isChild = data.child && data.child.length > 0;
+      var isClickAllScope = options.clickScope === 'all'; // 是否所有父子菜单均触发点击事件
       
-      if(!isChild && data.type !== '-'){
-        that.remove();
+      if((!isChild || isClickAllScope) && data.type !== '-'){
+        isChild || that.remove();
         typeof options.click === 'function' && options.click(data, othis);
+        layui.stope(e);
       }
     });
     

From f5dfdb17c81f7fe9e75cd272cabe0435c6893837 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, 29 Aug 2022 01:13:34 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20element=20progress=20?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/element.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/element.html b/examples/element.html
index 46793865..21b0197f 100644
--- a/examples/element.html
+++ b/examples/element.html
@@ -93,7 +93,7 @@ body{padding:20px;}
 
 <br><br>
 
-<div class="layui-progress" lay-showPercent="true">
+<div class="layui-progress" lay-showPercent="true" lay-filter="demo-progress-1">
   <div class="layui-progress-bar" lay-percent="1/3"></div>
 </div>
 

From a23754e2ce0e26699e64931bb09b86a359ed2651 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, 29 Aug 2022 01:14:26 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20`element.progress()`?=
 =?UTF-8?q?=20=E6=96=B9=E6=B3=95=E4=B8=8D=E6=94=AF=E6=8C=81=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=88=86=E6=95=B0=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/element.js | 51 +++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/modules/element.js b/src/modules/element.js
index c5c77f94..c6ff3678 100644
--- a/src/modules/element.js
+++ b/src/modules/element.js
@@ -1,18 +1,18 @@
 /**
- * element 常用元素操作
- * MIT Licensed 
+ * element
+ * 常用元素操作组件
  */
  
 layui.define('jquery', function(exports){
-  "use strict";
+  'use strict';
   
-  var $ = layui.$
-  ,hint = layui.hint()
-  ,device = layui.device()
+  var $ = layui.$;
+  var hint = layui.hint();
+  var device = layui.device();
   
-  ,MOD_NAME = 'element', THIS = 'layui-this', SHOW = 'layui-show'
+  var MOD_NAME = 'element', THIS = 'layui-this', SHOW = 'layui-show';
   
-  ,Element = function(){
+  var Element = function(){
     this.config = {};
   };
   
@@ -82,23 +82,34 @@ layui.define('jquery', function(exports){
   };
   
   
-  //动态改变进度条
+  // 动态改变进度条
   Element.prototype.progress = function(filter, percent){
-    var ELEM = 'layui-progress'
-    ,elem = $('.'+ ELEM +'[lay-filter='+ filter +']')
-    ,elemBar = elem.find('.'+ ELEM +'-bar')
-    ,text = elemBar.find('.'+ ELEM +'-text');
-    elemBar.css('width', percent).attr('lay-percent', percent);
+    var ELEM = 'layui-progress';
+    var elem = $('.'+ ELEM +'[lay-filter='+ filter +']');
+    var elemBar = elem.find('.'+ ELEM +'-bar');
+    var text = elemBar.find('.'+ ELEM +'-text');
+
+    elemBar.css('width', function(){
+      return /^.+\/.+$/.test(percent) 
+        ? (new Function('return '+ percent)() * 100) + '%'
+     : percent;
+    }).attr('lay-percent', percent);
     text.text(percent);
     return this;
   };
   
-  var NAV_ELEM = '.layui-nav', NAV_ITEM = 'layui-nav-item', NAV_BAR = 'layui-nav-bar'
-  ,NAV_TREE = 'layui-nav-tree', NAV_CHILD = 'layui-nav-child', NAV_CHILD_C = 'layui-nav-child-c'
-  ,NAV_MORE = 'layui-nav-more', NAV_DOWN = 'layui-icon-down', NAV_ANIM = 'layui-anim layui-anim-upbit'
+  var NAV_ELEM = '.layui-nav';
+  var NAV_ITEM = 'layui-nav-item';
+  var NAV_BAR = 'layui-nav-bar';
+  var NAV_TREE = 'layui-nav-tree';
+  var NAV_CHILD = 'layui-nav-child';
+  var NAV_CHILD_C = 'layui-nav-child-c';
+  var NAV_MORE = 'layui-nav-more';
+  var NAV_DOWN = 'layui-icon-down';
+  var NAV_ANIM = 'layui-anim layui-anim-upbit';
   
-  //基础事件体
-  ,call = {
+  // 基础事件体
+  var call = {
     //Tab 点击
     tabClick: function(e, index, liElem, options){
       options = options || {};
@@ -452,7 +463,7 @@ layui.define('jquery', function(exports){
             return /^.+\/.+$/.test(percent) 
               ? (new Function('return '+ percent)() * 100) + '%'
            : percent;
-          }());
+          });
           
           if(othis.attr('lay-showPercent')){
             setTimeout(function(){

From 7b9aa2cdc2f7878c891cc94a4eef08fb15c42ff4 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, 29 Aug 2022 12:30:46 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=8D=E6=9E=84=20util.fixbar=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/util.html  |  52 ++++++++++++---
 src/modules/util.js | 150 ++++++++++++++++++++++++++++++--------------
 2 files changed, 147 insertions(+), 55 deletions(-)

diff --git a/examples/util.html b/examples/util.html
index fa002ffa..72a39389 100644
--- a/examples/util.html
+++ b/examples/util.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-<title>工具集 - layui</title>
+<title>util 组件 - layui</title>
 
 <link rel="stylesheet" href="../src/css/layui.css">
 
@@ -31,19 +31,53 @@ body{padding: 50px;}
 
 1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>1<br>
 
+<div id="target-test"></div>
+
 <script src="../src/layui.js"></script>
 <script>
-layui.use('util', function(){
-  var util = layui.util
-  ,$ = layui.$;
+layui.use(['util', 'layer'], function(){
+  var $ = layui.$;
+  var util = layui.util;
+  var layer = layui.layer;
 
-  //固定块
+  // 固定块
   util.fixbar({
-    bar1: true
-    ,bar2: true
-    //,css: {right: 100, bottom: 100}
-    ,click: function(type){
+    bars: [{ // 定义可显示的 bar 列表信息 -- v2.8.0 新增
+      type: 'share',
+      icon: 'layui-icon-share'
+    }, {
+      type: 'help',
+      icon: 'layui-icon-help'
+    }, { 
+      type: 'cart',
+      icon: 'layui-icon-cart',
+      style: 'background-color: #FF5722;'
+    }, {
+      type: 'groups',
+      content: '群',
+      style: 'font-size: 21px;'
+    }],
+    // bar1: true,
+    // bar2: true,
+    // default: false, 是否显示默认的 bar 列表 --  v2.8.0 新增
+    // bgcolor: '#393D52', // bar 的默认背景色
+    // css: {right: 100, bottom: 100},
+    // target: '#target-test', // 插入 fixbar 节点的目标元素选择器
+    on: { // 任意事件 --  v2.8.0 新增
+      mouseenter: function(type){
+        layer.tips(type, this, {
+          tips: 4, 
+          fixed: true
+        });
+      },
+      mouseleave: function(type){
+        layer.closeAll('tips');
+      }
+    },
+    // 点击事件
+    click: function(type){
       console.log(this, type);
+      // layer.msg(type);
     }
   });
   
diff --git a/src/modules/util.js b/src/modules/util.js
index dea710d7..60ab5a16 100644
--- a/src/modules/util.js
+++ b/src/modules/util.js
@@ -5,61 +5,119 @@
 layui.define('jquery', function(exports){
   "use strict";
   
-  var $ = layui.$
-  ,hint = layui.hint()
+  var $ = layui.$;
+  var hint = layui.hint();
   
-  //外部接口
-  ,util = {
-    //固定块
+  // 外部接口
+  var util = {
+    // 固定块
     fixbar: function(options){
-      var ELEM = 'layui-fixbar', TOP_BAR = 'layui-fixbar-top'
-      ,dom = $(document), body = $('body')
-      ,is, timer;
+      var ELEM = 'layui-fixbar';
+      var $doc = $(document);
 
-      options = $.extend({
-        showHeight: 200 //出现TOP的滚动条高度临界值
+      // 默认可选项
+      options = $.extend(true, {
+        target: 'body', // fixbar 的插入目标选择器
+        bars: [], //  bar 信息
+        default: true, // 是否显示默认 bar
+        showHeight: 200 // 出现 top bar 的滚动条高度临界值
       }, options);
-      
-      options.bar1 = options.bar1 === true ? '&#xe606;' : options.bar1;
-      options.bar2 = options.bar2 === true ? '&#xe607;' : options.bar2;
-      options.bgcolor = options.bgcolor ? ('background-color:' + options.bgcolor) : '';
-      
-      var icon = [options.bar1, options.bar2, '&#xe604;'] //图标：信息、问号、TOP
-      ,elem = $(['<ul class="'+ ELEM +'">'
-        ,options.bar1 ? '<li class="layui-icon" lay-type="bar1" style="'+ options.bgcolor +'">'+ icon[0] +'</li>' : ''
-        ,options.bar2 ? '<li class="layui-icon" lay-type="bar2" style="'+ options.bgcolor +'">'+ icon[1] +'</li>' : ''
-        ,'<li class="layui-icon '+ TOP_BAR +'" lay-type="top" style="'+ options.bgcolor +'">'+ icon[2] +'</li>'
-      ,'</ul>'].join(''))
-      ,topBar = elem.find('.'+TOP_BAR)
-      ,scroll = function(){
-        var stop = dom.scrollTop();
-        if(stop >= (options.showHeight)){
-          is || (topBar.show(), is = 1);
-        } else {
-          is && (topBar.hide(), is = 0);
+
+      var $target = $(options.target);
+
+      // 是否提供默认图标
+      if(options.default){
+        // 兼容旧版本的一些属性
+        if(options.bar1){
+          options.bars.push({
+            type: 'bar1',
+            icon: 'layui-icon-chat'
+          });
         }
-      };
-      if($('.'+ ELEM)[0]) return;
-      
-      typeof options.css === 'object' && elem.css(options.css);
-      body.append(elem), scroll();
-      
-      //bar点击事件
-      elem.find('li').on('click', function(){
-        var othis = $(this), type = othis.attr('lay-type');
-        if(type === 'top'){
-          $('html,body').animate({
-            scrollTop : 0
-          }, 200);
+        if(options.bar2){
+          options.bars.push({
+            type: 'bar2',
+            icon: 'layui-icon-help'
+          });
         }
-        options.click && options.click.call(this, type);
+        // 默认 top bar
+        options.bars.push({
+          type: 'top',
+          icon: 'layui-icon-top'
+        });
+      }
+
+      var elem = $('<ul>').addClass(ELEM);
+      var elemTopBar;
+
+      // 遍历生成 bars 节点
+      layui.each(options.bars, function(i, item){
+        var elemBar = $('<li class="layui-icon">');
+
+        // 设置 bar 相关属性
+        elemBar.addClass(item.icon).attr({
+          'lay-type': item.type,
+          'style': item.style || ('background-color: '+ options.bgcolor)
+        }).html(item.content);
+
+        // bar 点击事件
+        elemBar.on('click', function(){
+          var type = $(this).attr('lay-type');
+          if(type === 'top'){
+            $('html,body').animate({
+              scrollTop : 0
+            }, 200);
+          }
+          typeof options.click === 'function' && options.click.call(this, type);
+        });
+
+        // 自定义任意事件
+        if(layui.type(options.on) === 'object'){
+          layui.each(options.on, function(eventName, callback){
+            elemBar.on(eventName, function(){
+              var type = $(this).attr('lay-type');
+              typeof callback === 'function' && callback.call(this, type);
+            });
+          })
+        }
+
+        // 获得 top bar 节点
+        if(item.type === 'top'){
+          elemBar.addClass('layui-fixbar-top');
+          elemTopBar = elemBar;
+        }
+
+        elem.append(elemBar); // 插入 bar 节点
       });
-      
-      //Top显示控制
-      dom.on('scroll', function(){
+
+      // 若目标元素已存在 fixbar，则移除旧的节点
+      $target.find('.'+ ELEM).remove();
+
+      // 向目标元素插入 fixbar 节点
+      typeof options.css === 'object' && elem.css(options.css);
+      $target.append(elem);
+
+      // top bar 的显示隐藏
+      if(elemTopBar){
+        var lock;
+        var setTopBar = (function setTopBar(){
+          var top = $doc.scrollTop();
+          if(top >= options.showHeight){
+            lock || (elemTopBar.show(), lock = 1);
+          } else {
+            lock && (elemTopBar.hide(), lock = 0);
+          }
+          return setTopBar;
+        })();
+      }
+
+      // 根据 scrollbar 设置 fixbar 相关状态
+      var timer;
+      $doc.on('scroll', function(){
+        if(!setTopBar) return;
         clearTimeout(timer);
         timer = setTimeout(function(){
-          scroll();
+          setTopBar();
         }, 100);
       }); 
     }