Merge pull request #1134 from layui/2.x

发布 v2.8.0-beta.2
2022-09-05 14:12:50 +08:00 · 2022-09-05 14:12:50 +08:00 · 016ea2085a
parent 71dad6f018 f1f54410aa
commit 016ea2085a
10 changed files with 330 additions and 143 deletions
--- a/dist/css/layui.css
+++ b/dist/css/layui.css
--- a/dist/layui.js
+++ b/dist/layui.js
--- a/examples/element.nav.html
+++ b/examples/element.nav.html
@ -1,15 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-<title>导航 - 常用元素 - layui</title>
-
-<link rel="stylesheet" href="../src/css/layui.css">
-
-<style>
-body{padding:20px;}
-</style>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+  <title>导航 - 常用元素 - layui</title>
+  <link rel="stylesheet" href="../src/css/layui.css">
+  <style>
+    body{padding: 16px;}
+    .demo-nav-tree>.layui-inline{vertical-align: top;}
+  </style>
 </head>
 <body>

@ -107,69 +106,131 @@ body{padding:20px;}
  <li class="layui-nav-item"><a href="">社区</a></li>
 </ul>

-<br><br>
+<br>

-<ul class="layui-nav layui-nav-tree"  lay-filter="test">
+<ul class="layui-nav layui-bg-gray">
+  <li class="layui-nav-item"><a href="">最新活动</a></li>
  <li class="layui-nav-item">
-    <a class="" href="javascript:;">产品</a>
+    <a href="javascript:;">产品</a>
+  </li>
+  <li class="layui-nav-item"><a href="">大数据</a></li>
+  <li class="layui-nav-item">
+    <a href="javascript:;">解决方案</a>
    <dl class="layui-nav-child">
-      <dd><a href="javascript:;">移动模块</a></dd>
-      <dd>
-        <a href="javascript:;">后台模版</a>
+      <dd><a href="">移动模块</a></dd>
+      <dd class="layui-this"><a href="">后台模版</a></dd>
+      <dd><a href="">电商平台</a></dd>
+    </dl>
+  </li>
+  <li class="layui-nav-item"><a href="">社区</a></li>
+</ul>
+
+<br>
+
+<div class="demo-nav-tree">
+  <div class="layui-inline">
+
+    <ul class="layui-nav layui-nav-tree" lay-filter="test">
+      <li class="layui-nav-item">
+        <a class="" href="javascript:;">产品</a>
        <dl class="layui-nav-child">
-          <dd><a href="javascript:;">组件一</a></dd>
+          <dd><a href="javascript:;">移动模块</a></dd>
          <dd>
-            <a href="javascript:;">组件二</a>
+            <a href="javascript:;">后台模版</a>
+            <dl class="layui-nav-child">
+              <dd><a href="javascript:;">组件一</a></dd>
+              <dd>
+                <a href="javascript:;">组件二</a>
+              </dd>
+              <dd><a href="javascript:;">组件三</a></dd>
+            </dl>
          </dd>
-          <dd><a href="javascript:;">组件三</a></dd>
+          <dd><a href="javascript:;">电商平台</a></dd>
+          <dd><a href="">跳转菜单</a></dd>
        </dl>
-      </dd>
-      <dd><a href="javascript:;">电商平台</a></dd>
-      <dd><a href="">跳转菜单</a></dd>
-    </dl>
-  </li>
-  <li class="layui-nav-item">
-    <a href="javascript:;">解决方案</a>
-    <dl class="layui-nav-child">
-      <dd><a href="javascript:;">移动模块</a></dd>
-      <dd>
-        <a href="javascript:;">后台模版</a>
-      </dd>
-      <dd><a href="">电商平台</a></dd>
-    </dl>
-  </li>
-  <li class="layui-nav-item"><a href="">云市场</a></li>
-  <li class="layui-nav-item"><a href="">社区</a></li>
-</ul>
+      </li>
+      <li class="layui-nav-item">
+        <a href="javascript:;">解决方案</a>
+        <dl class="layui-nav-child">
+          <dd><a href="javascript:;">移动模块</a></dd>
+          <dd>
+            <a href="javascript:;">后台模版</a>
+          </dd>
+          <dd><a href="">电商平台</a></dd>
+        </dl>
+      </li>
+      <li class="layui-nav-item"><a href="javascript:;">云市场</a></li>
+      <li class="layui-nav-item"><a href="">社区</a></li>
+    </ul>

