cy-element-ui 1.0.41 → 1.0.43

package/lib/treeSelect.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 125);
+/******/ 	return __webpack_require__(__webpack_require__.s = 123);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -539,14 +539,14 @@ var stop = function stop(e) {
 
 /***/ }),
 
-/***/ 125:
+/***/ 123:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/treeSelect/src/main.vue?vue&type=template&id=2ddf5605
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/treeSelect/src/main.vue?vue&type=template&id=6bc2d52a
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -581,6 +581,30 @@ var render = function render() {
         },
         [
           _c("div", { staticClass: "cy-tree-select-select-con" }, [
+            _vm.filterable
+              ? _c(
+                  "div",
+                  { staticClass: "cy-tree-select-select-con-s" },
+                  [
+                    _c("el-input", {
+                      attrs: {
+                        placeholder: "搜索",
+                        "prefix-icon": "el-icon-search",
+                        clearable: "",
+                        size: "small",
+                      },
+                      model: {
+                        value: _vm.filterText,
+                        callback: function ($$v) {
+                          _vm.filterText = $$v
+                        },
+                        expression: "filterText",
+                      },
+                    }),
+                  ],
+                  1
+                )
+              : _vm._e(),
             _vm.showCheckStrictly
               ? _c(
                   "div",
@@ -617,6 +641,7 @@ var render = function render() {
                     props: _vm.defaultOptions,
                     "expand-on-click-node": false,
                     "default-expand-all": _vm.defaultExpandAll,
+                    "filter-node-method": _vm.filterNode,
                   },
                   on: { check: _vm.treeCheck, "node-click": _vm.treeClick },
                 }),
@@ -696,7 +721,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/treeSelect/src/main.vue?vue&type=template&id=2ddf5605
+// CONCATENATED MODULE: ./packages/treeSelect/src/main.vue?vue&type=template&id=6bc2d52a
 
 // EXTERNAL MODULE: ./packages/checkbox/index.js + 5 modules
 var packages_checkbox = __webpack_require__(26);
@@ -737,6 +762,12 @@ var popover = __webpack_require__(42);
 			type: String
 		},
 
+		// 是否显示搜索框
+		filterable: {
+			type: Boolean,
+			default: false
+		},
+
 		// 是否显示 父子节点是否联动 多选框
 		showCheckStrictly: {
 			type: Boolean,
@@ -798,7 +829,9 @@ var popover = __webpack_require__(42);
 			isClearIcon: false, // 清空按钮显示状态
 
 			treeOptions: [], // 部门树列表
-			treeArr: [] // 部门列表
+			treeArr: [], // 部门列表
+			filterText: '', // 搜索关键词
+			matchedNodeIds: [] // 匹配的节点ID集合
 		};
 	},
 
@@ -851,13 +884,83 @@ var popover = __webpack_require__(42);
 				this.treeOptions = this.options;
 				this.treeArr = this.turnFormatTreeData([], this.treeOptions, 0);
 			}
+		},
+
+		filterText: function filterText(val) {
+			var _this3 = this;
+
+			if (val) {
+				// 先找出所有匹配的节点及其子节点
+				this.matchedNodeIds = this.findMatchedNodes(val, this.treeOptions);
+				// 执行过滤
+				this.$refs.tree.filter(val);
+				// 展开所有匹配的节点
+				this.$nextTick(function () {
+					_this3.expandMatchedNodes();
+				});
+			} else {
+				this.matchedNodeIds = [];
+				this.$refs.tree.filter(val);
+			}
 		}
 	},
 	created: function created() {},
 
 	methods: {
+		/**
+   * 树节点过滤
+   */
+		filterNode: function filterNode(value, data) {
+			if (!value) return true;
+			// 如果当前节点或其祖先节点匹配了，就显示
+			return this.matchedNodeIds.includes(data[this.defaultOptions.id]);
+		},
+
+
+		/**
+   * 查找所有匹配的节点及其子节点ID
+   */
+		findMatchedNodes: function findMatchedNodes(value, nodes) {
+			var _this4 = this;
+
+			var parentMatched = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
+			var matchedIds = [];
+
+			nodes.forEach(function (node) {
+				var currentNodeMatched = node[_this4.defaultOptions.label].indexOf(value) !== -1;
+				var shouldShow = currentNodeMatched || parentMatched;
+
+				if (shouldShow) {
+					matchedIds.push(node[_this4.defaultOptions.id]);
+				}
+
+				// 递归处理子节点，如果当前节点或其祖先匹配了，子节点也应该匹配
+				if (node[_this4.defaultOptions.children] && node[_this4.defaultOptions.children].length > 0) {
+					var childIds = _this4.findMatchedNodes(value, node[_this4.defaultOptions.children], shouldShow);
+					matchedIds = matchedIds.concat(childIds);
+				}
+			});
+
+			return matchedIds;
+		},
+
+
+		/**
+   * 展开所有匹配的节点
+   */
+		expandMatchedNodes: function expandMatchedNodes() {
+			var _this5 = this;
+
+			this.matchedNodeIds.forEach(function (nodeId) {
+				var treeNode = _this5.$refs.tree.store.nodesMap[nodeId];
+				if (treeNode) {
+					treeNode.expand();
+				}
+			});
+		},
 		init: function init() {
-			var _this3 = this;
+			var _this6 = this;
 
 			// 初始化是根据value，设置已选中项
 			var arr = [];
@@ -867,7 +970,7 @@ var popover = __webpack_require__(42);
 				arr = this.value ? [this.value] : [];
 			}
 			this.$nextTick(function () {
-				_this3.$refs.tree.setCheckedKeys(arr);
+				_this6.$refs.tree.setCheckedKeys(arr);
 			});
 		},
 
