cy-element-ui 1.0.15 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cy-element-ui",
-	"version": "1.0.15",
+	"version": "1.0.16",
 	"description": "基于ElementUI开发的组件",
 	"main": "lib/element-ui.common.js",
 	"browser": {

package/packages/form/src/form-item.vue

@@ -12,7 +12,8 @@
 		<label-wrap
 			:is-auto-width="labelStyle && labelStyle.width === 'auto'"
 			:update-all="form.labelWidth === 'auto'">
-			<label :for="labelFor" class="el-form-item__label" :style="labelStyle" v-if="!!label || $slots.label">
+			{{ label +'----'+ $slots.label }}
+			<label :for="labelFor" class="el-form-item__label" :style="labelStyle" v-if="label || $slots.label">
 				<slot name="label">{{ label + form.labelSuffix }}</slot>
 			</label>
 		</label-wrap>

package/packages/select/src/option.vue

@@ -10,6 +10,7 @@
 			'hover': hover
 		}">
 		<slot>
+			{{ this.label +'----'+ this.isObject +'----'+ this.value }}
 			<span>{{ currentLabel }}</span>
 		</slot>
 	</li>

package/packages/select/src/select.vue

@@ -41,7 +41,7 @@
 					<span class="el-select__tags-text">{{ item.currentLabel }}</span>
 				</el-tag>
 			</transition-group>
-
+			
 			<input
 				type="text"
 				class="el-select__input"
@@ -99,7 +99,8 @@
 			</template>
 			<template slot="suffix">
 				<i v-show="!showClose" :class="['el-select__caret', 'el-input__icon', 'el-icon-' + iconClass]"></i>
-				<i v-if="showClose" class="el-select__caret el-input__icon el-icon-circle-close" @click="handleClearClick"></i>
+				<i v-if="showClose" class="el-select__caret el-input__icon el-icon-circle-close"
+				   @click="handleClearClick"></i>
 			</template>
 		</el-input>
 		<transition
