@fe-free/core 2.2.6 → 2.2.8

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @fe-free/core
 
+## 2.2.8
+
+### Patch Changes
+
+- feat: global
+  - @fe-free/tool@2.2.8
+
+## 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.8",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -28,7 +28,9 @@
     "ahooks": "^3.7.8",
     "axios": "^1.6.5",
     "classnames": "^2.5.1",
+    "file-saver": "^2.0.5",
     "github-markdown-css": "^5.8.1",
+    "i": "^0.3.7",
     "localforage": "^1.10.0",
     "lodash-es": "^4.17.21",
     "react-ace": "^11.0.1",
@@ -39,7 +41,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.8"
   },
   "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) => {

package/src/global/error.ts

@@ -0,0 +1,89 @@
+import { message } from 'antd';
+import type { AxiosRequestConfig, AxiosResponse } from 'axios';
+import { AxiosError } from 'axios';
+
+class RequestError extends Error {
+  silent: boolean | undefined;
+  status: string | undefined;
+  config: AxiosRequestConfig<any> | undefined;
+  request: XMLHttpRequest | undefined;
+  response: AxiosResponse<any, any> | undefined;
+
+  constructor(
+    message: string,
+    {
+      silent,
+      config,
+      request,
+      response,
+    }: {
+      silent?: boolean;
+      status?: number;
+      config?: AxiosRequestConfig;
+      request?: XMLHttpRequest;
+      response?: AxiosResponse;
+    },
+  ) {
+    super(message);
+    this.name = 'RequestError';
+
+    this.silent = silent;
+    this.status = status;
+    this.config = config;
+    this.request = request;
+    this.response = response;
+  }
+}
+
+function commonHandleError(event) {
+  console.log('handleError', event);
+
+  if (event.reason) {
+    if (event.reason instanceof AxiosError) {
+      if (event.reason.code === 'ERR_NETWORK') {
+        message.error('网络异常');
+        return;
+      }
+      if (event.reason.code === 'ECONNABORTED') {
+        message.error('请求超时');
+        return;
+      }
+
+      if (event.reason.code === 'ERR_CANCELED') {
+        // 正常逻辑
+        return;
+      }
+    }
+
+    if (event.reason.message || event.reason.reason) {
+      message.error(event.reason.message || event.reason.reason);
+      return;
+    }
+  }
+
+  if (event.error) {
+    if (event.error.message || event.error.reason) {
+      message.error(event.error.message || event.error.reason);
+      return;
+    }
+  }
+
+  // unknown error
+}
+
+function initErrorHandle(onError) {
+  const handleError = (event) => {
+    commonHandleError(event);
+    onError?.(event);
+  };
+
+  window.addEventListener('error', handleError);
+  window.addEventListener('unhandledrejection', handleError);
+
+  return () => {
+    window.removeEventListener('error', handleError);
+    window.removeEventListener('unhandledrejection', handleError);
+  };
+}
+
+export { initErrorHandle, RequestError };

package/src/global/interceptors.ts

@@ -0,0 +1,34 @@
+import type { AxiosInstance } from 'axios';
+import { saveAs } from 'file-saver';
+
+function downloadInterceptor(instance: AxiosInstance) {
+  instance.interceptors.response.use(async function (response) {
+    const contentDisposition = response.headers['content-disposition'];
+
+    if (contentDisposition) {
+      let filename;
+
+      // 更加健壮且简洁的写法，优先处理 filename*=，否则处理 filename=
+      if (contentDisposition.includes('filename*=')) {
+        // RFC 5987 格式：filename*=utf-8''xxx
+        const match = contentDisposition.match(/filename\*\s*=\s*([^']*)''([^;]+)/i);
+        filename = match ? decodeURIComponent(match[2]) : undefined;
+      } else if (contentDisposition.includes('filename=')) {
+        // 普通格式：filename=xxx
+        const match = contentDisposition.match(/filename\s*=\s*("?)([^";]+)\1/i);
+        filename = match ? decodeURIComponent(match[2]) : undefined;
+      }
+
+      filename = filename || 'download';
+
+      // 处理文件下载 - 确保正确处理二进制数据
+      const blob = response.data;
+
+      saveAs(blob, filename);
+    }
+
+    return response;
+  });
+}
+
+export { downloadInterceptor };

package/src/index.ts

@@ -30,6 +30,8 @@ export {
   ProFormUploadDragger,
   proFormSelectSearchProps,
 } from './form';
+export { RequestError, initErrorHandle } from './global/error';
+export { downloadInterceptor } from './global/interceptors';
 export { Markdown } from './markdown';
 export { PageLayout } from './page_layout';
 export { routeTool } from './route';