From 7c32588556c765b615b3f7243c2667468361a2ef Mon Sep 17 00:00:00 2001
From: chenw <javacspring@foxmail.com>
Date: Thu, 4 Apr 2019 18:58:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E6=97=A5=E6=9C=9F=E6=8E=A7=E5=88=B6=E6=97=B6?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=8B=AC=E7=AB=8B=E6=98=BE=E7=A4=BA=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98=202.=E6=96=B0=E5=A2=9E=20=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=8E=A7=E4=BB=B6=E5=A2=9E=E5=8A=A0=E9=80=89=E5=AE=9A?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=8A=9F=E8=83=BD=E3=80=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=8C=89=E9=94=AE=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=203.=E6=96=B0=E5=A2=9E=20=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=89=A9=E5=B1=95=E5=B1=9E=E6=80=A7data-btn?=
 =?UTF-8?q?=E3=80=81data-callback=E5=AE=9E=E7=8E=B0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/ruoyi/js/common.js  | 63 +++++++++++++------
 1 file changed, 44 insertions(+), 19 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
index e18e40dd..8a88fea0 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -69,25 +69,50 @@ $(function() {
 	}
 	// laydate time-input 时间控件绑定
 	if ($(".time-input").length > 0) {
-	    layui.use('laydate', function() {
-	        var laydate = layui.laydate;
-	        var times = $(".time-input");
-	        // 控制控件外观
-	        var type = times.attr("data-type") || 'date';
-	        // 控制回显格式
-	        var format = times.attr("data-format") || 'yyyy-MM-dd';
-	        for (var i = 0; i < times.length; i++) {
-	            var time = times[i];
-	            laydate.render({
-	                elem: time,
-	                theme: 'molv',
-	                trigger: 'click',
-	                type: type,
-	                format: format,
-	                done: function(value, date) {}
-	            });
-	        }
-	    });
+		layui.use('laydate', function () {
+			var com = layui.laydate;
+			$(".time-input").each(function (index, item) {
+				var time = $(item);
+				// 控制控件外观
+				var type = time.attr("data-type") || 'date';
+				// 控制回显格式
+				var format = time.attr("data-format") || 'yyyy-MM-dd';
+				// 控制日期控件按钮
+				var buttons = time.attr("data-btn") || 'clear|now|confirm', newBtnArr = [];
+				// 日期控件选择完成后回调处理
+				var callback = time.attr("data-callback") || {};
+				if (buttons) {
+					if (buttons.indexOf("|") > 0) {
+						var btnArr = buttons.split("|"), btnLen = btnArr.length;
+						for (var j = 0; j < btnLen; j++) {
+							if ("clear" === btnArr[j] || "now" === btnArr[j] || "confirm" === btnArr[j]) {
+								newBtnArr.push(btnArr[j]);
+							}
+						}
+					} else {
+						if ("clear" === buttons || "now" === buttons || "confirm" === buttons) {
+							newBtnArr.push(buttons);
+						}
+					}
+				} else {
+					newBtnArr = ['clear', 'now', 'confirm'];
+				}
+				com.render({
+					elem: item,
+					theme: 'molv',
+					trigger: 'click',
+					type: type,
+					format: format,
+					btns: newBtnArr,
+					done: function (value, data) {
+						if (typeof window[callback] != 'undefined'
+							&& window[callback] instanceof Function) {
+							window[callback](value, data);
+						}
+					}
+				});
+			});
+		});
 	}
 	// tree 关键字搜索绑定
 	if ($("#keyword").length > 0) {