@fe-free/core 2.2.6 → 2.2.7

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @fe-free/core
 
+## 2.2.7
+
+### Patch Changes
+
+- feat: crud
+  - @fe-free/tool@2.2.7
+
 ## 2.2.6
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -39,7 +39,7 @@
     "remark-gfm": "^4.0.1",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "2.2.6"
+    "@fe-free/tool": "2.2.7"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "2.8.9",

package/src/crud/crud.stories.tsx

@@ -494,6 +494,9 @@ export const RowSelection: Story = {
             },
           ],
           request: fakeRequest,
+          rowSelection: {
+            alwaysShowAlert: true,
+          },
         }}
         batchActions={[
           {

package/src/crud/crud.tsx

@@ -118,7 +118,7 @@ function CRUDComponent<
             const disabled = readProps?.operateIsDisabled?.(record) || false;
             if (disabled) {
               btns.push(
-                <span key="read" className="text-desc cursor-not-allowed">
+                <span key="read" className="cursor-not-allowed text-desc">
                   {readProps?.operateText || '查看'}
                 </span>,
               );
@@ -144,7 +144,7 @@ function CRUDComponent<
             const disabled = readProps?.operateIsDisabled?.(record) || false;
             if (disabled) {
               btns.push(
-                <span key="read" className="text-desc cursor-not-allowed">
+                <span key="read" className="cursor-not-allowed text-desc">
                   {readProps?.operateText || '查看'}
                 </span>,
               );
@@ -169,7 +169,7 @@ function CRUDComponent<
 
             if (disabled) {
               btns.push(
-                <span key="update" className="text-desc cursor-not-allowed">
+                <span key="update" className="cursor-not-allowed text-desc">
                   {updateProps?.operateText || '编辑'}
                 </span>,
               );
@@ -284,6 +284,7 @@ function CRUDComponent<
     DataSource,
     Key
   >({
+    rowSelection: tableProps.rowSelection,
     batchActions,
     actionRef,
   });

package/src/crud/use_row_selection.tsx

@@ -6,13 +6,20 @@ import { LoadingButton } from '../button';
 import type { CRUDProps } from './types';
 
 function useRowSelection<DataSource, Key>({
+  rowSelection: originRowSelection,
   batchActions,
   actionRef,
 }: {
+  rowSelection?: CRUDProps<DataSource, Key>['tableProps']['rowSelection'];
   batchActions?: CRUDProps<DataSource, Key>['batchActions'];
   actionRef?: MutableRefObject<ActionType | undefined>;
 }) {
-  const rowSelection = useMemo(() => ({}), []);
+  const rowSelection = useMemo(
+    () => ({
+      ...originRowSelection,
+    }),
+    [originRowSelection],
+  );
 
   const tableAlertRender = useCallback(({ selectedRowKeys, onCleanSelected }) => {
     return (
@@ -30,13 +37,14 @@ function useRowSelection<DataSource, Key>({
   const tableAlertOptionRender = useCallback(
     ({ selectedRowKeys, selectedRows }) => {
       return (
-        <div className="flex gap-2 items-center">
+        <div className="flex items-center gap-2">
           {batchActions?.map((action) => (
             <LoadingButton
               key={action.btnText}
               type="link"
               danger={action.danger}
               className="!px-0"
+              disabled={selectedRowKeys.length === 0}
               onClick={async (event) => {
                 if (action.danger) {
                   await new Promise((resolve) => {