@kep-platform/basic-component 0.0.58 → 0.0.60

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

@@ -46,6 +46,8 @@ declare global {
     type TreeNodeType = {
         [key: string]: any;
         groupBy?: Condition[];
+        selectable?: boolean;
+        isLeaf?: boolean;
     };
 
     type onExpandHandler = (

package/dist/Table/Table.js

@@ -414,18 +414,18 @@ export default function Table(_ref3) {
       columns: formatedColumns,
       isFlex: isFlex
     }));else return undefined;
-  })) : empty), pagination !== false && dataSource.length !== 0 && /*#__PURE__*/React.createElement(Pagination, _extends({}, pagination, {
+  })) : empty), pagination !== false && ((pagination === null || pagination === void 0 ? void 0 : pagination.total) || dataSource.length) !== 0 && /*#__PURE__*/React.createElement(Pagination, _extends({}, pagination, {
     total: (pagination === null || pagination === void 0 ? void 0 : pagination.total) || dataSource.length,
     justifyContent: "right",
     onChange: function onChange(current, pageSize) {
-      _onChange2 === null || _onChange2 === void 0 || _onChange2({
+      _onChange2 === null || _onChange2 === void 0 || _onChange2(_objectSpread(_objectSpread({}, pagination), {}, {
         current: current,
         pageSize: pageSize
-      });
-      setPagination({
+      }));
+      setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
         current: current,
         pageSize: pageSize
-      });
+      }));
     }
   })));
 }

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 import("../Flex").FlexItemProps | keyof React.HtmlHTMLAttributes<HTMLDivElement>> & 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 React.HtmlHTMLAttributes<HTMLDivElement> | keyof import("../Flex").FlexItemProps> & import("../Flex").FlexItemProps & React.HtmlHTMLAttributes<HTMLDivElement>, "ref"> & {
     ref?: ((instance: HTMLDivElement | null) => void) | React.RefObject<HTMLDivElement> | null | undefined;
 }, never>> & string;
 type MainPropertyProps = {

package/dist/Tree/TreeNode.js

@@ -99,6 +99,9 @@ var groupTreeNodeByPropertyName = function groupTreeNodeByPropertyName(condition
 export var nodeTypeMap = {
   virtual: 'virtual'
 };
+function isFalse(value) {
+  return typeof value === 'boolean' && value === false;
+}
 export var TreeNodeController = observer(function (_ref) {
   var node = _ref.node,
     _ref$selectedKeys = _ref.selectedKeys,
@@ -122,15 +125,16 @@ export var TreeNodeController = observer(function (_ref) {
     return level + 1;
   }, [level]);
   var selected = useMemo(function () {
-    return selectedKeys.includes(node[fieldNames.key]);
+    return selectedKeys.includes(node[fieldNames.key]) && !isFalse(node.selectable);
   }, [selectedKeys, fieldNames, node]);
   var expanded = useMemo(function () {
-    return expandedKeys.includes(node[fieldNames.key]) || node.nodeType === nodeTypeMap.virtual;
+    return (expandedKeys.includes(node[fieldNames.key]) || node.nodeType === nodeTypeMap.virtual) && !node.isLeaf;
   }, [expandedKeys, fieldNames, node]);
   var treeNodeGroup = useMemo(function () {
     return groupTreeNodeByPropertyName(node.groupBy, node.children || []);
   }, [node.children, node.groupBy]);
   var onClickNodeHandler = useCallback(function (e) {
+    if (typeof node.selectable === 'boolean' && node.selectable === false) return;
     if (multiple) {
       if (selected) {
         onSelect(selectedKeys.filter(function (key) {
@@ -154,7 +158,7 @@ export var TreeNodeController = observer(function (_ref) {
         selected: !selected
       });
     }
-  }, [onSelect, selectedKeys, multiple, selected]);
+  }, [onSelect, selectedKeys, multiple, selected, node]);
   var onContextMenuHandler = useCallback(function (e) {
     onSelect([node[fieldNames.key]], {
       nativeEvent: e,
@@ -192,7 +196,8 @@ export var TreeNodeController = observer(function (_ref) {
       cursor: "pointer",
       onClick: onClickExpandIconhandler
     }, /*#__PURE__*/React.createElement(ExpandedIcon, {
-      expanded: expanded
+      expanded: expanded,
+      hidden: node.isLeaf
     })), /*#__PURE__*/React.createElement(TitleArea, {
       flex: 1
     }, titleRender ? titleRender(node) : node[fieldNames.title])),
@@ -205,7 +210,7 @@ export var TreeNodeController = observer(function (_ref) {
   });
   return /*#__PURE__*/React.createElement(React.Fragment, null, node.nodeType !== nodeTypeMap.virtual && /*#__PURE__*/React.createElement(TreeNode, {
     key: node[fieldNames.key],
-    selected: selectedKeys.includes(node[fieldNames.key]),
+    selected: selected,
     width: width,
     onClick: onClickNodeHandler,
     onContextMenu: onContextMenuHandler

package/dist/Tree/test.js

@@ -74,6 +74,8 @@ var mystore = new MyStore([{
   key: '1',
   title: 'jss',
   count: 1,
+  selectable: false,
+  isLeaf: true,
   children: [{
     key: '4',
     title: 'skjdfkljasklfjkljdsklajfkl就是要长一的点点滴滴的点点滴滴哒哒哒哒哒哒哒哒哒哒哒哒哒哒',

package/package.json

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