cy-element-ui 1.1.25 → 1.1.26

package/packages/table/src/store/current.js

@@ -1,76 +1,76 @@
-import { arrayFind } from 'element-ui/src/utils/util';
-import { getRowIdentity } from '../util';
-
-export default {
-	data() {
-		return {
-			states: {
-				// 不可响应的，设置 currentRowKey 时，data 不一定存在，也许无法算出正确的 currentRow
-				// 把该值缓存一下，当用户点击修改 currentRow 时，把该值重置为 null
-				_currentRowKey: null,
-				currentRow: null
-			}
-		};
-	},
-
-	methods: {
-		setCurrentRowKey(key) {
-			this.assertRowKey();
-			this.states._currentRowKey = key;
-			this.setCurrentRowByKey(key);
-		},
-
-		restoreCurrentRowKey() {
-			this.states._currentRowKey = null;
-		},
-
-		setCurrentRowByKey(key) {
-			const { states } = this;
-			const { data = [], rowKey } = states;
-			let currentRow = null;
-			if (rowKey) {
-				currentRow = arrayFind(data, item => getRowIdentity(item, rowKey) === key);
-			}
-			states.currentRow = currentRow;
-		},
-
-		updateCurrentRow(currentRow) {
-			const { states, table } = this;
-			const oldCurrentRow = states.currentRow;
-			if (currentRow && currentRow !== oldCurrentRow) {
-				states.currentRow = currentRow;
-				table.$emit('current-change', currentRow, oldCurrentRow);
-				return;
-			}
-			if (!currentRow && oldCurrentRow) {
-				states.currentRow = null;
-				table.$emit('current-change', null, oldCurrentRow);
-			}
-		},
-
-		updateCurrentRowData() {
-			const { states, table } = this;
-			const { rowKey, _currentRowKey } = states;
-			// data 为 null 时，解构时的默认值会被忽略
-			const data = states.data || [];
-			const oldCurrentRow = states.currentRow;
-
-			// 当 currentRow 不在 data 中时尝试更新数据
-			if (data.indexOf(oldCurrentRow) === -1 && oldCurrentRow) {
-				if (rowKey) {
-					const currentRowKey = getRowIdentity(oldCurrentRow, rowKey);
-					this.setCurrentRowByKey(currentRowKey);
-				} else {
-					states.currentRow = null;
-				}
-				if (states.currentRow === null) {
-					table.$emit('current-change', null, oldCurrentRow);
-				}
-			} else if (_currentRowKey) {
-				// 把初始时下设置的 rowKey 转化成 rowData
-				this.setCurrentRowByKey(_currentRowKey);
-				this.restoreCurrentRowKey();
-			}
-		}
-	}
-};
+import { arrayFind } from 'element-ui/src/utils/util';
+import { getRowIdentity } from '../util';
+
+export default {
+	data() {
+		return {
+			states: {
+				// 不可响应的，设置 currentRowKey 时，data 不一定存在，也许无法算出正确的 currentRow
+				// 把该值缓存一下，当用户点击修改 currentRow 时，把该值重置为 null
+				_currentRowKey: null,
+				currentRow: null
+			}
+		};
+	},
+
+	methods: {
+		setCurrentRowKey(key) {
+			this.assertRowKey();
+			this.states._currentRowKey = key;
+			this.setCurrentRowByKey(key);
+		},
+
+		restoreCurrentRowKey() {
+			this.states._currentRowKey = null;
+		},
+
+		setCurrentRowByKey(key) {
+			const { states } = this;
+			const { data = [], rowKey } = states;
+			let currentRow = null;
+			if (rowKey) {
+				currentRow = arrayFind(data, item => getRowIdentity(item, rowKey) === key);
+			}
+			states.currentRow = currentRow;
+		},
+
+		updateCurrentRow(currentRow) {
+			const { states, table } = this;
+			const oldCurrentRow = states.currentRow;
+			if (currentRow && currentRow !== oldCurrentRow) {
+				states.currentRow = currentRow;
+				table.$emit('current-change', currentRow, oldCurrentRow);
+				return;
+			}
+			if (!currentRow && oldCurrentRow) {
+				states.currentRow = null;
+				table.$emit('current-change', null, oldCurrentRow);
+			}
+		},
+
+		updateCurrentRowData() {
+			const { states, table } = this;
+			const { rowKey, _currentRowKey } = states;
+			// data 为 null 时，解构时的默认值会被忽略
+			const data = states.data || [];
+			const oldCurrentRow = states.currentRow;
+
+			// 当 currentRow 不在 data 中时尝试更新数据
+			if (data.indexOf(oldCurrentRow) === -1 && oldCurrentRow) {
+				if (rowKey) {
+					const currentRowKey = getRowIdentity(oldCurrentRow, rowKey);
+					this.setCurrentRowByKey(currentRowKey);
+				} else {
+					states.currentRow = null;
+				}
+				if (states.currentRow === null) {
+					table.$emit('current-change', null, oldCurrentRow);
+				}
+			} else if (_currentRowKey) {
+				// 把初始时下设置的 rowKey 转化成 rowData
+				this.setCurrentRowByKey(_currentRowKey);
+				this.restoreCurrentRowKey();
+			}
+		}
+	}
+};