@@ -154,55 +155,55 @@ import { isKorean } from 'element-ui/src/utils/shared';
 
 export default {
 	mixins: [Emitter, Locale, Focus('reference'), NavigationMixin],
-
+	
 	name: 'ElSelect',
-
+	
 	componentName: 'ElSelect',
-
+	
 	inject: {
 		elForm: {
 			default: ''
 		},
-
+		
 		elFormItem: {
 			default: ''
 		}
 	},
-
+	
 	provide() {
 		return {
 			'select': this
 		};
 	},
-
+	
 	computed: {
 		_elFormItemSize() {
 			return (this.elFormItem || {}).elFormItemSize;
 		},
-
+		
 		readonly() {
 			return !this.filterable || this.multiple || (!isIE() && !isEdge() && !this.visible);
 		},
-
+		
 		showClose() {
 			let hasValue = this.multiple
 				? Array.isArray(this.value) && this.value.length > 0
 				: this.value !== undefined && this.value !== null && this.value !== '';
 			let criteria = this.clearable &&
-    !this.selectDisabled &&
-    this.inputHovering &&
-    hasValue;
+				!this.selectDisabled &&
+				this.inputHovering &&
+				hasValue;
 			return criteria;
 		},
-
+		
 		iconClass() {
 			return this.remote && this.filterable ? '' : (this.visible ? 'arrow-up is-reverse' : 'arrow-up');
 		},
-
+		
 		debounce() {
 			return this.remote ? 300 : 0;
 		},
-
+		
 		emptyText() {
 			if (this.loading) {
 				return this.loadingText || this.t('el.select.loading');
@@ -217,21 +218,21 @@ export default {
 			}
 			return null;
 		},
-
+		
 		showNewOption() {
 			let hasExistingOption = this.options.filter(option => !option.created)
 				.some(option => option.currentLabel === this.query);
 			return this.filterable && this.allowCreate && this.query !== '' && !hasExistingOption;
 		},
-
+		
 		selectSize() {
 			return this.size || this._elFormItemSize || (this.$ELEMENT || {}).size;
 		},
-
+		
 		selectDisabled() {
 			return this.disabled || (this.elForm || {}).disabled;
 		},
-
+		
 		collapseTagSize() {
 			return ['small', 'mini'].indexOf(this.selectSize) > -1
 				? 'mini'
@@ -241,7 +242,7 @@ export default {
 			return typeof this.placeholder !== 'undefined' ? this.placeholder : this.t('el.select.placeholder');
 		}
 	},
-
+	
 	components: {
 		ElInput,
 		ElSelectMenu,
@@ -249,9 +250,9 @@ export default {
 		ElTag,
 		ElScrollbar
 	},
-
+	
 	directives: { Clickoutside },
-
+	
 	props: {
 		name: String,
 		id: String,
@@ -267,7 +268,7 @@ export default {
 			type: String,
 			validator(val) {
 				process.env.NODE_ENV !== 'production' &&
-     console.warn('[Element Warn][Select]\'auto-complete\' property will be deprecated in next major version. please use \'autocomplete\' instead.');
+				console.warn('[Element Warn][Select]\'auto-complete\' property will be deprecated in next major version. please use \'autocomplete\' instead.');
 				return true;
 			}
 		},
@@ -306,7 +307,7 @@ export default {
 			default: true
 		}
 	},
-
+	
 	data() {
 		return {
 			options: [],
@@ -333,18 +334,18 @@ export default {
 			isSilentBlur: false
 		};
 	},
-
+	
 	watch: {
 		selectDisabled() {
 			this.$nextTick(() => {
 				this.resetInputHeight();
 			});
 		},
-
+		
 		propPlaceholder(val) {
 			this.cachedPlaceHolder = this.currentPlaceholder = val;
 		},
-
+		
 		value(val, oldVal) {
 			if (this.multiple) {
 				this.resetInputHeight();
@@ -366,7 +367,7 @@ export default {
 				this.dispatch('ElFormItem', 'el.form.change', val);
 			}
 		},
-
+		
 		visible(val) {
 			if (!val) {
 				this.broadcast('ElSelectDropdown', 'destroyPopper');
@@ -381,22 +382,22 @@ export default {
 				this.resetHoverIndex();
 				this.$nextTick(() => {
 					if (this.$refs.input &&
-      this.$refs.input.value === '' &&
-      this.selected.length === 0) {
+						this.$refs.input.value === '' &&
+						this.selected.length === 0) {
 						this.currentPlaceholder = this.cachedPlaceHolder;
 					}
 				});
 				if (!this.multiple) {
 					if (this.selected) {
 						if (this.filterable && this.allowCreate &&
-       this.createdSelected && this.createdLabel) {
+							this.createdSelected && this.createdLabel) {
 							this.selectedLabel = this.createdLabel;
 						} else {
 							this.selectedLabel = this.selected.currentLabel;
 						}
 						if (this.filterable) this.query = this.selectedLabel;
 					}
-
+					
 					if (this.filterable) {
 						this.currentPlaceholder = this.cachedPlaceHolder;
 					}
@@ -413,7 +414,7 @@ export default {
 							this.broadcast('ElOption', 'queryChange', '');
 							this.broadcast('ElOptionGroup', 'queryChange');
 						}
-
+						
 						if (this.selectedLabel) {
 							this.currentPlaceholder = this.selectedLabel;
 							this.selectedLabel = '';
@@ -423,7 +424,7 @@ export default {
 			}
 			this.$emit('visible-change', val);
 		},
-
+		
 		options() {
 			if (this.$isServer) return;
 			this.$nextTick(() => {
@@ -441,11 +442,11 @@ export default {
 			}
 		}
 	},
-
+	
 	methods: {
 		handleNavigate(direction) {
 			if (this.isOnComposition) return;
-
+			
 			this.navigateOptions(direction);
 		},
 		handleComposition(event) {
@@ -462,7 +463,7 @@ export default {
 			if (this.previousQuery === val || this.isOnComposition) return;
 			if (
 				this.previousQuery === null &&
-    (typeof this.filterMethod === 'function' || typeof this.remoteMethod === 'function')
+				(typeof this.filterMethod === 'function' || typeof this.remoteMethod === 'function')
 			) {
 				this.previousQuery = val;
 				return;
@@ -495,7 +496,7 @@ export default {
 				this.checkDefaultFirstOption();
 			}
 		},
-
+		
 		scrollToOption(option) {
 			const target = Array.isArray(option) && option[0] ? option[0].$el : option.$el;
 			if (this.$refs.popper && target) {
@@ -504,23 +505,23 @@ export default {
 			}
 			this.$refs.scrollbar && this.$refs.scrollbar.handleScroll();
 		},
-
+		
 		handleMenuEnter() {
 			this.$nextTick(() => this.scrollToOption(this.selected));
 		},
-
+		
 		emitChange(val) {
 			if (!valueEquals(this.value, val)) {
 				this.$emit('change', val);
 			}
 		},
-
+		
 		getOption(value) {
 			let option;
 			const isObject = Object.prototype.toString.call(value).toLowerCase() === '[object object]';
 			const isNull = Object.prototype.toString.call(value).toLowerCase() === '[object null]';
 			const isUndefined = Object.prototype.toString.call(value).toLowerCase() === '[object undefined]';
-
+			
 			for (let i = this.cachedOptions.length - 1; i >= 0; i--) {
 				const cachedOption = this.cachedOptions[i];
 				const isEqual = isObject
@@ -543,7 +544,7 @@ export default {
 			}
 			return newOption;
 		},
-
+		
 		setSelected() {
 			if (!this.multiple) {
 				let option = this.getOption(this.value);
@@ -569,7 +570,7 @@ export default {
 				this.resetInputHeight();
 			});
 		},
-
+		
 		handleFocus(event) {
 			if (!this.softFocus) {
 				if (this.automaticDropdown || this.filterable) {
@@ -583,12 +584,12 @@ export default {
 				this.softFocus = false;
 			}
 		},
-
+		
 		blur() {
 			this.visible = false;
 			this.$refs.reference.blur();
 		},
-
+		
 		handleBlur(event) {
 			setTimeout(() => {
 				if (this.isSilentBlur) {
@@ -599,33 +600,33 @@ export default {
 			}, 50);
 			this.softFocus = false;
 		},
-
+		
 		handleClearClick(event) {
 			this.deleteSelected(event);
 		},
-
+		
 		doDestroy() {
 			this.$refs.popper && this.$refs.popper.doDestroy();
 		},
-
+		
 		handleClose() {
 			this.visible = false;
 		},
-
+		
 		toggleLastOptionHitState(hit) {
 			if (!Array.isArray(this.selected)) return;
 			const option = this.selected[this.selected.length - 1];
 			if (!option) return;
-
+			
 			if (hit === true || hit === false) {
 				option.hitState = hit;
 				return hit;
 			}
-
+			
 			option.hitState = !option.hitState;
 			return option.hitState;
 		},
-
+		
 		deletePrevTag(e) {
 			if (e.target.value.length <= 0 && !this.toggleLastOptionHitState()) {
 				const value = this.value.slice();
@@ -634,19 +635,19 @@ export default {
 				this.emitChange(value);
 			}
 		},
-
+		
 		managePlaceholder() {
 			if (this.currentPlaceholder !== '') {
 				this.currentPlaceholder = this.$refs.input.value ? '' : this.cachedPlaceHolder;
 			}
 		},
-
+		
 		resetInputState(e) {
 			if (e.keyCode !== 8) this.toggleLastOptionHitState(false);
 			this.inputLength = this.$refs.input.value.length * 15 + 20;
 			this.resetInputHeight();
 		},
-
+		
 		resetInputHeight() {
 			if (this.collapseTags && !this.filterable) return;
 			this.$nextTick(() => {
@@ -659,15 +660,15 @@ export default {
 				input.style.height = this.selected.length === 0
 					? sizeInMap + 'px'
 					: Math.max(
-						tags ? (tagsHeight + (tagsHeight > sizeInMap ? 6 : 0)) : 0,
-						sizeInMap
-					) + 'px';
+					tags ? (tagsHeight + (tagsHeight > sizeInMap ? 6 : 0)) : 0,
+					sizeInMap
+				) + 'px';
 				if (this.visible && this.emptyText !== false) {
 					this.broadcast('ElSelectDropdown', 'updatePopper');
 				}
 			});
 		},
-
+		
 		resetHoverIndex() {
 			setTimeout(() => {
 				if (!this.multiple) {
@@ -681,7 +682,7 @@ export default {
 				}
 			}, 300);
 		},
-
+		
 		handleOptionSelect(option, byClick) {
 			if (this.multiple) {
 				const value = (this.value || []).slice();
@@ -711,7 +712,7 @@ export default {
 				this.scrollToOption(option);
 			});
 		},
-
+		
 		setSoftFocus() {
 			this.softFocus = true;
 			const input = this.$refs.input || this.$refs.reference;
@@ -719,7 +720,7 @@ export default {
 				input.focus();
 			}
 		},
-
+		
 		getValueIndex(arr = [], value) {
 			const isObject = Object.prototype.toString.call(value).toLowerCase() === '[object object]';
 			if (!isObject) {
@@ -737,7 +738,7 @@ export default {
 				return index;
 			}
 		},
-
+		
 		toggleMenu() {
 			if (!this.selectDisabled) {
 				if (this.menuVisibleOnFocus) {
@@ -750,7 +751,7 @@ export default {
 				}
 			}
 		},
-
+		
 		selectOption() {
 			if (!this.visible) {
 				this.toggleMenu();
@@ -760,7 +761,7 @@ export default {
 				}
 			}
 		},
-
+		
 		deleteSelected(event) {
 			event.stopPropagation();
 			const value = this.multiple ? [] : '';
@@ -769,7 +770,7 @@ export default {
 			this.visible = false;
 			this.$emit('clear');
 		},
-
+		
 		deleteTag(event, tag) {
 			let index = this.selected.indexOf(tag);
 			if (index > -1 && !this.selectDisabled) {
@@ -781,14 +782,14 @@ export default {
 			}
 			event.stopPropagation();
 		},
-
+		
 		onInputChange() {
 			if (this.filterable && this.query !== this.selectedLabel) {
 				this.query = this.selectedLabel;
 				this.handleQueryChange(this.query);
 			}
 		},
-
+		
 		onOptionDestroy(index) {
 			if (index > -1) {
 				this.optionsCount--;
@@ -796,16 +797,16 @@ export default {
 				this.options.splice(index, 1);
 			}
 		},
-
+		
 		resetInputWidth() {
 			this.inputWidth = this.$refs.reference.$el.getBoundingClientRect().width;
 		},
-
+		
 		handleResize() {
 			this.resetInputWidth();
 			if (this.multiple) this.resetInputHeight();
 		},
-
+		
 		checkDefaultFirstOption() {
 			this.hoverIndex = -1;
 			// highlight the created option
@@ -835,7 +836,7 @@ export default {
 				}
 			}
 		},
-
+		
 		getValueKey(item) {
 			if (Object.prototype.toString.call(item.value).toLowerCase() !== '[object object]') {
 				return item.value;
@@ -844,7 +845,7 @@ export default {
 			}
 		}
 	},
-
+	
 	created() {
 		this.cachedPlaceHolder = this.currentPlaceholder = this.propPlaceholder;
 		if (this.multiple && !Array.isArray(this.value)) {
@@ -853,25 +854,25 @@ export default {
 		if (!this.multiple && Array.isArray(this.value)) {
 			this.$emit('input', '');
 		}
-
+		
 		this.debouncedOnInputChange = debounce(this.debounce, () => {
 			this.onInputChange();
 		});
-
+		
 		this.debouncedQueryChange = debounce(this.debounce, (e) => {
 			this.handleQueryChange(e.target.value);
 		});
-
+		
 		this.$on('handleOptionClick', this.handleOptionSelect);
 		this.$on('setSelected', this.setSelected);
 	},
-
+	
 	mounted() {
 		if (this.multiple && Array.isArray(this.value) && this.value.length > 0) {
 			this.currentPlaceholder = '';
 		}
 		addResizeListener(this.$el, this.handleResize);
-
+		
 		const reference = this.$refs.reference;
 		if (reference && reference.$el) {
 			const sizeMap = {
@@ -892,7 +893,7 @@ export default {
 		});
 		this.setSelected();
 	},
-
+	
 	beforeDestroy() {
 		if (this.$el && this.handleResize) removeResizeListener(this.$el, this.handleResize);
 	}