@lemon-fe/kits 1.0.0-107 → 1.0.0-109

package/README.md

@@ -31,3 +31,8 @@ Build library via `father-build`,
 ```bash
 $ npm run build
 ```
+
+## Break Changes
+
+- Layout Tab 属性 key 必须，title 可选
+- Section Tab 属性 Key 必须，title 可选

package/es/components/DataGrid/index.js

@@ -879,7 +879,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     value: function isPreserveSelected() {
       var rowSelection = this.props.rowSelection;
 
-      if (rowSelection === undefined) {
+      if (rowSelection === undefined || rowSelection.type === 'radio') {
         return false;
       }
 

package/es/components/Layout/index.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import type { ReactNode, CSSProperties } from 'react';
 interface Tab {
-    title: string;
-    key?: string;
+    title?: ReactNode;
+    key: string;
 }
 interface Props {
     children?: ReactNode;

package/es/components/Layout/index.js

@@ -28,10 +28,6 @@ import { Resizable } from 'react-resizable';
 import { mapChildren, prefixClassName } from "../utils";
 var prefix = prefixClassName('layout');
 
-var getKey = function getKey(tab) {
-  return tab.key || tab.title;
-};
-
 function Sider(props) {
   var _classNames;
 
@@ -174,7 +170,7 @@ export default function Layout(props) {
     items: tabs.map(function (item) {
       return {
         label: item.title,
-        key: getKey(item)
+        key: item.key
       };
     })
   }) : null, body || /*#__PURE__*/React.createElement(Content, {
@@ -208,7 +204,7 @@ function LayoutTabs(props) {
         var tab = tabs[index];
         return {
           label: (_get = get(node, ['props', 'tab'])) !== null && _get !== void 0 ? _get : tab.title,
-          key: (_get2 = get(node, 'key')) !== null && _get2 !== void 0 ? _get2 : getKey(tab),
+          key: (_get2 = get(node, 'key')) !== null && _get2 !== void 0 ? _get2 : tab.key,
           forceRender: get(node, ['props', 'forceRender']),
           children: node
         };

package/es/components/Section/TabBar.d.ts

@@ -1,8 +1,9 @@
+import { type ReactNode } from 'react';
 import type { MouseEvent } from 'react';
 interface Props {
     prefixCls: string;
     tabs: {
-        title?: string;
+        title?: ReactNode;
         key: string;
     }[];
     activeKey?: string;

package/es/components/Section/index.d.ts

@@ -30,10 +30,14 @@ interface Props extends Pick<TabsProps, 'activeKey' | 'onTabClick'> {
      * @description tabs
      */
     tabs?: {
-        title?: string;
+        title?: ReactNode;
         key: string;
         forceRender?: boolean;
     }[];
+    /**
+     * 是否隐藏TabBar
+     */
+    hideTabBar?: boolean;
     /**
      * @description body元素的样式
      */

package/es/components/Section/index.js

@@ -8,8 +8,9 @@ import React from 'react';
 import classNames from 'classnames';
 import { Tabs } from 'antd';
 import { mapChildren } from "../utils";
-import { PREFIX_CLS } from "../../constants";
 import TabBar from "./TabBar";
+import { prefixClassName } from "../utils";
+var prefix = prefixClassName('section');
 export default function Section(props) {
   var _classNames;
 
@@ -24,8 +25,8 @@ export default function Section(props) {
       actions = props.actions,
       flex = props.flex,
       activeKey = props.activeKey,
-      _onTabClick = props.onTabClick;
-  var prefixCls = PREFIX_CLS + '-section';
+      _onTabClick = props.onTabClick,
+      hideTabBar = props.hideTabBar;
   var containerStyle = style;
 
   if (flex) {
@@ -36,22 +37,40 @@ export default function Section(props) {
 
   var hasActions = !!actions;
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames(prefixCls, (_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-").concat(type), !!type), _defineProperty(_classNames, "".concat(prefixCls, "-flex"), !!flex), _classNames), className),
+    className: classNames(prefix(), (_classNames = {}, _defineProperty(_classNames, prefix(type), !!type), _defineProperty(_classNames, prefix('flex'), !!flex), _classNames), className),
     style: containerStyle
   }, title || hasActions ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-header")
+    className: prefix('header')
   }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-title")
+    className: prefix('title')
   }, title), actions) : null, tabs !== undefined && tabs.length > 0 ? Array.isArray(children) && children.length > 1 ? /*#__PURE__*/React.createElement(Tabs, {
     activeKey: activeKey,
     onTabClick: _onTabClick,
+    items: mapChildren(children, function (child, index) {
+      var _tabs$index = tabs[index],
+          tab = _tabs$index.title,
+          key = _tabs$index.key,
+          forceRender = _tabs$index.forceRender;
+      return {
+        key: key,
+        label: tab,
+        className: prefix('body'),
+        style: bodyStyle,
+        forceRender: forceRender,
+        children: child
+      };
+    }),
     renderTabBar: function renderTabBar(tabProps) {
+      if (hideTabBar) {
+        return null;
+      }
+
       var mKey = tabProps.activeKey,
           mClick = tabProps.onTabClick;
       return /*#__PURE__*/React.createElement(TabBar, {
         activeKey: mKey,
         tabs: tabs,
-        prefixCls: prefixCls,
+        prefixCls: prefix(),
         onTabClick: function onTabClick(key, index, e) {
           mClick(key, e);
 
@@ -63,22 +82,10 @@ export default function Section(props) {
         }
       });
     }
-  }, mapChildren(children, function (child, index) {
-    var _tabs$index = tabs[index],
-        tab = _tabs$index.title,
-        key = _tabs$index.key,
-        forceRender = _tabs$index.forceRender;
-    return /*#__PURE__*/React.createElement(Tabs.TabPane, {
-      tab: tab,
-      key: key,
-      className: "".concat(prefixCls, "-body"),
-      style: bodyStyle,
-      forceRender: forceRender
-    }, child);
-  })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TabBar, {
+  }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TabBar, {
     activeKey: activeKey,
     tabs: tabs,
-    prefixCls: prefixCls,
+    prefixCls: prefix(),
     onTabClick: function onTabClick(key, index, e) {
       if (_onTabClick) {
         _onTabClick(key, e);
@@ -89,10 +96,10 @@ export default function Section(props) {
       }
     }
   }), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-body"),
+    className: prefix('body'),
     style: bodyStyle
   }, children)) : /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-body"),
+    className: prefix('body'),
     style: bodyStyle
   }, children));
 }

package/es/components/Section/index.less

@@ -132,3 +132,7 @@
     min-height: 0;
   }
 }
+
+.@{prefixCls}-section-body > .@{prefixCls}-tab-bar:first-child {
+  margin-top: -@space-v;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-107",
+  "version": "1.0.0-109",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -31,12 +31,12 @@
     ]
   },
   "dependencies": {
-    "@ag-grid-community/client-side-row-model": "^29.2.0",
-    "@ag-grid-community/core": "^29.2.0",
-    "@ag-grid-community/csv-export": "^29.2.0",
-    "@ag-grid-community/infinite-row-model": "^29.2.0",
-    "@ag-grid-community/react": "^29.2.0",
-    "@ag-grid-community/styles": "^29.2.0",
+    "@ag-grid-community/client-side-row-model": "29.2.0",
+    "@ag-grid-community/core": "29.2.0",
+    "@ag-grid-community/csv-export": "29.2.0",
+    "@ag-grid-community/infinite-row-model": "29.2.0",
+    "@ag-grid-community/react": "29.2.0",
+    "@ag-grid-community/styles": "29.2.0",
     "@ant-design/icons": "^4.7.0",
     "@lemon-fe/hooks": "^0.1.142",
     "@lemon-fe/utils": "^0.1.117",
@@ -59,12 +59,12 @@
     "react": ">=16.8"
   },
   "devDependencies": {
-    "@ag-grid-enterprise/clipboard": "^29.2.0",
-    "@ag-grid-enterprise/column-tool-panel": "^29.2.0",
-    "@ag-grid-enterprise/master-detail": "^29.2.0",
-    "@ag-grid-enterprise/menu": "^29.2.0",
-    "@ag-grid-enterprise/row-grouping": "^29.2.0",
-    "@ag-grid-enterprise/side-bar": "^29.2.0",
+    "@ag-grid-enterprise/clipboard": "29.2.0",
+    "@ag-grid-enterprise/column-tool-panel": "29.2.0",
+    "@ag-grid-enterprise/master-detail": "29.2.0",
+    "@ag-grid-enterprise/menu": "29.2.0",
+    "@ag-grid-enterprise/row-grouping": "29.2.0",
+    "@ag-grid-enterprise/side-bar": "29.2.0",
     "@testing-library/jest-dom": "^5.15.1",
     "@testing-library/react": "^13.0.0",
     "@types/color-string": "^1.5.2",