-<br><br>
+  </div>
+  <div class="layui-inline">

-<ul class="layui-nav layui-bg-cyan layui-nav-tree"  lay-filter="test">
-  <li class="layui-nav-item layui-nav-itemed">
-    <a class="" href="javascript:;">产品</a>
-    <dl class="layui-nav-child">
-      <dd><a href="javascript:;">移动模块</a></dd>
-      <dd>
-        <a href="javascript:;">后台模版</a>
-      </dd>
-      <dd><a href="javascript:;">电商平台</a></dd>
-      <dd><a href="">跳转菜单</a></dd>
-    </dl>
-  </li>
-  <li class="layui-nav-item">
-    <a href="javascript:;">解决方案</a>
-    <dl class="layui-nav-child">
-      <dd><a href="javascript:;">移动模块</a></dd>
-      <dd><a href="javascript:;">后台模版</a></dd>
-      <dd><a href="">电商平台</a></dd>
-    </dl>
-  </li>
-  <li class="layui-nav-item"><a href="">云市场</a></li>
-  <li class="layui-nav-item"><a href="">社区</a></li>
-</ul>
+    <ul class="layui-nav layui-nav-tree layui-bg-gray"  lay-filter="test">
+      <li class="layui-nav-item">
+        <a class="" href="javascript:;">产品</a>
+        <dl class="layui-nav-child">
+          <dd><a href="javascript:;">移动模块</a></dd>
+          <dd>
+            <a href="javascript:;">后台模版</a>
+            <dl class="layui-nav-child">
+              <dd><a href="javascript:;">组件一</a></dd>
+              <dd>
+                <a href="javascript:;">组件二</a>
+              </dd>
+              <dd><a href="javascript:;">组件三</a></dd>
+            </dl>
+          </dd>
+          <dd><a href="javascript:;">电商平台</a></dd>
+          <dd><a href="">跳转菜单</a></dd>
+        </dl>
+      </li>
+      <li class="layui-nav-item">
+        <a href="javascript:;">解决方案</a>
+        <dl class="layui-nav-child">
+          <dd><a href="javascript:;">移动模块</a></dd>
+          <dd>
+            <a href="javascript:;">后台模版</a>
+          </dd>
+          <dd><a href="">电商平台</a></dd>
+        </dl>
+      </li>
+      <li class="layui-nav-item"><a href="javascript:;">云市场</a></li>
+      <li class="layui-nav-item"><a href="">社区</a></li>
+    </ul>

+  </div>
+  <div class="layui-inline">

-<br><br>
+    <ul class="layui-nav layui-bg-cyan layui-nav-tree"  lay-filter="test">
+      <li class="layui-nav-item layui-nav-itemed">
+        <a class="" href="javascript:;">产品</a>
+        <dl class="layui-nav-child">
+          <dd><a href="javascript:;">移动模块</a></dd>
+          <dd>
+            <a href="javascript:;">后台模版</a>
+          </dd>
+          <dd><a href="javascript:;">电商平台</a></dd>
+          <dd><a href="">跳转菜单</a></dd>
+        </dl>
+      </li>
+      <li class="layui-nav-item">
+        <a href="javascript:;">解决方案</a>
+        <dl class="layui-nav-child">
+          <dd><a href="javascript:;">移动模块</a></dd>
+          <dd><a href="javascript:;">后台模版</a></dd>
+          <dd><a href="">电商平台</a></dd>
+        </dl>
+      </li>
+      <li class="layui-nav-item"><a href="">云市场</a></li>
+      <li class="layui-nav-item"><a href="">社区</a></li>
+    </ul>
+
+  </div>
+</div>
+
+<br>
+<br>

 <span class="layui-breadcrumb">
  <a href="">首页</a>
--- a/examples/laydate.html
+++ b/examples/laydate.html
@ -16,12 +16,20 @@ body{padding: 50px 100px;}
 </head>
 <body>

+<div class="layui-inline">
+  <input type="text" class="layui-input" id="test-first">
+</div>
+
+<br>
+<hr>
+
 范围选择1：
 <div class="layui-inline">
  <input type="text" class="layui-input" id="test1">
 </div>

