chore(release): Merge branch 'dev' into master

Author: hjzheng

demos/components/select/index.html

@@ -108,6 +108,7 @@ <h3>多选（可搜索）</h3>
 					datalist="ctrl.datalist1"
 					searchable="true"
 					confirm-button="true"
+					search-fields="ctrl.searchFields"
 					on-select-change="ctrl.multiSelectChange(model, oldModel, selection, oldSelection)"
 					mapping="ctrl.fieldsMap">
 			</cc-dropdown-multiselect>
@@ -245,6 +246,8 @@ <h4>当前值: {{ctrl.selectedOneShop}}</h4>
 				}
 			})
 		.controller('DemoCtrl', function($scope) {
+
+			this.searchFields = undefined; // ['displayField', 'valueField'] //;
 			this.value1 = '上海';
 			this.value2 = 'xa';
 			this.value3 = [];

src/components/dropdown/dropdown-multiselect/DropdownMultiselectCtrl.js

@@ -48,6 +48,12 @@ export default class DropdownMultiselectCtrl {
 	_prepareOptions() {
 		this.mapping = Object.assign({}, DropdownMultiselectCtrl.defaultMapping, this.mapping);
 
+		if (typeof this.searchFields === 'undefined') {
+			this.searchFields = [this.mapping.valueField, this.mapping.displayField];
+		} else {
+			this.searchFields = this.searchFields.map(field => this.mapping[field]);
+		}
+
 		if (typeof this.searchable === 'undefined') {
 			this.searchable = false;
 		}
@@ -387,11 +393,9 @@ export default class DropdownMultiselectCtrl {
 
 	_search(text) {
 		let datalist = this._clampedDatalist;
-		let mapping = this.mapping;
-		let searchFields = [mapping.valueField, mapping.displayField];
 		let filteredItems = [];
 
-		searchFields.forEach(field => {
+		this.searchFields.forEach(field => {
 			datalist.forEach(item => {
 				const fieldValue = item[field];
 				if (fieldValue.toString().toLocaleUpperCase().indexOf(text && text.toLocaleUpperCase()) !== -1 &&

src/components/dropdown/dropdown-multiselect/dropdown-multiselect.tpl.html

@@ -11,7 +11,8 @@
 				ng-blur="$ctrl.setActiveState(false)"
 				ng-change="$ctrl.onSearchTextChange($ctrl.title)"
 			    ng-disabled="$ctrl.disabled"
-				ng-model="$ctrl.title">
+				ng-model="$ctrl.title"
+				title="{{ $ctrl.title }}">
 		<div class="dropdown-select-icons"
 			><span class="dropdown-select-clear"
 					ng-class="{visible: $ctrl.title.length}"

src/components/dropdown/dropdown-multiselect/index.js

@@ -23,6 +23,7 @@ const dropdownMultiselectDDO = {
 		searchable: '<?',
 		confirmButton: '<?',
 		placeholder: '@?',
+		searchFields: '=?',
 		onSelectChange: '&?',
 		onDropdownOpen: '&?',
 		onDropdownClose: '&?'