package/packages/table/src/store/expand.js

@@ -1,65 +1,65 @@
-import { toggleRowStatus, getKeysMap, getRowIdentity } from '../util';
-
-export default {
-	data() {
-		return {
-			states: {
-				defaultExpandAll: false,
-				expandRows: []
-			}
-		};
-	},
-
-	methods: {
-		updateExpandRows() {
-			const { data = [], rowKey, defaultExpandAll, expandRows } = this.states;
-			if (defaultExpandAll) {
-				this.states.expandRows = data.slice();
-			} else if (rowKey) {
-				// TODO：这里的代码可以优化
-				const expandRowsMap = getKeysMap(expandRows, rowKey);
-				this.states.expandRows = data.reduce((prev, row) => {
-					const rowId = getRowIdentity(row, rowKey);
-					const rowInfo = expandRowsMap[rowId];
-					if (rowInfo) {
-						prev.push(row);
-					}
-					return prev;
-				}, []);
-			} else {
-				this.states.expandRows = [];
-			}
-		},
-
-		toggleRowExpansion(row, expanded) {
-			const changed = toggleRowStatus(this.states.expandRows, row, expanded);
-			if (changed) {
-				this.table.$emit('expand-change', row, this.states.expandRows.slice());
-				this.scheduleLayout();
-			}
-		},
-
-		setExpandRowKeys(rowKeys) {
-			this.assertRowKey();
-			// TODO：这里的代码可以优化
-			const { data, rowKey } = this.states;
-			const keysMap = getKeysMap(data, rowKey);
-			this.states.expandRows = rowKeys.reduce((prev, cur) => {
-				const info = keysMap[cur];
-				if (info) {
-					prev.push(info.row);
-				}
-				return prev;
-			}, []);
-		},
-
-		isRowExpanded(row) {
-			const { expandRows = [], rowKey } = this.states;
-			if (rowKey) {
-				const expandMap = getKeysMap(expandRows, rowKey);
-				return !!expandMap[getRowIdentity(row, rowKey)];
-			}
-			return expandRows.indexOf(row) !== -1;
-		}
-	}
-};
+import { toggleRowStatus, getKeysMap, getRowIdentity } from '../util';
+
+export default {
+	data() {
+		return {
+			states: {
+				defaultExpandAll: false,
+				expandRows: []
+			}
+		};
+	},
+
+	methods: {
+		updateExpandRows() {
+			const { data = [], rowKey, defaultExpandAll, expandRows } = this.states;
+			if (defaultExpandAll) {
+				this.states.expandRows = data.slice();
+			} else if (rowKey) {
+				// TODO：这里的代码可以优化
+				const expandRowsMap = getKeysMap(expandRows, rowKey);
+				this.states.expandRows = data.reduce((prev, row) => {
+					const rowId = getRowIdentity(row, rowKey);
+					const rowInfo = expandRowsMap[rowId];
+					if (rowInfo) {
+						prev.push(row);
+					}
+					return prev;
+				}, []);
+			} else {
+				this.states.expandRows = [];
+			}
+		},
+
+		toggleRowExpansion(row, expanded) {
+			const changed = toggleRowStatus(this.states.expandRows, row, expanded);
+			if (changed) {
+				this.table.$emit('expand-change', row, this.states.expandRows.slice());
+				this.scheduleLayout();
+			}
+		},
+
+		setExpandRowKeys(rowKeys) {
+			this.assertRowKey();
+			// TODO：这里的代码可以优化
+			const { data, rowKey } = this.states;
+			const keysMap = getKeysMap(data, rowKey);
+			this.states.expandRows = rowKeys.reduce((prev, cur) => {
+				const info = keysMap[cur];
+				if (info) {
+					prev.push(info.row);
+				}
+				return prev;
+			}, []);
+		},
+
+		isRowExpanded(row) {
+			const { expandRows = [], rowKey } = this.states;
+			if (rowKey) {
+				const expandMap = getKeysMap(expandRows, rowKey);
+				return !!expandMap[getRowIdentity(row, rowKey)];
+			}
+			return expandRows.indexOf(row) !== -1;
+		}
+	}
+};

