From d3d9a5a75129be8c7c69de41bf025afe3992d621 Mon Sep 17 00:00:00 2001
From: 无木 <netfan@foxmail.com>
Date: Wed, 11 Dec 2019 15:55:38 +0800
Subject: [PATCH] 修复使用data-locale='{"format":"YYYY-MM-DD"}'方式配置daterangepicker时会丢失Custom Range、Apply、Clear国际化的问题
---
public/assets/js/require-form.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js
index d486148..c054900 100755
--- a/public/assets/js/require-form.js
+++ b/public/assets/js/require-form.js
@@ -208,7 +208,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
$(this).on('cancel.daterangepicker', function (ev, picker) {
$(this).val('').trigger('blur');
});
- $(this).daterangepicker($.extend({}, options, $(this).data()), callback);
+ $(this).daterangepicker($.extend(true, options, $(this).data()), callback);
});
});
}
--
libgit2 0.24.0