acud 1.1.13 → 1.1.15

package/lib/tree/utils/iconHelper.js

@@ -7,15 +7,30 @@ Object.defineProperty(exports, "__esModule", {
 exports.renderSwitcherIcon = renderSwitcherIcon;
 var _react = _interopRequireDefault(require("react"));
 var _OutlinedDown = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedDown"));
-function renderSwitcherIcon(prefixCls, nodeProps) {
-  var switcherCls = "".concat(prefixCls, "-switcher-icon");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _reactNode = require("../../_util/reactNode");
+function renderSwitcherIcon(prefixCls, switcherIcon, showLine, nodeProps) {
   var isLeaf = nodeProps.isLeaf;
   if (isLeaf) {
-    return null;
+    if (!showLine) {
+      return null;
+    }
+    return /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(prefixCls, "-switcher-leaf-line")
+    });
+  }
+  var switcherCls = "".concat(prefixCls, "-switcher-icon");
+  var switcher = typeof switcherIcon === 'function' ? switcherIcon(nodeProps) : switcherIcon;
+  if ((0, _reactNode.isValidElement)(switcher)) {
+    return (0, _reactNode.cloneElement)(switcher, {
+      className: (0, _classnames["default"])(switcher.props.className || '', switcherCls)
+    });
+  }
+  if (switcher) {
+    return switcher;
   }
   return /*#__PURE__*/_react["default"].createElement(_OutlinedDown["default"], {
-    className: switcherCls,
-    width: '16px'
+    className: switcherCls
   });
 }
 ;

package/lib/tree-select/index.js

@@ -155,7 +155,7 @@ var InternalTreeSelect = function InternalTreeSelect(_a, ref) {
     removeIcon: removeIcon,
     clearIcon: clearIcon,
     switcherIcon: function switcherIcon(nodeProps) {
-      return (0, _iconHelper.renderSwitcherIcon)(treePrefixCls, nodeProps);
+      return (0, _iconHelper.renderSwitcherIcon)(treePrefixCls, null, false, nodeProps);
     },
     showTreeIcon: treeIcon,
     notFoundContent: mergedNotFound,

package/lib/tree-select/src/OptionList.js

@@ -252,6 +252,40 @@ var OptionList = function OptionList(_, ref) {
       triggerChange([].concat((0, _toConsumableArray2["default"])(allDisabledCheckedKeys), (0, _toConsumableArray2["default"])(allAbleKeys)));
     }
   }, [selectAllStatus, allAbleKeys, allDisabledCheckedKeys]);