package/packages/table/src/store/helper.js

@@ -1,41 +1,41 @@
-import Store from './index';
-import debounce from 'throttle-debounce/debounce';
-
-export function createStore(table, initialState = {}) {
-	if (!table) {
-		throw new Error('Table is required.');
-	}
-
-	const store = new Store();
-	store.table = table;
-	// fix https://github.com/ElemeFE/element/issues/14075
-	// related pr https://github.com/ElemeFE/element/pull/14146
-	store.toggleAllSelection = debounce(10, store._toggleAllSelection);
-	Object.keys(initialState).forEach(key => {
-		store.states[key] = initialState[key];
-	});
-	return store;
-}
-
-export function mapStates(mapper) {
-	const res = {};
-	Object.keys(mapper).forEach(key => {
-		const value = mapper[key];
-		let fn;
-		if (typeof value === 'string') {
-			fn = function() {
-				return this.store.states[value];
-			};
-		} else if (typeof value === 'function') {
-			fn = function() {
-				return value.call(this, this.store.states);
-			};
-		} else {
-			console.error('invalid value type');
-		}
-		if (fn) {
-			res[key] = fn;
-		}
-	});
-	return res;
-};
+import Store from './index';
+import debounce from 'throttle-debounce/debounce';
+
+export function createStore(table, initialState = {}) {
+	if (!table) {
+		throw new Error('Table is required.');
+	}
+
+	const store = new Store();
+	store.table = table;
+	// fix https://github.com/ElemeFE/element/issues/14075
+	// related pr https://github.com/ElemeFE/element/pull/14146
+	store.toggleAllSelection = debounce(10, store._toggleAllSelection);
+	Object.keys(initialState).forEach(key => {
+		store.states[key] = initialState[key];
+	});
+	return store;
+}
+
+export function mapStates(mapper) {
+	const res = {};
+	Object.keys(mapper).forEach(key => {
+		const value = mapper[key];
+		let fn;
+		if (typeof value === 'string') {
+			fn = function() {
+				return this.store.states[value];
+			};
+		} else if (typeof value === 'function') {
+			fn = function() {
+				return value.call(this, this.store.states);
+			};
+		} else {
+			console.error('invalid value type');
+		}
+		if (fn) {
+			res[key] = fn;
+		}
+	});
+	return res;
+};

package/packages/table/src/store/index.js

