@kep-platform/basic-component 0.0.55 → 0.0.57

package/dist/@types/index.d.ts

@@ -37,8 +37,15 @@ declare global {
         [key in RequiredTreeNodeKeys]: string;
     };
 
+    type Condition = {
+        attribute: string;
+        condition?: (value: any) => boolean;
+        description: string;
+    };
+
     type TreeNodeType = {
         [key: string]: any;
+        groupBy?: Condition[];
     };
 
     type onExpandHandler = (

package/dist/Tree/MainProperties.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-export declare const MainArea: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<Omit<import("styled-components").FastOmit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, keyof React.HtmlHTMLAttributes<HTMLDivElement> | keyof import("../Flex").FlexItemProps> & import("../Flex").FlexItemProps & React.HtmlHTMLAttributes<HTMLDivElement>, "ref"> & {
+export declare const MainArea: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<Omit<import("styled-components").FastOmit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, keyof import("../Flex").FlexItemProps | keyof React.HtmlHTMLAttributes<HTMLDivElement>> & import("../Flex").FlexItemProps & React.HtmlHTMLAttributes<HTMLDivElement>, "ref"> & {
     ref?: ((instance: HTMLDivElement | null) => void) | React.RefObject<HTMLDivElement> | null | undefined;
 }, never>> & string;
 type MainPropertyProps = {

package/dist/Tree/Tree.d.ts

@@ -15,7 +15,6 @@ export type TreeProps = {
     title?: ReactNode;
     isFlex?: boolean;
     bordered?: boolean;
-    groupBy?: string | null;
 };
 declare const Tree: (({ treeData, columns, fieldNames, title: treeTitle, titleWidth, titleRender, selectedKeys, expandedKeys, isFlex, onSelect, onExpand, contextMenuRender, onContextMenuItemSelect, multiple, bordered, }: TreeProps) => React.JSX.Element) & {
     displayName: string;

package/dist/Tree/TreeNode.js

@@ -45,7 +45,7 @@ var TreeNodeGroup = function TreeNodeGroup(props) {
     _useState2 = _slicedToArray(_useState, 2),
     expanded = _useState2[0],
     setExpanded = _useState2[1];
-  if (React.Children.toArray(props.children).length > 1) return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TreeNodeGroupNode, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TreeNodeGroupNode, {
     width: props.width,
     onClick: function onClick() {
       return setExpanded(!expanded);
@@ -66,25 +66,32 @@ var TreeNodeGroup = function TreeNodeGroup(props) {
     expanded: expanded
   })), /*#__PURE__*/React.createElement(FlexItem, {
     flex: 1
-  }, props.groupName, " : ", props.groupValue))), expanded && React.Children.map(props.children, function (child) {
+  }, props.groupTitle))), expanded && React.Children.map(props.children, function (child) {
     return /*#__PURE__*/React.cloneElement(child, {
       level: props.level + 1
     });
-  }));else return props.children;
+  }));
 };
