Merge branch 'master' of https://github.com/lizongwen/Credit-UI-Admin

lizongwen · May 22, 2019 · 5340c80 · 5340c80
2 parents dcdda43 + e908701
commit 5340c80
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 41 deletions.
diff --git a/.project b/.project
diff --git 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
@@ -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>

diff --git 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>
@@ -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>