@@ -1,147 +1,147 @@
-import Vue from 'vue';
-import Watcher from './watcher';
-import { arrayFind } from 'element-ui/src/utils/util';
-
-Watcher.prototype.mutations = {
-	setData(states, data) {
-		const dataInstanceChanged = states._data !== data;
-		states._data = data;
-
-		this.execQuery();
-		// 数据变化，更新部分数据。
-		// 没有使用 computed，而是手动更新部分数据 https://github.com/vuejs/vue/issues/6660#issuecomment-331417140
-		this.updateCurrentRowData();
-		this.updateExpandRows();
-		if (states.reserveSelection) {
-			this.assertRowKey();
-			this.updateSelectionByRowKey();
-		} else {
-			if (dataInstanceChanged) {
-				this.clearSelection();
-			} else {
-				this.cleanSelection();
-			}
-		}
-		this.updateAllSelected();
-
-		this.updateTableScrollY();
-	},
-
-	insertColumn(states, column, index, parent) {
-		let array = states._columns;
-		if (parent) {
-			array = parent.children;
-			if (!array) array = parent.children = [];
-		}
-
-		if (typeof index !== 'undefined') {
-			array.splice(index, 0, column);
-		} else {
-			array.push(column);
-		}
-
-		if (column.type === 'selection') {
-			states.selectable = column.selectable;
-			states.reserveSelection = column.reserveSelection;
-		}
-
-		if (this.table.$ready) {
-			this.updateColumns(); // hack for dynamics insert column
-			this.scheduleLayout();
-		}
-	},
-
-	removeColumn(states, column, parent) {
-		let array = states._columns;
-		if (parent) {
-			array = parent.children;
-			if (!array) array = parent.children = [];
-		}
-		if (array) {
-			array.splice(array.indexOf(column), 1);
-		}
-
-		if (this.table.$ready) {
-			this.updateColumns(); // hack for dynamics remove column
-			this.scheduleLayout();
-		}
-	},
-
-	sort(states, options) {
-		const { prop, order, init } = options;
-		if (prop) {
-			const column = arrayFind(states.columns, column => column.property === prop);
-			if (column) {
-				column.order = order;
-				this.updateSort(column, prop, order);
-				this.commit('changeSortCondition', { init });
-			}
-		}
-	},
-
-	changeSortCondition(states, options) {
-		// 修复 pr https://github.com/ElemeFE/element/pull/15012 导致的 bug
-		const { sortingColumn: column, sortProp: prop, sortOrder: order } = states;
-		if (order === null) {
-			states.sortingColumn = null;
-			states.sortProp = null;
-		}
-		const ingore = { filter: true };
-		this.execQuery(ingore);
-
-		if (!options || !(options.silent || options.init)) {
-			this.table.$emit('sort-change', {
-				column,
-				prop,
-				order
-			});
-		}
-
-		this.updateTableScrollY();
-	},
-
-	filterChange(states, options) {
-		let { column, values, silent } = options;
-		const newFilters = this.updateFilters(column, values);
-
-		this.execQuery();
-
-		if (!silent) {
-			this.table.$emit('filter-change', newFilters);
-		}
-
-		this.updateTableScrollY();
-	},
-
-	toggleAllSelection() {
-		this.toggleAllSelection();
-	},
-
-	rowSelectedChanged(states, row) {
-		this.toggleRowSelection(row);
-		this.updateAllSelected();
-	},
-
-	setHoverRow(states, row) {
-		states.hoverRow = row;
-	},
-
-	setCurrentRow(states, row) {
-		this.updateCurrentRow(row);
-	}
-};
-
-Watcher.prototype.commit = function(name, ...args) {
-	const mutations = this.mutations;
-	if (mutations[name]) {
-		mutations[name].apply(this, [this.states].concat(args));
-	} else {
-		throw new Error(`Action not found: ${ name }`);
-	}
-};
-
-Watcher.prototype.updateTableScrollY = function() {
-	Vue.nextTick(this.table.updateScrollY);
-};
-
-export default Watcher;
+import Vue from 'vue';
+import Watcher from './watcher';
+import { arrayFind } from 'element-ui/src/utils/util';
+
+Watcher.prototype.mutations = {
+	setData(states, data) {
+		const dataInstanceChanged = states._data !== data;
+		states._data = data;
+
+		this.execQuery();
+		// 数据变化，更新部分数据。
+		// 没有使用 computed，而是手动更新部分数据 https://github.com/vuejs/vue/issues/6660#issuecomment-331417140
+		this.updateCurrentRowData();
+		this.updateExpandRows();
+		if (states.reserveSelection) {
+			this.assertRowKey();
+			this.updateSelectionByRowKey();
+		} else {
+			if (dataInstanceChanged) {
+				this.clearSelection();
+			} else {
+				this.cleanSelection();
+			}
+		}
+		this.updateAllSelected();
+
+		this.updateTableScrollY();
+	},
+
+	insertColumn(states, column, index, parent) {
+		let array = states._columns;
+		if (parent) {
+			array = parent.children;
+			if (!array) array = parent.children = [];
+		}
+
+		if (typeof index !== 'undefined') {
+			array.splice(index, 0, column);
+		} else {
+			array.push(column);
+		}
+
+		if (column.type === 'selection') {
+			states.selectable = column.selectable;
+			states.reserveSelection = column.reserveSelection;
+		}
+
+		if (this.table.$ready) {
+			this.updateColumns(); // hack for dynamics insert column
+			this.scheduleLayout();
+		}
+	},
+
+	removeColumn(states, column, parent) {
+		let array = states._columns;
+		if (parent) {
+			array = parent.children;
+			if (!array) array = parent.children = [];
+		}
+		if (array) {
+			array.splice(array.indexOf(column), 1);
+		}
+
+		if (this.table.$ready) {
+			this.updateColumns(); // hack for dynamics remove column
+			this.scheduleLayout();
+		}
+	},
+
+	sort(states, options) {
+		const { prop, order, init } = options;
+		if (prop) {
+			const column = arrayFind(states.columns, column => column.property === prop);
+			if (column) {
+				column.order = order;
+				this.updateSort(column, prop, order);
+				this.commit('changeSortCondition', { init });
+			}
+		}
+	},
+
+	changeSortCondition(states, options) {
+		// 修复 pr https://github.com/ElemeFE/element/pull/15012 导致的 bug
+		const { sortingColumn: column, sortProp: prop, sortOrder: order } = states;
+		if (order === null) {
+			states.sortingColumn = null;
+			states.sortProp = null;
+		}
+		const ingore = { filter: true };
+		this.execQuery(ingore);
+
+		if (!options || !(options.silent || options.init)) {
+			this.table.$emit('sort-change', {
+				column,
+				prop,
+				order
+			});
+		}
+
+		this.updateTableScrollY();
+	},
+
+	filterChange(states, options) {
+		let { column, values, silent } = options;
+		const newFilters = this.updateFilters(column, values);
+
+		this.execQuery();
+
+		if (!silent) {
+			this.table.$emit('filter-change', newFilters);
+		}
+
+		this.updateTableScrollY();
+	},
+
+	toggleAllSelection() {
+		this.toggleAllSelection();
+	},
+
+	rowSelectedChanged(states, row) {
+		this.toggleRowSelection(row);
+		this.updateAllSelected();
+	},
+
+	setHoverRow(states, row) {
+		states.hoverRow = row;
+	},
+
+	setCurrentRow(states, row) {
+		this.updateCurrentRow(row);
+	}
+};
+
+Watcher.prototype.commit = function(name, ...args) {
+	const mutations = this.mutations;
+	if (mutations[name]) {
+		mutations[name].apply(this, [this.states].concat(args));
+	} else {
+		throw new Error(`Action not found: ${ name }`);
+	}
+};
+
+Watcher.prototype.updateTableScrollY = function() {
+	Vue.nextTick(this.table.updateScrollY);
+};
+
+export default Watcher;