!82 日期控件功问题修复及功能增强

Merge pull request !82 from javacspring/develop

ruoyi-admin/src/main/resources/static/ruoyi/js/common.js

@@ -69,24 +69,49 @@ $(function() {
 	}
 	// laydate time-input 时间控件绑定
 	if ($(".time-input").length > 0) {
-	    layui.use('laydate', function() {
+		layui.use('laydate', function () {
-	        var laydate = layui.laydate;
+			var com = layui.laydate;
-	        var times = $(".time-input");
+			$(".time-input").each(function (index, item) {
+				var time = $(item);
 				// 控制控件外观
-	        var type = times.attr("data-type") || 'date';
+				var type = time.attr("data-type") || 'date';
 				// 控制回显格式
-	        var format = times.attr("data-format") || 'yyyy-MM-dd';
+				var format = time.attr("data-format") || 'yyyy-MM-dd';
-	        for (var i = 0; i < times.length; i++) {
+				// 控制日期控件按钮
-	            var time = times[i];
+				var buttons = time.attr("data-btn") || 'clear|now|confirm', newBtnArr = [];
-	            laydate.render({
+				// 日期控件选择完成后回调处理
-	                elem: time,
+				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,
-	                done: function(value, date) {}
+					btns: newBtnArr,
-	            });
+					done: function (value, data) {
+						if (typeof window[callback] != 'undefined'
+							&& window[callback] instanceof Function) {
+							window[callback](value, data);
 						}
+					}
+				});
+			});
 		});
 	}
 	// tree 关键字搜索绑定