@teamix/pro 1.2.8 → 1.2.9

package/lib/sidebar/components/tree/index.js

@@ -13,10 +13,18 @@ var _utils = require("@teamix/utils");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _excluded = ["dataSource", "searchKey", "onSelect"];
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -37,32 +45,60 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 var cls = (0, _utils.baseClass)('teamix-pro-sidebar-tree');
 
 var ProSidebarTree = function ProSidebarTree(props) {
   var dataSourceProp = props.dataSource,
-      searchKey = props.searchKey; // 自动展开父节点。过滤时用
+      searchKey = props.searchKey,
+      onSelect = props.onSelect,
+      others = _objectWithoutProperties(props, _excluded); // 自动展开父节点。过滤时用
 
-  var _useState = (0, _react.useState)(),
+
+  var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      matchedKeys = _useState2[0],
-      setMatchedKeys = _useState2[1];
+      autoExpandParent = _useState2[0],
+      setAutoExpandParent = _useState2[1];
 
   var _useState3 = (0, _react.useState)(),
       _useState4 = _slicedToArray(_useState3, 2),
-      expandedKeys = _useState4[0],
-      setExpandedKeys = _useState4[1];
+      matchedKeys = _useState4[0],
+      setMatchedKeys = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []),
+  var _useState5 = (0, _react.useState)(),
       _useState6 = _slicedToArray(_useState5, 2),
-      dataSource = _useState6[0],
-      setDataSource = _useState6[1];
+      expandedKeys = _useState6[0],
+      setExpandedKeys = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []),
+      _useState8 = _slicedToArray(_useState7, 2),
+      dataSource = _useState8[0],
+      setDataSource = _useState8[1];
 
+  (0, _react.useEffect)(function () {
+    getAllExpend();
+  }, []);
   (0, _react.useEffect)(function () {
     filterDataSource(searchKey !== null && searchKey !== void 0 ? searchKey : '');
-  }, [searchKey]); // 过滤
+  }, [searchKey]); // 获取全部展开节点key
+
+  var getAllExpend = function getAllExpend() {
+    var allKeys = (0, _utils.treeToList)(dataSource).map(function (item) {
+      return item.value;
+    });
+    setExpandedKeys(allKeys);
+  }; // 过滤
+
 
   var filterDataSource = function filterDataSource(value) {
+    if (!value) {
+      setExpandedKeys([]);
+      getAllExpend();
+    }
+
     value = value.trim();
     var matchedKeys = [];
 
@@ -74,7 +110,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
     var loop = function loop(data) {
       return data.forEach(function (item) {
         if (item.label.indexOf(value) > -1) {
-          matchedKeys.push(item.key);
+          matchedKeys.push(item.value);
         }
 
         if (item.children && item.children.length) {
@@ -85,27 +121,58 @@ var ProSidebarTree = function ProSidebarTree(props) {
 
     loop(dataSource);
     setExpandedKeys(_toConsumableArray(matchedKeys));
+    setAutoExpandParent(true);
     setMatchedKeys(matchedKeys);
   };
 
   var filterTreeNode = function filterTreeNode(node) {
     return matchedKeys && matchedKeys.indexOf(node.props.eventKey) > -1;
+  }; // 节点展开回调
+
+
+  var handleExpand = function handleExpand(key) {
+    setExpandedKeys(key);
+    setAutoExpandParent(false);
+  }; // 渲染树节点
+
+
+  var renderTreeNode = function renderTreeNode(data) {
+    return data.map(function (item) {
+      return /*#__PURE__*/_react.default.createElement(_components.Tree.Node, {
+        key: item.value,
+        label: renderTreeNodeItem(item)
+      }, item.children && item.children.length > 0 && renderTreeNode(item.children));
+    });
+  }; // 渲染单个树节点 label
+
+
+  var renderTreeNodeItem = function renderTreeNodeItem(data) {
+    var node = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, data.label);
+
+    if (data.tag) {
+      if ( /*#__PURE__*/(0, _react.isValidElement)(data.tag)) {
+        node = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, node, data.tag);
+      }
+    }
+
+    return node;
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {
     className: cls()
-  }, /*#__PURE__*/_react.default.createElement(_components.Tree, {
-    draggable: true,
+  }, /*#__PURE__*/_react.default.createElement(_components.Tree, _objectSpread({
     defaultExpandAll: true,
     isLabelBlock: true,
     isNodeBlock: {
       defaultPaddingLeft: 8,
       indent: 16
     },
-    dataSource: dataSource,
     filterTreeNode: filterTreeNode,
-    expandedKeys: expandedKeys
-  }));
+    expandedKeys: expandedKeys,
+    onExpand: handleExpand,
+    autoExpandParent: autoExpandParent,
+    onSelect: onSelect
+  }, others), renderTreeNode(dataSource)));
 };
 
 var _default = ProSidebarTree;

