cy-element-ui 1.1.27 → 1.1.28

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cy-element-ui",
-	"version": "1.1.27",
+	"version": "1.1.28",
 	"description": "基于 Element UI 的 Vue 2 组件库，包含产研自定义组件",
 	"main": "lib/index.js",
 	"files": [

package/packages/cy/treeSelect/src/main.vue

@@ -26,9 +26,9 @@
 						ref="tree"
 						:data="treeOptions"
 						:show-checkbox="multiple"
-						:node-key="defaultOptions.id"
+						:node-key="treeFieldMap.id"
 						:check-strictly="!isCheckStrictly"
-						:props="defaultOptions"
+						:props="treeFieldMap"
 						:expand-on-click-node="false"
 						:default-expand-all="defaultExpandAll"
 						:filter-node-method="filterNode"
@@ -43,7 +43,7 @@
 				<div class="cy-tree-select-select-v">
 					<!-- 未选中时显示占位提示，选中后显示已选节点 label 拼接文本 -->
 					<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>
+					<span v-else>{{ checkedArr.map(item => item[treeFieldMap.label]).join() }}</span>
 				</div>
 
 				<!-- 右侧图标区：hover 显示清空按钮，否则显示下拉箭头 -->
@@ -180,6 +180,16 @@ export default {
 		};
 	},
 	computed: {
+		/**
+		 * 字段映射配置：将用户传入的 defaultOptions 与默认值合并，
+		 * 保证 children / label / id 三个 key 始终存在，
+		 * 避免只传部分字段时取到的 key 为 undefined 而导致层级/选中/搜索失效
+		 * @returns {Object} 合并后的字段映射
+		 */
+		treeFieldMap() {
+			return Object.assign({ children: 'children', label: 'label', id: 'id' }, this.defaultOptions);
+		},
+
 		/**
 		 * 根据 value 反查当前选中节点对象数组，用于回显文本
 		 * @returns {Array} 选中节点对象数组
@@ -188,12 +198,12 @@ export default {
 			if (this.multiple) {
 				let arr = [];
 				this.value && this.value.forEach(id => {
-					let cItem = this.treeArr.filter(tItem => tItem[this.defaultOptions.id] === id)[0];
+					let cItem = this.treeArr.filter(tItem => tItem[this.treeFieldMap.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];
+				let cItem = this.treeArr.filter(tItem => tItem[this.treeFieldMap.id] === Number(this.value))[0];
 				return cItem ? [cItem] : [];
 			}
 		}
@@ -254,7 +264,7 @@ export default {
 		 */
 		filterNode(value, data) {
 			if (!value) return true;
-			return this.matchedNodeIds.includes(data[this.defaultOptions.id]);
+			return this.matchedNodeIds.includes(data[this.treeFieldMap.id]);
 		},
 
 		/**
@@ -268,15 +278,15 @@ export default {
 			let matchedIds = [];
 
 			nodes.forEach(node => {
-				const currentNodeMatched = node[this.defaultOptions.label].indexOf(value) !== -1;
+				const currentNodeMatched = node[this.treeFieldMap.label].indexOf(value) !== -1;
 				const shouldShow = currentNodeMatched || parentMatched;
 
 				if (shouldShow) {
-					matchedIds.push(node[this.defaultOptions.id]);
+					matchedIds.push(node[this.treeFieldMap.id]);
 				}
 
-				if (node[this.defaultOptions.children] && node[this.defaultOptions.children].length > 0) {
-					const childIds = this.findMatchedNodes(value, node[this.defaultOptions.children], shouldShow);
+				if (node[this.treeFieldMap.children] && node[this.treeFieldMap.children].length > 0) {
+					const childIds = this.findMatchedNodes(value, node[this.treeFieldMap.children], shouldShow);
 					matchedIds = matchedIds.concat(childIds);
 				}
 			});
@@ -324,7 +334,7 @@ export default {
 		treeCheck(value, { checkedKeys, checkedNodes }) {
 			let arr = [];
 			arr = checkedNodes;
-			let idArr = arr.map(item => item[this.defaultOptions.id]);
+			let idArr = arr.map(item => item[this.treeFieldMap.id]);
 			this.$emit('change', this.multiple ? idArr : idArr[0], this.multiple ? arr : arr[0]);
 		},
 
@@ -339,7 +349,7 @@ export default {
 		treeClick(value, node, event) {
 			if (this.multiple) return;
 
-			this.$emit('change', value[this.defaultOptions.id], value);
+			this.$emit('change', value[this.treeFieldMap.id], value);
 			this.popoverOpen = false;
 		},
 
@@ -363,12 +373,12 @@ export default {
 		turnFormatTreeData(arr, data, pId) {
 			data.forEach(item => {
 				let cItem = JSON.parse(JSON.stringify(item));
-				delete cItem[this.defaultOptions.children];
+				delete cItem[this.treeFieldMap.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]);
+				if (item[this.treeFieldMap.children] && item[this.treeFieldMap.children].length > 0) {
+					this.turnFormatTreeData(arr, item[this.treeFieldMap.children], item[this.treeFieldMap.id]);
 				}
 			});
 			return arr;

package/src/index.js

@@ -224,7 +224,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-	version: '1.1.26',
+	version: '1.1.27',
 	locale: locale.use,
 	i18n: locale.i18n,
 	install,