cy-element-ui 1.0.57 → 1.0.59

package/packages/treeSelect/src/main.vue

@@ -1,325 +1,325 @@
-<template>
-	<div class="cy-tree-select">
-		<el-popover v-model="popoverOpen" placement="bottom-start" width="300" trigger="click" :popper-class="popperClass" @show="popoverOpen = true" @hide="popoverOpen = false">
-			<div class="cy-tree-select-select-con">
-				<div v-if="filterable" class="cy-tree-select-select-con-s">
-					<el-input
-						v-model="filterText"
-						placeholder="搜索"
-						prefix-icon="el-icon-search"
-						clearable
-						size="small"
-					></el-input>
-				</div>
-				<div v-if="showCheckStrictly" class="cy-tree-select-select-con-t">
-					<el-checkbox v-model="isCheckStrictly">父子节点联动</el-checkbox>
-				</div>
-				
-				<div class="cy-tree-select-select-con-c">
-					<el-tree
-						ref="tree"
-						:data="treeOptions"
-						:show-checkbox="multiple"
-						:node-key="defaultOptions.id"
-						:check-strictly="!isCheckStrictly"
-						:props="defaultOptions"
-						:expand-on-click-node="false"
-						:default-expand-all="defaultExpandAll"
-						:filter-node-method="filterNode"
-						@check="treeCheck"
-						@node-click="treeClick"
-					></el-tree>
-				</div>
-			</div>
-			
-			<div slot="reference" class="cy-tree-select-select" :class="size" :style="vStyle">
-				<div class="cy-tree-select-select-v">
-					<span v-if="checkedArr.length < 1" class="cy-tree-select-select-v-placeholder">{{ placeholder }}</span>
-					<span v-else>{{ checkedArr.map(item => item[defaultOptions.label]).join() }}</span>
-				</div>
-				
-				<div class="cy-tree-select-select-v-icon" @mouseenter="isClearIcon = true" @mouseleave="isClearIcon = false">
-					<i v-if="isClearIcon && clearable" class="el-icon-circle-close" @click.stop="handleClear"></i>
-					<i v-else class="el-icon-arrow-down cy-tree-select-select-v-arrow" :class="{ 'cy-tree-select-select-v-arrow-show': popoverOpen }"></i>
-				</div>
-			</div>
-		</el-popover>
-	</div>
-</template>
-
-<script>
-import ElCheckbox from 'cy-element-ui/packages/checkbox';
-import ElPopover from 'cy-element-ui/packages/popover';
-
-export default {
-	name: 'CyTreeSelect',
-	component: [
-		ElCheckbox,
-		ElPopover
-	],
-	model: {
-		prop: 'value',
-		event: 'change',
-	},
-	props: {
-		value: {
-			type: [String, Number, Array],
-			default: ''
-		},
-
-		options: {
-			type: Array,
-			default: []
-		},
-
-		placeholder: {
-			type: String,
-			default: ''
-		},
-
-		// 尺寸
-		size: {
-			type: String,
-		},
-
-		// 是否显示搜索框
-		filterable: {
-			type: Boolean,
-			default: false
-		},
-
-		// 是否显示 父子节点是否联动 多选框
-		showCheckStrictly: {
-			type: Boolean,
-			default: true
-		},
-
-		// 父子节点是否联动
-		checkStrictly: {
-			type: Boolean,
-			default: true
-		},
-
-		// 是否显示清空按钮
-		clearable: {
-			type: Boolean,
-			default: false
-		},
-
-		// 是否多选
-		multiple: {
-			type: Boolean,
-			default: false,
-		},
-
-		// 默认数据参数选项
-		defaultOptions: {
-			type: Object,
-			default: () => {
-				return {
-					children: 'children',
-					label: 'label',
-					id: 'id'
-				}
-			}
-		},
-
-		// 显示的文本框样式
-		vStyle: {
-			type: [Array, String, Object],
-			default: ''
-		},
-
-		// 树数据区域外层popover的class
-		popperClass: {
-			type: String,
-			default: ''
-		},
-
-		// 是否默认展开所有节点
-		defaultExpandAll: {
-			type: Boolean,
-			default: false
-		}
-	},
-	data() {
-		return {
-			isCheckStrictly: true, // 父子节点是否联动
-			popoverOpen: false, // 显示状态
-			isClearIcon: false, // 清空按钮显示状态
-
-			treeOptions: [], // 部门树列表
-			treeArr: [], // 部门列表
-			filterText: '', // 搜索关键词
-			matchedNodeIds: [], // 匹配的节点ID集合
-		}
-	},
-	computed: {
-		// 当前选中的数组
-		checkedArr() {
-			if (this.multiple) {
-				let arr = [];
-				this.value && this.value.forEach(id => {
-					let cItem = this.treeArr.filter(tItem => tItem[this.defaultOptions.id] === id)[0];
-					if (cItem) arr.push(cItem);
-				})
-				return arr
-			} else {
-				let cItem = this.treeArr.filter(tItem => tItem[this.defaultOptions.id] === Number(this.value))[0];
-				return cItem ? [cItem] : []
-			}
-		}
-	},
-	watch: {
-		checkStrictly: {
-			immediate: true,
-			handler() {
-				this.isCheckStrictly = this.checkStrictly;
-			}
-		},
-
-		value: {
-			immediate: true,
-			deep: true,
-			handler() {
-				this.$nextTick(() => {
-					this.init();
-				})
-			}
-		},
-
-		options: {
-			deep: true,
-			immediate: true,
-			handler() {
-				this.treeOptions = this.options;
-				this.treeArr = this.turnFormatTreeData([], this.treeOptions, 0);
-			}
-		},
-
-		filterText(val) {
-			if (val) {
-				// 先找出所有匹配的节点及其子节点
-				this.matchedNodeIds = this.findMatchedNodes(val, this.treeOptions);
-				// 执行过滤
-				this.$refs.tree.filter(val);
-				// 展开所有匹配的节点
-				this.$nextTick(() => {
-					this.expandMatchedNodes();
-				});
-			} else {
-				this.matchedNodeIds = [];
-				this.$refs.tree.filter(val);
-			}
-		}
-	},
-	created() {
-
-	},
-	methods: {
-		/**
-		 * 树节点过滤
-		 */
-		filterNode(value, data) {
-			if (!value) return true;
-			// 如果当前节点或其祖先节点匹配了，就显示
-			return this.matchedNodeIds.includes(data[this.defaultOptions.id]);
-		},
-
-		/**
-		 * 查找所有匹配的节点及其子节点ID
-		 */
-		findMatchedNodes(value, nodes, parentMatched = false) {
-			let matchedIds = [];
-
-			nodes.forEach(node => {
-				const currentNodeMatched = node[this.defaultOptions.label].indexOf(value) !== -1;
-				const shouldShow = currentNodeMatched || parentMatched;
-
-				if (shouldShow) {
-					matchedIds.push(node[this.defaultOptions.id]);
-				}
-
-				// 递归处理子节点，如果当前节点或其祖先匹配了，子节点也应该匹配
-				if (node[this.defaultOptions.children] && node[this.defaultOptions.children].length > 0) {
-					const childIds = this.findMatchedNodes(value, node[this.defaultOptions.children], shouldShow);
-					matchedIds = matchedIds.concat(childIds);
-				}
-			});
-
-			return matchedIds;
-		},
-
-		/**
-		 * 展开所有匹配的节点
-		 */
-		expandMatchedNodes() {
-			this.matchedNodeIds.forEach(nodeId => {
-				const treeNode = this.$refs.tree.store.nodesMap[nodeId];
-				if (treeNode) {
-					treeNode.expand();
-				}
-			});
-		},
-
-		init() {
-			// 初始化是根据value，设置已选中项
-			let arr = [];
-			if (this.multiple) {
-				arr = this.value ? this.value : [];
-			} else {
-				arr = this.value ? [this.value] : []
-			}
-			this.$nextTick(() => {
-				this.$refs.tree.setCheckedKeys(arr);
-			})
-		},
-
-		/**
-   * 树复选框点击
-   */
-		treeCheck(value, { checkedKeys, checkedNodes }) {
-			let arr = [];
-			arr = checkedNodes;
-			let idArr = arr.map(item => item[this.defaultOptions.id]);
-			// 返回id数组
-			this.$emit('change', this.multiple ? idArr : idArr[0], this.multiple ? arr : arr[0]);
-		},
-
-		/**
-   * 树节点点击
-   */
-		treeClick(value, node, event) {
-			if (this.multiple) return;
-
-			this.$emit('change', value.id, value);
-			this.popoverOpen = false;
-		},
-
-		/**
-   * 清空
-   */
-		handleClear() {
-			this.$emit('change', this.multiple ? [] : '', this.multiple ? [] : null);
-			this.$refs.tree.setCheckedKeys([]);
-		},
-
-		/**
-   * 部门树 格式化为 单例数组
-   */
-		turnFormatTreeData(arr, data, pId) {
-			data.forEach(item => {
-				let cItem = JSON.parse(JSON.stringify(item));
-				delete cItem[this.defaultOptions.children];
-				cItem.pId = pId;
-				arr.push(cItem);
-
-				if (item[this.defaultOptions.children] && item[this.defaultOptions.children].length > 0) {
-					this.turnFormatTreeData(arr, item[this.defaultOptions.children], item[this.defaultOptions.id]);
-				}
-			})
-			return arr
-		},
-	}
-};
-</script>
+<template>
+	<div class="cy-tree-select">
+		<el-popover v-model="popoverOpen" placement="bottom-start" width="300" trigger="click" :popper-class="popperClass" @show="popoverOpen = true" @hide="popoverOpen = false">
+			<div class="cy-tree-select-select-con">
+				<div v-if="filterable" class="cy-tree-select-select-con-s">
+					<el-input
+						v-model="filterText"
+						placeholder="搜索"
+						prefix-icon="el-icon-search"
+						clearable
+						size="small"
+					></el-input>
+				</div>
+				<div v-if="showCheckStrictly" class="cy-tree-select-select-con-t">
+					<el-checkbox v-model="isCheckStrictly">父子节点联动</el-checkbox>
+				</div>
+				
+				<div class="cy-tree-select-select-con-c">
+					<el-tree
+						ref="tree"
+						:data="treeOptions"
+						:show-checkbox="multiple"
+						:node-key="defaultOptions.id"
+						:check-strictly="!isCheckStrictly"
+						:props="defaultOptions"
+						:expand-on-click-node="false"
+						:default-expand-all="defaultExpandAll"
+						:filter-node-method="filterNode"
+						@check="treeCheck"
+						@node-click="treeClick"
+					></el-tree>
+				</div>
+			</div>
+			
+			<div slot="reference" class="cy-tree-select-select" :class="size" :style="vStyle">
+				<div class="cy-tree-select-select-v">
+					<span v-if="checkedArr.length < 1" class="cy-tree-select-select-v-placeholder">{{ placeholder }}</span>
+					<span v-else>{{ checkedArr.map(item => item[defaultOptions.label]).join() }}</span>
+				</div>
+				
+				<div class="cy-tree-select-select-v-icon" @mouseenter="isClearIcon = true" @mouseleave="isClearIcon = false">
+					<i v-if="isClearIcon && clearable" class="el-icon-circle-close" @click.stop="handleClear"></i>
+					<i v-else class="el-icon-arrow-down cy-tree-select-select-v-arrow" :class="{ 'cy-tree-select-select-v-arrow-show': popoverOpen }"></i>
+				</div>
+			</div>
+		</el-popover>
+	</div>
+</template>
+
+<script>
+import ElCheckbox from 'element-ui/packages/checkbox';
+import ElPopover from 'element-ui/packages/popover';
+
+export default {
+	name: 'CyTreeSelect',
+	component: [
+		ElCheckbox,
+		ElPopover
+	],
+	model: {
+		prop: 'value',
+		event: 'change',
+	},
+	props: {
+		value: {
+			type: [String, Number, Array],
+			default: ''
+		},
+
+		options: {
+			type: Array,
+			default: []
+		},
+
+		placeholder: {
+			type: String,
+			default: ''
+		},
+
+		// 尺寸
+		size: {
+			type: String,
+		},
+
+		// 是否显示搜索框
+		filterable: {
+			type: Boolean,
+			default: false
+		},
+
+		// 是否显示 父子节点是否联动 多选框
+		showCheckStrictly: {
+			type: Boolean,
+			default: true
+		},
+
+		// 父子节点是否联动
+		checkStrictly: {
+			type: Boolean,
+			default: true
+		},
+
+		// 是否显示清空按钮
+		clearable: {
+			type: Boolean,
+			default: false
+		},
+
+		// 是否多选
+		multiple: {
+			type: Boolean,
+			default: false,
+		},
+
+		// 默认数据参数选项
+		defaultOptions: {
+			type: Object,
+			default: () => {
+				return {
+					children: 'children',
+					label: 'label',
+					id: 'id'
+				}
+			}
+		},
+
+		// 显示的文本框样式
+		vStyle: {
+			type: [Array, String, Object],
+			default: ''
+		},
+
+		// 树数据区域外层popover的class
+		popperClass: {
+			type: String,
+			default: ''
+		},
+
+		// 是否默认展开所有节点
+		defaultExpandAll: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			isCheckStrictly: true, // 父子节点是否联动
+			popoverOpen: false, // 显示状态
+			isClearIcon: false, // 清空按钮显示状态
+
+			treeOptions: [], // 部门树列表
+			treeArr: [], // 部门列表
+			filterText: '', // 搜索关键词
+			matchedNodeIds: [], // 匹配的节点ID集合
+		}
+	},
+	computed: {
+		// 当前选中的数组
+		checkedArr() {
+			if (this.multiple) {
+				let arr = [];
+				this.value && this.value.forEach(id => {
+					let cItem = this.treeArr.filter(tItem => tItem[this.defaultOptions.id] === id)[0];
+					if (cItem) arr.push(cItem);
+				})
+				return arr
+			} else {
+				let cItem = this.treeArr.filter(tItem => tItem[this.defaultOptions.id] === Number(this.value))[0];
+				return cItem ? [cItem] : []
+			}
+		}
+	},
+	watch: {
+		checkStrictly: {
+			immediate: true,
+			handler() {
+				this.isCheckStrictly = this.checkStrictly;
+			}
+		},
+
+		value: {
+			immediate: true,
+			deep: true,
+			handler() {
+				this.$nextTick(() => {
+					this.init();
+				})
+			}
+		},
+
+		options: {
+			deep: true,
+			immediate: true,
+			handler() {
+				this.treeOptions = this.options;
+				this.treeArr = this.turnFormatTreeData([], this.treeOptions, 0);
+			}
+		},
+
+		filterText(val) {
+			if (val) {
+				// 先找出所有匹配的节点及其子节点
+				this.matchedNodeIds = this.findMatchedNodes(val, this.treeOptions);
+				// 执行过滤
+				this.$refs.tree.filter(val);
+				// 展开所有匹配的节点
+				this.$nextTick(() => {
+					this.expandMatchedNodes();
+				});
+			} else {
+				this.matchedNodeIds = [];
+				this.$refs.tree.filter(val);
+			}
+		}
+	},
+	created() {
+
+	},
+	methods: {
+		/**
+		 * 树节点过滤
+		 */
+		filterNode(value, data) {
+			if (!value) return true;
+			// 如果当前节点或其祖先节点匹配了，就显示
+			return this.matchedNodeIds.includes(data[this.defaultOptions.id]);
+		},
+
+		/**
+		 * 查找所有匹配的节点及其子节点ID
+		 */
+		findMatchedNodes(value, nodes, parentMatched = false) {
+			let matchedIds = [];
+
+			nodes.forEach(node => {
+				const currentNodeMatched = node[this.defaultOptions.label].indexOf(value) !== -1;
+				const shouldShow = currentNodeMatched || parentMatched;
+
+				if (shouldShow) {
+					matchedIds.push(node[this.defaultOptions.id]);
+				}
+
+				// 递归处理子节点，如果当前节点或其祖先匹配了，子节点也应该匹配
+				if (node[this.defaultOptions.children] && node[this.defaultOptions.children].length > 0) {
+					const childIds = this.findMatchedNodes(value, node[this.defaultOptions.children], shouldShow);
+					matchedIds = matchedIds.concat(childIds);
+				}
+			});
+
+			return matchedIds;
+		},
+
+		/**
+		 * 展开所有匹配的节点
+		 */
+		expandMatchedNodes() {
+			this.matchedNodeIds.forEach(nodeId => {
+				const treeNode = this.$refs.tree.store.nodesMap[nodeId];
+				if (treeNode) {
+					treeNode.expand();
+				}
+			});
+		},
+
+		init() {
+			// 初始化是根据value，设置已选中项
+			let arr = [];
+			if (this.multiple) {
+				arr = this.value ? this.value : [];
+			} else {
+				arr = this.value ? [this.value] : []
+			}
+			this.$nextTick(() => {
+				this.$refs.tree.setCheckedKeys(arr);
+			})
+		},
+
+		/**
+   * 树复选框点击
+   */
+		treeCheck(value, { checkedKeys, checkedNodes }) {
+			let arr = [];
+			arr = checkedNodes;
+			let idArr = arr.map(item => item[this.defaultOptions.id]);
+			// 返回id数组
+			this.$emit('change', this.multiple ? idArr : idArr[0], this.multiple ? arr : arr[0]);
+		},
+
+		/**
+   * 树节点点击
+   */
+		treeClick(value, node, event) {
+			if (this.multiple) return;
+
+			this.$emit('change', value.id, value);
+			this.popoverOpen = false;
+		},
+
+		/**
+   * 清空
+   */
+		handleClear() {
+			this.$emit('change', this.multiple ? [] : '', this.multiple ? [] : null);
+			this.$refs.tree.setCheckedKeys([]);
+		},
+
+		/**
+   * 部门树 格式化为 单例数组
+   */
+		turnFormatTreeData(arr, data, pId) {
+			data.forEach(item => {
+				let cItem = JSON.parse(JSON.stringify(item));
+				delete cItem[this.defaultOptions.children];
+				cItem.pId = pId;
+				arr.push(cItem);
+
+				if (item[this.defaultOptions.children] && item[this.defaultOptions.children].length > 0) {
+					this.turnFormatTreeData(arr, item[this.defaultOptions.children], item[this.defaultOptions.id]);
+				}
+			})
+			return arr
+		},
+	}
+};
+</script>

package/packages/upload/src/index.vue

@@ -1,8 +1,8 @@
 <script>
 import UploadList from './upload-list';
 import Upload from './upload';
-import ElProgress from 'cy-element-ui/packages/progress';
-import Migrating from 'cy-element-ui/src/mixins/migrating';
+import ElProgress from 'element-ui/packages/progress';
+import Migrating from 'element-ui/src/mixins/migrating';
 
 function noop() {}
 

package/packages/upload/src/upload-list.vue

@@ -63,8 +63,8 @@
 	</transition-group>
 </template>
 <script>
-	import Locale from 'cy-element-ui/src/mixins/locale';
-	import ElProgress from 'cy-element-ui/packages/progress';
+	import Locale from 'element-ui/src/mixins/locale';
+	import ElProgress from 'element-ui/packages/progress';
 
 	export default {
 

package/src/directives/repeat-click.js

@@ -1,5 +1,5 @@
-import { once, on } from 'cy-element-ui/src/utils/dom';
-import { isMac } from 'cy-element-ui/src/utils/util';
+import { once, on } from 'element-ui/src/utils/dom';
+import { isMac } from 'element-ui/src/utils/util';
 
 export default {
 	bind(el, binding, vnode) {