package/lib/sidebar/index.js

@@ -17,7 +17,7 @@ var _sidebarContainer = _interopRequireDefault(require("./components/sidebar-con
 
 var _tree = _interopRequireDefault(require("./components/tree"));
 
-var _excluded = ["dataSource", "className", "style", "searchOnChange", "showSearch"];
+var _excluded = ["dataSource", "className", "style", "searchOnChange", "showSearch", "onSelect", "treeProps", "cardProps"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -56,6 +56,9 @@ var ProSidebar = function ProSidebar(props) {
       _searchOnChange = props.searchOnChange,
       _props$showSearch = props.showSearch,
       showSearch = _props$showSearch === void 0 ? true : _props$showSearch,
+      onSelect = props.onSelect,
+      treeProps = props.treeProps,
+      cardProps = props.cardProps,
       others = _objectWithoutProperties(props, _excluded); // 搜索的关键词
 
 
@@ -69,7 +72,7 @@ var ProSidebar = function ProSidebar(props) {
       '': true
     }, className, true)),
     style: style
-  }, /*#__PURE__*/_react.default.createElement(_sidebarContainer.default, _objectSpread({
+  }, /*#__PURE__*/_react.default.createElement(_sidebarContainer.default, _objectSpread(_objectSpread({
     searchOnChange: function searchOnChange(value) {
       if (showSearch) {
         _searchOnChange === null || _searchOnChange === void 0 ? void 0 : _searchOnChange(value);
@@ -77,10 +80,11 @@ var ProSidebar = function ProSidebar(props) {
       }
     },
     showSearch: showSearch
-  }, others), /*#__PURE__*/_react.default.createElement(_tree.default, {
+  }, others), cardProps), /*#__PURE__*/_react.default.createElement(_tree.default, _objectSpread({
     dataSource: dataSource,
-    searchKey: searchKey
-  })));
+    searchKey: searchKey,
+    onSelect: onSelect
+  }, treeProps))));
 };
 
 var _default = ProSidebar;

package/lib/sidebar/typing.d.ts

@@ -6,7 +6,13 @@ import { ProCardProps, ProFieldProps } from '..';
 export declare type ProSidebarProps = {
     /** 数据源 */
     dataSource?: ProSidebarDataSource;
-} & React.HTMLAttributes<HTMLElement> & ProSidebarContainerProps;
+    /** 节点点击回调 */
+    onSelect?: TreeProps['onSelect'];
+    /** 树配置 */
+    treeProps?: TreeProps;
+    /** 卡片配置 */
+    cardProps?: ProCardProps;
+} & Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> & Omit<ProSidebarContainerProps, 'onSelect'>;
 /** 数据源定义 */
 export declare type ProSidebarDataSource = ProSidebarDataSourceItem[];
 export declare type ProSidebarDataSourceItem = {
@@ -23,6 +29,11 @@ export declare type ProSidebarDataSourceItem = {
     /** 子项 */
     children?: ProSidebarDataSourceItem[];
 };
+/** tag 定义 */
+export declare type ProSidebarDataSourceTag = {
+    /** 显示值 */
+    value: string;
+};
 /** sidebar 容器定义 */
 export declare type ProSidebarContainerProps = {
     children?: React.ReactNode;
@@ -48,4 +59,6 @@ export declare type ProSidebarTreeProps = {
     dataSource?: ProSidebarDataSource;
     /** 搜索过滤关键词 */
     searchKey?: string;
+    /** 节点点击回调 */
+    onChange?: ProSidebarProps['onChange'];
 } & TreeProps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",