@kep-platform/basic-component 0.0.56 → 0.0.58

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

@@ -39,7 +39,7 @@ declare global {
 
     type Condition = {
         attribute: string;
-        condition: (value: any) => boolean;
+        condition?: (value: any) => boolean;
         description: string;
     };
 

package/dist/Tree/Tree.d.ts

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

package/dist/Tree/Tree.js

@@ -63,7 +63,9 @@ var Tree = observer(function (_ref) {
     _ref$multiple = _ref.multiple,
     multiple = _ref$multiple === void 0 ? false : _ref$multiple,
     _ref$bordered = _ref.bordered,
-    bordered = _ref$bordered === void 0 ? false : _ref$bordered;
+    bordered = _ref$bordered === void 0 ? false : _ref$bordered,
+    _ref$hideColumns = _ref.hideColumns,
+    hideColumns = _ref$hideColumns === void 0 ? false : _ref$hideColumns;
   var rootNode = useMemo(function () {
     return _defineProperty(_defineProperty(_defineProperty({}, fieldNames.key, 'root'), "nodeType", nodeTypeMap.virtual), "children", treeData);
   }, [treeData]);
@@ -81,7 +83,7 @@ var Tree = observer(function (_ref) {
 
   /* 如果columns存在而且长度大于0，则启用TableMode，用以展示节点属性 */
   var isTableMode = useMemo(function () {
-    return columns && columns.length > 0;
+    return columns && columns.length > 0 && !hideColumns;
   }, [columns]);
 
   /* 如果没有行宽，position:sticky就会存在问题,所以要计算出行的宽度，这样行内的Column的sticky才能生效 */

package/dist/Tree/TreeNode.js

@@ -35,7 +35,7 @@ var TreeNode = styled(ListItem)(_templateObject4 || (_templateObject4 = _taggedT
     return css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n                background-color: var(--kep-platform-color-bg-active) !important;\n                color: var(--kep-platform-color-text-active) !important;\n                & ", ", & ", " {\n                    background-color: var(--kep-platform-color-bg-active) !important;\n                    color: var(--kep-platform-color-text-active) !important;\n                }\n                & ", " {\n                    overflow-x: auto;\n                    & > ", " {\n                        width: auto;\n                    }\n                }\n                & ", " {\n                    overflow-x: auto;\n                }\n            "])), Column, MainArea, MainArea, Flex, TitleArea);
   }
 });
-var TreeNodeGroupNode = styled.li(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n    height: 40px;\n    line-height: 40px;\n    background-color: var(--kep-platform-color-primary);\n    color: var(--kep-platform-color-white);\n    & span {\n        color: var(--kep-platform-color-white) !important;\n    }\n    cursor: pointer;\n    ", "\n"])), function (props) {
+var TreeNodeGroupNode = styled.li(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n    height: 32px;\n    line-height: 32px;\n    background-color: var(--kep-platform-color-primary);\n    color: var(--kep-platform-color-white);\n    & span {\n        color: var(--kep-platform-color-white) !important;\n    }\n    cursor: pointer;\n    ", "\n"])), function (props) {
   if (props.width) {
     return css(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n                width: ", "px;\n            "])), props.width);
   }
@@ -51,7 +51,7 @@ var TreeNodeGroup = function TreeNodeGroup(props) {
       return setExpanded(!expanded);
     }
   }, /*#__PURE__*/React.createElement(Flex, {
-    width: props.mainWidth,
+    width: props.width,
     style: {
       position: 'sticky',
       left: 0
@@ -65,7 +65,11 @@ var TreeNodeGroup = function TreeNodeGroup(props) {
   }, /*#__PURE__*/React.createElement(ExpandedIcon, {
     expanded: expanded
   })), /*#__PURE__*/React.createElement(FlexItem, {
-    flex: 1
+    flex: 1,
+    style: {
+      textOverflow: 'initial',
+      overflow: 'auto'
+    }
   }, props.groupTitle))), expanded && React.Children.map(props.children, function (child) {
     return /*#__PURE__*/React.cloneElement(child, {
       level: props.level + 1
@@ -79,6 +83,9 @@ var groupTreeNodeByPropertyName = function groupTreeNodeByPropertyName(condition
       var attribute = cond.attribute,
         condition = cond.condition,
         description = cond.description;
+      if (!condition) {
+        return "".concat(description, ":").concat(item[attribute] || '');
+      }
       return condition(item[attribute]) ? "".concat(description, ":\u662F") : "".concat(description, ":\u5426");
     }).join(' | ');
     if (!acc[key]) {

package/dist/Tree/test.js

@@ -93,10 +93,7 @@ var mystore = new MyStore([{
   count: 1,
   groupBy: [{
     attribute: 'count',
-    condition: function condition(value) {
-      return value === 1;
-    },
-    description: '数量等于1'
+    description: '数量'
   }],
   children: [{
     key: '3',
@@ -194,6 +191,7 @@ export default (function () {
       dataIndex: 'count',
       align: 'center'
     }],
+    hideColumns: true,
     selectedKeys: selectedKeys,
     expandedKeys: expandedKeys,
     onSelect: function onSelect(selectedKeys) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kep-platform/basic-component",
-    "version": "0.0.56",
+    "version": "0.0.58",
     "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.56",
+        "@kep-platform/hooks": "^0.0.58",
         "color": "^4.2.3",
         "rc-pagination": "^4.1.0"
     },
@@ -87,5 +87,5 @@
     "authors": [
         "less-step-jss 1599925910@qq.com"
     ],
-    "gitHead": "d78f1b33a287d2c584cfc98c0daac159a49ab200"
+    "gitHead": "a493e28e826430e666079e3d2568460c14912886"
 }