-<br><hr>
+<br>
+<hr>

 <div class="layui-form">
 <div class="layui-form-item">
@ -138,7 +146,15 @@ layui.use('laydate', function(laydate){
  //全局配置
  laydate.set({
    //trigger: 'focus'
-  })
+  });
+
+  // 第一个任意示例
+  laydate.render({
+    elem: '#test-first',
+    min: 0,
+    //max: '2016-12-30'
+  });
+

  //范围选择1
  laydate.render({
--- a/examples/util.html
+++ b/examples/util.html
@ -29,9 +29,9 @@ body{padding: 50px;}

 <hr>

-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>
+<div id="target-test" style1="position: relative; height: 300px; overflow: auto;">
+  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>

 <script src="../src/layui.js"></script>
 <script>
@ -63,6 +63,7 @@ layui.use(['util', 'layer'], function(){
    // bgcolor: '#393D52', // bar 的默认背景色
    // css: {right: 100, bottom: 100},
    // target: '#target-test', // 插入 fixbar 节点的目标元素选择器
+    // duration: 300, // top bar 等动画时长（毫秒）
    on: { // 任意事件 --  v2.8.0 新增
      mouseenter: function(type){
        layer.tips(type, this, {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "layui",
-  "version": "2.8.0-beta.1",
+  "version": "2.8.0-beta.2",
  "description": "Classic modular Front-End UI library",
  "main": "dist/layui.js",
  "license": "MIT",
--- a/src/css/layui.css
+++ b/src/css/layui.css
@ -915,7 +915,7 @@ a cite{font-style: normal; *cursor:pointer;}
 /* 小表格 */
 .layui-table[lay-size="sm"] th,
 .layui-table[lay-size="sm"] td{padding-top: 5px; padding-right: 10px; padding-bottom: 5px; padding-left: 10px; font-size: 12px;}
-.layui-table-view .layui-table[lay-size="sm"] .layui-table-cell{height: 30px; line-height: 20px; padding-top: 5px; padding-left: 5px; padding-right: 5px;}
+.layui-table-view .layui-table[lay-size="sm"] .layui-table-cell{height: 30px; line-height: 20px; padding-top: 5px; padding-left: 11px; padding-right: 11px;}

 /* 数据表格 */
 .layui-table[lay-data],
@ -1112,7 +1112,6 @@ body .layui-table-tips .layui-layer-content{background: none; padding: 0; box-sh
 .layui-dropdown:before{content:""; position: absolute; width: 100%; height: 6px; left: 0; top: -6px;}


-
 /** 导航菜单 **/
 .layui-nav{position: relative; padding: 0 20px; background-color: #393D49; color: #fff; border-radius: 2px; font-size: 0; box-sizing: border-box;}
 .layui-nav *{font-size: 14px;}
@ -1133,7 +1132,7 @@ body .layui-table-tips .layui-layer-content{background: none; padding: 0; box-sh
 .layui-nav-itemed > a .layui-nav-more{transform: rotate(180deg);}


-.layui-nav-child{display: none; position: absolute; left: 0; top: 65px; min-width: 100%; line-height: 36px; padding: 5px 0;  box-shadow: 0 2px 4px rgba(0,0,0,.12); border: 1px solid #eee; background-color: #fff; z-index: 100; border-radius: 2px; white-space: nowrap;}
+.layui-nav-child{display: none; position: absolute; left: 0; top: 65px; min-width: 100%; line-height: 36px; padding: 5px 0;  box-shadow: 0 2px 4px rgba(0,0,0,.12); border: 1px solid #eee; background-color: #fff; z-index: 100; border-radius: 2px; white-space: nowrap; box-sizing: border-box;}
 .layui-nav .layui-nav-child a{color: #5F5F5F; color: rgba(0,0,0,.8);}
 .layui-nav .layui-nav-child a:hover{background-color: #F6F6F6; color: rgba(0,0,0,.8);}
 .layui-nav-child dd{margin: 1px 0; position: relative;}
@ -1172,6 +1171,21 @@ body .layui-table-tips .layui-layer-content{background: none; padding: 0; box-sh

 /* 侧边 */.layui-nav-side{position: fixed; top: 0; bottom: 0; left: 0; overflow-x: hidden; z-index: 999;}

+/* 导航浅色背景 */
+.layui-nav.layui-bg-gray .layui-nav-item a,
+.layui-nav-tree.layui-bg-gray a{color: rgba(0,0,0,.8);}
+.layui-nav-tree.layui-bg-gray{padding: 6px 0;}
+.layui-nav-tree.layui-bg-gray .layui-nav-itemed>a{color: #000 !important;}
+.layui-nav.layui-bg-gray .layui-this a{color: #5FB878;}
+.layui-nav-tree.layui-bg-gray .layui-nav-itemed>.layui-nav-child{padding-left: 11px; background: none!important;}
+.layui-nav-tree.layui-bg-gray .layui-nav-item>a{padding-top: 0; padding-bottom: 0;}
+.layui-nav-tree.layui-bg-gray .layui-nav-item>a .layui-nav-more{padding: 0;}
+.layui-nav-tree.layui-bg-gray .layui-this,
+.layui-nav-tree.layui-bg-gray .layui-this>a,
+.layui-nav-tree.layui-bg-gray .layui-nav-child dd.layui-this,
+.layui-nav-tree.layui-bg-gray .layui-nav-child dd.layui-this a{background: none!important; color: #5FB878!important; font-weight: 700;}
+.layui-nav-tree.layui-bg-gray .layui-nav-bar{background-color: #5FB878;}
+

 /** 面包屑 **/
 .layui-breadcrumb{visibility: hidden; font-size: 0;}
--- a/src/layui.js
+++ b/src/layui.js
@ -15,7 +15,7 @@
  }

  ,Layui = function(){
-    this.v = '2.8.0-beta.1'; // Layui 版本号
+    this.v = '2.8.0-beta.2'; // Layui 版本号
  }
  
  //识别预先可能定义的指定全局对象
--- a/src/modules/laydate.js
+++ b/src/modules/laydate.js
@ -6,32 +6,32 @@
  var isLayui = window.layui && layui.define, ready = {
    getPath: (window.lay && lay.getPath) ? lay.getPath : ''
    
-    //载入 CSS 依赖
+    // 载入 CSS 依赖
    ,link: function(href, fn, cssname){
      
-      //未设置路径，则不主动加载 css
+      // 未设置路径，则不主动加载 css
      if(!laydate.path) return;
      
-      //加载 css
+      // 加载 css
      if(window.lay && lay.layui){
        lay.layui.link(laydate.path + href, fn, cssname);
      }
    }
-  }
+  };
  
-  //识别预先可能定义的指定全局对象
-  ,GLOBAL = window.LAYUI_GLOBAL || {}
+  // 识别预先可能定义的指定全局对象
+  var GLOBAL = window.LAYUI_GLOBAL || {};
  
-  //外部调用
-  ,laydate = {
-    v: '5.4.0' //layDate 版本号
+  // 外部调用
+  var laydate = {
+    v: '5.4.0' // layDate 版本号
    ,config: {
      weekStart: 0, // 默认周日一周的开始
-    } //全局配置项
+    } // 全局配置项
    ,index: (window.laydate && window.laydate.v) ? 100000 : 0
    ,path: GLOBAL.laydate_dir || ready.getPath
    
-    //设置全局项
+    // 设置全局项
    ,set: function(options){
      var that = this;
      that.config = lay.extend({}, that.config, options);
@ -52,10 +52,10 @@

      return this;
    }
-  }
+  };
  
-  //操作当前实例
-  ,thisModule = function(){
+  // 操作当前实例
+  var thisModule = function(){
    var that = this
    ,options = that.config
    ,id = options.id;
@ -69,15 +69,32 @@
      }
      ,config: that.config
    };
-  }
+  };

-  //字符常量
-  ,MOD_NAME = 'laydate', ELEM = '.layui-laydate', THIS = 'layui-this', SHOW = 'layui-show', HIDE = 'layui-hide', DISABLED = 'laydate-disabled', LIMIT_YEAR = [100, 200000]
+  // 字符常量
+  var MOD_NAME = 'laydate';
+  var ELEM = '.layui-laydate';
+  var THIS = 'layui-this';
+  var SHOW = 'layui-show';
+  var HIDE = 'layui-hide';
+  var DISABLED = 'laydate-disabled';
+  var LIMIT_YEAR = [100, 200000];
  
-  ,ELEM_STATIC = 'layui-laydate-static', ELEM_LIST = 'layui-laydate-list', ELEM_SELECTED = 'laydate-selected', ELEM_HINT = 'layui-laydate-hint', ELEM_PREV = 'laydate-day-prev', ELEM_NEXT = 'laydate-day-next', ELEM_FOOTER = 'layui-laydate-footer', ELEM_CONFIRM = '.laydate-btns-confirm', ELEM_TIME_TEXT = 'laydate-time-text', ELEM_TIME_BTN = 'laydate-btns-time', ELEM_PREVIEW = 'layui-laydate-preview'
+  var ELEM_STATIC = 'layui-laydate-static';
+  var ELEM_LIST = 'layui-laydate-list';
+  var ELEM_SELECTED = 'laydate-selected';
+  var ELEM_HINT = 'layui-laydate-hint';
+  var ELEM_PREV = 'laydate-day-prev';
+  var ELEM_NEXT = 'laydate-day-next';
+  var ELEM_FOOTER = 'layui-laydate-footer';
+  var ELEM_NOW = '.laydate-btns-now'
+  var ELEM_CONFIRM = '.laydate-btns-confirm';
+  var ELEM_TIME_TEXT = 'laydate-time-text';
+  var ELEM_TIME_BTN = 'laydate-btns-time';
+  var ELEM_PREVIEW = 'layui-laydate-preview';
  
-  //组件构造器
-  ,Class = function(options){
+  // 组件构造器
+  var Class = function(options){
    var that = this;
    that.index = ++laydate.index;
    that.config = lay.extend({}, that.config, laydate.config, options);
@ -93,20 +110,20 @@
      return that;
    }
    
-    //初始化 id 参数
+    // 初始化 id 参数
    options = that.config;
    options.id = ('id' in options) ? options.id : that.index;
    
-    //初始化
+    // 初始化
    laydate.ready(function(){
      that.init();
    });
-  }
+  };
  
-  //日期格式字符
-  ,dateType = 'yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s';
+  // 日期格式字符
+  var dateType = 'yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s';
  
-  //将日期格式字符转换为数组
+  // 将日期格式字符转换为数组
  thisModule.formatArr = function(format){
    return (format || '').match(new RegExp(dateType + '|.', 'g')) || []
  };
@ -115,12 +132,12 @@
    组件操作
  */
  
-  //是否闰年
+  // 是否闰年
  Class.isLeapYear = function(year){
    return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
  };
  
-  //默认配置
+  // 默认配置
  Class.prototype.config = {
    type: 'date' //控件类型，支持：year/month/date/time/datetime
    ,range: false //是否开启范围选择，即双控件
@ -836,8 +853,11 @@
      }
    }

-    //初始值不在最大最小范围内
-    minMaxError && that.setValue(that.parse()).hint('初始值' + lang.invalidDate + lang.formatError[1]);
+    // 初始值不在最大最小范围内
+    if(minMaxError && value){
+      that.setValue(that.parse());
+      that.hint('value ' + lang.invalidDate + lang.formatError[1]);
+    }

    fn && fn();
    return that;
@ -881,12 +901,16 @@
    return that;
  };
  
-  //无效日期范围的标记
-  Class.prototype.limit = function(elem, date, index, time, type){
-    var that = this
-    ,options = that.config, timestrap = {}
-    ,dateTime = index > (time ? 0 : 41) ? that.endDate : options.dateTime
-    ,isOut, thisDateTime = lay.extend({}, dateTime, date || {});
+  // 无效日期范围的标记
+  Class.prototype.limit = function(opts){
+    opts = opts || {};
+
+    var that = this;
+    var options = that.config;
+    var timestrap = {}
+    var dateTime = opts.index > (opts.time ? 0 : 41) ? that.endDate : options.dateTime;
+    var isOut;
+    var thisDateTime = lay.extend({}, dateTime, opts.date || {});
    
    lay.each({
      now: thisDateTime
@ -895,11 +919,11 @@
    }, function(key, item){
      timestrap[key] = that.newDate(lay.extend({
        year: item.year
-        ,month: type === 'year' ? 0 : item.month // 年份的时候只比较年
-        ,date: (type === 'year' || type === 'month') ? 1 : item.date // 年月只比较年月不与最大最小比日期
+        ,month: opts.type === 'year' ? 0 : item.month // 年份的时候只比较年
+        ,date: (opts.type === 'year' || opts.type === 'month') ? 1 : item.date // 年月只比较年月不与最大最小比日期
      }, function(){
        var hms = {};
-        lay.each(time, function(i, keys){
+        lay.each(opts.time, function(i, keys){
          hms[keys] = item[keys];
        });
        return hms;
@ -907,7 +931,8 @@
    });
    
    isOut = timestrap.now < timestrap.min || timestrap.now > timestrap.max;
-    elem && elem[isOut ? 'addClass' : 'removeClass'](DISABLED);
+    opts.elem && opts.elem[isOut ? 'addClass' : 'removeClass'](DISABLED);
+
    return isOut;
  };
  
@ -966,11 +991,15 @@
      YMD[1]++;
      YMD[2] = st + 1;
      item.attr('lay-ymd', YMD.join('-')).html('<div>' + YMD[2] + '</div>');
-      that.mark(item, YMD).holidays(item, YMD).limit(item, {
-        year: YMD[0]
-        ,month: YMD[1] - 1
-        ,date: YMD[2]
-      }, index_);
+      that.mark(item, YMD).holidays(item, YMD).limit({
+        elem: item,
+        date: {
+          year: YMD[0],
+          month: YMD[1] - 1,
+          date: YMD[2]
+        },
+        index: index_
+      });
    });  
    
    //同步头部年月
@ -1013,9 +1042,23 @@
      that.calendar(that.endDate, 1);
    }
    
-    //通过检测当前有效日期，来设定确定按钮是否可点
+    // 通过检测当前有效日期，来设定底部按钮状态
    if(!options.range){
-      that.limit(lay(that.footer).find(ELEM_CONFIRM), null, 0, ['hours', 'minutes', 'seconds']);
+      var timeParams = ['hours', 'minutes', 'seconds'];
+
+      // 现在按钮
+      that.limit({
+        elem: lay(that.footer).find(ELEM_NOW),
+        date: that.systemDate(),
+        index: 0,
+        time: timeParams
+      });
+      // 确认按钮
+      that.limit({
+        elem: lay(that.footer).find(ELEM_CONFIRM),
+        index: 0,
+        time: timeParams
+      });
    }
    
    //同步按钮可点状态
@ -1080,7 +1123,12 @@
        }
        */

-        that.limit(lay(li), ymd, index, null, type);
+        that.limit({
+          elem: lay(li),
+          date: ymd,
+          index: index,
+          type: type
+        });
        yearNum++;
      });

@ -1112,7 +1160,12 @@
        }
        */

-        that.limit(lay(li), ymd, index, null, type);
+        that.limit({
+          elem: lay(li),
+          date: ymd,
+          index: index,
+          type: type
+        });
      });

      lay(elemYM[isCN ? 0 : 1]).attr('lay-ym', listYM[0] + '-' + listYM[1])
@ -1125,20 +1178,34 @@
      var setTimeStatus = function(){
        lay(ul).find('ol').each(function(i, ol){
          lay(ol).find('li').each(function(ii, li){
-            that.limit(lay(li), [{
-              hours: ii
-            }, {
-              hours: that[startEnd].hours
-              ,minutes: ii
-            }, {
-              hours: that[startEnd].hours
-              ,minutes: that[startEnd].minutes
-              ,seconds: ii
-            }][i], index, [['hours'], ['hours', 'minutes'], ['hours', 'minutes', 'seconds']][i]);
+            that.limit({
+              elem: lay(li),
+              date: [{
+                hours: ii
+              }, {
+                hours: that[startEnd].hours
+                ,minutes: ii
+              }, {
+                hours: that[startEnd].hours
+                ,minutes: that[startEnd].minutes
+                ,seconds: ii
+              }][i],
+              index: index,
+              time: [
+                ['hours'], 
+                ['hours', 'minutes'], 
+                ['hours', 'minutes', 'seconds']
+              ][i]
+            });
          });
        });
        if(!options.range){
-          that.limit(lay(that.footer).find(ELEM_CONFIRM), that[startEnd], 0, ['hours', 'minutes', 'seconds']);
+          that.limit({
+            elem: lay(that.footer).find(ELEM_CONFIRM),
+            date: that[startEnd],
+            inedx: 0,
+            time: ['hours', 'minutes', 'seconds']
+          });
        }
      };
      
@ -1178,7 +1245,10 @@
        if(lay(this).hasClass(DISABLED)) return;
        if(index === 0){
          dateTime[type] = ym;
-          that.limit(lay(that.footer).find(ELEM_CONFIRM), null, 0);
+          that.limit({
+            elem: lay(that.footer).find(ELEM_CONFIRM),
+            index: 0
+          });
        } else { //范围选择
          that.endDate[type] = ym;
        }
@ -1299,7 +1369,11 @@
      isOut = that.newDate(start).getTime() > that.newDate(end).getTime();
      
      //如果不在有效日期内，直接禁用按钮，否则比较开始和结束日期
-      (that.limit(null, start) || that.limit(null, end)) 
+      (that.limit({
+        date: start
+      }) || that.limit({
+        date: end
+      })) 
        ? elemBtn.addClass(DISABLED)
      : elemBtn[isOut ? 'addClass' : 'removeClass'](DISABLED);
      
@ -1533,14 +1607,21 @@
        that.done(['', {}, {}]);
      }
      
-      //现在
+      // 现在
      ,now: function(){
        var thisDate = new Date();
+
+        // 当前系统时间未在 min/max 范围内，则不可点击
+        if(lay(btn).hasClass(DISABLED)){
+          return that.hint(lang.tools.now +', '+ lang.invalidDate);
+        }
+
        lay.extend(dateTime, that.systemDate(), {
          hours: thisDate.getHours()
          ,minutes: thisDate.getMinutes()
          ,seconds: thisDate.getSeconds()
        });
+
        that.setValue(that.parse()).remove();
        isStatic && that.calendar();
        that.done();
@ -1593,8 +1674,11 @@
        });
        if(isAlone) dateTime.year = listYM[0];
        options.range || that.done(null, 'change');     
-        options.range || that.limit(lay(that.footer).find(ELEM_CONFIRM), {
-          year: listYM[0]
+        options.range || that.limit({
+          elem: lay(that.footer).find(ELEM_CONFIRM),
+          date: {
+            year: listYM[0]
+          }
        });
      }
      
--- a/src/modules/util.js
+++ b/src/modules/util.js
@ -20,11 +20,18 @@ layui.define('jquery', function(exports){
        target: 'body', // fixbar 的插入目标选择器
        bars: [], //  bar 信息
        default: true, // 是否显示默认 bar
-        showHeight: 200 // 出现 top bar 的滚动条高度临界值
+        showHeight: 200, // 出现 top bar 的滚动条高度临界值
+        duration: 200 // top bar 等动画时长（毫秒）
      }, options);

+      // 目标元素对象
      var $target = $(options.target);

+      // 滚动条所在元素对象
+      var $scroll = options.scroll 
+        ? $(options.scroll) 
+      : $(options.target === 'body' ? $doc : $target)
+
      // 是否提供默认图标
      if(options.default){
        // 兼容旧版本的一些属性
@ -64,9 +71,13 @@ layui.define('jquery', function(exports){
        elemBar.on('click', function(){
          var type = $(this).attr('lay-type');
          if(type === 'top'){
-            $('html,body').animate({
+            (
+              options.target === 'body' 
+                ? $('html,body') 
+              : $scroll
+            ).animate({
              scrollTop : 0
-            }, 200);
+            }, options.duration);
          }
          typeof options.click === 'function' && options.click.call(this, type);
        });
@ -101,7 +112,7 @@ layui.define('jquery', function(exports){
      if(elemTopBar){
        var lock;
        var setTopBar = (function setTopBar(){
-          var top = $doc.scrollTop();
+          var top = $scroll.scrollTop();
          if(top >= options.showHeight){
            lock || (elemTopBar.show(), lock = 1);
          } else {
@ -113,7 +124,7 @@ layui.define('jquery', function(exports){

      // 根据 scrollbar 设置 fixbar 相关状态
      var timer;
-      $doc.on('scroll', function(){
+      $scroll.on('scroll', function(){
        if(!setTopBar) return;
        clearTimeout(timer);
        timer = setTimeout(function(){