From 5f353e6947e47f6429b9a25026c6e0d69a031646 Mon Sep 17 00:00:00 2001
From: lizongwen <93700983@qq.com>
Date: Thu, 11 Oct 2018 17:04:06 +0800
Subject: [PATCH 1/4] 1

---
 .project | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 .project

diff --git a/.project b/.project
deleted file mode 100644
index a384632..0000000
--- a/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Credit-UI-Admin</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.aptana.ide.core.unifiedBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.aptana.projects.webnature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1513824695849</id>
-			<name></name>
-			<type>26</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>

From 8acc6b286cb243646cc044b0ddb8871a07c3eb89 Mon Sep 17 00:00:00 2001
From: lizongwen <93700983@qq.com>
Date: Thu, 1 Nov 2018 17:37:52 +0800
Subject: [PATCH 2/4] 1

---
 views/general.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/general.html b/views/general.html
index 8806448..8cf239b 100644
--- a/views/general.html
+++ b/views/general.html
@@ -579,7 +579,7 @@ <h3 class="box-title">多选框</h3>
 								<div class="checkbox">
 									<label class="checkbox-label checkbox-disabled">
 										<span class="checkbox-input-wrapper">
-											<input type="checkbox" name="optionsCheckbox" id="" value="option1">
+											<input type="checkbox" name="optionsCheckbox" id="" value="option1" disabled>
 											<span class="checkbox-inner"></span>
 										</span>
 										<span class="checkbox-text">checkbox1</span>

From 1c65a086645ef4c3d30b38a218b2704a2f21dd9c Mon Sep 17 00:00:00 2001
From: lizongwen <93700983@qq.com>
Date: Thu, 29 Nov 2018 11:05:19 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4placeholder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 views/general.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/general.html b/views/general.html
index 8cf239b..99c3697 100644
--- a/views/general.html
+++ b/views/general.html
@@ -600,7 +600,7 @@ <h3 class="box-title">普通下拉选择框</h3>
 							<form role="form">
 								<div class="form-group">
 									<label>Select</label>
-									<select id="id" class="form-control">
+									<select id="id" class="form-control" placeholder="请选择">
 										<option>option 1</option>
 										<option>option 2</option>
 										<option>option 3</option>

From e908701dabbdfd11058c3b82dec2edae812bfb65 Mon Sep 17 00:00:00 2001
From: lizongwen <93700983@qq.com>
Date: Tue, 8 Jan 2019 16:30:47 +0800
Subject: [PATCH 4/4] enter

---
 assets/js/backend/advanced.js |  5 ++++-
 views/advanced.html           | 37 ++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/assets/js/backend/advanced.js b/assets/js/backend/advanced.js
index db1bc70..a048296 100644
--- a/assets/js/backend/advanced.js
+++ b/assets/js/backend/advanced.js
@@ -2,7 +2,10 @@ define(['jquery', 'bootstrap', 'bootstrap-select', 'select2', 'select2-to-tree',
 	var Controller = {
 		index: function () {
 			$('.selectpicker').each(function () {
-				$(this).selectpicker()
+				$(this).selectpicker({
+					iconBase:'icon iconfont',
+					tickIcon:'icon-check1'
+				})
 			});
 			// $('#select2_id_1').each(function () {
 				// $(this).select2({
diff --git a/views/advanced.html b/views/advanced.html
index a6f4a5b..d1e789a 100644
--- a/views/advanced.html
+++ b/views/advanced.html
@@ -90,12 +90,47 @@ <h3 class="box-title">多选插件-bootstrap-select</h3>
 				<div class="box-body">
 					<div class="form-group">
 						<label>bootstrap-select</label>
-						<select class="form-control selectpicker">
+						<select class="form-control selectpicker" id="bootstrapSelect" multiple data-live-search="true">
 							<option>option 1</option>
 							<option>option 2</option>
 							<option>option 3</option>
 							<option>option 4</option>
 							<option>option 5</option>
+							<option>option 6</option>
+							<option>option 7</option>
+							<option>option 8</option>
+							<option>option 9</option>
+							<option>option 10</option>
+							<option>option 11</option>
+							<option>option 12</option>
+							<option>option 13</option>
+							<option>option 14</option>
+							<option>option 15</option>
+							<option>option 16</option>
+							<option>option 17</option>
+							<option>option 18</option>
+							<option>option 19</option>
+							<option>option 20</option>
+							<option>option 21</option>
+							<option>option 22</option>
+							<option>option 23</option>
+							<option>option 24</option>
+							<option>option 25</option>
+							<option>option 26</option>
+							<option>option 27</option>
+							<option>option 28</option>
+							<option>option 29</option>
+							<option>option 30</option>
+							<option>option 31</option>
+							<option>option 32</option>
+							<option>option 33</option>
+							<option>option 34</option>
+							<option>option 35</option>
+							<option>option 36</option>
+							<option>option 37</option>
+							<option>option 38</option>
+							<option>option 39</option>
+							<option>option 40</option>
 						</select>
 					</div>
 				</div>