bkui-vue 2.1.0-dev-beta.15 → 2.1.0-dev-beta.17

package/lib/index.js

@@ -3,5 +3,5 @@ export * from './hooks';
 export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
-export const version = "2.1.0-dev-beta.15";
+export const version = "2.1.0-dev-beta.17";
 window.__bkui_vue_version__ = version;

package/lib/tree/index.js

@@ -19871,64 +19871,75 @@ var use_search_this = undefined;
  */
 
 /* harmony default export */ const use_search = (function (props) {
-  var _props$search;
   var refSearch = (0,external_vue_namespaceObject.toRef)(props, 'search');
-  var _ref = (_props$search = props.search) !== null && _props$search !== void 0 ? _props$search : {},
-    _ref$resultType = _ref.resultType,
-    resultType = _ref$resultType === void 0 ? 'tree' : _ref$resultType,
-    _ref$showChildNodes = _ref.showChildNodes,
-    showChildNodes = _ref$showChildNodes === void 0 ? true : _ref$showChildNodes;
   var isCommonType = function isCommonType(val) {
     return ['string', 'number', 'boolean'].includes(_typeof(val));
   };
-  var exactMath = function exactMath(matchValue, itemValue) {
+  var exactMatch = function exactMatch(matchValue, itemValue) {
     return matchValue === itemValue;
   };
-  var regMatch = function regMatch(matchValue, itemValue) {
-    return new RegExp("".concat(matchValue), 'i').test("".concat(itemValue));
+  var fuzzyMatch = function fuzzyMatch(matchValue, itemValue) {
+    try {
+      return new RegExp("".concat(matchValue), 'i').test("".concat(itemValue));
+    } catch (_unused) {
+      return "".concat(itemValue).toLowerCase().includes("".concat(matchValue).toLowerCase());
+    }
   };
   var matchFn = function matchFn(match, args) {
     return Reflect.apply(match, use_search_this, args);
   };
-  var isSearchDisabled = refSearch.value === undefined || refSearch.value === false;
-  var searchFn = function searchFn(itemValue, item) {
-    if (isSearchDisabled) {
-      return true;
+  var isSearchDisabled = (0,external_vue_namespaceObject.computed)(function () {
+    return refSearch.value === undefined || refSearch.value === false;
+  });
+  var searchOption = (0,external_vue_namespaceObject.computed)(function () {
+    if (refSearch.value && _typeof(refSearch.value) === 'object') {
+      return refSearch.value;
     }
+    var emptyOption = {
+      value: ''
+    };
+    return emptyOption;
+  });
+  var resultType = (0,external_vue_namespaceObject.computed)(function () {
+    var _searchOption$value$r;
+    return (_searchOption$value$r = searchOption.value.resultType) !== null && _searchOption$value$r !== void 0 ? _searchOption$value$r : 'tree';
+  });
+  var showChildNodes = (0,external_vue_namespaceObject.computed)(function () {
+    var _searchOption$value$s;
+    return (_searchOption$value$s = searchOption.value.showChildNodes) !== null && _searchOption$value$s !== void 0 ? _searchOption$value$s : false;
+  });
+  var getSearchValue = function getSearchValue() {
+    var _searchOption$value$v;
     if (isCommonType(refSearch.value)) {
-      if ("".concat(refSearch.value).length === 0) {
-        return false;
-      }
-      return matchFn(regMatch, [refSearch.value, itemValue, item]);
+      return refSearch.value;
     }
-    var _refSearch$value = refSearch.value,
-      _refSearch$value$valu = _refSearch$value.value,
-      value = _refSearch$value$valu === void 0 ? '' : _refSearch$value$valu,
-      _refSearch$value$matc = _refSearch$value.match,
-      match = _refSearch$value$matc === void 0 ? 'fuzzy' : _refSearch$value$matc;
-    var defultMatch = match === 'fuzzy' ? regMatch : exactMath;
-    var matchCallback = typeof match === 'function' ? match : defultMatch;
+    return (_searchOption$value$v = searchOption.value.value) !== null && _searchOption$value$v !== void 0 ? _searchOption$value$v : '';
+  };
+  var searchFn = function searchFn(itemValue, item) {
+    if (isSearchDisabled.value) {
+      return true;
+    }
+    var value = getSearchValue();
     if ("".concat(value).length === 0) {
       return false;
     }
+    if (isCommonType(refSearch.value)) {
+      return matchFn(fuzzyMatch, [value, itemValue, item]);
+    }
+    var _searchOption$value$m = searchOption.value.match,
+      match = _searchOption$value$m === void 0 ? 'fuzzy' : _searchOption$value$m;
+    var defaultMatch = match === 'fuzzy' ? fuzzyMatch : exactMatch;
+    var matchCallback = typeof match === 'function' ? match : defaultMatch;
     return matchFn(matchCallback, [value, itemValue, item]);
   };
   var isSearchActive = (0,external_vue_namespaceObject.computed)(function () {
-    if (refSearch.value === false) {
+    if (isSearchDisabled.value) {
       return false;
     }
-    if (isCommonType(refSearch.value)) {
-      return "".concat(refSearch.value).length > 0;
-    }
-    var _refSearch$value$valu2 = refSearch.value.value,
-      value = _refSearch$value$valu2 === void 0 ? '' : _refSearch$value$valu2;
-    return "".concat(value).length > 0;
+    return "".concat(getSearchValue()).length > 0;
   });
-  /**
-   * 索索结果展示为Tree
-   */
   var isTreeUI = (0,external_vue_namespaceObject.computed)(function () {
-    return resultType === 'tree';
+    return resultType.value === 'tree';
   });
   return {
     searchFn: searchFn,
@@ -20491,7 +20502,6 @@ var use_tree_init_this = undefined;
       isNodeChecked = _useNodeAttribute.isNodeChecked,
       isNodeMatched = _useNodeAttribute.isNodeMatched,
       hasChildNode = _useNodeAttribute.hasChildNode,
-      getNodePath = _useNodeAttribute.getNodePath,
       getNodeId = _useNodeAttribute.getNodeId,
       getNodeAttr = _useNodeAttribute.getNodeAttr,
       getNodeById = _useNodeAttribute.getNodeById,
@@ -20504,28 +20514,50 @@ var use_tree_init_this = undefined;
       refSearch = _useSearch.refSearch,
       isSearchDisabled = _useSearch.isSearchDisabled,
       isTreeUI = _useSearch.isTreeUI,
+      resultType = _useSearch.resultType,
       showChildNodes = _useSearch.showChildNodes;
-    var matchedNodePath = (0,external_vue_namespaceObject.reactive)([]);
+    var matchedNodeIds = (0,external_vue_namespaceObject.reactive)(new Set());
+    var visibleNodeIds = (0,external_vue_namespaceObject.reactive)(new Set());
+    var searchOriginalOpenState = new Map();
+    var getRenderNodeId = function getRenderNodeId(node) {
+      return "".concat(getNodeId(node));
+    };
+    var setSearchNodeOpen = function setSearchNodeOpen(node) {
+      var nodeId = getRenderNodeId(node);
+      if (!searchOriginalOpenState.has(nodeId)) {
+        searchOriginalOpenState.set(nodeId, isNodeOpened(node));
+      }
+      setNodeAttribute(node, NODE_ATTRIBUTES.IS_OPEN, true, false);
+    };
+    var restoreSearchOpenState = function restoreSearchOpenState() {
+      searchOriginalOpenState.forEach(function (isOpen, nodeId) {
+        var node = getNodeById(nodeId);
+        if (node) {
+          setNodeAttribute(node, NODE_ATTRIBUTES.IS_OPEN, isOpen, false);
+        }
+      });
+      searchOriginalOpenState.clear();
+    };
+    var addAncestorNodes = function addAncestorNodes(node) {
+      var parent = getParentNode(node);
+      while (parent) {
+        var parentId = getRenderNodeId(parent);
+        visibleNodeIds.add(parentId);
+        setSearchNodeOpen(parent);
+        parent = getParentNode(parent);
+      }
+    };
+    var _addDescendantNodes = function addDescendantNodes(node) {
+      var _flatData$childMap$ge, _flatData$childMap;
+      var children = (_flatData$childMap$ge = (_flatData$childMap = flatData.childMap) === null || _flatData$childMap === void 0 ? void 0 : _flatData$childMap.get(node)) !== null && _flatData$childMap$ge !== void 0 ? _flatData$childMap$ge : [];
+      children.forEach(function (child) {
+        visibleNodeIds.add(getRenderNodeId(child));
+        _addDescendantNodes(child);
+      });
+    };
     var filterFn = function filterFn(item) {
       if (isSearchActive.value) {
-        if (showChildNodes) {
-          var _getNodePath;
-          var itemPath = (_getNodePath = getNodePath(item)) !== null && _getNodePath !== void 0 ? _getNodePath : '';
-          var asParentPath = "".concat(itemPath, "-");
-          var isNodeOpen = checkNodeIsOpen(item);
-          var isNodeMatch = isNodeMatched(item);
-          var isNodeRoot = isRootNode(item);
-          if (isNodeOpen) {
-            if (isNodeRoot) {
-              return isNodeMatch;
-            }
-            return isNodeMatch || matchedNodePath.some(function (path) {
-              return asParentPath.indexOf("".concat(path, "-")) === 0;
-            });
-          }
-          return false;
-        }
-        return checkNodeIsOpen(item) && isNodeMatched(item);
+        return visibleNodeIds.has(getRenderNodeId(item));
       }
       return checkNodeIsOpen(item);
     };
@@ -20619,23 +20651,42 @@ var use_tree_init_this = undefined;
       deepUpdateChildNode = _useNodeAction.deepUpdateChildNode,
       updateParentChecked = _useNodeAction.updateParentChecked;
     var handleSearch = (0,shared_namespaceObject.debounce)(120, function () {
-      matchedNodePath.length = 0;
+      restoreSearchOpenState();
+      matchedNodeIds.clear();
+      visibleNodeIds.clear();
       flatData.data.forEach(function (item) {
-        var isMatch = searchFn(getLabel(item, props), item);
+        var isMatch = !isSearchDisabled.value && searchFn(getLabel(item, props), item);
+        var nodeId = getRenderNodeId(item);
         if (isMatch) {
-          matchedNodePath.push(getNodePath(item));
+          matchedNodeIds.add(nodeId);
+          visibleNodeIds.add(nodeId);
         }
-        setNodeAttribute(item, [NODE_ATTRIBUTES.IS_MATCH], [isMatch], isTreeUI.value && isMatch);
+        setNodeAttribute(item, [NODE_ATTRIBUTES.IS_MATCH, NODE_ATTRIBUTES.IS_OPEN], [isMatch, isNodeOpened(item)], false);
       });
-    });
-    if (!isSearchDisabled) {
-      (0,external_vue_namespaceObject.watch)([refSearch], function () {
-        handleSearch();
-      }, {
-        deep: true,
-        immediate: true
+      if (!isSearchActive.value) {
+        return;
+      }
+      flatData.data.forEach(function (item) {
+        if (!matchedNodeIds.has(getRenderNodeId(item))) {
+          return;
+        }
+        if (resultType.value === 'tree') {
+          addAncestorNodes(item);
+        }
+        if (showChildNodes.value) {
+          setSearchNodeOpen(item);
+          _addDescendantNodes(item);
+        }
       });
-    }
+    });
+    (0,external_vue_namespaceObject.watch)([refSearch, function () {
+      return flatData.data;
+    }, resultType, showChildNodes], function () {
+      handleSearch();
+    }, {
+      deep: true,
+      immediate: true
+    });
     (0,external_vue_namespaceObject.onMounted)(function () {
       if (props.virtualRender) {
         (0,external_vue_namespaceObject.nextTick)(function () {

package/lib/tree/use-search.d.ts

@@ -3,9 +3,9 @@ declare const _default: (props: TreePropTypes) => {
     searchFn: (itemValue: unknown, item: unknown) => boolean;
     refSearch: import("vue").Ref<string | number | boolean | SearchOption, string | number | boolean | SearchOption>;
     isSearchActive: import("vue").ComputedRef<boolean>;
-    isSearchDisabled: boolean;
-    resultType: "list" | "tree";
+    isSearchDisabled: import("vue").ComputedRef<boolean>;
+    resultType: import("vue").ComputedRef<"list" | "tree">;
     isTreeUI: import("vue").ComputedRef<boolean>;
-    showChildNodes: boolean;
+    showChildNodes: import("vue").ComputedRef<boolean>;
 };
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.1.0-dev-beta.15",
+  "version": "2.1.0-dev-beta.17",
   "workspaces": [
     "packages/**",
     "scripts/cli",