+  var formatContent = React.useCallback(function (content, searchValue, prefixCls) {
+    if (typeof content !== 'string' && typeof content !== 'number') {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, content);
+    }
+    var contentStr = content.toString();
+    var lowerContent = contentStr.toLowerCase();
+    var lowerSearch = searchValue.toLowerCase().trim();
+    var searchStartIndex = lowerContent.indexOf(lowerSearch);
+    var len = lowerSearch.length;
+    // 存在搜索值不在content的情况，比如key与children不一致时
+    if (searchStartIndex === -1) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, content);
+    }
+    return /*#__PURE__*/React.createElement(React.Fragment, null, contentStr.slice(0, searchStartIndex), /*#__PURE__*/React.createElement("span", {
+      className: "".concat(prefixCls, "-search-highlight")
+    }, contentStr.slice(searchStartIndex, searchStartIndex + len)), contentStr.slice(searchStartIndex + len));
+  }, []);
+  var formatTreeData = React.useMemo(function () {
+    if ((searchValue === null || searchValue === void 0 ? void 0 : searchValue.toString().trim()) === '') {
+      return memoTreeData;
+    }
+    var loopTree = function loopTree(arr) {
+      return arr.map(function (item) {
+        var newItem = (0, _extends2["default"])((0, _extends2["default"])({}, item), {
+          title: formatContent(item.title, searchValue, prefixCls)
+        });
+        if (newItem.children && newItem.children.length) {
+          newItem.children = loopTree(newItem.children);
+        }
+        return newItem;
+      });
+    };
+    return loopTree(memoTreeData);
+  }, [memoTreeData, searchValue, prefixCls, formatContent]);
   // ========================== Render ==========================
   if (memoTreeData.length === 0) {
     return /*#__PURE__*/React.createElement("div", {
@@ -275,7 +309,7 @@ var OptionList = function OptionList(_, ref) {
     ref: treeRef,
     focusable: false,
     prefixCls: "".concat(prefixCls, "-tree"),
-    treeData: memoTreeData,
+    treeData: formatTreeData,
     height: listHeight,
     itemHeight: listItemHeight,
     virtual: virtual !== false && dropdownMatchSelectWidth !== false,

package/lib/tree-select/style/index.css

@@ -404,6 +404,7 @@
 }
 .acud-select-tree-switcher .acud-tree-switcher-icon svg,
 .acud-select-tree-switcher .acud-select-tree-switcher-icon svg {
+  width: 16px!important;
   transition: transform 0.3s;
 }
 .acud-select-tree-switcher-noop {
@@ -412,6 +413,29 @@
 .acud-select-tree-switcher_close .acud-select-tree-switcher-icon svg {
   transform: rotate(-90deg);
 }
+.acud-select-tree-switcher-leaf-line {
+  position: relative;
+  z-index: 1;
+  display: inline-block;
+  width: 100%;
+  height: 100%;
+}
+.acud-select-tree-switcher-leaf-line::before {
+  position: absolute;
+  top: 0;
+  right: 8px;
+  bottom: -4px;
+  margin-left: -1px;
+  border-right: 1px solid #B8BABF;
+  content: ' ';
+}
+.acud-select-tree-switcher-leaf-line::after {
+  position: absolute;
+  width: 10px;
+  height: 14px;
+  border-bottom: 1px solid #B8BABF;
+  content: ' ';
+}
 .acud-select-tree .acud-select-tree-node-content-wrapper {
   position: relative;
   z-index: auto;
@@ -503,6 +527,26 @@
 .acud-select-tree-treenode:hover .acud-select-tree-draggable-icon {
   opacity: 0.45;
 }
+.acud-select-tree-show-line .acud-select-tree-indent-unit {
+  position: relative;
+  height: 100%;
+}
+.acud-select-tree-show-line .acud-select-tree-indent-unit::before {
+  position: absolute;
+  top: 0;
+  right: 16px;
+  bottom: -4px;
+  border-right: 1px solid #B8BABF;
+  content: '';
+}
+.acud-select-tree-show-line .acud-select-tree-indent-unit-end::before {
+  display: none;
+}
+.acud-select-tree .acud-select-tree-treenode-leaf-last .acud-select-tree-switcher-leaf-line::before {
+  top: auto !important;
+  bottom: auto !important;
+  height: 14px !important;
+}
 .acud-select-tree-checkbox {
   margin: 2px 0 0 8px;
   top: 0.1em;

package/package.json

@@ -1,29 +1,45 @@
 {
     "name": "acud",
-    "version": "1.1.13",
+    "version": "1.1.15",
     "description": "acg react 组件库",
+    "license": "ISC",
+    "author": "acg",
+    "sideEffects": [
+        "dist/*",
+        "es/**/style/*",
+        "lib/**/style/*",
+        "*.less"
+    ],
     "main": "lib/index.js",
-    "module": "es/index.js",
     "unpkg": "dist/aucd.min.js",
+    "module": "es/index.js",
     "typings": "lib/index.d.ts",
+    "files": [
+        "dist",
+        "lib",
+        "es"
+    ],
     "scripts": {
         "build": "npm run compile && NODE_OPTIONS='--max-old-space-size=4096' npm run dist",
         "compile": "node ./tools/bin/acud-tools-run compile",
         "compile:less": "node ./tools/bin/acud-tools-run compile:less",
         "dist": "node ./tools/bin/acud-tools-run dist",
         "dist:esbuild": "ESBUILD=true npm run dist",
-        "start": "node ./tools/bin/acud-tools-run clean && cross-env NODE_ENV=development bisheng start -c ./site/bisheng.config.js",
-        "site": "bisheng build --ssr -c ./site/bisheng.config.js",
-        "test": "jest --cache=false --env=jsdom",
         "lint": "npm run lint:script && npm run lint:style",
         "lint-fix": "npm run lint-fix:script && npm run lint-fix:style",
-        "lint:script": "eslint . --ext '.js,.jsx,.ts,.tsx'",
-        "lint:style": "stylelint 'components/**/*.less' --syntax less",
         "lint-fix:script": "npm run lint:script -- --fix",
         "lint-fix:style": "npm run lint:style -- --fix",
+        "lint:script": "eslint . --ext '.js,.jsx,.ts,.tsx'",
+        "lint:style": "stylelint 'components/**/*.less' --syntax less",
         "prepare": "curl -s http://icode.baidu.com/tools/hooks/commit-msg > .husky/commit-msg && echo '\nsh \".husky/commit-msg.sh\"' >> .husky/commit-msg && chmod u+x .husky/commit-msg && husky install",
         "prepublishOnly": "npm run build",
-        "pub": "node ./scripts/publish.js --registry=https://registry.npmjs.org"
+        "pub": "node ./scripts/publish.js --registry=https://registry.npmjs.org",
+        "site": "bisheng build --ssr -c ./site/bisheng.config.js",
+        "start": "node ./tools/bin/acud-tools-run clean && cross-env NODE_ENV=development bisheng start -c ./site/bisheng.config.js",
+        "test": "jest --cache=false --env=jsdom"
+    },
+    "lint-staged": {
+        "components/**/*.{ts,tsx,js,jsx}": "npm run lint"
     },
     "dependencies": {
         "acud-icon": "^1.0.7",
@@ -189,21 +205,5 @@
     "peerDependencies": {
         "react": ">=16.9.0",
         "react-dom": ">=16.9.0"
-    },
-    "sideEffects": [
-        "dist/*",
-        "es/**/style/*",
-        "lib/**/style/*",
-        "*.less"
-    ],
-    "author": "acg",
-    "files": [
-        "dist",
-        "lib",
-        "es"
-    ],
-    "license": "ISC",
-    "lint-staged": {
-        "components/**/*.{ts,tsx,js,jsx}": "npm run lint"
     }
 }