From d3d9a5a75129be8c7c69de41bf025afe3992d621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E6=9C=A8?= Date: Wed, 11 Dec 2019 15:55:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8data-locale?= =?UTF-8?q?=3D'{"format":"YYYY-MM-DD"}'=E6=96=B9=E5=BC=8F=E9=85=8D?= =?UTF-8?q?=E7=BD=AEdaterangepicker=E6=97=B6=E4=BC=9A=E4=B8=A2=E5=A4=B1Cus?= =?UTF-8?q?tom=20Range=E3=80=81Apply=E3=80=81Clear=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 d48614805..c0549006a 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); }); }); } -- Gitee