-function groupTreeNodeByPropertyName(arr, propertyName, fieldNames) {
-  var grouped = arr.reduce(function (acc, obj) {
-    var key = obj[propertyName || fieldNames.key] || obj[fieldNames.key];
-    if (key) {
-      if (!acc[key]) {
-        acc[key] = [];
+var groupTreeNodeByPropertyName = function groupTreeNodeByPropertyName(conditions, data) {
+  if (!conditions) return data;
+  var result = data.reduce(function (acc, item) {
+    var key = conditions.map(function (cond) {
+      var attribute = cond.attribute,
+        condition = cond.condition,
+        description = cond.description;
+      if (!condition) {
+        return description;
       }
-      acc[key].push(obj);
-    } else {}
+      return condition(item[attribute]) ? "".concat(description, ":\u662F") : "".concat(description, ":\u5426");
+    }).join(' | ');
+    if (!acc[key]) {
+      acc[key] = [];
+    }
+    acc[key].push(item);
     return acc;
   }, {});
-  return grouped;
-}
+  return result;
+};
 export var nodeTypeMap = {
   virtual: 'virtual'
 };
@@ -117,14 +124,8 @@ export var TreeNodeController = observer(function (_ref) {
     return expandedKeys.includes(node[fieldNames.key]) || node.nodeType === nodeTypeMap.virtual;
   }, [expandedKeys, fieldNames, node]);
   var treeNodeGroup = useMemo(function () {
-    return groupTreeNodeByPropertyName(node.children || [], node.groupBy, fieldNames);
+    return groupTreeNodeByPropertyName(node.groupBy, node.children || []);
   }, [node.children, node.groupBy]);
-  var groupTitle = useMemo(function () {
-    var _columns$find;
-    return (_columns$find = columns.find(function (column) {
-      return column.dataIndex === node.groupBy;
-    })) === null || _columns$find === void 0 ? void 0 : _columns$find.title;
-  }, [columns, node.groupBy]);
   var onClickNodeHandler = useCallback(function (e) {
     if (multiple) {
       if (selected) {
@@ -210,13 +211,12 @@ export var TreeNodeController = observer(function (_ref) {
     onSelect: function onSelect(key, item) {
       return onContextMenuItemSelect === null || onContextMenuItemSelect === void 0 ? void 0 : onContextMenuItemSelect(node, key, item);
     }
-  }, nodeEntity) : nodeEntity), expanded && treeNodeGroup && Object.keys(treeNodeGroup).map(function (groupKey) {
+  }, nodeEntity) : nodeEntity), expanded && treeNodeGroup && !Array.isArray(treeNodeGroup) && Object.keys(treeNodeGroup).map(function (groupKey) {
     return /*#__PURE__*/React.createElement(TreeNodeGroup, {
       width: width,
       mainWidth: mainWidth,
       key: groupKey,
-      groupValue: groupKey,
-      groupName: groupTitle,
+      groupTitle: groupKey,
       level: childLevel
     }, treeNodeGroup[groupKey].map(function (childNode) {
       return /*#__PURE__*/React.createElement(TreeNodeController, {
@@ -239,5 +239,25 @@ export var TreeNodeController = observer(function (_ref) {
         onContextMenuItemSelect: onContextMenuItemSelect
       });
     }));
+  }), expanded && treeNodeGroup && Array.isArray(treeNodeGroup) && treeNodeGroup.map(function (childNode) {
+    return /*#__PURE__*/React.createElement(TreeNodeController, {
+      width: width,
+      selectedKeys: selectedKeys,
+      key: childNode[fieldNames.key],
+      node: childNode,
+      fieldNames: fieldNames,
+      isFlex: isFlex,
+      isTableMode: isTableMode,
+      columns: columns,
+      onSelect: onSelect,
+      multiple: multiple,
+      level: childLevel,
+      mainWidth: mainWidth,
+      onExpand: onExpand,
+      expandedKeys: expandedKeys,
+      contextMenuRender: contextMenuRender,
+      titleRender: titleRender,
+      onContextMenuItemSelect: onContextMenuItemSelect
+    });
   }));
 });

package/dist/Tree/test.js

@@ -74,7 +74,6 @@ var mystore = new MyStore([{
   key: '1',
   title: 'jss',
   count: 1,
-  groupBy: 'count',
   children: [{
     key: '4',
     title: 'skjdfkljasklfjkljdsklajfkl就是要长一的点点滴滴的点点滴滴哒哒哒哒哒哒哒哒哒哒哒哒哒哒',
@@ -92,7 +91,13 @@ var mystore = new MyStore([{
   key: '2121212121212',
   title: '2',
   count: 1,
-  groupBy: 'count',
+  groupBy: [{
+    attribute: 'count',
+    condition: function condition(value) {
+      return value === 1;
+    },
+    description: '数量等于1'
+  }],
   children: [{
     key: '3',
     title: 'jss',
@@ -109,7 +114,22 @@ var mystore = new MyStore([{
     key: '20',
     title: '3',
     children: [],
-    count: 2
+    count: 1
+  }, {
+    key: '21',
+    title: 'xixi',
+    children: [],
+    count: 1
+  }, {
+    key: '22',
+    title: 'haha',
+    children: [],
+    count: 1
+  }, {
+    key: '23',
+    title: 'lala',
+    children: [],
+    count: 1
   }]
 }]);
 var Title = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    width: 100%;\n    text-align: center;\n"])));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kep-platform/basic-component",
-    "version": "0.0.55",
+    "version": "0.0.57",
     "description": "A react library developed with dumi",
     "license": "MIT",
     "module": "dist/index.js",
@@ -47,7 +47,7 @@
     },
     "dependencies": {
         "@ant-design/icons": "^5.3.7",
-        "@kep-platform/hooks": "^0.0.55",
+        "@kep-platform/hooks": "^0.0.57",
         "color": "^4.2.3",
         "rc-pagination": "^4.1.0"
     },
@@ -87,5 +87,5 @@
     "authors": [
         "less-step-jss 1599925910@qq.com"
     ],
-    "gitHead": "b2a7b4a7b4d21101ff9f28c127a03a6a4c7be849"
+    "gitHead": "dbdddab5ad9f3286c9f67b0d98a54286ea6a52b6"
 }