cy-element-ui 1.1.27 → 1.1.28

package/lib/CyTreeSelect.js

@@ -213,7 +213,7 @@ module.exports = require("element-ui/lib/utils/shared");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/cy/treeSelect/src/main.vue?vue&type=template&id=139d556a
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/cy/treeSelect/src/main.vue?vue&type=template&id=7e2add3e
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -304,9 +304,9 @@ var render = function () {
                   attrs: {
                     data: _vm.treeOptions,
                     "show-checkbox": _vm.multiple,
-                    "node-key": _vm.defaultOptions.id,
+                    "node-key": _vm.treeFieldMap.id,
                     "check-strictly": !_vm.isCheckStrictly,
-                    props: _vm.defaultOptions,
+                    props: _vm.treeFieldMap,
                     "expand-on-click-node": false,
                     "default-expand-all": _vm.defaultExpandAll,
                     "filter-node-method": _vm.filterNode,
@@ -339,7 +339,7 @@ var render = function () {
                         _vm._s(
                           _vm.checkedArr
                             .map(function (item) {
-                              return item[_vm.defaultOptions.label]
+                              return item[_vm.treeFieldMap.label]
                             })
                             .join()
                         )
@@ -391,7 +391,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/cy/treeSelect/src/main.vue?vue&type=template&id=139d556a
+// CONCATENATED MODULE: ./packages/cy/treeSelect/src/main.vue?vue&type=template&id=7e2add3e
 
 // EXTERNAL MODULE: ./packages/checkbox/index.js + 5 modules
 var packages_checkbox = __webpack_require__(16);
@@ -589,6 +589,17 @@ var tree = __webpack_require__(46);
 	},
 
 	computed: {
+		/**
+   * 字段映射配置：将用户传入的 defaultOptions 与默认值合并，
+   * 保证 children / label / id 三个 key 始终存在，
+   * 避免只传部分字段时取到的 key 为 undefined 而导致层级/选中/搜索失效
+   * @returns {Object} 合并后的字段映射
+   */
+		treeFieldMap: function treeFieldMap() {
+			return Object.assign({ children: 'children', label: 'label', id: 'id' }, this.defaultOptions);
+		},
+
+
 		/**
    * 根据 value 反查当前选中节点对象数组，用于回显文本
    * @returns {Array} 选中节点对象数组
@@ -600,14 +611,14 @@ var tree = __webpack_require__(46);
 				var arr = [];
 				this.value && this.value.forEach(function (id) {
 					var cItem = _this.treeArr.filter(function (tItem) {
-						return tItem[_this.defaultOptions.id] === id;
+						return tItem[_this.treeFieldMap.id] === id;
 					})[0];
 					if (cItem) arr.push(cItem);
 				});
 				return arr;
 			} else {
 				var cItem = this.treeArr.filter(function (tItem) {
-					return tItem[_this.defaultOptions.id] === Number(_this.value);
+					return tItem[_this.treeFieldMap.id] === Number(_this.value);
 				})[0];
 				return cItem ? [cItem] : [];
 			}
@@ -672,7 +683,7 @@ var tree = __webpack_require__(46);
    */
 		filterNode: function filterNode(value, data) {
 			if (!value) return true;
-			return this.matchedNodeIds.includes(data[this.defaultOptions.id]);
+			return this.matchedNodeIds.includes(data[this.treeFieldMap.id]);
 		},
 
 
@@ -691,15 +702,15 @@ var tree = __webpack_require__(46);
 			var matchedIds = [];
 
 			nodes.forEach(function (node) {
-				var currentNodeMatched = node[_this4.defaultOptions.label].indexOf(value) !== -1;
+				var currentNodeMatched = node[_this4.treeFieldMap.label].indexOf(value) !== -1;
 				var shouldShow = currentNodeMatched || parentMatched;
 
 				if (shouldShow) {
-					matchedIds.push(node[_this4.defaultOptions.id]);
+					matchedIds.push(node[_this4.treeFieldMap.id]);
 				}
 
-				if (node[_this4.defaultOptions.children] && node[_this4.defaultOptions.children].length > 0) {
-					var childIds = _this4.findMatchedNodes(value, node[_this4.defaultOptions.children], shouldShow);
+				if (node[_this4.treeFieldMap.children] && node[_this4.treeFieldMap.children].length > 0) {
+					var childIds = _this4.findMatchedNodes(value, node[_this4.treeFieldMap.children], shouldShow);
 					matchedIds = matchedIds.concat(childIds);
 				}
 			});
@@ -760,7 +771,7 @@ var tree = __webpack_require__(46);
 			var arr = [];
 			arr = checkedNodes;
 			var idArr = arr.map(function (item) {
-				return item[_this7.defaultOptions.id];
+				return item[_this7.treeFieldMap.id];
 			});
 			this.$emit('change', this.multiple ? idArr : idArr[0], this.multiple ? arr : arr[0]);
 		},
@@ -777,7 +788,7 @@ var tree = __webpack_require__(46);
 		treeClick: function 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;
 		},
 
@@ -805,12 +816,12 @@ var tree = __webpack_require__(46);
 
 			data.forEach(function (item) {
 				var cItem = JSON.parse(JSON.stringify(item));
-				delete cItem[_this8.defaultOptions.children];
+				delete cItem[_this8.treeFieldMap.children];
 				cItem.pId = pId;
 				arr.push(cItem);
 
-				if (item[_this8.defaultOptions.children] && item[_this8.defaultOptions.children].length > 0) {
-					_this8.turnFormatTreeData(arr, item[_this8.defaultOptions.children], item[_this8.defaultOptions.id]);
+				if (item[_this8.treeFieldMap.children] && item[_this8.treeFieldMap.children].length > 0) {
+					_this8.turnFormatTreeData(arr, item[_this8.treeFieldMap.children], item[_this8.treeFieldMap.id]);
 				}
 			});
 			return arr;

package/lib/element-ui.common.js

@@ -43203,8 +43203,8 @@ result_src.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_result = (result_src);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/cy/treeSelect/src/main.vue?vue&type=template&id=139d556a
-var mainvue_type_template_id_139d556a_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/cy/treeSelect/src/main.vue?vue&type=template&id=7e2add3e
+var mainvue_type_template_id_7e2add3e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -43294,9 +43294,9 @@ var mainvue_type_template_id_139d556a_render = function () {
                   attrs: {
                     data: _vm.treeOptions,
                     "show-checkbox": _vm.multiple,
-                    "node-key": _vm.defaultOptions.id,
+                    "node-key": _vm.treeFieldMap.id,
                     "check-strictly": !_vm.isCheckStrictly,
-                    props: _vm.defaultOptions,
+                    props: _vm.treeFieldMap,
                     "expand-on-click-node": false,
                     "default-expand-all": _vm.defaultExpandAll,
                     "filter-node-method": _vm.filterNode,
@@ -43329,7 +43329,7 @@ var mainvue_type_template_id_139d556a_render = function () {
                         _vm._s(
                           _vm.checkedArr
                             .map(function (item) {
-                              return item[_vm.defaultOptions.label]
+                              return item[_vm.treeFieldMap.label]
                             })
                             .join()
                         )
@@ -43377,11 +43377,11 @@ var mainvue_type_template_id_139d556a_render = function () {
     1
   )
 }
-var mainvue_type_template_id_139d556a_staticRenderFns = []
-mainvue_type_template_id_139d556a_render._withStripped = true
+var mainvue_type_template_id_7e2add3e_staticRenderFns = []
+mainvue_type_template_id_7e2add3e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/cy/treeSelect/src/main.vue?vue&type=template&id=139d556a
+// CONCATENATED MODULE: ./packages/cy/treeSelect/src/main.vue?vue&type=template&id=7e2add3e
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/cy/treeSelect/src/main.vue?vue&type=script&lang=js
 //
@@ -43567,6 +43567,17 @@ mainvue_type_template_id_139d556a_render._withStripped = true
 	},
 
 	computed: {
+		/**
+   * 字段映射配置：将用户传入的 defaultOptions 与默认值合并，
+   * 保证 children / label / id 三个 key 始终存在，
+   * 避免只传部分字段时取到的 key 为 undefined 而导致层级/选中/搜索失效
+   * @returns {Object} 合并后的字段映射
+   */
+		treeFieldMap: function treeFieldMap() {
+			return Object.assign({ children: 'children', label: 'label', id: 'id' }, this.defaultOptions);
+		},
+
+
 		/**
    * 根据 value 反查当前选中节点对象数组，用于回显文本
    * @returns {Array} 选中节点对象数组
@@ -43578,14 +43589,14 @@ mainvue_type_template_id_139d556a_render._withStripped = true
 				var arr = [];
 				this.value && this.value.forEach(function (id) {
 					var cItem = _this.treeArr.filter(function (tItem) {
-						return tItem[_this.defaultOptions.id] === id;
+						return tItem[_this.treeFieldMap.id] === id;
 					})[0];
 					if (cItem) arr.push(cItem);
 				});
 				return arr;
 			} else {
 				var cItem = this.treeArr.filter(function (tItem) {
-					return tItem[_this.defaultOptions.id] === Number(_this.value);
+					return tItem[_this.treeFieldMap.id] === Number(_this.value);
 				})[0];
 				return cItem ? [cItem] : [];
 			}
@@ -43650,7 +43661,7 @@ mainvue_type_template_id_139d556a_render._withStripped = true
    */
 		filterNode: function filterNode(value, data) {
 			if (!value) return true;
-			return this.matchedNodeIds.includes(data[this.defaultOptions.id]);
+			return this.matchedNodeIds.includes(data[this.treeFieldMap.id]);
 		},
 
 
@@ -43669,15 +43680,15 @@ mainvue_type_template_id_139d556a_render._withStripped = true
 			var matchedIds = [];
 
 			nodes.forEach(function (node) {
-				var currentNodeMatched = node[_this4.defaultOptions.label].indexOf(value) !== -1;
+				var currentNodeMatched = node[_this4.treeFieldMap.label].indexOf(value) !== -1;
 				var shouldShow = currentNodeMatched || parentMatched;
 
 				if (shouldShow) {
-					matchedIds.push(node[_this4.defaultOptions.id]);
+					matchedIds.push(node[_this4.treeFieldMap.id]);
 				}
 
-				if (node[_this4.defaultOptions.children] && node[_this4.defaultOptions.children].length > 0) {
-					var childIds = _this4.findMatchedNodes(value, node[_this4.defaultOptions.children], shouldShow);
+				if (node[_this4.treeFieldMap.children] && node[_this4.treeFieldMap.children].length > 0) {
+					var childIds = _this4.findMatchedNodes(value, node[_this4.treeFieldMap.children], shouldShow);
 					matchedIds = matchedIds.concat(childIds);
 				}
 			});
@@ -43738,7 +43749,7 @@ mainvue_type_template_id_139d556a_render._withStripped = true
 			var arr = [];
 			arr = checkedNodes;
 			var idArr = arr.map(function (item) {
-				return item[_this7.defaultOptions.id];
+				return item[_this7.treeFieldMap.id];
 			});
 			this.$emit('change', this.multiple ? idArr : idArr[0], this.multiple ? arr : arr[0]);
 		},
@@ -43755,7 +43766,7 @@ mainvue_type_template_id_139d556a_render._withStripped = true
 		treeClick: function 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;
 		},
 
@@ -43783,12 +43794,12 @@ mainvue_type_template_id_139d556a_render._withStripped = true
 
 			data.forEach(function (item) {
 				var cItem = JSON.parse(JSON.stringify(item));
-				delete cItem[_this8.defaultOptions.children];
+				delete cItem[_this8.treeFieldMap.children];
 				cItem.pId = pId;
 				arr.push(cItem);
 
-				if (item[_this8.defaultOptions.children] && item[_this8.defaultOptions.children].length > 0) {
-					_this8.turnFormatTreeData(arr, item[_this8.defaultOptions.children], item[_this8.defaultOptions.id]);
+				if (item[_this8.treeFieldMap.children] && item[_this8.treeFieldMap.children].length > 0) {
+					_this8.turnFormatTreeData(arr, item[_this8.treeFieldMap.children], item[_this8.treeFieldMap.id]);
 				}
 			});
 			return arr;
@@ -43807,8 +43818,8 @@ mainvue_type_template_id_139d556a_render._withStripped = true
 
 var treeSelect_src_main_component = normalizeComponent(
   cy_treeSelect_src_mainvue_type_script_lang_js,
-  mainvue_type_template_id_139d556a_render,
-  mainvue_type_template_id_139d556a_staticRenderFns,
+  mainvue_type_template_id_7e2add3e_render,
+  mainvue_type_template_id_7e2add3e_staticRenderFns,
   false,
   null,
   null,
@@ -44835,7 +44846,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-	version: '1.1.26',
+	version: '1.1.27',
 	locale: lib_locale_default.a.use,
 	i18n: lib_locale_default.a.i18n,
 	install: src_install,