@@ -876,7 +979,7 @@ var popover = __webpack_require__(42);
    * 树复选框点击
    */
 		treeCheck: function treeCheck(value, _ref) {
-			var _this4 = this;
+			var _this7 = this;
 
 			var checkedKeys = _ref.checkedKeys,
 			    checkedNodes = _ref.checkedNodes;
@@ -884,7 +987,7 @@ var popover = __webpack_require__(42);
 			var arr = [];
 			arr = checkedNodes;
 			var idArr = arr.map(function (item) {
-				return item[_this4.defaultOptions.id];
+				return item[_this7.defaultOptions.id];
 			});
 			// 返回id数组
 			this.$emit('change', this.multiple ? idArr : idArr[0], this.multiple ? arr : arr[0]);
@@ -915,16 +1018,16 @@ var popover = __webpack_require__(42);
    * 部门树 格式化为 单例数组
    */
 		turnFormatTreeData: function turnFormatTreeData(arr, data, pId) {
-			var _this5 = this;
+			var _this8 = this;
 
 			data.forEach(function (item) {
 				var cItem = JSON.parse(JSON.stringify(item));
-				delete cItem[_this5.defaultOptions.children];
+				delete cItem[_this8.defaultOptions.children];
 				cItem.pId = pId;
 				arr.push(cItem);
 
-				if (item[_this5.defaultOptions.children] && item[_this5.defaultOptions.children].length > 0) {
-					_this5.turnFormatTreeData(arr, item[_this5.defaultOptions.children], item[_this5.defaultOptions.id]);
+				if (item[_this8.defaultOptions.children] && item[_this8.defaultOptions.children].length > 0) {
+					_this8.turnFormatTreeData(arr, item[_this8.defaultOptions.children], item[_this8.defaultOptions.id]);
 				}
 			});
 			return arr;

package/lib/upload.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 51);
+/******/ 	return __webpack_require__(__webpack_require__.s = 50);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1242,7 +1242,7 @@ var isDefined = function isDefined(val) {
 
 /***/ }),
 
-/***/ 51:
+/***/ 50:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cy-element-ui",
-	"version": "1.0.41",
+	"version": "1.0.43",
 	"description": "基于ElementUI开发的组件",
 	"main": "lib/element-ui.common.js",
 	"files": [
@@ -64,7 +64,7 @@
 		"url": "https://github.com/ElemeFE/element/issues"
 	},
 	"unpkg": "lib/index.js",
-	"style": "lib/theme-cy/index.css",
+	"style": "lib/theme-chalk/index.css",
 	"web-types": "./web-types.json",
 	"dependencies": {
 		"async-validator": "~1.8.1",

package/packages/theme-cy/src/index.scss

@@ -1,7 +1,7 @@
 /* Automatically generated by './build/bin/gen-cssfile.js' */
 @import "./element.scss";
 @import "./fileUpload.scss";
+@import "./selectDisplayInput.scss";
 @import "./subTitle.scss";
 @import "./tabDialog.scss";
 @import "./treeSelect.scss";
-@import "./selectDisplayInput.scss";

package/src/index.js

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