From f9b43bdbe4a372f82e14fa62f717400c14384460 Mon Sep 17 00:00:00 2001
From: PPPSCN <35696959@qq.com>
Date: Sat, 16 Feb 2019 19:46:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0slider?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bower.json                          |  5 +++--
 public/assets/css/backend.css       |  1 +
 public/assets/js/require-backend.js |  1 +
 public/assets/js/require-form.js    | 16 ++++++++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index 0bfe1827..59a256ff 100755
--- a/bower.json
+++ b/bower.json
@@ -11,7 +11,7 @@
     "font-awesome": "^4.6.1",
     "bootstrap-table": "~1.11.0",
     "jstree": "~3.3.2",
-    "moment": "~2.15.2",
+    "moment": "^2.20.1",
     "plupload": "~2.2.0",
     "toastr": "~2.1.3",
     "jcrop": "~2.0.4",
@@ -32,6 +32,7 @@
     "fastadmin-dragsort": "~1.0.0",
     "fastadmin-addtabs": "~1.0.3",
     "fastadmin-selectpage": "~1.0.0",
-    "fastadmin-layer": "~3.1.2"
+    "fastadmin-layer": "~3.1.2",
+    "bootstrap-slider": "*"
   }
 }
diff --git a/public/assets/css/backend.css b/public/assets/css/backend.css
index 5c9a6903..322a2da2 100644
--- a/public/assets/css/backend.css
+++ b/public/assets/css/backend.css
@@ -11,6 +11,7 @@
 @import url("../libs/nice-validator/dist/jquery.validator.css");
 @import url("../libs/bootstrap-select/dist/css/bootstrap-select.min.css");
 @import url("../libs/fastadmin-selectpage/selectpage.css");
+@import url("../libs/bootstrap-slider/slider.css");
 html,
 body {
   height: 100%;
diff --git a/public/assets/js/require-backend.js b/public/assets/js/require-backend.js
index 45342eae..03aaa73f 100644
--- a/public/assets/js/require-backend.js
+++ b/public/assets/js/require-backend.js
@@ -33,6 +33,7 @@ require.config({
         'bootstrap-table-export': '../libs/bootstrap-table/dist/extensions/export/bootstrap-table-export.min',
         'bootstrap-table-mobile': '../libs/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile',
         'bootstrap-table-lang': '../libs/bootstrap-table/dist/locale/bootstrap-table-zh-CN',
+        'bootstrap-slider': '../libs/bootstrap-slider/bootstrap-slider',
         'tableexport': '../libs/tableExport.jquery.plugin/tableExport.min',
         'dragsort': '../libs/fastadmin-dragsort/jquery.dragsort',
         'sortable': '../libs/Sortable/Sortable.min',
diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js
index c59fe82b..27433d8d 100755
--- a/public/assets/js/require-form.js
+++ b/public/assets/js/require-form.js
@@ -368,6 +368,20 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
             },
             bindevent: function (form) {
 
+            },
+            slider: function (form) {
+                if ($(".slider", form).size() > 0) {
+                    require(['bootstrap-slider'], function () {
+                        $('.slider').removeClass('hidden').css('width', function (index, value) {
+                            return $(this).parents('.form-control').width();
+                        }).slider().on('slide', function (ev) {
+                            var data = $(this).data();
+                            if (typeof data.unit !== 'undefined') {
+                                $(this).parents('.form-control').siblings('.value').text(ev.value + data.unit);
+                            }
+                        });
+                    });
+                }
             }
         },
         api: {
@@ -467,6 +481,8 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
 
                 events.fieldlist(form);
 
+                events.slider(form);
+
                 events.switcher(form);
             },
             custom: {}